|
17 | 17 | package org.apache.commons.io; |
18 | 18 |
|
19 | 19 | 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; |
21 | 21 |
|
22 | 22 | import java.io.File; |
23 | 23 | import java.io.IOException; |
|
38 | 38 | */ |
39 | 39 | class FileUtilsCopyDirectoryToDirectoryTest { |
40 | 40 |
|
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); |
52 | 47 | } |
53 | 48 |
|
54 | 49 | /** Temporary folder managed by JUnit. */ |
|
0 commit comments