Merge branch 'develop'

toolisticon · Mar 20, 2024 · f72b820 · f72b820
2 parents 98f8b69 + 81dd3ce
commit f72b820
Show file tree

Hide file tree

Showing 25 changed files with 52 additions and 65 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 ]
+        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 ]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ This compile testing framework allows you to to do this and additionally support
 
 - allows compile time tests supporting the most relevant test frameworks (junit4, junit5, testng, ...)
 - simple, but powerful fluent api (immutable)
+- additionally provides compilation outcome to do custom assertions with your favorite unit test frameworks.
 - supports all Java versions >=8 (including support for java 9 modules)
 - Enables you to debug annotation processors during compilation tests
 - provides useful information for analysis of failing tests:
@@ -106,7 +107,12 @@ Black-Box-Compilation test allow you to define testcase source files and to appl
                 CuteApi.ExpectedFileObjectMatcherKind.BINARY,
                 JavaFileObjectUtils.readFromString("package your.test.package;\npublic class GeneratedFile{}")
             )
-        .executeTest();
+        .executeTest()
+        .executeCustomAssertions(e -> {
+            // You can do all checks as custom assertions as well :)
+            MatcherAssert.assertThat("Compilation should be successful", e.compilationWasSuccessful());
+            // ...
+        });
 ```
 
 Additionally, to the explicitly configured assertions it implicitly checks if your annotation processor has been applied and triggers an AssertionError if not.

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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.0</version>
     </parent>
 
     <name>cute</name>

diff --git a/cute/src/main/java/io/toolisticon/cute/CuteClassLoader.java b/cute/src/main/java/io/toolisticon/cute/CuteClassLoader.java
@@ -2,6 +2,6 @@
 
 public interface CuteClassLoader {
 
-    <TYPE> Class<TYPE> getClass(String binaryClassName) throws ClassNotFoundException;
+    Class<?> getClass(String binaryClassName) throws ClassNotFoundException;
 
 }
diff --git a/cute/src/main/java/io/toolisticon/cute/CuteClassLoaderImpl.java b/cute/src/main/java/io/toolisticon/cute/CuteClassLoaderImpl.java
@@ -15,72 +15,49 @@ class CuteClassLoaderImpl extends ClassLoader implements CuteClassLoader {
 
     final CompileTestFileManager compileTestFileManager;
 
-    final Map<String, Class<?>> classMap = new HashMap<>();
+    final Map<String, CompileTestFileManager.InMemoryOutputJavaFileObject> classMap = new HashMap<>();
 
     public CuteClassLoaderImpl(CompileTestFileManager compileTestFileManager) {
         this.compileTestFileManager = compileTestFileManager;
 
         // get classes
-        List<JavaFileObject> javaFileObjectList = compileTestFileManager.getGeneratedJavaFileObjects().stream()
+        List<CompileTestFileManager.InMemoryOutputJavaFileObject> javaFileObjectList = compileTestFileManager.getGeneratedJavaFileObjects().stream()
                 .filter(e -> e.getKind() == JavaFileObject.Kind.CLASS)
                 .collect(Collectors.toList());
 
-        for (JavaFileObject javaFileObject : javaFileObjectList) {
-            try {
-                byte[] byteArray = readAllBytes(javaFileObject.openInputStream());
-                String className = convertJavaFileObjectNameToBinaryClassName(javaFileObject);
-                classMap.put(className, defineClass(className, byteArray, 0, byteArray.length));
-            } catch (IOException e) {
-                // Ignore for the moment
-            }
-        }
+        for (CompileTestFileManager.InMemoryOutputJavaFileObject javaFileObject : javaFileObjectList) {
 
-    }
+            String className = convertJavaFileObjectNameToBinaryClassName(javaFileObject);
+            classMap.put(className, javaFileObject);
 
-    private static byte[] readAllBytes(InputStream inputStream) throws IOException {
-        final int bufLen = 4 * 0x400; // 4KB
-        byte[] buf = new byte[bufLen];
-        int readLen;
-        IOException exception = null;
-
-        try {
-            try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-                while ((readLen = inputStream.read(buf, 0, bufLen)) != -1)
-                    outputStream.write(buf, 0, readLen);
-
-                return outputStream.toByteArray();
-            }
-        } catch (IOException e) {
-            exception = e;
-            throw e;
-        } finally {
-            if (exception == null) inputStream.close();
-            else try {
-                inputStream.close();
-            } catch (IOException e) {
-                exception.addSuppressed(e);
-            }
         }
+
     }
 
+
     static String convertJavaFileObjectNameToBinaryClassName(JavaFileObject javaFileObject) {
         Pattern pattern = Pattern.compile("^[/](.*)[.]class$");
         Matcher matcher = pattern.matcher(javaFileObject.getName());
         if (matcher.matches()) {
-            return matcher.group(1).replaceAll("[/]",".");
+            return matcher.group(1).replaceAll("[/]", ".");
         }
         throw new IllegalStateException("Got invalid name : " + javaFileObject.getName());
     }
 
     @Override
-    public <TYPE> Class<TYPE> getClass(String binaryClassName) throws ClassNotFoundException {
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
 
+        if (!classMap.containsKey(name)) {
+            throw new ClassNotFoundException("Couldnt't find class : " + name);
+        }
 
-        Class<TYPE> clazz =  (Class<TYPE>) this.classMap.get(binaryClassName);
+        CompileTestFileManager.InMemoryOutputJavaFileObject javaFileObject = classMap.get(name);
 
-        if(clazz == null){
-            throw new ClassNotFoundException(binaryClassName);
-        }
-        return clazz;
+        return defineClass(name, javaFileObject.getContent(), 0, javaFileObject.getContent().length);
+    }
+
+    @Override
+    public Class<?> getClass(String binaryClassName) throws ClassNotFoundException {
+        return this.loadClass(binaryClassName);
     }
 }
diff --git a/cute/src/test/java/io/toolisticon/cute/CuteTest.java b/cute/src/test/java/io/toolisticon/cute/CuteTest.java
@@ -98,6 +98,10 @@ public void test_testGenerationOfClassAndCustomAssertions() {
                             Class<?> generatedClass = e.getClassLoader().getClass("io.toolisticon.cute.testhelper.compiletest.TestClassGeneratedClass");
                             MatcherAssert.assertThat("Class should exist", generatedClass != null);
 
+                            Class<?> compiledClass = e.getClassLoader().getClass("io.toolisticon.cute.testhelper.compiletest.TestClass");
+                            MatcherAssert.assertThat("Class should exist", compiledClass != null);
+
+
                             SimpleTestProcessor1Interface instance = (SimpleTestProcessor1Interface) generatedClass.getDeclaredConstructor().newInstance();
                             MatcherAssert.assertThat(instance.getOutput(), Matchers.is("WORKS!!!"));
 

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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+        <version>1.3.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.2.0</version>
+    <version>1.3.0</version>
     <packaging>pom</packaging>
 
     <name>cute-parent</name>