Skip to content

HADOOP-19438. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-resourceestimator. #7548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slfan1989 merged 4 commits into from
Apr 1, 2025
Merged

HADOOP-19438. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-resourceestimator. #7548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
294d118
HADOOP-19438. Upgrade JUnit from 4 to 5 in hadoop-resourceestimator.
slfan1989 Mar 28, 2025
cc7fa27
HADOOP-19438. Fix CheckStyle.
slfan1989 Mar 28, 2025
28a0a0b
HADOOP-19438. Fix blanks.
slfan1989 Mar 28, 2025
f129cf3
Merge branch 'apache:trunk' into HADOOP-19438
slfan1989 Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions ...tor/src/test/java/org/apache/hadoop/resourceestimator/common/api/TestResourceSkyline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,18 @@

package org.apache.hadoop.resourceestimator.common.api;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

import java.util.TreeMap;

import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

/**
* Test {@link ResourceSkyline} class.
Expand All @@ -45,7 +47,8 @@ public class TestResourceSkyline {
private TreeMap<Long, Resource> resourceOverTime;
private RLESparseResourceAllocation skylineList;

@Before public final void setup() {
@BeforeEach
public final void setup() {
resourceOverTime = new TreeMap<>();
skylineList = new RLESparseResourceAllocation(resourceOverTime,
new DefaultResourceCalculator());
Expand All @@ -54,40 +57,40 @@ public class TestResourceSkyline {
}

@Test public final void testGetJobId() {
Assert.assertNull(resourceSkyline);
assertNull(resourceSkyline);
ReservationInterval riAdd = new ReservationInterval(0, 10);
skylineList.addInterval(riAdd, resource1);
riAdd = new ReservationInterval(10, 20);
skylineList.addInterval(riAdd, resource1);
resourceSkyline =
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
Assert.assertEquals("1", resourceSkyline.getJobId());
assertEquals("1", resourceSkyline.getJobId());
}

@Test public final void testGetJobSubmissionTime() {
Assert.assertNull(resourceSkyline);
assertNull(resourceSkyline);
ReservationInterval riAdd = new ReservationInterval(0, 10);
skylineList.addInterval(riAdd, resource1);
riAdd = new ReservationInterval(10, 20);
skylineList.addInterval(riAdd, resource1);
resourceSkyline =
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
Assert.assertEquals(0, resourceSkyline.getJobSubmissionTime());
assertEquals(0, resourceSkyline.getJobSubmissionTime());
}

@Test public final void testGetJobFinishTime() {
Assert.assertNull(resourceSkyline);
assertNull(resourceSkyline);
ReservationInterval riAdd = new ReservationInterval(0, 10);
skylineList.addInterval(riAdd, resource1);
riAdd = new ReservationInterval(10, 20);
skylineList.addInterval(riAdd, resource1);
resourceSkyline =
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
Assert.assertEquals(20, resourceSkyline.getJobFinishTime());
assertEquals(20, resourceSkyline.getJobFinishTime());
}

@Test public final void testGetKthResource() {
Assert.assertNull(resourceSkyline);
assertNull(resourceSkyline);
ReservationInterval riAdd = new ReservationInterval(10, 20);
skylineList.addInterval(riAdd, resource1);
riAdd = new ReservationInterval(20, 30);
Expand All @@ -97,27 +100,27 @@ public class TestResourceSkyline {
final RLESparseResourceAllocation skylineList2 =
resourceSkyline.getSkylineList();
for (int i = 10; i < 20; i++) {
Assert.assertEquals(resource1.getMemorySize(),
assertEquals(resource1.getMemorySize(),
skylineList2.getCapacityAtTime(i).getMemorySize());
Assert.assertEquals(resource1.getVirtualCores(),
assertEquals(resource1.getVirtualCores(),
skylineList2.getCapacityAtTime(i).getVirtualCores());
}
for (int i = 20; i < 30; i++) {
Assert.assertEquals(resource2.getMemorySize(),
assertEquals(resource2.getMemorySize(),
skylineList2.getCapacityAtTime(i).getMemorySize());
Assert.assertEquals(resource2.getVirtualCores(),
assertEquals(resource2.getVirtualCores(),
skylineList2.getCapacityAtTime(i).getVirtualCores());
}
// test if resourceSkyline automatically extends the skyline with
// zero-resource at both ends
Assert.assertEquals(0, skylineList2.getCapacityAtTime(9).getMemorySize());
Assert.assertEquals(0, skylineList2.getCapacityAtTime(9).getVirtualCores());
Assert.assertEquals(0, skylineList2.getCapacityAtTime(30).getMemorySize());
Assert
.assertEquals(0, skylineList2.getCapacityAtTime(30).getVirtualCores());
assertEquals(0, skylineList2.getCapacityAtTime(9).getMemorySize());
assertEquals(0, skylineList2.getCapacityAtTime(9).getVirtualCores());
assertEquals(0, skylineList2.getCapacityAtTime(30).getMemorySize());
assertEquals(0, skylineList2.getCapacityAtTime(30).getVirtualCores());
}

@After public final void cleanUp() {
@AfterEach
public final void cleanUp() {
resourceSkyline = null;
resource1 = null;
resource2 = null;
Expand Down
37 changes: 20 additions & 17 deletions ...ava/org/apache/hadoop/resourceestimator/common/serialization/TestHistorySkylineSerDe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@

package org.apache.hadoop.resourceestimator.common.serialization;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand All @@ -32,10 +35,9 @@
import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand All @@ -56,7 +58,8 @@ public class TestHistorySkylineSerDe {
private TreeMap<Long, Resource> resourceOverTime;
private RLESparseResourceAllocation skylineList;

@Before public final void setup() {
@BeforeEach
public final void setup() {
resourceOverTime = new TreeMap<>();
skylineList = new RLESparseResourceAllocation(resourceOverTime,
new DefaultResourceCalculator());
Expand Down Expand Up @@ -93,36 +96,36 @@ public class TestHistorySkylineSerDe {
// check if the recurrenceId is correct
List<ResourceSkyline> resourceSkylineList =
historySkylineDe.get(recurrenceId);
Assert.assertNotNull(resourceSkylineList);
Assert.assertEquals(1, resourceSkylineList.size());
assertNotNull(resourceSkylineList);
assertEquals(1, resourceSkylineList.size());

// check if the resourceSkyline is correct
ResourceSkyline resourceSkylineDe = resourceSkylineList.get(0);
Assert
.assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
Assert.assertEquals(resourceSkylineDe.getJobInputDataSize(),
assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
assertEquals(resourceSkylineDe.getJobInputDataSize(),
resourceSkyline.getJobInputDataSize(), 0);
Assert.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
assertEquals(resourceSkylineDe.getJobSubmissionTime(),
resourceSkyline.getJobSubmissionTime());
Assert.assertEquals(resourceSkylineDe.getJobFinishTime(),
assertEquals(resourceSkylineDe.getJobFinishTime(),
resourceSkyline.getJobFinishTime());
Assert.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
resourceSkyline.getContainerSpec().getMemorySize());
Assert.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
resourceSkyline.getContainerSpec().getVirtualCores());
final RLESparseResourceAllocation skylineList2 =
resourceSkyline.getSkylineList();
final RLESparseResourceAllocation skylineListDe =
resourceSkylineDe.getSkylineList();
for (int i = 0; i < 20; i++) {
Assert.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
skylineListDe.getCapacityAtTime(i).getMemorySize());
Assert.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
skylineListDe.getCapacityAtTime(i).getVirtualCores());
}
}

@After public final void cleanUp() {
@AfterEach
public final void cleanUp() {
gson = null;
resourceSkyline = null;
resourceOverTime.clear();
Expand Down
23 changes: 13 additions & 10 deletions ...test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSerDe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@

package org.apache.hadoop.resourceestimator.common.serialization;

import static org.junit.jupiter.api.Assertions.assertEquals;

import org.apache.hadoop.yarn.api.records.Resource;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand All @@ -41,23 +42,25 @@ public class TestResourceSerDe {

private Resource resource;

@Before public final void setup() {
@BeforeEach
public final void setup() {
resource = Resource.newInstance(1024 * 100, 100);
gson = new GsonBuilder()
.registerTypeAdapter(Resource.class, new ResourceSerDe()).create();
}

@Test public final void testSerialization() {
@Test
public final void testSerialization() {
final String json = gson.toJson(resource, new TypeToken<Resource>() {
}.getType());
final Resource resourceDe = gson.fromJson(json, new TypeToken<Resource>() {
}.getType());
Assert.assertEquals(resource.getMemorySize(), resourceDe.getMemorySize());
Assert
.assertEquals(resource.getVirtualCores(), resourceDe.getVirtualCores());
assertEquals(resource.getMemorySize(), resourceDe.getMemorySize());
assertEquals(resource.getVirtualCores(), resourceDe.getVirtualCores());
}

@After public final void cleanUp() {
@AfterEach
public final void cleanUp() {
resource = null;
gson = null;
}
Expand Down
32 changes: 17 additions & 15 deletions ...va/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSkylineSerDe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@

package org.apache.hadoop.resourceestimator.common.serialization;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.TreeMap;

import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand All @@ -51,7 +52,8 @@ public class TestResourceSkylineSerDe {
private TreeMap<Long, Resource> resourceOverTime;
private RLESparseResourceAllocation skylineList;

@Before public final void setup() {
@BeforeEach
public final void setup() {
resourceOverTime = new TreeMap<>();
skylineList = new RLESparseResourceAllocation(resourceOverTime,
new DefaultResourceCalculator());
Expand All @@ -76,31 +78,31 @@ public class TestResourceSkylineSerDe {
final ResourceSkyline resourceSkylineDe =
gson.fromJson(json, new TypeToken<ResourceSkyline>() {
}.getType());
Assert
.assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
Assert.assertEquals(resourceSkylineDe.getJobInputDataSize(),
assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
assertEquals(resourceSkylineDe.getJobInputDataSize(),
resourceSkyline.getJobInputDataSize(), 0);
Assert.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
assertEquals(resourceSkylineDe.getJobSubmissionTime(),
resourceSkyline.getJobSubmissionTime());
Assert.assertEquals(resourceSkylineDe.getJobFinishTime(),
assertEquals(resourceSkylineDe.getJobFinishTime(),
resourceSkyline.getJobFinishTime());
Assert.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
resourceSkyline.getContainerSpec().getMemorySize());
Assert.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
resourceSkyline.getContainerSpec().getVirtualCores());
final RLESparseResourceAllocation skylineList2 =
resourceSkyline.getSkylineList();
final RLESparseResourceAllocation skylineListDe =
resourceSkylineDe.getSkylineList();
for (int i = 0; i < 20; i++) {
Assert.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
skylineListDe.getCapacityAtTime(i).getMemorySize());
Assert.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
skylineListDe.getCapacityAtTime(i).getVirtualCores());
}
}

@After public final void cleanUp() {
@AfterEach
public final void cleanUp() {
gson = null;
resourceSkyline = null;
resourceOverTime.clear();
Expand Down
Loading