diff --git a/parent/pom.xml b/parent/pom.xml index 1917f7f..1a3ae6a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -108,9 +108,9 @@ - junit - junit - 4.13.1 + org.junit.jupiter + junit-jupiter + 5.14.3 test diff --git a/processor/pom.xml b/processor/pom.xml index d204afd..1344ed0 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -46,11 +46,10 @@ - junit - junit + org.junit.jupiter + junit-jupiter test - org.assertj assertj-core diff --git a/processor/src/test/java/org/mapstruct/tools/gem/processor/ProcessorTest.java b/processor/src/test/java/org/mapstruct/tools/gem/processor/ProcessorTest.java index f8cde37..1db5c40 100644 --- a/processor/src/test/java/org/mapstruct/tools/gem/processor/ProcessorTest.java +++ b/processor/src/test/java/org/mapstruct/tools/gem/processor/ProcessorTest.java @@ -24,25 +24,18 @@ import javax.tools.StandardLocation; import javax.tools.ToolProvider; -import org.assertj.core.api.JUnitSoftAssertions; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import static org.assertj.core.api.Assertions.assertThat; -public class ProcessorTest { +class ProcessorTest { - // CHECKSTYLE:OFF - @Rule - public final TemporaryFolder tempDir = new TemporaryFolder(); //NOSONAR - - @Rule - public final JUnitSoftAssertions softly = new JUnitSoftAssertions(); - // CHECKSTYLE:ON + @TempDir + private File tempDir; @Test - public void example() throws IOException, ClassNotFoundException { + void example() throws IOException { StringJavaFileObject src = new StringJavaFileObject( "org.mapstruct.annotations.processor.GemGenerator", getSource() @@ -55,9 +48,9 @@ private void compile(Processor processor, JavaFileObject... compilationUnits) th DiagnosticCollector diagnostics = new DiagnosticCollector(); StandardJavaFileManager fileManager = compiler.getStandardFileManager( diagnostics, null, null ); - File classesDir = tempDir.newFolder( "classes" ); + File classesDir = newFolder( tempDir, "classes" ); fileManager.setLocation( StandardLocation.CLASS_OUTPUT, Collections.singletonList( classesDir ) ); - File generatedDir = tempDir.newFolder( "generated" ); + File generatedDir = newFolder( tempDir, "generated" ); fileManager.setLocation( StandardLocation.SOURCE_OUTPUT, Collections.singletonList( generatedDir ) ); JavaCompiler.CompilationTask task = compiler.getTask( @@ -88,7 +81,7 @@ private void compile(Processor processor, JavaFileObject... compilationUnits) th protected void assertGeneratedFileContent(String gemName, File generatedDir) { Path gemPath = generatedDir.toPath().resolve( "org/mapstruct/tools/gem/processor/" + gemName + ".java" ); - softly.assertThat( gemPath ) + assertThat( gemPath ) .as( gemName ) .exists(); @@ -96,7 +89,7 @@ protected void assertGeneratedFileContent(String gemName, File generatedDir) { InputStream expectedGemStream = getClass().getClassLoader() .getResourceAsStream( "fixtures/org/mapstruct/tools/gem/processor/" + gemName + ".java" ) ) { - softly.assertThat( generatedGemStream ) + assertThat( generatedGemStream ) .as( gemName ) .hasSameContentAs( expectedGemStream ); } @@ -139,4 +132,12 @@ private String getSource() { "public class GemGenerator {\n" + "}"; } + + private static File newFolder(File root, String folder) throws IOException { + File result = new File(root, folder); + if (!result.mkdir()) { + throw new IOException("Couldn't create folder " + result); + } + return result; + } }