Used Maven IT extension assertions

Author: simasch

src/main/java/org/utplsql/maven/plugin/io/ReportWriter.java

@@ -86,6 +86,7 @@ private void writeReports(Connection connection, Reporter reporter, ReporterPara
 
                 if (!file.getParentFile().exists()) {
                     log.debug("Creating directory for report file " + file.getAbsolutePath());
+                    //noinspection ResultOfMethodCallIgnored
                     file.getParentFile().mkdirs();
                 }
 

src/test/java/org/utplsql/maven/plugin/ReportChecker.java

@@ -1,15 +1,17 @@
 package org.utplsql.maven.plugin;
 
+import com.soebes.itf.jupiter.maven.MavenExecutionResult;
 import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.Assertions;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static com.soebes.itf.extension.assertj.MavenProjectResultAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ReportChecker {
 
@@ -21,17 +23,15 @@ private ReportChecker() {
      * Path separator is set to "/" to ensure windows / linux / mac compatibility.
      * \r and \n are removed to provide simpler comparison.
      *
-     * @param testClass  Class under test
-     * @param testFolder Folder name
-     * @param files      Files to compare
+     * @param result {@link MavenExecutionResult}
+     * @param files  Files to compare
      */
-    public static void checkReports(Class<?> testClass, String testFolder, String... files) throws IOException {
-        String fullyQualifiedClassNameDirectory = testClass.getName().replace(".", "/");
-
+    public static void assertThatReportsAreGeneratedAsExpected(MavenExecutionResult result, String... files) {
         for (String filename : files) {
-            File expectedOutputFile = new File("target/maven-it/" + fullyQualifiedClassNameDirectory + "/" + testFolder + "/project/expected-output/utplsql", filename);
-            File outputFile = new File("target/maven-it/" + fullyQualifiedClassNameDirectory + "/" + testFolder + "/project/target/utplsql", filename);
-            assertTrue(outputFile.exists(), "The report " + outputFile.getPath() + " was not generated");
+            File expectedOutputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory(), "/expected-output/utplsql/" + filename);
+            File outputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory(), "/target/utplsql/" + filename);
+
+            assertThat(result.getMavenProjectResult()).withFile("/utplsql/" + filename).exists();
 
             try (Stream<String> stream = Files.lines(outputFile.toPath())) {
                 String outputContent = stream
@@ -41,27 +41,26 @@ public static void checkReports(Class<?> testClass, String testFolder, String...
                         .map(line -> line.replaceAll("\r", "").replaceAll("\n", ""))
                         .collect(Collectors.joining("\n"));
 
-                Assertions.assertEquals(
+                assertEquals(
                         FileUtils.readFileToString(expectedOutputFile, "utf-8")
                                 .replace("\r", "")
                                 .replace("\n", ""),
                         outputContent.replace("\n", ""), "The files differ!");
+            } catch (IOException e) {
+                fail(e);
             }
         }
     }
 
     /**
-     * Check if a report file exits
+     * Check if the report was generated
      *
-     * @param testClass  Class under test
-     * @param testFolder Folder name
-     * @param filename   File Name
-     * @return true or false
+     * @param result   {@link MavenExecutionResult}
+     * @param filename File Name
+     * @return if report exits
      */
-    public static boolean reportExists(Class<?> testClass, String testFolder, String filename) {
-        String fullyQualifiedClassNameDirectory = testClass.getName().replace(".", "/");
-
-        File outputFile = new File("target/maven-it/" + fullyQualifiedClassNameDirectory + "/" + testFolder + "/project/target/utplsql", filename);
+    public static boolean reportWasGenerated(MavenExecutionResult result, String filename) {
+        File outputFile = new File(result.getMavenProjectResult().getTargetProjectDirectory(), "/target/utplsql/" + filename);
         return outputFile.exists();
     }
 }

src/test/java/org/utplsql/maven/plugin/UtPlsqlMojoIT.java

@@ -5,12 +5,9 @@
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
 
-import java.io.IOException;
-
 import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.utplsql.maven.plugin.ReportChecker.checkReports;
-import static org.utplsql.maven.plugin.ReportChecker.reportExists;
+import static org.utplsql.maven.plugin.ReportChecker.assertThatReportsAreGeneratedAsExpected;
+import static org.utplsql.maven.plugin.ReportChecker.reportWasGenerated;
 
 @MavenGoal("test")
 @MavenJupiterExtension
@@ -22,44 +19,44 @@ void minimalist(MavenExecutionResult result) {
     }
 
     @MavenTest
-    void owner_param(MavenExecutionResult result) throws IOException {
+    void owner_param(MavenExecutionResult result) {
         assertThat(result).isSuccessful();
 
-        checkReports(this.getClass(), "owner_param", "sonar-test-report.xml", "coverage-sonar-report.xml");
+        assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml", "coverage-sonar-report.xml");
     }
 
     @MavenTest
-    void regex(MavenExecutionResult result) throws IOException {
+    void regex(MavenExecutionResult result) {
         assertThat(result).isSuccessful();
 
-        checkReports(this.getClass(), "regex", "sonar-test-report.xml", "coverage-sonar-report.xml");
+        assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml", "coverage-sonar-report.xml");
     }
 
     @MavenTest
-    void simple(MavenExecutionResult result) throws IOException {
+    void simple(MavenExecutionResult result) {
         assertThat(result).isSuccessful();
 
-        checkReports(this.getClass(), "simple", "sonar-test-report.xml", "coverage-sonar-report.xml");
+        assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml", "coverage-sonar-report.xml");
     }
 
     @MavenTest
-    void skip(MavenExecutionResult result) throws IOException {
+    void skip(MavenExecutionResult result) {
         assertThat(result).isSuccessful();
 
-        assertFalse(reportExists(this.getClass(), "skip", "sonar-test-report.xml"));
+        assertThat(reportWasGenerated(result, "sonar-test-report.xml")).isFalse();
     }
 
     @MavenTest
-    void tags(MavenExecutionResult result) throws IOException {
+    void tags(MavenExecutionResult result) {
         assertThat(result).isSuccessful();
 
-        checkReports(this.getClass(), "tags", "sonar-test-report.xml");
+        assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml");
     }
 
     @MavenTest
-    void type_mapping(MavenExecutionResult result) throws IOException {
+    void type_mapping(MavenExecutionResult result) {
         assertThat(result).isSuccessful();
 
-        checkReports(this.getClass(), "type_mapping", "sonar-test-report.xml", "coverage-sonar-report.xml");
+        assertThatReportsAreGeneratedAsExpected(result, "sonar-test-report.xml", "coverage-sonar-report.xml");
     }
 }

src/test/resources/junit-platform.properties

@@ -0,0 +1 @@
+junit.jupiter.displayname.generator.default=org.junit.jupiter.api.DisplayNameGenerator$ReplaceUnderscores