Преглед изворни кода

HADOOP-19428. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-dynamometer-blockgen. (#7590)

Co-authored-by: Chris Nauroth <cnauroth@apache.org>
Co-authored-by: Hualong Zhang <hualong.z@hotmail.com>
Reviewed-by: Chris Nauroth <cnauroth@apache.org>
Reviewed-by: Hualong Zhang <hualong.z@hotmail.com>
Signed-off-by: Shilun Fan <slfan1989@apache.org>
slfan1989 пре 2 месеци
родитељ
комит
14b55b59e4

+ 6 - 6
hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestBlockGen.java

@@ -21,13 +21,13 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.junit.After;
-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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 /** Tests for block generation via {@link GenerateBlockImagesDriver}. */
@@ -40,7 +40,7 @@ public class TestBlockGen {
   private static final String BLOCK_LIST_OUTPUT_DIR_NAME = "blockLists";
   private Path tmpPath;
 
-  @Before
+  @BeforeEach
   public void setup() throws Exception {
     Configuration conf = new Configuration();
     dfsCluster = new MiniDFSCluster.Builder(conf).build();
@@ -57,7 +57,7 @@ public class TestBlockGen {
         new Path(tmpPath, FS_IMAGE_NAME));
   }
 
-  @After
+  @AfterEach
   public void cleanUp() {
     dfsCluster.shutdown();
   }

+ 2 - 2
hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestXMLParser.java

@@ -19,8 +19,8 @@ package org.apache.hadoop.tools.dynamometer.blockgenerator;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 /** Tests for {@link XMLParser}. */