Merge pull request #38 from arquillian/master

Update from origin
kifj · Dec 22, 2023 · 5217897 · 5217897
2 parents 9e5c621 + dec16d2
commit 5217897
Show file tree

Hide file tree

Showing 188 changed files with 298 additions and 10,105 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,7 +3,7 @@
   <extension>
     <groupId>io.takari.maven</groupId>
     <artifactId>takari-smart-builder</artifactId>
-    <version>0.6.2</version>
+    <version>0.6.4</version>
   </extension>
   <extension>
     <groupId>io.takari.aether</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -7,7 +7,7 @@
   <!-- Artifact Information -->
   <groupId>org.jboss.arquillian</groupId>
   <artifactId>arquillian-bom</artifactId>
-  <version>1.7.2.Final-SNAPSHOT</version>
+  <version>1.8.1.Final-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Arquillian BOM</name>
   <url>http://arquillian.org</url>
@@ -45,7 +45,7 @@
 
     <version.shrinkwrap_core>1.2.6</version.shrinkwrap_core>
     <version.shrinkwrap_descriptors>2.0.0</version.shrinkwrap_descriptors>
-    <version.shrinkwrap_resolver>3.1.4</version.shrinkwrap_resolver>
+    <version.shrinkwrap_resolver>3.2.1</version.shrinkwrap_resolver>
 
     <jboss.releases.repo.id>jboss-releases-repository</jboss.releases.repo.id>
     <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/

diff --git a/build/pom.xml b/build/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-parent</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -25,8 +25,8 @@
     <!-- Arquillian Core common Deps, Test related -->
     <version.javax.inject>1</version.javax.inject>
     <version.junit>4.13.2</version.junit>
-    <version.junit5.platform>1.9.3</version.junit5.platform>
-    <version.junit5>5.9.3</version.junit5>
+    <version.junit5.platform>1.10.1</version.junit5.platform>
+    <version.junit5>5.10.1</version.junit5>
     <version.mockito>4.10.0</version.mockito>
     <version.testng>7.5</version.testng>
     <version.assertj>3.24.2</version.assertj>
@@ -67,6 +67,11 @@
         <artifactId>junit-jupiter-api</artifactId>
         <version>${version.junit5}</version>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${version.junit5}</version>
+      </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-engine</artifactId>

diff --git a/config/api/pom.xml b/config/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/config/impl-base/pom.xml b/config/impl-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/...c/test/java/org/jboss/arquillian/config/descriptor/impl/ArquillianDescriptorTestCase.java b/...c/test/java/org/jboss/arquillian/config/descriptor/impl/ArquillianDescriptorTestCase.java
@@ -506,7 +506,7 @@ private ArquillianDescriptor create() {
     private ArquillianDescriptor create(String xml) throws Exception {
         validateXML(desc);
 
-        return Descriptors.importAs(ArquillianDescriptor.class).from(xml);
+        return Descriptors.importAs(ArquillianDescriptor.class).fromString(xml);
     }
 
     private void validateXML(String xml) throws Exception {

diff --git a/...va/org/jboss/arquillian/config/impl/extension/ArquillianDescriptorPropertiesTestCase.java b/...va/org/jboss/arquillian/config/impl/extension/ArquillianDescriptorPropertiesTestCase.java
@@ -532,7 +532,7 @@ private ArquillianDescriptor create() {
     private ArquillianDescriptor create(String xml) throws Exception {
         validateXML(desc.exportAsString());
 
-        return Descriptors.importAs(ArquillianDescriptor.class).from(xml);
+        return Descriptors.importAs(ArquillianDescriptor.class).fromString(xml);
     }
 
     private void validateXML(String xml) throws Exception {

diff --git a/config/pom.xml b/config/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-parent</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
   </parent>
 
   <!-- Model Information -->

diff --git a/config/spi/pom.xml b/config/spi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/container/impl-base/pom.xml b/container/impl-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/container/impl-base/src/test/java/org/jboss/arquillian/container/impl/MapObjectTestCase.java b/container/impl-base/src/test/java/org/jboss/arquillian/container/impl/MapObjectTestCase.java
@@ -18,7 +18,7 @@
 package org.jboss.arquillian.container.impl;
 
 import java.util.HashMap;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.jboss.arquillian.config.descriptor.api.Multiline;
 import org.junit.Test;
 

diff --git a/...boss/arquillian/container/impl/client/container/ContainerLifecycleControllerTestCase.java b/...boss/arquillian/container/impl/client/container/ContainerLifecycleControllerTestCase.java
@@ -18,7 +18,7 @@
 package org.jboss.arquillian.container.impl.client.container;
 
 import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.jboss.arquillian.config.descriptor.api.ContainerDef;
 import org.jboss.arquillian.container.impl.LocalContainerRegistry;
 import org.jboss.arquillian.container.impl.client.ContainerDeploymentContextHandler;

diff --git a/container/pom.xml b/container/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-parent</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
   </parent>
 
   <!-- Model Information -->

diff --git a/container/spi/pom.xml b/container/spi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/container/test-api/pom.xml b/container/test-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/container/test-impl-base/pom.xml b/container/test-impl-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/...pl-base/src/main/java/org/jboss/arquillian/container/test/impl/RemoteExtensionLoader.java b/...pl-base/src/main/java/org/jboss/arquillian/container/test/impl/RemoteExtensionLoader.java
@@ -21,6 +21,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -185,7 +186,10 @@ private <T> Set<Class<? extends T>> load(Class<T> serviceClass, ClassLoader load
             Enumeration<URL> enumeration = loader.getResources(serviceFile);
             while (enumeration.hasMoreElements()) {
                 final URL url = enumeration.nextElement();
-                final InputStream is = url.openStream();
+                URLConnection jarConnection = url.openConnection();
+                //Don't cache the file (avoids file leaks on GlassFish).
+                jarConnection.setUseCaches(false);
+                final InputStream is = jarConnection.getInputStream();
                 BufferedReader reader = null;
 
                 try {
@@ -222,6 +226,9 @@ private <T> Set<Class<? extends T>> load(Class<T> serviceClass, ClassLoader load
                 } catch (IOException exc) {
                     throw new RuntimeException("Could not read file: " + url);
                 } finally {
+                    if (is != null) {
+                       is.close();
+                    }
                     if (reader != null) {
                         reader.close();
                     }

diff --git a/...e/src/main/java/org/jboss/arquillian/container/test/impl/execution/LocalTestExecuter.java b/...e/src/main/java/org/jboss/arquillian/container/test/impl/execution/LocalTestExecuter.java
@@ -52,16 +52,14 @@ public class LocalTestExecuter {
     private InstanceProducer<TestResult> testResult;
 
     public void execute(@Observes LocalExecutionEvent event) throws Exception {
-        TestResult result = new TestResult();
+        TestResult result = TestResult.passed();
         try {
             event.getExecutor().invoke(
                 enrichArguments(
                     event.getExecutor().getMethod(),
                     serviceLoader.get().all(TestEnricher.class)));
-            result.setStatus(Status.PASSED);
         } catch (Throwable e) {
-            result.setStatus(Status.FAILED);
-            result.setThrowable(e);
+            result = TestResult.failed(e);
         } finally {
             result.setEnd(System.currentTimeMillis());
         }

diff --git a/...ss/arquillian/container/test/impl/client/container/ClientContainerControllerTestCase.java b/...ss/arquillian/container/test/impl/client/container/ClientContainerControllerTestCase.java
@@ -18,7 +18,7 @@
 package org.jboss.arquillian.container.test.impl.client.container;
 
 import java.util.List;
-import junit.framework.Assert;
+
 import org.jboss.arquillian.config.descriptor.api.ContainerDef;
 import org.jboss.arquillian.container.impl.LocalContainerRegistry;
 import org.jboss.arquillian.container.spi.Container;
@@ -44,6 +44,7 @@
 import org.jboss.arquillian.core.spi.ServiceLoader;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/container/test-spi/pom.xml b/container/test-spi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/core/api/pom.xml b/core/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/core/impl-base/pom.xml b/core/impl-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-parent</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
   </parent>
 
   <!-- Model Information -->

diff --git a/core/spi/pom.xml b/core/spi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/junit/container/pom.xml b/junit/container/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/junit/container/src/main/java/org/jboss/arquillian/junit/container/JUnitTestRunner.java b/junit/container/src/main/java/org/jboss/arquillian/junit/container/JUnitTestRunner.java
@@ -22,7 +22,7 @@
 import org.jboss.arquillian.junit.State;
 import org.jboss.arquillian.test.spi.TestResult;
 import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;

diff --git a/...container/src/test/java/org/jboss/arquillian/junit/container/JUnitTestRunnerTestCase.java b/...container/src/test/java/org/jboss/arquillian/junit/container/JUnitTestRunnerTestCase.java
@@ -24,7 +24,7 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.rules.ExpectedException;
 
 public class JUnitTestRunnerTestCase {
@@ -145,6 +145,7 @@ public static class TestScenarios {
 
         public static Exception exceptionThrownInAfter;
 
+        @SuppressWarnings("deprecation")
         @Rule
         public ExpectedException e = ExpectedException.none();
 

diff --git a/junit/core/pom.xml b/junit/core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.7.2.Final-SNAPSHOT</version>
+    <version>1.8.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/junit/core/src/main/java/org/jboss/arquillian/junit/Arquillian.java b/junit/core/src/main/java/org/jboss/arquillian/junit/Arquillian.java
@@ -22,27 +22,21 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import org.jboss.arquillian.junit.event.AfterRules;
 import org.jboss.arquillian.junit.event.BeforeRules;
 import org.jboss.arquillian.junit.event.RulesEnrichment;
 import org.jboss.arquillian.test.spi.LifecycleMethodExecutor;
-import org.jboss.arquillian.test.spi.TestMethodExecutor;
-import org.jboss.arquillian.test.spi.TestResult;
-import org.jboss.arquillian.test.spi.TestResult.Status;
 import org.jboss.arquillian.test.spi.TestRunnerAdaptor;
-import org.jboss.arquillian.test.spi.execution.SkippedTestExecutionException;
-import org.junit.internal.AssumptionViolatedException;
-import org.junit.internal.runners.model.MultipleFailureException;
 import org.junit.internal.runners.model.ReflectiveCallable;
 import org.junit.internal.runners.statements.Fail;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.notification.RunListener;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
 
 /**

diff --git a/junit/core/src/main/java/org/jboss/arquillian/junit/MethodInvoker.java b/junit/core/src/main/java/org/jboss/arquillian/junit/MethodInvoker.java
@@ -5,7 +5,7 @@
 import org.jboss.arquillian.test.spi.TestResult;
 import org.jboss.arquillian.test.spi.TestRunnerAdaptor;
 import org.jboss.arquillian.test.spi.execution.SkippedTestExecutionException;
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 import org.junit.runners.model.FrameworkMethod;
 
 abstract class MethodInvoker {

diff --git a/.../core/src/main/java/org/jboss/arquillian/junit/extension/UpdateTestResultBeforeAfter.java b/.../core/src/main/java/org/jboss/arquillian/junit/extension/UpdateTestResultBeforeAfter.java
@@ -22,7 +22,7 @@
 import org.jboss.arquillian.test.spi.TestResult;
 import org.jboss.arquillian.test.spi.TestResult.Status;
 import org.jboss.arquillian.test.spi.event.suite.AfterTestLifecycleEvent;
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
 
 /**
  * Update the TestResult based on result After going through the JUnit chain.

diff --git a/...boss/arquillian/junit/ClassWithArquillianClassAndMethodRuleWithExpectedExceptionRule.java b/...boss/arquillian/junit/ClassWithArquillianClassAndMethodRuleWithExpectedExceptionRule.java
@@ -20,6 +20,7 @@ public class ClassWithArquillianClassAndMethodRuleWithExpectedExceptionRule {
     @Rule
     public ArquillianTest arquillianTest = new ArquillianTest();
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException e = ExpectedException.none();
 

diff --git a/...t/java/org/jboss/arquillian/junit/ClassWithArquillianRunnerWithExpectedExceptionRule.java b/...t/java/org/jboss/arquillian/junit/ClassWithArquillianRunnerWithExpectedExceptionRule.java
@@ -30,6 +30,7 @@
 
 @RunWith(Arquillian.class)
 public class ClassWithArquillianRunnerWithExpectedExceptionRule {
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException e = ExpectedException.none();