Merge pull request #40601 from dmlloyd/jbmar

Test framework: Use JBoss Marshalling cloner
quarkusio · May 16, 2024 · 8f946ab · 8f946ab
2 parents 92eeae9 + 0e113de
commit 8f946ab
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 389 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -120,6 +120,7 @@
         <wildfly-common.version>1.7.0.Final</wildfly-common.version>
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
         <wildfly-elytron.version>2.4.1.Final</wildfly-elytron.version>
+        <jboss-marshalling.version>2.1.4.SP1</jboss-marshalling.version>
         <jboss-threads.version>3.6.1.Final</jboss-threads.version>
         <vertx.version>4.5.7</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
@@ -4796,6 +4797,11 @@
                 <type>pom</type>
             </dependency>
 
+            <dependency>
+                <groupId>org.jboss.marshalling</groupId>
+                <artifactId>jboss-marshalling</artifactId>
+                <version>${jboss-marshalling.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.threads</groupId>
                 <artifactId>jboss-threads</artifactId>

diff --git a/test-framework/junit5/pom.xml b/test-framework/junit5/pom.xml
@@ -49,10 +49,8 @@
             <artifactId>quarkus-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <!-- Avoid adding this to the BOM -->
-            <version>1.4.20</version>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling</artifactId>
         </dependency>
 
         <dependency>

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
@@ -40,7 +40,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
@@ -52,7 +51,6 @@
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
@@ -106,7 +104,7 @@
 import io.quarkus.test.junit.callback.QuarkusTestContext;
 import io.quarkus.test.junit.callback.QuarkusTestMethodContext;
 import io.quarkus.test.junit.internal.DeepClone;
-import io.quarkus.test.junit.internal.SerializationWithXStreamFallbackDeepClone;
+import io.quarkus.test.junit.internal.NewSerializingDeepClone;
 
 public class QuarkusTestExtension extends AbstractJvmQuarkusTestExtension
         implements BeforeEachCallback, BeforeTestExecutionCallback, AfterTestExecutionCallback, AfterEachCallback,
@@ -355,7 +353,7 @@ private void shutdownHangDetection() {
     }
 
     private void populateDeepCloneField(StartupAction startupAction) {
-        deepClone = new SerializationWithXStreamFallbackDeepClone(startupAction.getClassLoader());
+        deepClone = new NewSerializingDeepClone(originalCl, startupAction.getClassLoader());
     }
 
     private void populateTestMethodInvokers(ClassLoader quarkusClassLoader) {
@@ -962,49 +960,13 @@ private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocation
             Parameter[] parameters = invocationContext.getExecutable().getParameters();
             for (int i = 0; i < originalArguments.size(); i++) {
                 Object arg = originalArguments.get(i);
-                boolean cloneRequired = false;
-                Object replacement = null;
                 Class<?> argClass = parameters[i].getType();
-                if (arg != null) {
-                    Class<?> theclass = argClass;
-                    while (theclass.isArray()) {
-                        theclass = theclass.getComponentType();
-                    }
-                    if (theclass.isPrimitive()) {
-                        cloneRequired = false;
-                    } else if (TestInfo.class.isAssignableFrom(theclass)) {
-                        TestInfo info = (TestInfo) arg;
-                        Method newTestMethod = info.getTestMethod().isPresent()
-                                ? determineTCCLExtensionMethod(info.getTestMethod().get(), testClassFromTCCL)
-                                : null;
-                        replacement = new TestInfoImpl(info.getDisplayName(), info.getTags(),
-                                Optional.of(testClassFromTCCL),
-                                Optional.ofNullable(newTestMethod));
-                    } else if (clonePattern.matcher(theclass.getName()).matches()) {
-                        cloneRequired = true;
-                    } else {
-                        try {
-                            cloneRequired = runningQuarkusApplication.getClassLoader()
-                                    .loadClass(theclass.getName()) != theclass;
-                        } catch (ClassNotFoundException e) {
-                            if (arg instanceof Supplier) {
-                                cloneRequired = true;
-                            } else {
-                                throw e;
-                            }
-                        }
-                    }
-                }
 
-                if (replacement != null) {
-                    argumentsFromTccl.add(replacement);
-                } else if (cloneRequired) {
-                    argumentsFromTccl.add(deepClone.clone(arg));
-                } else if (testMethodInvokerToUse != null) {
+                if (testMethodInvokerToUse != null) {
                     argumentsFromTccl.add(testMethodInvokerToUse.getClass().getMethod("methodParamInstance", String.class)
                             .invoke(testMethodInvokerToUse, argClass.getName()));
                 } else {
-                    argumentsFromTccl.add(arg);
+                    argumentsFromTccl.add(deepClone.clone(arg));
                 }
             }
 
@@ -1014,7 +976,7 @@ private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocation
                         .invoke(testMethodInvokerToUse, effectiveTestInstance, newMethod, argumentsFromTccl,
                                 extensionContext.getRequiredTestClass().getName());
             } else {
-                return newMethod.invoke(effectiveTestInstance, argumentsFromTccl.toArray(new Object[0]));
+                return newMethod.invoke(effectiveTestInstance, argumentsFromTccl.toArray(Object[]::new));
             }
 
         } catch (InvocationTargetException e) {

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomListConverter.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomListConverter.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomMapConverter.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomMapConverter.java
diff --git a/...ramework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomMapEntryConverter.java b/...ramework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomMapEntryConverter.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomSetConverter.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomSetConverter.java