Skip to content

Commit 294d118

Browse files
slfan1989slfan1989
committed
HADOOP-19438. Upgrade JUnit from 4 to 5 in hadoop-resourceestimator.
1 parent 5c10e0d commit 294d118

File tree

11 files changed

+362
-312
lines changed

11 files changed

+362
-312
lines changed

‎hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/api/TestResourceSkyline.java‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
2727
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
2828
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
29-
import org.junit.After;
30-
import org.junit.Assert;
31-
import org.junit.Before;
32-
import org.junit.Test;
29+
import org.junit.jupiter.api.AfterEach;
30+
import org.junit.jupiter.api.Assertions;
31+
import org.junit.jupiter.api.BeforeEach;
32+
import org.junit.jupiter.api.Test;
3333

3434
/**
3535
* Test {@link ResourceSkyline} class.
@@ -45,7 +45,8 @@ public class TestResourceSkyline {
4545
private TreeMap<Long, Resource> resourceOverTime;
4646
private RLESparseResourceAllocation skylineList;
4747

48-
@Before public final void setup() {
48+
@BeforeEach
49+
public final void setup() {
4950
resourceOverTime = new TreeMap<>();
5051
skylineList = new RLESparseResourceAllocation(resourceOverTime,
5152
new DefaultResourceCalculator());
@@ -54,40 +55,40 @@ public class TestResourceSkyline {
5455
}
5556

5657
@Test public final void testGetJobId() {
57-
Assert.assertNull(resourceSkyline);
58+
Assertions.assertNull(resourceSkyline);
5859
ReservationInterval riAdd = new ReservationInterval(0, 10);
5960
skylineList.addInterval(riAdd, resource1);
6061
riAdd = new ReservationInterval(10, 20);
6162
skylineList.addInterval(riAdd, resource1);
6263
resourceSkyline =
6364
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
64-
Assert.assertEquals("1", resourceSkyline.getJobId());
65+
Assertions.assertEquals("1", resourceSkyline.getJobId());
6566
}
6667

6768
@Test public final void testGetJobSubmissionTime() {
68-
Assert.assertNull(resourceSkyline);
69+
Assertions.assertNull(resourceSkyline);
6970
ReservationInterval riAdd = new ReservationInterval(0, 10);
7071
skylineList.addInterval(riAdd, resource1);
7172
riAdd = new ReservationInterval(10, 20);
7273
skylineList.addInterval(riAdd, resource1);
7374
resourceSkyline =
7475
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
75-
Assert.assertEquals(0, resourceSkyline.getJobSubmissionTime());
76+
Assertions.assertEquals(0, resourceSkyline.getJobSubmissionTime());
7677
}
7778

7879
@Test public final void testGetJobFinishTime() {
79-
Assert.assertNull(resourceSkyline);
80+
Assertions.assertNull(resourceSkyline);
8081
ReservationInterval riAdd = new ReservationInterval(0, 10);
8182
skylineList.addInterval(riAdd, resource1);
8283
riAdd = new ReservationInterval(10, 20);
8384
skylineList.addInterval(riAdd, resource1);
8485
resourceSkyline =
8586
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
86-
Assert.assertEquals(20, resourceSkyline.getJobFinishTime());
87+
Assertions.assertEquals(20, resourceSkyline.getJobFinishTime());
8788
}
8889

8990
@Test public final void testGetKthResource() {
90-
Assert.assertNull(resourceSkyline);
91+
Assertions.assertNull(resourceSkyline);
9192
ReservationInterval riAdd = new ReservationInterval(10, 20);
9293
skylineList.addInterval(riAdd, resource1);
9394
riAdd = new ReservationInterval(20, 30);
@@ -97,27 +98,27 @@ public class TestResourceSkyline {
9798
final RLESparseResourceAllocation skylineList2 =
9899
resourceSkyline.getSkylineList();
99100
for (int i = 10; i < 20; i++) {
100-
Assert.assertEquals(resource1.getMemorySize(),
101+
Assertions.assertEquals(resource1.getMemorySize(),
101102
skylineList2.getCapacityAtTime(i).getMemorySize());
102-
Assert.assertEquals(resource1.getVirtualCores(),
103+
Assertions.assertEquals(resource1.getVirtualCores(),
103104
skylineList2.getCapacityAtTime(i).getVirtualCores());
104105
}
105106
for (int i = 20; i < 30; i++) {
106-
Assert.assertEquals(resource2.getMemorySize(),
107+
Assertions.assertEquals(resource2.getMemorySize(),
107108
skylineList2.getCapacityAtTime(i).getMemorySize());
108-
Assert.assertEquals(resource2.getVirtualCores(),
109+
Assertions.assertEquals(resource2.getVirtualCores(),
109110
skylineList2.getCapacityAtTime(i).getVirtualCores());
110111
}
111112
// test if resourceSkyline automatically extends the skyline with
112113
// zero-resource at both ends
113-
Assert.assertEquals(0, skylineList2.getCapacityAtTime(9).getMemorySize());
114-
Assert.assertEquals(0, skylineList2.getCapacityAtTime(9).getVirtualCores());
115-
Assert.assertEquals(0, skylineList2.getCapacityAtTime(30).getMemorySize());
116-
Assert
117-
.assertEquals(0, skylineList2.getCapacityAtTime(30).getVirtualCores());
114+
Assertions.assertEquals(0, skylineList2.getCapacityAtTime(9).getMemorySize());
115+
Assertions.assertEquals(0, skylineList2.getCapacityAtTime(9).getVirtualCores());
116+
Assertions.assertEquals(0, skylineList2.getCapacityAtTime(30).getMemorySize());
117+
Assertions.assertEquals(0, skylineList2.getCapacityAtTime(30).getVirtualCores());
118118
}
119119

120-
@After public final void cleanUp() {
120+
@AfterEach
121+
public final void cleanUp() {
121122
resourceSkyline = null;
122123
resource1 = null;
123124
resource2 = null;

‎hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestHistorySkylineSerDe.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
3333
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
3434
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
35-
import org.junit.After;
36-
import org.junit.Assert;
37-
import org.junit.Before;
38-
import org.junit.Test;
35+
import org.junit.jupiter.api.AfterEach;
36+
import org.junit.jupiter.api.Assertions;
37+
import org.junit.jupiter.api.BeforeEach;
38+
import org.junit.jupiter.api.Test;
3939

4040
import com.google.gson.Gson;
4141
import com.google.gson.GsonBuilder;
@@ -56,7 +56,8 @@ public class TestHistorySkylineSerDe {
5656
private TreeMap<Long, Resource> resourceOverTime;
5757
private RLESparseResourceAllocation skylineList;
5858

59-
@Before public final void setup() {
59+
@BeforeEach
60+
public final void setup() {
6061
resourceOverTime = new TreeMap<>();
6162
skylineList = new RLESparseResourceAllocation(resourceOverTime,
6263
new DefaultResourceCalculator());
@@ -93,36 +94,37 @@ public class TestHistorySkylineSerDe {
9394
// check if the recurrenceId is correct
9495
List<ResourceSkyline> resourceSkylineList =
9596
historySkylineDe.get(recurrenceId);
96-
Assert.assertNotNull(resourceSkylineList);
97-
Assert.assertEquals(1, resourceSkylineList.size());
97+
Assertions.assertNotNull(resourceSkylineList);
98+
Assertions.assertEquals(1, resourceSkylineList.size());
9899

99100
// check if the resourceSkyline is correct
100101
ResourceSkyline resourceSkylineDe = resourceSkylineList.get(0);
101-
Assert
102+
Assertions
102103
.assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
103-
Assert.assertEquals(resourceSkylineDe.getJobInputDataSize(),
104+
Assertions.assertEquals(resourceSkylineDe.getJobInputDataSize(),
104105
resourceSkyline.getJobInputDataSize(), 0);
105-
Assert.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
106+
Assertions.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
106107
resourceSkyline.getJobSubmissionTime());
107-
Assert.assertEquals(resourceSkylineDe.getJobFinishTime(),
108+
Assertions.assertEquals(resourceSkylineDe.getJobFinishTime(),
108109
resourceSkyline.getJobFinishTime());
109-
Assert.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
110+
Assertions.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
110111
resourceSkyline.getContainerSpec().getMemorySize());
111-
Assert.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
112+
Assertions.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
112113
resourceSkyline.getContainerSpec().getVirtualCores());
113114
final RLESparseResourceAllocation skylineList2 =
114115
resourceSkyline.getSkylineList();
115116
final RLESparseResourceAllocation skylineListDe =
116117
resourceSkylineDe.getSkylineList();
117118
for (int i = 0; i < 20; i++) {
118-
Assert.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
119+
Assertions.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
119120
skylineListDe.getCapacityAtTime(i).getMemorySize());
120-
Assert.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
121+
Assertions.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
121122
skylineListDe.getCapacityAtTime(i).getVirtualCores());
122123
}
123124
}
124125

125-
@After public final void cleanUp() {
126+
@AfterEach
127+
public final void cleanUp() {
126128
gson = null;
127129
resourceSkyline = null;
128130
resourceOverTime.clear();

‎hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSerDe.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
package org.apache.hadoop.resourceestimator.common.serialization;
2222

2323
import org.apache.hadoop.yarn.api.records.Resource;
24-
import org.junit.After;
25-
import org.junit.Assert;
26-
import org.junit.Before;
27-
import org.junit.Test;
24+
import org.junit.jupiter.api.AfterEach;
25+
import org.junit.jupiter.api.Assertions;
26+
import org.junit.jupiter.api.BeforeEach;
27+
import org.junit.jupiter.api.Test;
2828

2929
import com.google.gson.Gson;
3030
import com.google.gson.GsonBuilder;
@@ -41,7 +41,8 @@ public class TestResourceSerDe {
4141

4242
private Resource resource;
4343

44-
@Before public final void setup() {
44+
@BeforeEach
45+
public final void setup() {
4546
resource = Resource.newInstance(1024 * 100, 100);
4647
gson = new GsonBuilder()
4748
.registerTypeAdapter(Resource.class, new ResourceSerDe()).create();
@@ -52,12 +53,12 @@ public class TestResourceSerDe {
5253
}.getType());
5354
final Resource resourceDe = gson.fromJson(json, new TypeToken<Resource>() {
5455
}.getType());
55-
Assert.assertEquals(resource.getMemorySize(), resourceDe.getMemorySize());
56-
Assert
57-
.assertEquals(resource.getVirtualCores(), resourceDe.getVirtualCores());
56+
Assertions.assertEquals(resource.getMemorySize(), resourceDe.getMemorySize());
57+
Assertions.assertEquals(resource.getVirtualCores(), resourceDe.getVirtualCores());
5858
}
5959

60-
@After public final void cleanUp() {
60+
@AfterEach
61+
public final void cleanUp() {
6162
resource = null;
6263
gson = null;
6364
}

‎hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSkylineSerDe.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
2828
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
2929
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
30-
import org.junit.After;
31-
import org.junit.Assert;
32-
import org.junit.Before;
33-
import org.junit.Test;
30+
import org.junit.jupiter.api.AfterEach;
31+
import org.junit.jupiter.api.Assertions;
32+
import org.junit.jupiter.api.BeforeEach;
33+
import org.junit.jupiter.api.Test;
3434

3535
import com.google.gson.Gson;
3636
import com.google.gson.GsonBuilder;
@@ -51,7 +51,8 @@ public class TestResourceSkylineSerDe {
5151
private TreeMap<Long, Resource> resourceOverTime;
5252
private RLESparseResourceAllocation skylineList;
5353

54-
@Before public final void setup() {
54+
@BeforeEach
55+
public final void setup() {
5556
resourceOverTime = new TreeMap<>();
5657
skylineList = new RLESparseResourceAllocation(resourceOverTime,
5758
new DefaultResourceCalculator());
@@ -76,31 +77,32 @@ public class TestResourceSkylineSerDe {
7677
final ResourceSkyline resourceSkylineDe =
7778
gson.fromJson(json, new TypeToken<ResourceSkyline>() {
7879
}.getType());
79-
Assert
80+
Assertions
8081
.assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
81-
Assert.assertEquals(resourceSkylineDe.getJobInputDataSize(),
82+
Assertions.assertEquals(resourceSkylineDe.getJobInputDataSize(),
8283
resourceSkyline.getJobInputDataSize(), 0);
83-
Assert.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
84+
Assertions.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
8485
resourceSkyline.getJobSubmissionTime());
85-
Assert.assertEquals(resourceSkylineDe.getJobFinishTime(),
86+
Assertions.assertEquals(resourceSkylineDe.getJobFinishTime(),
8687
resourceSkyline.getJobFinishTime());
87-
Assert.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
88+
Assertions.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
8889
resourceSkyline.getContainerSpec().getMemorySize());
89-
Assert.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
90+
Assertions.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
9091
resourceSkyline.getContainerSpec().getVirtualCores());
9192
final RLESparseResourceAllocation skylineList2 =
9293
resourceSkyline.getSkylineList();
9394
final RLESparseResourceAllocation skylineListDe =
9495
resourceSkylineDe.getSkylineList();
9596
for (int i = 0; i < 20; i++) {
96-
Assert.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
97+
Assertions.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
9798
skylineListDe.getCapacityAtTime(i).getMemorySize());
98-
Assert.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
99+
Assertions.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
99100
skylineListDe.getCapacityAtTime(i).getVirtualCores());
100101
}
101102
}
102103

103-
@After public final void cleanUp() {
104+
@AfterEach
105+
public final void cleanUp() {
104106
gson = null;
105107
resourceSkyline = null;
106108
resourceOverTime.clear();

0 commit comments

Comments
 (0)