Skip to content

Commit 92c4ec4

Browse files
committed
Use assertThrows().
1 parent d403237 commit 92c4ec4

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

src/test/java/org/apache/commons/io/FileUtilsCopyDirectoryToDirectoryTest.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.apache.commons.io;
1818

1919
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.fail;
20+
import static org.junit.jupiter.api.Assertions.assertThrows;
2121

2222
import java.io.File;
2323
import java.io.IOException;
@@ -38,17 +38,12 @@
3838
*/
3939
class FileUtilsCopyDirectoryToDirectoryTest {
4040

41-
private static void assertExceptionTypeAndMessage(final File srcDir, final File destDir,
42-
final Class<? extends Exception> expectedExceptionType, final String expectedMessage) {
43-
try {
44-
FileUtils.copyDirectoryToDirectory(srcDir, destDir);
45-
} catch (final Exception e) {
46-
final String msg = e.getMessage();
47-
assertEquals(expectedExceptionType, e.getClass());
48-
assertEquals(expectedMessage, msg);
49-
return;
50-
}
51-
fail();
41+
private static void assertExceptionTypeAndMessage(final File srcDir, final File destDir, final Class<? extends Exception> expectedExceptionType,
42+
final String expectedMessage) {
43+
final Exception e = assertThrows(Exception.class, () -> FileUtils.copyDirectoryToDirectory(srcDir, destDir));
44+
final String msg = e.getMessage();
45+
assertEquals(expectedExceptionType, e.getClass());
46+
assertEquals(expectedMessage, msg);
5247
}
5348

5449
/** Temporary folder managed by JUnit. */

0 commit comments

Comments
 (0)