[GitHub] [storm] snikhil5 commented on a diff in pull request #3479: [STORM-3832] Moving unit tests from junit4 to junit5

[GitBox]

snikhil5 commented on code in PR #3479:
URL: https://github.com/apache/storm/pull/3479#discussion_r885705109


##########
external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java:
##########
@@ -72,24 +73,17 @@ public class AvroGenericRecordBoltTest {
     private static Schema schema2;
     private static Tuple tuple1;
     private static Tuple tuple2;
-    @Rule
-    public MiniDFSClusterRule dfsClusterRule = new MiniDFSClusterRule(() -> {
-        Configuration conf = new Configuration();
-        conf.set("fs.trash.interval", "10");
-        conf.setBoolean("dfs.permissions", true);
-        File baseDir = new File("./target/hdfs/").getAbsoluteFile();
-        FileUtil.fullyDelete(baseDir);
-        conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, 
baseDir.getAbsolutePath());
-        return conf;
-    });
+
+    @RegisterExtension
+    public static final MiniDFSClusterExtension DFS_CLUSTER_EXTENSION = new 
MiniDFSClusterExtension();

Review Comment:
   done



##########
external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java:
##########
@@ -141,12 +136,12 @@ public void multipleTuplesOneFile() throws IOException {
         bolt.execute(tuple1);
         bolt.execute(tuple1);
 
-        Assert.assertEquals(1, countNonZeroLengthFiles(testRoot));
+        assertEquals(1, countNonZeroLengthFiles(testRoot));
         verifyAllAvroFiles(testRoot);
     }
 
     @Test
-    public void multipleTuplesMutliplesFiles() throws IOException {
+    public void multipleTuplesMuliplesFiles() throws IOException {

Review Comment:
   done



##########
external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java:
##########
@@ -43,36 +39,25 @@
 import org.apache.storm.tuple.TupleImpl;
 import org.apache.storm.tuple.Values;
 import org.apache.storm.utils.MockTupleHelpers;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TestHdfsBolt {
-
+    @RegisterExtension
+    public static final MiniDFSClusterExtension DFS_CLUSTER_EXTENSION = new 
MiniDFSClusterExtension();

Review Comment:
   done



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@storm.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org