JUnit5 Extension for unit testing application parts (#31)

Author: GoodforGod

annotation-processor-common/src/testFixtures/java/ru/tinkoff/kora/annotation/processor/common/TestUtils.java

@@ -107,11 +107,35 @@ public static ClassLoader annotationProcess(List<Class<?>> targetClasses, Proces
         return annotationProcessFiles(files, processors);
     }
 
+    public static ClassLoader annotationProcess(List<Class<?>> targetClasses, List<Processor> processors) throws Exception {
+        var files = targetClasses.stream()
+            .map(targetClass -> {
+                var targetFile = targetClass.getName().replace('.', '/') + ".java";
+                var root = "src/test/java/";
+                return root + targetFile;
+            })
+            .toList();
+
+        return annotationProcessFiles(files, true, processors);
+    }
+
     public static ClassLoader annotationProcessFiles(List<String> targetFiles, Processor... processors) throws Exception {
         return annotationProcessFiles(targetFiles, true, processors);
     }
 
-    public static ClassLoader annotationProcessFiles(List<String> targetFiles, boolean clearClasses, Processor... processors) throws Exception {
+    public static ClassLoader annotationProcessFiles(List<String> targetFiles, boolean clearClasses, Processor ... processors) throws Exception {
+        return annotationProcessFiles(targetFiles, clearClasses, List.of(processors));
+    }
+
+    public static ClassLoader annotationProcessFiles(List<String> targetFiles, boolean clearClasses, List<Processor> processors) throws Exception {
+        return annotationProcessFiles(targetFiles, List.of(), clearClasses, processors);
+    }
+
+    public static ClassLoader annotationProcessFiles(List<String> targetFiles, List<String> targetClasses, boolean clearClasses, List<Processor> processors) throws Exception {
+        return annotationProcessFiles(targetFiles, targetClasses, clearClasses, p -> true, processors);
+    }
+
+    public static ClassLoader annotationProcessFiles(List<String> targetFiles, List<String> targetClasses, boolean clearClasses, Predicate<Path> clearClassesPredicate, List<Processor> processors) throws Exception {
         var compiler = ToolProvider.getSystemJavaCompiler();
         var out = new StringWriter();
         var diagnostics = new ArrayList<Diagnostic<? extends JavaFileObject>>();
@@ -126,7 +150,7 @@ public static ClassLoader annotationProcessFiles(List<String> targetFiles, boole
             if (clearClasses) {
                 try (var s = Files.walk(outClasses)) {
                     s.forEach(p -> {
-                        if (!Files.isDirectory(p)) {
+                        if (!Files.isDirectory(p) && clearClassesPredicate.test(p)) {
                             try {
                                 Files.delete(p);
                             } catch (IOException e) {
@@ -157,8 +181,8 @@ public static ClassLoader annotationProcessFiles(List<String> targetFiles, boole
             cp.add(outClasses);
             standardFileManager.setLocationFromPaths(StandardLocation.CLASS_PATH, cp);
 
-            var task = compiler.getTask(out, standardFileManager, l, List.of("-parameters", "-g", "--enable-preview", "--source", "17", "-XprintRounds"), List.of(), inputSourceFiles);
-            task.setProcessors(List.of(processors));
+            var task = compiler.getTask(out, standardFileManager, l, List.of("-parameters", "-g", "--enable-preview", "--source", "17", "-XprintRounds"), targetClasses, inputSourceFiles);
+            task.setProcessors(processors);
             try {
                 task.call();
                 if (diagnostics.stream().noneMatch(d -> d.getKind() == Diagnostic.Kind.ERROR)) {

application-graph/src/main/java/ru/tinkoff/kora/application/graph/ApplicationGraphDraw.java

@@ -10,6 +10,7 @@
 import java.util.TreeMap;
 
 public class ApplicationGraphDraw {
+
     private final List<Node<?>> graphNodes = new ArrayList<>();
     private final Class<?> root;
 
@@ -21,11 +22,11 @@ public Class<?> getRoot() {
         return root;
     }
 
-    public <T> Node<T> addNode0(Type type, Class<?>[] tags, Graph.Factory<T> factory, Node<?>... dependencies) {
+    public <T> Node<T> addNode0(Type type, Class<?>[] tags, Graph.Factory<? extends T> factory, Node<?>... dependencies) {
         return this.addNode0(type, tags, factory, List.of(), dependencies);
     }
 
-    public <T> Node<T> addNode0(Type type, Class<?>[] tags, Graph.Factory<T> factory, List<Node<? extends GraphInterceptor<T>>> interceptors, Node<?>... dependencies) {
+    public <T> Node<T> addNode0(Type type, Class<?>[] tags, Graph.Factory<? extends T> factory, List<Node<? extends GraphInterceptor<T>>> interceptors, Node<?>... dependencies) {
         for (var dependency : dependencies) {
             if (dependency.index >= 0 && dependency.graphDraw != this) {
                 throw new IllegalArgumentException("Dependency is from another graph");
@@ -73,7 +74,7 @@ public Node<?> findNodeByType(Type type) {
         return null;
     }
 
-    public <T> void replaceNode(Node<T> node, Graph.Factory<T> factory) {
+    public <T> void replaceNode(Node<T> node, Graph.Factory<? extends T> factory) {
         this.graphNodes.set(node.index, new Node<T>(
             this, node.index, factory, node.type(), List.of(), List.of(), node.tags()
         ));

application-graph/src/main/java/ru/tinkoff/kora/application/graph/Node.java

@@ -8,7 +8,7 @@
 public final class Node<T> {
     final ApplicationGraphDraw graphDraw;
     final int index;
-    final Graph.Factory<T> factory;
+    final Graph.Factory<? extends T> factory;
     // leaks for the test purposes
     private final Type type;
     private final Class<?>[] tags;
@@ -18,7 +18,7 @@ public final class Node<T> {
     private final List<Node<?>> dependentNodes;
     private final boolean isValueOf;
 
-    Node(ApplicationGraphDraw graphDraw, int index, Graph.Factory<T> factory, Type type, List<Node<?>> dependencyNodes, List<Node<? extends GraphInterceptor<T>>> interceptors, Class<?>[] tags) {
+    Node(ApplicationGraphDraw graphDraw, int index, Graph.Factory<? extends T> factory, Type type, List<Node<?>> dependencyNodes, List<Node<? extends GraphInterceptor<T>>> interceptors, Class<?>[] tags) {
         this.graphDraw = graphDraw;
         this.index = index;
         this.factory = factory;
@@ -31,7 +31,7 @@ public final class Node<T> {
         this.tags = tags;
     }
 
-    private Node(ApplicationGraphDraw graphDraw, int index, Graph.Factory<T> factory, Type type, List<Node<?>> dependencyNodes, List<Node<? extends GraphInterceptor<T>>> interceptors, List<Node<?>> dependentNodes, List<Node<?>> intercepts, boolean isValueOf, Class<?>[] tags) {
+    private Node(ApplicationGraphDraw graphDraw, int index, Graph.Factory<? extends T> factory, Type type, List<Node<?>> dependencyNodes, List<Node<? extends GraphInterceptor<T>>> interceptors, List<Node<?>> dependentNodes, List<Node<?>> intercepts, boolean isValueOf, Class<?>[] tags) {
         this.graphDraw = graphDraw;
         this.index = index;
         this.factory = factory;

build.gradle

@@ -48,7 +48,7 @@ subprojects {
 
 // config test libraries
 subprojects {
-    if (project.parent.name != "test") {
+    if (project.parent.name != "internal") {
         return
     }
     dependencies {
@@ -61,10 +61,10 @@ def isPublishedLibrary = { Project p ->
     if (!p.childProjects.isEmpty()) {
         return false
     }
-    if (p.parent.name == "test") {
+    if (p.parent.name == "internal") {
         return false
     }
-    if (p.name == 'maven-parent') {
+    if (p.name == "maven-parent") {
         return false
     }
     return true
@@ -226,7 +226,7 @@ subprojects {
     dependencies {
         api libs.jsr305
 
-        testImplementation project(":test:test-logging")
+        testImplementation project(":internal:test-logging")
         testImplementation libs.junit.jupiter
         testImplementation libs.mockito.core
         testImplementation libs.assertj
@@ -330,7 +330,7 @@ def isOtherTest = { Project p ->
     if (p.name.startsWith("http") || p.name.startsWith("kafka") || p.name.startsWith("database")) {
         return false
     }
-    if (p.parent.name == "test") {
+    if (p.parent.name == "internal") {
         return false
     }
     return !kspProjects.contains(p.name)

cache/cache-annotation-processor/build.gradle

@@ -9,7 +9,7 @@ dependencies {
     implementation libs.logback.classic
 
     testImplementation testFixtures(project(":annotation-processor-common"))
-    testImplementation project(":test:test-logging")
+    testImplementation project(":internal:test-logging")
     testImplementation "com.google.testing.compile:compile-testing:0.19"
 }
 

cache/cache-caffeine/build.gradle

@@ -11,7 +11,7 @@ dependencies {
     testImplementation project(":cache:cache-annotation-processor")
     testImplementation project(":config:config-annotation-processor")
     testImplementation project(":kora-app-annotation-processor")
-    testImplementation project(":test:test-logging")
+    testImplementation project(":internal:test-logging")
 }
 
 apply from: '../../in-test-generated.gradle'

cache/cache-common/build.gradle

@@ -3,5 +3,5 @@ dependencies {
     api project(":common")
     api project(":logging:logging-common")
 
-    testImplementation project(":test:test-logging")
+    testImplementation project(":internal:test-logging")
 }

cache/cache-redis/build.gradle

@@ -16,8 +16,8 @@ dependencies {
     testImplementation project(":config:config-annotation-processor")
     testImplementation project(":kora-app-annotation-processor")
     testImplementation project(":json:json-annotation-processor")
-    testImplementation project(":test:test-logging")
-    testImplementation project(":test:test-redis")
+    testImplementation project(":internal:test-logging")
+    testImplementation project(":internal:test-redis")
 
     testImplementation libs.testcontainers.junit.jupiter
 }

cache/cache-symbol-processor/build.gradle

@@ -14,7 +14,7 @@ dependencies {
     implementation libs.kotlinpoet
     implementation libs.kotlinpoet.ksp
 
-    testImplementation project(":test:test-logging")
+    testImplementation project(":internal:test-logging")
     testImplementation testFixtures(project(":symbol-processor-common"))
     testImplementation(libs.kotlin.stdlib.lib)
     testImplementation(libs.kotlin.coroutines.reactor)

common/src/main/java/ru/tinkoff/kora/common/KoraApp.java

@@ -1,32 +1,10 @@
 package ru.tinkoff.kora.common;
 
-import reactor.core.publisher.Mono;
-import ru.tinkoff.kora.application.graph.Lifecycle;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Retention(RetentionPolicy.SOURCE)
+@Retention(RetentionPolicy.CLASS)
 @Target(ElementType.TYPE)
-public @interface KoraApp {
-}
-
-
-
-interface TestApp {
-    default Lifecycle someLifecycle() {
-        return new Lifecycle() {
-            @Override
-            public Mono<?> init() {
-                return null;
-            }
-
-            @Override
-            public Mono<?> release() {
-                return null;
-            }
-        };
-    }
-}
+public @interface KoraApp { }