From 9ad4e902e7d75967d86f85a0235ab368b39f41d8 Mon Sep 17 00:00:00 2001
From: Holly Cummins <hcummins@redhat.com>
Date: Mon, 2 Dec 2024 10:23:52 +0000
Subject: [PATCH] Move TestBuildChainFunction to its own class
---
.../AbstractJvmQuarkusTestExtension.java | 2 +-
.../test/junit/QuarkusTestExtension.java | 113 ------------
.../test/junit/TestBuildChainFunction.java | 163 ++++++++++++++++++
3 files changed, 164 insertions(+), 114 deletions(-)
create mode 100644 test-framework/junit5/src/main/java/io/quarkus/test/junit/TestBuildChainFunction.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
index a36ee0cc8ac64c..f8db4882990165 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
@@ -212,7 +212,7 @@ protected PrepareResult createAugmentor(ExtensionContext context, Class<? extend
}
quarkusTestProfile = profile;
return new PrepareResult(curatedApplication
- .createAugmentor(QuarkusTestExtension.TestBuildChainFunction.class.getName(), props), profileInstance,
+ .createAugmentor(TestBuildChainFunction.class.getName(), props), profileInstance,
curatedApplication, testClassLocation);
}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
index 8d54d14d940746..77117bbc03f1b4 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -1170,119 +1170,6 @@ public void close() {
}
}
- public static class TestBuildChainFunction implements Function<Map<String, Object>, List<Consumer<BuildChainBuilder>>> {
-
- @Override
- public List<Consumer<BuildChainBuilder>> apply(Map<String, Object> stringObjectMap) {
- Path testLocation = (Path) stringObjectMap.get(TEST_LOCATION);
- // the index was written by the extension
- Index testClassesIndex = TestClassIndexer.readIndex(testLocation, (Class<?>) stringObjectMap.get(TEST_CLASS));
-
- List<Consumer<BuildChainBuilder>> allCustomizers = new ArrayList<>(1);
- Consumer<BuildChainBuilder> defaultCustomizer = new Consumer<BuildChainBuilder>() {
-
- @Override
- public void accept(BuildChainBuilder buildChainBuilder) {
- buildChainBuilder.addBuildStep(new BuildStep() {
- @Override
- public void execute(BuildContext context) {
- context.produce(new TestClassPredicateBuildItem(new Predicate<String>() {
- @Override
- public boolean test(String className) {
- return PathTestHelper.isTestClass(className,
- Thread.currentThread().getContextClassLoader(), testLocation);
- }
- }));
- }
- }).produces(TestClassPredicateBuildItem.class)
- .build();
- buildChainBuilder.addBuildStep(new BuildStep() {
- @Override
- public void execute(BuildContext context) {
- //we need to make sure all hot reloadable classes are application classes
- context.produce(new ApplicationClassPredicateBuildItem(new Predicate<String>() {
- @Override
- public boolean test(String className) {
- return QuarkusClassLoader.isApplicationClass(className);
- }
- }));
- }
- }).produces(ApplicationClassPredicateBuildItem.class).build();
- buildChainBuilder.addBuildStep(new BuildStep() {
- @Override
- public void execute(BuildContext context) {
- context.produce(new TestAnnotationBuildItem(QuarkusTest.class.getName()));
- }
- }).produces(TestAnnotationBuildItem.class)
- .build();
-
- List<String> testClassBeans = new ArrayList<>();
-
- List<AnnotationInstance> extendWith = testClassesIndex
- .getAnnotations(DotNames.EXTEND_WITH);
- for (AnnotationInstance annotationInstance : extendWith) {
- if (annotationInstance.target().kind() != AnnotationTarget.Kind.CLASS) {
- continue;
- }
- ClassInfo classInfo = annotationInstance.target().asClass();
- if (classInfo.isAnnotation()) {
- continue;
- }
- Type[] extendsWithTypes = annotationInstance.value().asClassArray();
- for (Type type : extendsWithTypes) {
- if (DotNames.QUARKUS_TEST_EXTENSION.equals(type.name())) {
- testClassBeans.add(classInfo.name().toString());
- }
- }
- }
-
- List<AnnotationInstance> registerExtension = testClassesIndex.getAnnotations(DotNames.REGISTER_EXTENSION);
- for (AnnotationInstance annotationInstance : registerExtension) {
- if (annotationInstance.target().kind() != AnnotationTarget.Kind.FIELD) {
- continue;
- }
- FieldInfo fieldInfo = annotationInstance.target().asField();
- if (DotNames.QUARKUS_TEST_EXTENSION.equals(fieldInfo.type().name())) {
- testClassBeans.add(fieldInfo.declaringClass().name().toString());
- }
- }
-
- if (!testClassBeans.isEmpty()) {
- buildChainBuilder.addBuildStep(new BuildStep() {
- @Override
- public void execute(BuildContext context) {
- for (String quarkusExtendWithTestClass : testClassBeans) {
- context.produce(new TestClassBeanBuildItem(quarkusExtendWithTestClass));
- }
- }
- }).produces(TestClassBeanBuildItem.class)
- .build();
- }
-
- buildChainBuilder.addBuildStep(new BuildStep() {
- @Override
- public void execute(BuildContext context) {
- Object testProfile = stringObjectMap.get(TEST_PROFILE);
- if (testProfile != null) {
- context.produce(new TestProfileBuildItem(testProfile.toString()));
- }
- }
- }).produces(TestProfileBuildItem.class).build();
-
- }
- };
- allCustomizers.add(defaultCustomizer);
-
- // give other extensions the ability to customize the build chain
- for (TestBuildChainCustomizerProducer testBuildChainCustomizerProducer : ServiceLoader
- .load(TestBuildChainCustomizerProducer.class, this.getClass().getClassLoader())) {
- allCustomizers.add(testBuildChainCustomizerProducer.produce(testClassesIndex));
- }
-
- return allCustomizers;
- }
- }
-
private static void resetHangTimeout() {
if (hangTaskKey != null) {
hangTaskKey.cancel(false);
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestBuildChainFunction.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestBuildChainFunction.java
new file mode 100644
index 00000000000000..b75ac09a257618
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestBuildChainFunction.java
@@ -0,0 +1,163 @@
+package io.quarkus.test.junit;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.Index;
+import org.jboss.jandex.Type;
+
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem;
+import io.quarkus.deployment.builditem.TestAnnotationBuildItem;
+import io.quarkus.deployment.builditem.TestClassBeanBuildItem;
+import io.quarkus.deployment.builditem.TestClassPredicateBuildItem;
+import io.quarkus.deployment.builditem.TestProfileBuildItem;
+import io.quarkus.test.common.PathTestHelper;
+import io.quarkus.test.common.TestClassIndexer;
+import io.quarkus.test.junit.buildchain.TestBuildChainCustomizerProducer;
+
+public class TestBuildChainFunction implements Function<Map<String, Object>, List<Consumer<BuildChainBuilder>>> {
+
+ @Override
+ public List<Consumer<BuildChainBuilder>> apply(Map<String, Object> stringObjectMap) {
+ Path testLocation = (Path) stringObjectMap.get(AbstractJvmQuarkusTestExtension.TEST_LOCATION);
+ // the index was written by the extension
+ Index testClassesIndex = TestClassIndexer.readIndex(testLocation,
+ (Class<?>) stringObjectMap.get(AbstractJvmQuarkusTestExtension.TEST_CLASS));
+
+ List<Consumer<BuildChainBuilder>> allCustomizers = new ArrayList<>(1);
+ Consumer<BuildChainBuilder> defaultCustomizer = new Consumer<BuildChainBuilder>() {
+
+ @Override
+ public void accept(BuildChainBuilder buildChainBuilder) {
+ buildChainBuilder.addBuildStep(new BuildStep() {
+ @Override
+ public void execute(BuildContext context) {
+ context.produce(new TestClassPredicateBuildItem(new Predicate<String>() {
+ @Override
+ public boolean test(String className) {
+ return PathTestHelper.isTestClass(className,
+ Thread.currentThread()
+ .getContextClassLoader(),
+ testLocation);
+ }
+ }));
+ }
+ })
+ .produces(TestClassPredicateBuildItem.class)
+ .build();
+ buildChainBuilder.addBuildStep(new BuildStep() {
+ @Override
+ public void execute(BuildContext context) {
+ //we need to make sure all hot reloadable classes are application classes
+ context.produce(new ApplicationClassPredicateBuildItem(new Predicate<String>() {
+ @Override
+ public boolean test(String className) {
+ return QuarkusClassLoader.isApplicationClass(className);
+ }
+ }));
+ }
+ })
+ .produces(ApplicationClassPredicateBuildItem.class)
+ .build();
+ buildChainBuilder.addBuildStep(new BuildStep() {
+ @Override
+ public void execute(BuildContext context) {
+ context.produce(new TestAnnotationBuildItem(QuarkusTest.class.getName()));
+ }
+ })
+ .produces(TestAnnotationBuildItem.class)
+ .build();
+
+ List<String> testClassBeans = new ArrayList<>();
+
+ List<AnnotationInstance> extendWith = testClassesIndex
+ .getAnnotations(DotNames.EXTEND_WITH);
+ for (AnnotationInstance annotationInstance : extendWith) {
+ if (annotationInstance.target()
+ .kind() != AnnotationTarget.Kind.CLASS) {
+ continue;
+ }
+ ClassInfo classInfo = annotationInstance.target()
+ .asClass();
+ if (classInfo.isAnnotation()) {
+ continue;
+ }
+ Type[] extendsWithTypes = annotationInstance.value()
+ .asClassArray();
+ for (Type type : extendsWithTypes) {
+ if (DotNames.QUARKUS_TEST_EXTENSION.equals(type.name())) {
+ testClassBeans.add(classInfo.name()
+ .toString());
+ }
+ }
+ }
+
+ List<AnnotationInstance> registerExtension = testClassesIndex.getAnnotations(DotNames.REGISTER_EXTENSION);
+ for (AnnotationInstance annotationInstance : registerExtension) {
+ if (annotationInstance.target()
+ .kind() != AnnotationTarget.Kind.FIELD) {
+ continue;
+ }
+ FieldInfo fieldInfo = annotationInstance.target()
+ .asField();
+ if (DotNames.QUARKUS_TEST_EXTENSION.equals(fieldInfo.type()
+ .name())) {
+ testClassBeans.add(fieldInfo.declaringClass()
+ .name()
+ .toString());
+ }
+ }
+
+ if (!testClassBeans.isEmpty()) {
+ buildChainBuilder.addBuildStep(new BuildStep() {
+ @Override
+ public void execute(BuildContext context) {
+ for (String quarkusExtendWithTestClass : testClassBeans) {
+ context.produce(new TestClassBeanBuildItem(quarkusExtendWithTestClass));
+ }
+ }
+ })
+ .produces(TestClassBeanBuildItem.class)
+ .build();
+ }
+
+ buildChainBuilder.addBuildStep(new BuildStep() {
+ @Override
+ public void execute(BuildContext context) {
+ Object testProfile = stringObjectMap.get(AbstractJvmQuarkusTestExtension.TEST_PROFILE);
+ if (testProfile != null) {
+ context.produce(new TestProfileBuildItem(testProfile.toString()));
+ }
+ }
+ })
+ .produces(TestProfileBuildItem.class)
+ .build();
+
+ }
+ };
+ allCustomizers.add(defaultCustomizer);
+
+ // give other extensions the ability to customize the build chain
+ for (TestBuildChainCustomizerProducer testBuildChainCustomizerProducer : ServiceLoader
+ .load(TestBuildChainCustomizerProducer.class, this.getClass()
+ .getClassLoader())) {
+ allCustomizers.add(testBuildChainCustomizerProducer.produce(testClassesIndex));
+ }
+
+ return allCustomizers;
+ }
+}