Ensure that @QuarkusTest plays nicely with @testfactory

core/runtime/pom.xml

@@ -120,6 +120,11 @@
                         <parentFirstArtifact>org.objenesis:objenesis</parentFirstArtifact>
                         <parentFirstArtifact>net.bytebuddy:byte-buddy</parentFirstArtifact>
                         <parentFirstArtifact>net.bytebuddy:byte-buddy-agent</parentFirstArtifact>
+                        <parentFirstArtifact>org.junit.jupiter:junit-jupiter-api</parentFirstArtifact>
+                        <parentFirstArtifact>org.junit.jupiter:junit-jupiter-engine</parentFirstArtifact>
+                        <parentFirstArtifact>org.junit.jupiter:junit-jupiter-params</parentFirstArtifact>
+                        <parentFirstArtifact>org.junit.platform:junit-platform-commons</parentFirstArtifact>
+                        <parentFirstArtifact>org.junit.platform:junit-platform-engine</parentFirstArtifact>
                     </parentFirstArtifacts>
                     <excludedArtifacts>
                         <excludedArtifact>io.smallrye:smallrye-config</excludedArtifact>

integration-tests/main/src/test/java/io/quarkus/it/main/DynamicTestsTestCase.java

@@ -0,0 +1,39 @@
+package io.quarkus.it.main;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+
+import io.quarkus.it.arc.UnusedBean;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class DynamicTestsTestCase {
+
+    @Inject
+    UnusedBean bean;
+
+    @Test
+    public void testInjection() {
+        assertNotNull(bean);
+    }
+
+    @TestFactory
+    public List<?> dynamicTests() {
+        return Arrays.asList(
+                DynamicTest.dynamicTest("test 1", () -> {
+                    assertNotNull(bean);
+                }),
+                DynamicTest.dynamicTest("test 2", () -> {
+                    assertEquals(1, 1);
+                }));
+    }
+}

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java

@@ -320,6 +320,17 @@ public void interceptTestTemplateMethod(Invocation<Void> invocation, ReflectiveI
         invocation.skip();
     }
 
+    @Override
+    public <T> T interceptTestFactoryMethod(Invocation<T> invocation,
+            ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
+        if (isNativeTest(extensionContext)) {
+            return invocation.proceed();
+        }
+        T result = (T) runExtensionMethod(invocationContext, extensionContext);
+        invocation.skip();
+        return result;
+    }
+
     @Override
     public void interceptAfterEachMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
             ExtensionContext extensionContext) throws Throwable {
@@ -342,7 +353,7 @@ public void interceptAfterAllMethod(Invocation<Void> invocation, ReflectiveInvoc
         invocation.skip();
     }
 
-    private void runExtensionMethod(ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext)
+    private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext)
             throws Throwable {
         Method newMethod = null;
 
@@ -389,7 +400,7 @@ private void runExtensionMethod(ReflectiveInvocationContext<Method> invocationCo
                 }
             }
 
-            newMethod.invoke(actualTestInstance, argumentsFromTccl.toArray(new Object[0]));
+            return newMethod.invoke(actualTestInstance, argumentsFromTccl.toArray(new Object[0]));
         } catch (InvocationTargetException e) {
             throw e.getCause();
         } catch (IllegalAccessException | ClassNotFoundException e) {