[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_r885141605


##########
storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java:
##########
@@ -63,51 +63,55 @@ public class DependencyUploaderTest {
     private DependencyUploader sut;
     private ClientBlobStore mockBlobStore;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         sut = new DependencyUploader();
         mockBlobStore = mock(ClientBlobStore.class);
         sut.setBlobStore(mockBlobStore);
         doNothing().when(mockBlobStore).shutdown();
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         sut.shutdown();
     }
 
-    @Test(expected = FileNotAvailableException.class)
-    public void uploadFilesWhichOneOfThemIsNotFoundInLocal() throws Exception {
-        File mockFile = mock(File.class);
-        when(mockFile.isFile()).thenReturn(true);
-        when(mockFile.exists()).thenReturn(true);
-
-        File mockFile2 = mock(File.class);
-        when(mockFile.isFile()).thenReturn(true);
-        when(mockFile.exists()).thenReturn(false);
-
-        List<File> dependencies = new ArrayList<>();
-        dependencies.add(mockFile);
-        dependencies.add(mockFile2);
-
-        sut.uploadFiles(dependencies, false);
-        fail("Should throw FileNotAvailableException");
+    @Test
+    public void uploadFilesWhichOneOfThemIsNotFoundInLocal() {
+        assertThrows(FileNotAvailableException.class, () -> {
+            File mockFile = mock(File.class);
+            when(mockFile.isFile()).thenReturn(true);
+            when(mockFile.exists()).thenReturn(true);
+
+            File mockFile2 = mock(File.class);
+            when(mockFile.isFile()).thenReturn(true);
+            when(mockFile.exists()).thenReturn(false);
+
+            List<File> dependencies = new ArrayList<>();
+            dependencies.add(mockFile);
+            dependencies.add(mockFile2);
+
+            sut.uploadFiles(dependencies, false);
+        });
+        // fail("Should throw FileNotAvailableException");

Review Comment:
   done



##########
storm-client/test/jvm/org/apache/storm/dependency/DependencyUploaderTest.java:
##########
@@ -63,51 +63,55 @@ public class DependencyUploaderTest {
     private DependencyUploader sut;
     private ClientBlobStore mockBlobStore;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         sut = new DependencyUploader();
         mockBlobStore = mock(ClientBlobStore.class);
         sut.setBlobStore(mockBlobStore);
         doNothing().when(mockBlobStore).shutdown();
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         sut.shutdown();
     }
 
-    @Test(expected = FileNotAvailableException.class)
-    public void uploadFilesWhichOneOfThemIsNotFoundInLocal() throws Exception {
-        File mockFile = mock(File.class);
-        when(mockFile.isFile()).thenReturn(true);
-        when(mockFile.exists()).thenReturn(true);
-
-        File mockFile2 = mock(File.class);
-        when(mockFile.isFile()).thenReturn(true);
-        when(mockFile.exists()).thenReturn(false);
-
-        List<File> dependencies = new ArrayList<>();
-        dependencies.add(mockFile);
-        dependencies.add(mockFile2);
-
-        sut.uploadFiles(dependencies, false);
-        fail("Should throw FileNotAvailableException");
+    @Test
+    public void uploadFilesWhichOneOfThemIsNotFoundInLocal() {
+        assertThrows(FileNotAvailableException.class, () -> {
+            File mockFile = mock(File.class);
+            when(mockFile.isFile()).thenReturn(true);
+            when(mockFile.exists()).thenReturn(true);
+
+            File mockFile2 = mock(File.class);
+            when(mockFile.isFile()).thenReturn(true);
+            when(mockFile.exists()).thenReturn(false);
+
+            List<File> dependencies = new ArrayList<>();
+            dependencies.add(mockFile);
+            dependencies.add(mockFile2);
+
+            sut.uploadFiles(dependencies, false);
+        });
+        // fail("Should throw FileNotAvailableException");
     }
 
-    @Test(expected = FileNotAvailableException.class)
-    public void uploadFilesWhichOneOfThemIsNotFile() throws Exception {
-        File mockFile = mock(File.class);
-        when(mockFile.isFile()).thenReturn(true);
-        when(mockFile.exists()).thenReturn(true);
+    @Test
+    public void uploadFilesWhichOneOfThemIsNotFile() {
+        assertThrows(FileNotAvailableException.class, () -> {
+            File mockFile = mock(File.class);
+            when(mockFile.isFile()).thenReturn(true);
+            when(mockFile.exists()).thenReturn(true);
 
-        File mockFile2 = mock(File.class);
-        when(mockFile.isFile()).thenReturn(false);
-        when(mockFile.exists()).thenReturn(true);
+            File mockFile2 = mock(File.class);
+            when(mockFile.isFile()).thenReturn(false);
+            when(mockFile.exists()).thenReturn(true);
 
-        List<File> dependencies = Lists.newArrayList(mockFile, mockFile2);
+            List<File> dependencies = Lists.newArrayList(mockFile, mockFile2);
 
-        sut.uploadFiles(dependencies, false);
-        fail("Should throw FileNotAvailableException");
+            sut.uploadFiles(dependencies, false);
+        });
+        // fail("Should throw FileNotAvailableException");

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