Skip to content

Commit cc7fa27

Browse files
slfan1989slfan1989
committed
HADOOP-19438. Fix CheckStyle.
1 parent 294d118 commit cc7fa27

File tree

11 files changed

+170
-155
lines changed

11 files changed

+170
-155
lines changed

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020

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

23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
import static org.junit.jupiter.api.Assertions.assertNull;
25+
2326
import java.util.TreeMap;
2427

2528
import org.apache.hadoop.yarn.api.records.Resource;
2629
import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
2730
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
2831
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
2932
import org.junit.jupiter.api.AfterEach;
30-
import org.junit.jupiter.api.Assertions;
3133
import org.junit.jupiter.api.BeforeEach;
3234
import org.junit.jupiter.api.Test;
3335

@@ -55,40 +57,40 @@ public final void setup() {
5557
}
5658

5759
@Test public final void testGetJobId() {
58-
Assertions.assertNull(resourceSkyline);
60+
assertNull(resourceSkyline);
5961
ReservationInterval riAdd = new ReservationInterval(0, 10);
6062
skylineList.addInterval(riAdd, resource1);
6163
riAdd = new ReservationInterval(10, 20);
6264
skylineList.addInterval(riAdd, resource1);
6365
resourceSkyline =
6466
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
65-
Assertions.assertEquals("1", resourceSkyline.getJobId());
67+
assertEquals("1", resourceSkyline.getJobId());
6668
}
6769

6870
@Test public final void testGetJobSubmissionTime() {
69-
Assertions.assertNull(resourceSkyline);
71+
assertNull(resourceSkyline);
7072
ReservationInterval riAdd = new ReservationInterval(0, 10);
7173
skylineList.addInterval(riAdd, resource1);
7274
riAdd = new ReservationInterval(10, 20);
7375
skylineList.addInterval(riAdd, resource1);
7476
resourceSkyline =
7577
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
76-
Assertions.assertEquals(0, resourceSkyline.getJobSubmissionTime());
78+
assertEquals(0, resourceSkyline.getJobSubmissionTime());
7779
}
7880

7981
@Test public final void testGetJobFinishTime() {
80-
Assertions.assertNull(resourceSkyline);
82+
assertNull(resourceSkyline);
8183
ReservationInterval riAdd = new ReservationInterval(0, 10);
8284
skylineList.addInterval(riAdd, resource1);
8385
riAdd = new ReservationInterval(10, 20);
8486
skylineList.addInterval(riAdd, resource1);
8587
resourceSkyline =
8688
new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
87-
Assertions.assertEquals(20, resourceSkyline.getJobFinishTime());
89+
assertEquals(20, resourceSkyline.getJobFinishTime());
8890
}
8991

9092
@Test public final void testGetKthResource() {
91-
Assertions.assertNull(resourceSkyline);
93+
assertNull(resourceSkyline);
9294
ReservationInterval riAdd = new ReservationInterval(10, 20);
9395
skylineList.addInterval(riAdd, resource1);
9496
riAdd = new ReservationInterval(20, 30);
@@ -98,23 +100,23 @@ public final void setup() {
98100
final RLESparseResourceAllocation skylineList2 =
99101
resourceSkyline.getSkylineList();
100102
for (int i = 10; i < 20; i++) {
101-
Assertions.assertEquals(resource1.getMemorySize(),
103+
assertEquals(resource1.getMemorySize(),
102104
skylineList2.getCapacityAtTime(i).getMemorySize());
103-
Assertions.assertEquals(resource1.getVirtualCores(),
105+
assertEquals(resource1.getVirtualCores(),
104106
skylineList2.getCapacityAtTime(i).getVirtualCores());
105107
}
106108
for (int i = 20; i < 30; i++) {
107-
Assertions.assertEquals(resource2.getMemorySize(),
109+
assertEquals(resource2.getMemorySize(),
108110
skylineList2.getCapacityAtTime(i).getMemorySize());
109-
Assertions.assertEquals(resource2.getVirtualCores(),
111+
assertEquals(resource2.getVirtualCores(),
110112
skylineList2.getCapacityAtTime(i).getVirtualCores());
111113
}
112114
// test if resourceSkyline automatically extends the skyline with
113115
// zero-resource at both ends
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());
116+
assertEquals(0, skylineList2.getCapacityAtTime(9).getMemorySize());
117+
assertEquals(0, skylineList2.getCapacityAtTime(9).getVirtualCores());
118+
assertEquals(0, skylineList2.getCapacityAtTime(30).getMemorySize());
119+
assertEquals(0, skylineList2.getCapacityAtTime(30).getVirtualCores());
118120
}
119121

120122
@AfterEach

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

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

23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
import static org.junit.jupiter.api.Assertions.assertNotNull;
25+
2326
import java.util.ArrayList;
2427
import java.util.HashMap;
2528
import java.util.List;
@@ -33,7 +36,6 @@
3336
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
3437
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
3538
import org.junit.jupiter.api.AfterEach;
36-
import org.junit.jupiter.api.Assertions;
3739
import org.junit.jupiter.api.BeforeEach;
3840
import org.junit.jupiter.api.Test;
3941

@@ -94,31 +96,30 @@ public final void setup() {
9496
// check if the recurrenceId is correct
9597
List<ResourceSkyline> resourceSkylineList =
9698
historySkylineDe.get(recurrenceId);
97-
Assertions.assertNotNull(resourceSkylineList);
98-
Assertions.assertEquals(1, resourceSkylineList.size());
99+
assertNotNull(resourceSkylineList);
100+
assertEquals(1, resourceSkylineList.size());
99101

100102
// check if the resourceSkyline is correct
101103
ResourceSkyline resourceSkylineDe = resourceSkylineList.get(0);
102-
Assertions
103-
.assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
104-
Assertions.assertEquals(resourceSkylineDe.getJobInputDataSize(),
104+
assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
105+
assertEquals(resourceSkylineDe.getJobInputDataSize(),
105106
resourceSkyline.getJobInputDataSize(), 0);
106-
Assertions.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
107+
assertEquals(resourceSkylineDe.getJobSubmissionTime(),
107108
resourceSkyline.getJobSubmissionTime());
108-
Assertions.assertEquals(resourceSkylineDe.getJobFinishTime(),
109+
assertEquals(resourceSkylineDe.getJobFinishTime(),
109110
resourceSkyline.getJobFinishTime());
110-
Assertions.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
111+
assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
111112
resourceSkyline.getContainerSpec().getMemorySize());
112-
Assertions.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
113+
assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
113114
resourceSkyline.getContainerSpec().getVirtualCores());
114115
final RLESparseResourceAllocation skylineList2 =
115116
resourceSkyline.getSkylineList();
116117
final RLESparseResourceAllocation skylineListDe =
117118
resourceSkylineDe.getSkylineList();
118119
for (int i = 0; i < 20; i++) {
119-
Assertions.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
120+
assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
120121
skylineListDe.getCapacityAtTime(i).getMemorySize());
121-
Assertions.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
122+
assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
122123
skylineListDe.getCapacityAtTime(i).getVirtualCores());
123124
}
124125
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020

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

23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
2325
import org.apache.hadoop.yarn.api.records.Resource;
2426
import org.junit.jupiter.api.AfterEach;
25-
import org.junit.jupiter.api.Assertions;
2627
import org.junit.jupiter.api.BeforeEach;
2728
import org.junit.jupiter.api.Test;
2829

@@ -48,13 +49,14 @@ public final void setup() {
4849
.registerTypeAdapter(Resource.class, new ResourceSerDe()).create();
4950
}
5051

51-
@Test public final void testSerialization() {
52+
@Test
53+
public final void testSerialization() {
5254
final String json = gson.toJson(resource, new TypeToken<Resource>() {
5355
}.getType());
5456
final Resource resourceDe = gson.fromJson(json, new TypeToken<Resource>() {
5557
}.getType());
56-
Assertions.assertEquals(resource.getMemorySize(), resourceDe.getMemorySize());
57-
Assertions.assertEquals(resource.getVirtualCores(), resourceDe.getVirtualCores());
58+
assertEquals(resource.getMemorySize(), resourceDe.getMemorySize());
59+
assertEquals(resource.getVirtualCores(), resourceDe.getVirtualCores());
5860
}
5961

6062
@AfterEach

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

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

23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
2325
import java.util.TreeMap;
2426

2527
import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
@@ -28,7 +30,6 @@
2830
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
2931
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
3032
import org.junit.jupiter.api.AfterEach;
31-
import org.junit.jupiter.api.Assertions;
3233
import org.junit.jupiter.api.BeforeEach;
3334
import org.junit.jupiter.api.Test;
3435

@@ -77,26 +78,25 @@ public final void setup() {
7778
final ResourceSkyline resourceSkylineDe =
7879
gson.fromJson(json, new TypeToken<ResourceSkyline>() {
7980
}.getType());
80-
Assertions
81-
.assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
82-
Assertions.assertEquals(resourceSkylineDe.getJobInputDataSize(),
81+
assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
82+
assertEquals(resourceSkylineDe.getJobInputDataSize(),
8383
resourceSkyline.getJobInputDataSize(), 0);
84-
Assertions.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
84+
assertEquals(resourceSkylineDe.getJobSubmissionTime(),
8585
resourceSkyline.getJobSubmissionTime());
86-
Assertions.assertEquals(resourceSkylineDe.getJobFinishTime(),
86+
assertEquals(resourceSkylineDe.getJobFinishTime(),
8787
resourceSkyline.getJobFinishTime());
88-
Assertions.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
88+
assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
8989
resourceSkyline.getContainerSpec().getMemorySize());
90-
Assertions.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
90+
assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
9191
resourceSkyline.getContainerSpec().getVirtualCores());
9292
final RLESparseResourceAllocation skylineList2 =
9393
resourceSkyline.getSkylineList();
9494
final RLESparseResourceAllocation skylineListDe =
9595
resourceSkylineDe.getSkylineList();
9696
for (int i = 0; i < 20; i++) {
97-
Assertions.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
97+
assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
9898
skylineListDe.getCapacityAtTime(i).getMemorySize());
99-
Assertions.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
99+
assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
100100
skylineListDe.getCapacityAtTime(i).getVirtualCores());
101101
}
102102
}

‎hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/TestResourceEstimatorService.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
3939
import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
4040
import org.junit.jupiter.api.Assertions;
41+
import org.junit.jupiter.api.BeforeEach;
4142
import org.junit.jupiter.api.Test;
4243

4344
import com.google.gson.Gson;
@@ -81,6 +82,7 @@ protected Application configure() {
8182
return config;
8283
}
8384

85+
@BeforeEach
8486
@Override
8587
public void setUp() throws Exception {
8688
super.setUp();

‎hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestInMemoryStore.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
* Test {@link InMemoryStore} class.
2727
*/
2828
public class TestInMemoryStore extends TestSkylineStore {
29-
@Override public final SkylineStore createSkylineStore() {
29+
@Override
30+
public final SkylineStore createSkylineStore() {
3031
return new InMemoryStore();
3132
}
3233
}

0 commit comments

Comments
 (0)