Skip to content

Commit 801366b

Browse files
hotcodemachaAshutosh Gupta
authored andcommitted
YARN-11269. Upgrade JUnit from 4 to 5 in hadoop-yarn-server-timeline-pluginstorage (apache#4771)
Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com> Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
1 parent a2c2eac commit 801366b

File tree

6 files changed

+110
-100
lines changed

6 files changed

+110
-100
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<type>test-jar</type>
7272
<scope>test</scope>
7373
</dependency>
74-
<dependency>
74+
<dependency>
7575
<groupId>org.apache.hadoop</groupId>
7676
<artifactId>hadoop-yarn-common</artifactId>
7777
</dependency>
@@ -129,6 +129,21 @@
129129
<artifactId>assertj-core</artifactId>
130130
<scope>test</scope>
131131
</dependency>
132+
<dependency>
133+
<groupId>org.junit.jupiter</groupId>
134+
<artifactId>junit-jupiter-api</artifactId>
135+
<scope>test</scope>
136+
</dependency>
137+
<dependency>
138+
<groupId>org.junit.jupiter</groupId>
139+
<artifactId>junit-jupiter-engine</artifactId>
140+
<scope>test</scope>
141+
</dependency>
142+
<dependency>
143+
<groupId>org.junit.jupiter</groupId>
144+
<artifactId>junit-jupiter-params</artifactId>
145+
<scope>test</scope>
146+
</dependency>
132147
<dependency>
133148
<groupId>com.fasterxml.jackson.core</groupId>
134149
<artifactId>jackson-databind</artifactId>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/PluginStoreTestUtils.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
import java.util.Map;
5050
import java.util.Set;
5151

52-
import static org.junit.Assert.assertEquals;
53-
import static org.junit.Assert.assertNotNull;
52+
import static org.junit.jupiter.api.Assertions.assertEquals;
53+
import static org.junit.jupiter.api.Assertions.assertNotNull;
5454

5555
/**
5656
* Utility methods related to the ATS v1.5 plugin storage tests.
@@ -176,10 +176,8 @@ static void verifyTestEntities(TimelineDataManager tdm)
176176
UserGroupInformation.getLoginUser());
177177
assertNotNull(entity1);
178178
assertNotNull(entity2);
179-
assertEquals("Failed to read out entity 1",
180-
(Long) 123l, entity1.getStartTime());
181-
assertEquals("Failed to read out entity 2",
182-
(Long) 456l, entity2.getStartTime());
179+
assertEquals((Long) 123l, entity1.getStartTime(), "Failed to read out entity 1");
180+
assertEquals((Long) 456l, entity2.getStartTime(), "Failed to read out entity 2");
183181
}
184182

185183
/**

0 commit comments

Comments
 (0)