Merge branch 'develop'

toolisticon · Apr 4, 2024 · 69d968a · 69d968a
2 parents 2f2cf06 + 6a4bcd1
commit 69d968a
Show file tree

Hide file tree

Showing 25 changed files with 86 additions and 51 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest,macos-latest,windows-latest ]
-        java: [ 8.0.x, 9.0.x, 10.0.x, 11.0.x, 12.0.x, 13.0.x, 14.0.x, 15.0.x, 16.0.x, 17.0.x, 18.0.x, 19.0.x, 20.0.x, 21.0.x ]
+        java: [ 8.0.x, 9.0.x, 10.0.x, 11.0.x, 12.0.x, 13.0.x, 14.0.x, 15.0.x, 16.0.x, 17.0.x, 18.0.x, 19.0.x, 20.0.x, 21.0.x, 22.0.x ]
 
     steps:
       - uses: actions/checkout@v4
@@ -23,14 +23,8 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
+          cache: 'maven'
 
-      - name: Cache .m2
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
       - name: Prepare mvnw
         run: chmod +x ./mvnw
 

diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>cute-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>coverage</name>

diff --git a/cute/pom.xml b/cute/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>cute-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>cute</name>

diff --git a/cute/src/main/java/io/toolisticon/cute/CuteApi.java b/cute/src/main/java/io/toolisticon/cute/CuteApi.java
@@ -29,7 +29,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -54,7 +53,7 @@ public interface CompilerTestBB {
         UnitTestType getPassInType();
 
 
-        List<Class<Processor>> processors();
+        List<Class<? extends Processor>> processors();
 
         List<String> compilerOptions();
 
@@ -298,17 +297,10 @@ public interface BlackBoxTestRootInterface {
 
     }
 
-    @FluentApiInterface(CompilerTestBB.class)
-    public interface BlackBoxTestProcessorsInterface {
 
-        /**
-         * Allows you to add a single annotation processor used at black-box tests compilation.
-         *
-         * @param processor the annotation processor to use. null values are prohibited and will lead to a {@link io.toolisticon.fluapigen.validation.api.ValidatorException}.
-         * @return the next fluent interface
-         */
-        BlackBoxTestSourceFilesInterface processor(@FluentApiBackingBeanMapping(value = "processors") @NotNull Class<? extends Processor> processor);
 
+    @FluentApiInterface(CompilerTestBB.class)
+    public interface BlackBoxTestProcessorsInterface{
 
         /**
          * Allows you to add annotation processors used at black-box tests compilation.
@@ -329,7 +321,16 @@ public interface BlackBoxTestProcessorsInterface {
          * @param processors the annotation processors to use. Passing an empty collection will compile the source files without using processors, null values are prohibited and will lead to a {@link io.toolisticon.fluapigen.validation.api.ValidatorException}.
          * @return the next fluent interface
          */
-        BlackBoxTestSourceFilesInterface processors(@FluentApiBackingBeanMapping(value = "processors") @NotNull Collection<Class<? extends Processor>> processors);
+        BlackBoxTestSourceFilesInterface processors(@FluentApiBackingBeanMapping(value = "processors")  @NotNull Iterable<Class<? extends Processor>> processors);
+
+
+        /**
+         * Allows you to add a single annotation processor used at black-box tests compilation.
+         *
+         * @param processor the annotation processor to use. null values are prohibited and will lead to a {@link io.toolisticon.fluapigen.validation.api.ValidatorException}.
+         * @return the next fluent interface
+         */
+        BlackBoxTestSourceFilesAndProcessorInterface processor(@FluentApiBackingBeanMapping(value = "processors") @NotNull Class<? extends Processor> processor);
 
         /**
          * More obvious method not to use processors during compilation.
@@ -343,6 +344,19 @@ default BlackBoxTestSourceFilesInterface noProcessors() {
 
     }
 
+    @FluentApiInterface(CompilerTestBB.class)
+    public interface BlackBoxTestSourceFilesAndProcessorInterface extends BlackBoxTestSourceFilesInterface{
+
+        /**
+         * Allows you to add a single annotation processor used at black-box tests compilation.
+         *
+         * @param processor the annotation processor to use. null values are prohibited and will lead to a {@link io.toolisticon.fluapigen.validation.api.ValidatorException}.
+         * @return the next fluent interface
+         */
+        BlackBoxTestSourceFilesAndProcessorInterface andProcessor(@FluentApiBackingBeanMapping(value = "processors", action = MappingAction.ADD) @NotNull Class<? extends Processor> processor);
+
+    }
+
     @FluentApiInterface(CompilerTestBB.class)
     public interface BlackBoxTestSourceFilesInterface {
 

diff --git a/cute/src/main/java/io/toolisticon/cute/DebugOutputGenerator.java b/cute/src/main/java/io/toolisticon/cute/DebugOutputGenerator.java
@@ -126,12 +126,9 @@ private static String getDebugMessages(CompilationResult compilationResult, Diag
 
 
                 stringBuilder.append("[").append(i)
-                        //.append(diagnostics.getSource() != null ? "|s:'" + ((FileObject)diagnostics.getSource()).getName() + "'" : "")
-                        //.append(diagnostics.getLineNumber() != Diagnostic.NOPOS ? "|l:'" + diagnostics.getLineNumber() + "'" : "")
-                        //.append(diagnostics.getColumnNumber() != Diagnostic.NOPOS ? "|c:'" + diagnostics.getColumnNumber() + "'" : "")
-                        .append("]'")
-                        .append(diagnostics)
-                        .append("'\n");
+                        .append("] : ")
+                        .append(getDiagnosticString(diagnostics))
+                        .append("\n");
                 i++;
             }
 
@@ -140,6 +137,14 @@ private static String getDebugMessages(CompilationResult compilationResult, Diag
         return stringBuilder.toString();
     }
 
+    private static String getDiagnosticString(Diagnostic<? extends JavaFileObject> diagnostics) {
+        return "[ " + diagnostics.getKind() + ", "
+                + "s:" + ( diagnostics.getSource() != null ? "'" +  diagnostics.getSource().getName() + "'" : "<NOT_RELATED_WITH_SOURCE_FILE>") + ", "
+                + "l:" + diagnostics.getLineNumber() + ", "
+                + "c:" + diagnostics.getColumnNumber()+ " ] "
+                + ":= '" + diagnostics.getMessage(null) + "'";
+    }
+
     private static String getGeneratedFileOverview(CompilationResult compilationResult) {
 
        return "{\n" +

diff --git a/cute/src/test/java/io/toolisticon/cute/CuteTest.java b/cute/src/test/java/io/toolisticon/cute/CuteTest.java
@@ -3,6 +3,7 @@
 import io.toolisticon.cute.common.ExceptionThrowerProcessor;
 import io.toolisticon.cute.common.SimpleTestProcessor1;
 import io.toolisticon.cute.common.SimpleTestProcessor1Interface;
+import io.toolisticon.cute.common.SimpleTestProcessor2;
 import io.toolisticon.cute.testcases.SimpleTestInterface;
 import io.toolisticon.fluapigen.validation.api.ValidatorException;
 import org.hamcrest.MatcherAssert;
@@ -20,6 +21,7 @@
 import javax.tools.StandardLocation;
 import java.io.IOException;
 import java.io.Writer;
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -948,7 +950,7 @@ public void blackBoxTest_nullValuedProcessor() {
 
     @Test(expected = ValidatorException.class)
     public void blackBoxTest_nullValuedProcessors() {
-        Cute.blackBoxTest().given().processor(null);
+        Cute.blackBoxTest().given().processors((Class<Processor>)null);
     }
 
     @Test(expected = ValidatorException.class)
@@ -1168,7 +1170,7 @@ public void blackBoxTest_checkForExpectedException_failure_otherException() {
     @Test
     public void blackBoxTest_checkForExpectedException_failure_noException() {
         try {
-            Cute.blackBoxTest().given().processor(SimpleTestProcessor1.class)
+            Cute.blackBoxTest().given().processor(SimpleTestProcessor1.class).andProcessor(SimpleTestProcessor2.class)
                     .andSourceFiles("/compiletests/exceptionthrown/ExceptionThrownUsecase.java")
                     .whenCompiled()
                     .thenExpectThat()
@@ -1181,4 +1183,22 @@ public void blackBoxTest_checkForExpectedException_failure_noException() {
         }
         throw new AssertionError("Expected exceptions wasn't triggered!!!");
     }
+
+    @Test
+    public void blackBoxTest_AddMultipleProcessorsWithLinkedProcessorApi() throws NoSuchFieldException, IllegalAccessException {
+
+            CuteApi.CompilerTestExpectAndThatInterface expectThat = Cute.blackBoxTest().given()
+                    .processor(SimpleTestProcessor1.class)
+                    .andProcessor(SimpleTestProcessor2.class)
+                    .andSourceFiles("/compiletests/generatedclasstest/TestClass.java")
+                    .whenCompiled()
+                    .thenExpectThat()
+                    .compilationSucceeds()
+                    .andThat().generatedClass("io.toolisticon.cute.testhelper.compiletest.TestClassGeneratedClass").exists();
+
+
+            expectThat.executeTest();
+
+    }
+
 }
diff --git a/cute/src/test/resources/compiletests/generatedclasstest/TestClass.java b/cute/src/test/resources/compiletests/generatedclasstest/TestClass.java
@@ -1,8 +1,10 @@
 package io.toolisticon.cute.testhelper.compiletest;
 
 import io.toolisticon.cute.common.SimpleTestAnnotation1;
+import io.toolisticon.cute.common.SimpleTestAnnotation2;
 
 @SimpleTestAnnotation1("WORKS!!!")
+@SimpleTestAnnotation2
 public class TestClass {
 
 

diff --git a/extension/api/pom.xml b/extension/api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>extension-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>extension-api</name>

diff --git a/extension/junit4/pom.xml b/extension/junit4/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>extension-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>extension-junit4</name>

diff --git a/extension/junit5/pom.xml b/extension/junit5/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>extension-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>extension-junit5</name>

diff --git a/extension/modulesupport/pom.xml b/extension/modulesupport/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>extension-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>extension-modulesupport</name>

diff --git a/extension/plainjava/pom.xml b/extension/plainjava/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>extension-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>extension-plainjava</name>

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>cute-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>extension-parent</name>

diff --git a/extension/testng/pom.xml b/extension/testng/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>extension-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>extension-testng</name>

diff --git a/integration-test/java9/namedAutomaticModule/pom.xml b/integration-test/java9/namedAutomaticModule/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>integration-test-java9-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-java9-namedAutomaticModule</name>

diff --git a/integration-test/java9/pom.xml b/integration-test/java9/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>integration-test-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-java9-parent</name>

diff --git a/integration-test/java9/regularTestModule/pom.xml b/integration-test/java9/regularTestModule/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>integration-test-java9-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-java9-regularModule</name>

diff --git a/integration-test/java9/test/pom.xml b/integration-test/java9/test/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>integration-test-java9-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-java9-test</name>

diff --git a/integration-test/java9/unnamedAutomaticModule/pom.xml b/integration-test/java9/unnamedAutomaticModule/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>integration-test-java9-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-java9-unnamedAutomaticModule</name>

diff --git a/integration-test/junit4/pom.xml b/integration-test/junit4/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>integration-test-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-junit4</name>

diff --git a/integration-test/junit5/pom.xml b/integration-test/junit5/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>integration-test-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-junit5</name>

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>cute-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-parent</name>

diff --git a/integration-test/testng/pom.xml b/integration-test/testng/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>integration-test-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>integration-test-testng</name>

diff --git a/legacy/pom.xml b/legacy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.cute</groupId>
         <artifactId>cute-parent</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
     </parent>
 
     <name>cute-legacy</name>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.toolisticon.cute</groupId>
     <artifactId>cute-parent</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <packaging>pom</packaging>
 
     <name>cute-parent</name>
@@ -82,11 +82,11 @@
         <spiap.version>0.8.0</spiap.version>
         <fluapigen.version>1.1.0</fluapigen.version>
 
+
         <!-- versions of test dependencies -->
-        <junit4.version>4.13.1</junit4.version>
+        <junit4.version>4.13.2</junit4.version>
         <junit5.version>5.7.2</junit5.version>
-        <testng.version>6.14.3</testng.version>
-
+        <testng.version>7.4.0</testng.version>
         <hamcrest.version>2.2</hamcrest.version>
         <mockito.version>2.28.2</mockito.version>