Skip to content

Commit f552664

Browse files
slfan1989cnaurothzhtttylz
authored
YARN-11268. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-yarn-server-timelineservice-documentstore. (#7450)
 [JDK17] Upgrade JUnit from 4 to 5 in hadoop-yarn-server-timelineservice-documentstore. Co-authored-by: Chris Nauroth <[email protected]> Co-authored-by: Hualong Zhang <[email protected]> Reviewed-by: Chris Nauroth <[email protected]> Reviewed-by: Hualong Zhang <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
1 parent e72b218 commit f552664

File tree

7 files changed

+179
-168
lines changed

7 files changed

+179
-168
lines changed

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,11 @@
188188
<artifactId>junit-vintage-engine</artifactId>
189189
<scope>test</scope>
190190
</dependency>
191-
191+
<dependency>
192+
<groupId>org.mockito</groupId>
193+
<artifactId>mockito-junit-jupiter</artifactId>
194+
<scope>test</scope>
195+
</dependency>
192196
</dependencies>
193197

194198
<build>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreCollectionCreator.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424
import org.apache.hadoop.yarn.server.timelineservice.documentstore.lib.DocumentStoreFactory;
2525
import org.apache.hadoop.yarn.server.timelineservice.documentstore.writer.DocumentStoreWriter;
2626
import org.apache.hadoop.yarn.server.timelineservice.documentstore.writer.DummyDocumentStoreWriter;
27-
import org.junit.Before;
28-
import org.junit.Test;
29-
import org.junit.runner.RunWith;
30-
import org.powermock.core.classloader.annotations.PrepareForTest;
31-
import org.powermock.modules.junit4.PowerMockRunner;
27+
import org.junit.jupiter.api.BeforeEach;
28+
import org.junit.jupiter.api.Test;
29+
import org.junit.jupiter.api.extension.ExtendWith;
30+
import org.mockito.junit.jupiter.MockitoExtension;
3231

3332
import static org.mockito.ArgumentMatchers.any;
3433
import static org.mockito.Mockito.mockStatic;
@@ -37,15 +36,14 @@
3736
/**
3837
* Test case for ${@link DocumentStoreCollectionCreator}.
3938
*/
40-
@RunWith(PowerMockRunner.class)
41-
@PrepareForTest(DocumentStoreFactory.class)
39+
@ExtendWith(MockitoExtension.class)
4240
public class TestDocumentStoreCollectionCreator {
4341

4442
private final DocumentStoreWriter<TimelineDocument> documentStoreWriter = new
4543
DummyDocumentStoreWriter<>();
4644
private final Configuration conf = new Configuration();
4745

48-
@Before
46+
@BeforeEach
4947
public void setUp() throws YarnException {
5048
conf.set(DocumentStoreUtils.TIMELINE_SERVICE_DOCUMENTSTORE_DATABASE_NAME,
5149
"TestDB");

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineReaderImpl.java

+55-52
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,32 @@
3838
import org.apache.hadoop.yarn.server.timelineservice.documentstore.collection.document.TimelineDocument;
3939
import org.apache.hadoop.yarn.server.timelineservice.documentstore.collection.document.entity.TimelineEntityDocument;
4040

41-
import org.junit.After;
42-
import org.junit.Assert;
43-
import org.junit.Before;
44-
import org.junit.Test;
45-
import org.junit.runner.RunWith;
41+
import org.junit.jupiter.api.AfterEach;
42+
import org.junit.jupiter.api.BeforeEach;
43+
import org.junit.jupiter.api.Test;
44+
import org.junit.jupiter.api.extension.ExtendWith;
4645

4746
import org.mockito.ArgumentMatchers;
4847
import org.mockito.MockedStatic;
4948

50-
import org.powermock.core.classloader.annotations.PrepareForTest;
51-
import org.powermock.modules.junit4.PowerMockRunner;
49+
import org.mockito.junit.jupiter.MockitoExtension;
5250

5351
import java.io.IOException;
5452
import java.util.EnumSet;
5553
import java.util.List;
5654
import java.util.Set;
5755

56+
import static org.junit.jupiter.api.Assertions.assertEquals;
57+
import static org.junit.jupiter.api.Assertions.assertThrows;
58+
import static org.junit.jupiter.api.Assertions.assertTrue;
59+
import static org.junit.jupiter.api.Assertions.fail;
5860
import static org.mockito.Mockito.mockStatic;
5961
import static org.mockito.Mockito.when;
6062

6163
/**
6264
* Test case for {@link DocumentStoreTimelineReaderImpl}.
6365
*/
64-
@RunWith(PowerMockRunner.class)
65-
@PrepareForTest(DocumentStoreFactory.class)
66+
@ExtendWith(MockitoExtension.class)
6667
public class TestDocumentStoreTimelineReaderImpl {
6768

6869
private final DocumentStoreReader<TimelineDocument> documentStoreReader = new
@@ -84,7 +85,7 @@ public TestDocumentStoreTimelineReaderImpl() throws IOException {
8485

8586
private MockedStatic<DocumentStoreFactory> documentStoreFactoryMockedStatic;
8687

87-
@Before
88+
@BeforeEach
8889
public void setUp() throws YarnException {
8990
conf.set(DocumentStoreUtils.TIMELINE_SERVICE_DOCUMENTSTORE_DATABASE_NAME,
9091
"TestDB");
@@ -98,14 +99,16 @@ public void setUp() throws YarnException {
9899
.thenReturn(documentStoreReader);
99100
}
100101

101-
@After
102+
@AfterEach
102103
public void close() {
103104
documentStoreFactoryMockedStatic.close();
104105
}
105106

106-
@Test(expected = YarnException.class)
107+
@Test
107108
public void testFailOnNoCosmosDBConfigs() throws Exception {
108-
DocumentStoreUtils.validateCosmosDBConf(new Configuration());
109+
assertThrows(YarnException.class, () -> {
110+
DocumentStoreUtils.validateCosmosDBConf(new Configuration());
111+
});
109112
}
110113

111114
@Test
@@ -120,12 +123,12 @@ public void testGetEntity() throws Exception {
120123
TimelineEntity timelineEntity = timelineReader.getEntity(context,
121124
dataToRetrieve);
122125

123-
Assert.assertEquals(appTimelineEntity.getCreatedTime(), timelineEntity
126+
assertEquals(appTimelineEntity.getCreatedTime(), timelineEntity
124127
.getCreatedTime().longValue());
125-
Assert.assertEquals(0, timelineEntity .getMetrics().size());
126-
Assert.assertEquals(0, timelineEntity.getEvents().size());
127-
Assert.assertEquals(0, timelineEntity.getConfigs().size());
128-
Assert.assertEquals(appTimelineEntity.getInfo().size(),
128+
assertEquals(0, timelineEntity .getMetrics().size());
129+
assertEquals(0, timelineEntity.getEvents().size());
130+
assertEquals(0, timelineEntity.getConfigs().size());
131+
assertEquals(appTimelineEntity.getInfo().size(),
129132
timelineEntity.getInfo().size());
130133
}
131134

@@ -139,13 +142,13 @@ public void testGetEntityCustomField() throws Exception {
139142
TimelineEntity timelineEntity = timelineReader.getEntity(context,
140143
dataToRetrieve);
141144

142-
Assert.assertEquals(appTimelineEntity.getCreatedTime(), timelineEntity
145+
assertEquals(appTimelineEntity.getCreatedTime(), timelineEntity
143146
.getCreatedTime().longValue());
144-
Assert.assertEquals(appTimelineEntity.getMetrics().size(),
147+
assertEquals(appTimelineEntity.getMetrics().size(),
145148
timelineEntity.getMetrics().size());
146-
Assert.assertEquals(0, timelineEntity.getEvents().size());
147-
Assert.assertEquals(0, timelineEntity.getConfigs().size());
148-
Assert.assertEquals(appTimelineEntity.getInfo().size(),
149+
assertEquals(0, timelineEntity.getEvents().size());
150+
assertEquals(0, timelineEntity.getConfigs().size());
151+
assertEquals(appTimelineEntity.getInfo().size(),
149152
timelineEntity.getInfo().size());
150153
}
151154

@@ -159,15 +162,15 @@ public void testGetEntityAllFields() throws Exception {
159162
TimelineEntity timelineEntity = timelineReader.getEntity(context,
160163
dataToRetrieve);
161164

162-
Assert.assertEquals(appTimelineEntity.getCreatedTime(), timelineEntity
165+
assertEquals(appTimelineEntity.getCreatedTime(), timelineEntity
163166
.getCreatedTime().longValue());
164-
Assert.assertEquals(appTimelineEntity.getMetrics().size(),
167+
assertEquals(appTimelineEntity.getMetrics().size(),
165168
timelineEntity .getMetrics().size());
166-
Assert.assertEquals(appTimelineEntity.getEvents().size(),
169+
assertEquals(appTimelineEntity.getEvents().size(),
167170
timelineEntity.getEvents().size());
168-
Assert.assertEquals(appTimelineEntity.getConfigs().size(),
171+
assertEquals(appTimelineEntity.getConfigs().size(),
169172
timelineEntity.getConfigs().size());
170-
Assert.assertEquals(appTimelineEntity.getInfo().size(),
173+
assertEquals(appTimelineEntity.getInfo().size(),
171174
timelineEntity.getInfo().size());
172175
}
173176

@@ -181,7 +184,7 @@ public void testGetAllEntities() throws Exception {
181184
Set<TimelineEntity> actualEntities = timelineReader.getEntities(context,
182185
new TimelineEntityFilters.Builder().build(), dataToRetrieve);
183186

184-
Assert.assertEquals(entities.size(), actualEntities.size());
187+
assertEquals(entities.size(), actualEntities.size());
185188
}
186189

187190
@Test
@@ -194,7 +197,7 @@ public void testGetEntitiesWithLimit() throws Exception {
194197
new TimelineEntityFilters.Builder().entityLimit(2L).build(),
195198
dataToRetrieve);
196199

197-
Assert.assertEquals(2, actualEntities.size());
200+
assertEquals(2, actualEntities.size());
198201
}
199202

200203
@Test
@@ -207,7 +210,7 @@ public void testGetEntitiesByWindows() throws Exception {
207210
new TimelineEntityFilters.Builder().createdTimeBegin(1533985554927L)
208211
.createTimeEnd(1533985554927L).build(), dataToRetrieve);
209212

210-
Assert.assertEquals(1, actualEntities.size());
213+
assertEquals(1, actualEntities.size());
211214
}
212215

213216
@Test
@@ -227,11 +230,11 @@ public void testGetFilteredEntities() throws Exception {
227230
new TimelineEntityFilters.Builder().infoFilters(infoFilterList).build(),
228231
dataToRetrieve);
229232

230-
Assert.assertEquals(1, actualEntities.size());
233+
assertEquals(1, actualEntities.size());
231234
// Only one entity with type YARN_APPLICATION_ATTEMPT should be returned.
232235
for (TimelineEntity entity : actualEntities) {
233236
if (!entity.getType().equals("YARN_APPLICATION_ATTEMPT")) {
234-
Assert.fail("Incorrect filtering based on info filters");
237+
fail("Incorrect filtering based on info filters");
235238
}
236239
}
237240

@@ -245,11 +248,11 @@ public void testGetFilteredEntities() throws Exception {
245248
new TimelineEntityFilters.Builder().configFilters(confFilterList)
246249
.build(), dataToRetrieve);
247250

248-
Assert.assertEquals(1, actualEntities.size());
251+
assertEquals(1, actualEntities.size());
249252
// Only one entity with type YARN_APPLICATION should be returned.
250253
for (TimelineEntity entity : actualEntities) {
251254
if (!entity.getType().equals("YARN_APPLICATION")) {
252-
Assert.fail("Incorrect filtering based on info filters");
255+
fail("Incorrect filtering based on info filters");
253256
}
254257
}
255258

@@ -263,11 +266,11 @@ public void testGetFilteredEntities() throws Exception {
263266
new TimelineEntityFilters.Builder().eventFilters(eventFilters).build(),
264267
dataToRetrieve);
265268

266-
Assert.assertEquals(1, actualEntities.size());
269+
assertEquals(1, actualEntities.size());
267270
// Only one entity with type YARN_CONTAINER should be returned.
268271
for (TimelineEntity entity : actualEntities) {
269272
if (!entity.getType().equals("YARN_CONTAINER")) {
270-
Assert.fail("Incorrect filtering based on info filters");
273+
fail("Incorrect filtering based on info filters");
271274
}
272275
}
273276

@@ -279,11 +282,11 @@ public void testGetFilteredEntities() throws Exception {
279282
new TimelineEntityFilters.Builder().metricFilters(metricFilterList)
280283
.build(), dataToRetrieve);
281284

282-
Assert.assertEquals(1, actualEntities.size());
285+
assertEquals(1, actualEntities.size());
283286
// Only one entity with type YARN_CONTAINER should be returned.
284287
for (TimelineEntity entity : actualEntities) {
285288
if (!entity.getType().equals("YARN_CONTAINER")) {
286-
Assert.fail("Incorrect filtering based on info filters");
289+
fail("Incorrect filtering based on info filters");
287290
}
288291
}
289292
}
@@ -300,23 +303,23 @@ public void testReadingDifferentEntityTypes() throws Exception {
300303
TimelineEntity timelineEntity = timelineReader.getEntity(context,
301304
dataToRetrieve);
302305

303-
Assert.assertEquals(TimelineEntityType.YARN_FLOW_ACTIVITY.toString(),
306+
assertEquals(TimelineEntityType.YARN_FLOW_ACTIVITY.toString(),
304307
timelineEntity.getType());
305308

306309
// reading YARN_FLOW_RUN
307310
context.setEntityType(TimelineEntityType.YARN_FLOW_RUN.toString());
308311
timelineEntity = timelineReader.getEntity(context,
309312
dataToRetrieve);
310313

311-
Assert.assertEquals(TimelineEntityType.YARN_FLOW_RUN.toString(),
314+
assertEquals(TimelineEntityType.YARN_FLOW_RUN.toString(),
312315
timelineEntity.getType());
313316

314317
// reading YARN_APPLICATION
315318
context.setEntityType(TimelineEntityType.YARN_APPLICATION.toString());
316319
timelineEntity = timelineReader.getEntity(context,
317320
dataToRetrieve);
318321

319-
Assert.assertEquals(TimelineEntityType.YARN_APPLICATION.toString(),
322+
assertEquals(TimelineEntityType.YARN_APPLICATION.toString(),
320323
timelineEntity.getType());
321324
}
322325

@@ -327,9 +330,9 @@ public void testReadingAllEntityTypes() throws Exception {
327330

328331
context.setEntityType(TimelineEntityType.YARN_CONTAINER.toString());
329332
Set<String> entityTypes = timelineReader.getEntityTypes(context);
330-
Assert.assertTrue(entityTypes.contains(TimelineEntityType.YARN_CONTAINER
333+
assertTrue(entityTypes.contains(TimelineEntityType.YARN_CONTAINER
331334
.toString()));
332-
Assert.assertTrue(entityTypes.contains(TimelineEntityType
335+
assertTrue(entityTypes.contains(TimelineEntityType
333336
.YARN_APPLICATION_ATTEMPT.toString()));
334337
}
335338

@@ -351,7 +354,7 @@ public void testMetricsToRetrieve() throws Exception {
351354
context.setEntityType(TimelineEntityType.YARN_APPLICATION.toString());
352355
TimelineEntity timelineEntity = timelineReader.getEntity(context,
353356
dataToRetrieve);
354-
Assert.assertEquals(0, timelineEntity.getMetrics().size());
357+
assertEquals(0, timelineEntity.getMetrics().size());
355358

356359
timelineFilterList.addFilter(new TimelinePrefixFilter(
357360
TimelineCompareOp.EQUAL,
@@ -361,19 +364,19 @@ public void testMetricsToRetrieve() throws Exception {
361364
context.setEntityType(TimelineEntityType.YARN_APPLICATION.toString());
362365
timelineEntity = timelineReader.getEntity(context,
363366
dataToRetrieve);
364-
Assert.assertTrue(timelineEntity.getMetrics().size() > 0);
367+
assertTrue(timelineEntity.getMetrics().size() > 0);
365368

366369
//testing metrics prefix for AND condition
367370
timelineFilterList.setOperator(TimelineFilterList.Operator.AND);
368371
timelineEntity = timelineReader.getEntity(context,
369372
dataToRetrieve);
370-
Assert.assertEquals(0, timelineEntity.getMetrics().size());
373+
assertEquals(0, timelineEntity.getMetrics().size());
371374

372375
dataToRetrieve.getMetricsToRetrieve().getFilterList().remove(0);
373376
context.setEntityType(TimelineEntityType.YARN_APPLICATION.toString());
374377
timelineEntity = timelineReader.getEntity(context,
375378
dataToRetrieve);
376-
Assert.assertTrue(timelineEntity.getMetrics().size() > 0);
379+
assertTrue(timelineEntity.getMetrics().size() > 0);
377380
}
378381

379382
@Test
@@ -394,7 +397,7 @@ public void testConfigsToRetrieve() throws Exception {
394397
context.setEntityType(TimelineEntityType.YARN_APPLICATION.toString());
395398
TimelineEntity timelineEntity = timelineReader.getEntity(context,
396399
dataToRetrieve);
397-
Assert.assertEquals(0, timelineEntity.getConfigs().size());
400+
assertEquals(0, timelineEntity.getConfigs().size());
398401

399402
timelineFilterList.addFilter(new TimelinePrefixFilter(
400403
TimelineCompareOp.EQUAL, "YARN_AM_NODE_LABEL_EXPRESSION"));
@@ -403,18 +406,18 @@ public void testConfigsToRetrieve() throws Exception {
403406
context.setEntityType(TimelineEntityType.YARN_APPLICATION.toString());
404407
timelineEntity = timelineReader.getEntity(context,
405408
dataToRetrieve);
406-
Assert.assertTrue(timelineEntity.getConfigs().size() > 0);
409+
assertTrue(timelineEntity.getConfigs().size() > 0);
407410

408411
//testing metrics prefix for AND condition
409412
timelineFilterList.setOperator(TimelineFilterList.Operator.AND);
410413
timelineEntity = timelineReader.getEntity(context,
411414
dataToRetrieve);
412-
Assert.assertEquals(0, timelineEntity.getConfigs().size());
415+
assertEquals(0, timelineEntity.getConfigs().size());
413416

414417
dataToRetrieve.getConfsToRetrieve().getFilterList().remove(0);
415418
context.setEntityType(TimelineEntityType.YARN_APPLICATION.toString());
416419
timelineEntity = timelineReader.getEntity(context,
417420
dataToRetrieve);
418-
Assert.assertTrue(timelineEntity.getConfigs().size() > 0);
421+
assertTrue(timelineEntity.getConfigs().size() > 0);
419422
}
420423
}

0 commit comments

Comments
 (0)