Additional changes to execute all tests

Signed-off-by: jansupol <jan.supol@oracle.com>
eclipse-ee4j · Nov 11, 2022 · f7d85d6 · f7d85d6
1 parent f03e351
commit f7d85d6
Show file tree

Hide file tree

Showing 34 changed files with 338 additions and 110 deletions.
diff --git a/...t/java/org/glassfish/jersey/examples/entityfiltering/security/RestrictedResourceTest.java b/...t/java/org/glassfish/jersey/examples/entityfiltering/security/RestrictedResourceTest.java
@@ -21,7 +21,15 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
+import org.glassfish.jersey.test.spi.TestHelper;
+import org.junit.jupiter.api.DynamicContainer;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -34,7 +42,21 @@
  */
 public class RestrictedResourceTest {
 
-    public abstract static class RestrictedResourceTemplateTest extends JerseyTest {
+    public static Iterable<Class<? extends Feature>> providers() {
+        return Arrays.asList(MoxyJsonFeature.class, JacksonFeature.class);
+    }
+
+    @TestFactory
+    public Collection<DynamicContainer> generateTests() {
+        Collection<DynamicContainer> tests = new ArrayList<>();
+        providers().forEach(feature -> {
+            RestrictedResourceTemplateTest test = new RestrictedResourceTemplateTest(feature);
+            tests.add(TestHelper.toTestContainer(test, feature.getSimpleName()));
+        });
+        return tests;
+    }
+
+    public static class RestrictedResourceTemplateTest extends JerseyTest {
         public RestrictedResourceTemplateTest(final Class<? extends Feature> filteringProvider) {
             super(new ResourceConfig(SecurityEntityFilteringFeature.class)
                     .packages("org.glassfish.jersey.examples.entityfiltering.security")
@@ -136,16 +158,4 @@ public void testRuntimeRolesAllowedInvalid() throws Exception {
             assertThat(mixedField, nullValue());
         }
     }
-
-    public static class MoxyJsonFeatureRestrictedResourceTest extends RestrictedResourceTemplateTest {
-        public MoxyJsonFeatureRestrictedResourceTest() {
-            super(MoxyJsonFeature.class);
-        }
-    }
-
-    public static class JacksonFeatureRestrictedResourceTest extends RestrictedResourceTemplateTest {
-        public JacksonFeatureRestrictedResourceTest() {
-            super(JacksonFeature.class);
-        }
-    }
 }
diff --git a/...java/org/glassfish/jersey/examples/entityfiltering/security/UnrestrictedResourceTest.java b/...java/org/glassfish/jersey/examples/entityfiltering/security/UnrestrictedResourceTest.java
@@ -20,7 +20,15 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
+import org.glassfish.jersey.test.spi.TestHelper;
+import org.junit.jupiter.api.DynamicContainer;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -32,7 +40,21 @@
  */
 public class UnrestrictedResourceTest {
 
-    public abstract static class UnrestrictedResourceTemplateTest extends JerseyTest {
+    public static Iterable<Class<? extends Feature>> providers() {
+        return Arrays.asList(MoxyJsonFeature.class, JacksonFeature.class);
+    }
+
+    @TestFactory
+    public Collection<DynamicContainer> generateTests() {
+        Collection<DynamicContainer> tests = new ArrayList<>();
+        providers().forEach(feature -> {
+            UnrestrictedResourceTemplateTest test = new UnrestrictedResourceTemplateTest(feature) {};
+            tests.add(TestHelper.toTestContainer(test, feature.getSimpleName()));
+        });
+        return tests;
+    }
+
+    public static class UnrestrictedResourceTemplateTest extends JerseyTest {
         public UnrestrictedResourceTemplateTest(final Class<? extends Feature> filteringProvider) {
             super(new ResourceConfig(SecurityEntityFilteringFeature.class)
                     .packages("org.glassfish.jersey.examples.entityfiltering.security")
@@ -58,16 +80,4 @@ public void testRestrictedEntity() throws Exception {
             assertThat(mixedField.getUserField(), nullValue());
         }
     }
-
-    public static class MoxyJsonFeatureUnrestrictedResourceTest extends UnrestrictedResourceTemplateTest {
-        public MoxyJsonFeatureUnrestrictedResourceTest() {
-            super(MoxyJsonFeature.class);
-        }
-    }
-
-    public static class JacksonFeatureUnrestrictedResourceTest extends UnrestrictedResourceTemplateTest {
-        public JacksonFeatureUnrestrictedResourceTest() {
-            super(JacksonFeature.class);
-        }
-    }
 }
diff --git a/...est/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java b/...est/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java
@@ -10,6 +10,9 @@
 
 package org.glassfish.jersey.examples.entityfiltering.selectable;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +29,10 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
+import org.glassfish.jersey.test.spi.TestHelper;
+import org.junit.jupiter.api.DynamicContainer;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -40,7 +46,21 @@
  */
 public class PersonResourceTest {
 
-    public abstract static class PersonResourceTemplateTest extends JerseyTest {
+    public static Iterable<Class<? extends Feature>> providers() {
+        return Arrays.asList(MoxyJsonFeature.class, JacksonFeature.class);
+    }
+
+    @TestFactory
+    public Collection<DynamicContainer> generateTests() {
+        Collection<DynamicContainer> tests = new ArrayList<>();
+        providers().forEach(feature -> {
+            PersonResourceTemplateTest test = new PersonResourceTemplateTest(feature);
+            tests.add(TestHelper.toTestContainer(test, feature.getSimpleName()));
+        });
+        return tests;
+    }
+
+    public static class PersonResourceTemplateTest extends JerseyTest {
         private final Class<? extends Feature> filteringProvider;
 
         public PersonResourceTemplateTest(final Class<? extends Feature> filteringProvider) {
@@ -193,16 +213,4 @@ public void testFiltersSameName() throws Exception {
             assertThat(secondLevel.getRegion(), nullValue());
         }
     }
-
-    public static class MoxyJsonFeaturePersonResourceTest extends PersonResourceTemplateTest {
-        public MoxyJsonFeaturePersonResourceTest() {
-            super(MoxyJsonFeature.class);
-        }
-    }
-
-    public static class JacksonFeaturePersonResourceTest extends PersonResourceTemplateTest {
-        public JacksonFeaturePersonResourceTest() {
-            super(JacksonFeature.class);
-        }
-    }
 }
diff --git a/...ing/src/test/java/org/glassfish/jersey/examples/entityfiltering/ProjectsResourceTest.java b/...ing/src/test/java/org/glassfish/jersey/examples/entityfiltering/ProjectsResourceTest.java
@@ -10,6 +10,9 @@
 
 package org.glassfish.jersey.examples.entityfiltering;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import javax.ws.rs.core.Feature;
@@ -22,8 +25,11 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
+import org.glassfish.jersey.test.spi.TestHelper;
+import org.junit.jupiter.api.DynamicContainer;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -36,8 +42,22 @@
  */
 public class ProjectsResourceTest {
 
-    public abstract static class ProjectsResourceTemplateTest extends JerseyTest {
-        public ProjectsResourceTemplateTest(final Class<?extends Feature> filteringProvider) {
+    public static Iterable<Class<? extends Feature>> providers() {
+        return Arrays.asList(MoxyJsonFeature.class, JacksonFeature.class);
+    }
+
+    @TestFactory
+    public Collection<DynamicContainer> generateTests() {
+        Collection<DynamicContainer> tests = new ArrayList<>();
+        providers().forEach(feature -> {
+            ProjectsResourceTemplateTest test = new ProjectsResourceTemplateTest(feature);
+            tests.add(TestHelper.toTestContainer(test, feature.getSimpleName()));
+        });
+        return tests;
+    }
+
+    public static class ProjectsResourceTemplateTest extends JerseyTest {
+        public ProjectsResourceTemplateTest(final Class<? extends Feature> filteringProvider) {
             super(new ResourceConfig(EntityFilteringFeature.class)
                     .packages("org.glassfish.jersey.examples.entityfiltering.resource")
                     .register(filteringProvider));
@@ -87,17 +107,4 @@ private void testProject(final Project project, final boolean isDetailed) {
         }
     }
 
-    @Nested
-    public static class MoxyJsonFeatureProjectsResourceTest extends ProjectsResourceTemplateTest {
-        public MoxyJsonFeatureProjectsResourceTest() {
-            super(MoxyJsonFeature.class);
-        }
-    }
-
-    @Nested
-    public static class JacksonFeatureProjectsResourceTest extends ProjectsResourceTemplateTest {
-        public JacksonFeatureProjectsResourceTest() {
-            super(JacksonFeature.class);
-        }
-    }
 }
diff --git a/...ltering/src/test/java/org/glassfish/jersey/examples/entityfiltering/TaskResourceTest.java b/...ltering/src/test/java/org/glassfish/jersey/examples/entityfiltering/TaskResourceTest.java
@@ -10,6 +10,9 @@
 
 package org.glassfish.jersey.examples.entityfiltering;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import javax.ws.rs.core.Feature;
@@ -22,7 +25,10 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
+import org.glassfish.jersey.test.spi.TestHelper;
+import org.junit.jupiter.api.DynamicContainer;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -35,6 +41,20 @@
  */
 public class TaskResourceTest {
 
+    public static Iterable<Class<? extends Feature>> providers() {
+        return Arrays.asList(MoxyJsonFeature.class, JacksonFeature.class);
+    }
+
+    @TestFactory
+    public Collection<DynamicContainer> generateTests() {
+        Collection<DynamicContainer> tests = new ArrayList<>();
+        providers().forEach(feature -> {
+            TaskResourceTemplateTest test = new TaskResourceTemplateTest(feature) {};
+            tests.add(TestHelper.toTestContainer(test, feature.getSimpleName()));
+        });
+        return tests;
+    }
+
     public abstract static class TaskResourceTemplateTest extends JerseyTest {
         public TaskResourceTemplateTest(final Class<? extends Feature> filteringProvider) {
             super(new ResourceConfig(EntityFilteringFeature.class)
@@ -85,16 +105,4 @@ private void testTask(final Task task, final boolean isDetailed) {
             }
         }
     }
-
-    public static class MoxyJsonFeatureTaskResourceTest extends TaskResourceTemplateTest {
-        public MoxyJsonFeatureTaskResourceTest() {
-            super(MoxyJsonFeature.class);
-        }
-    }
-
-    public static class JacksonFeatureTaskResourceTest extends TaskResourceTemplateTest {
-        public JacksonFeatureTaskResourceTest() {
-            super(JacksonFeature.class);
-        }
-    }
 }
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
@@ -234,6 +234,13 @@
                     <forkMode>always</forkMode>
                     <enableAssertions>false</enableAssertions>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>${surefire.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.ops4j.pax.exam</groupId>

diff --git a/...eld/src/test/java/org/glassfish/jersey/examples/helloworld/RequestScopedResourceTest.java b/...eld/src/test/java/org/glassfish/jersey/examples/helloworld/RequestScopedResourceTest.java
@@ -97,6 +97,14 @@ public static void after() throws Exception {
         weld.shutdown();
     }
 
+    @Override
+    @AfterAll
+    public void tearDown() throws Exception {
+        super.tearDown();
+        System.out.printf("SYNC: %d, ASYNC: %d, STRAIGHT: %d%n",
+                parameterizedCounter.intValue(), parameterizedAsyncCounter.intValue(), straightCounter.intValue());
+    }
+
     @Override
     protected ResourceConfig configure() {
         //        enable(TestProperties.LOG_TRAFFIC);

diff --git a/ext/metainf-services/pom.xml b/ext/metainf-services/pom.xml
@@ -90,6 +90,13 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <test>**/MetaInfServicesTest*</test>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/test-framework/core/src/main/java/org/glassfish/jersey/test/JerseyTest.java b/test-framework/core/src/main/java/org/glassfish/jersey/test/JerseyTest.java
@@ -16,6 +16,7 @@
 
 package org.glassfish.jersey.test;
 
+import java.lang.annotation.Annotation;
 import java.net.URI;
 import java.security.AccessController;
 import java.util.ArrayList;
@@ -57,6 +58,7 @@
 import org.junit.Before;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance;
 
 /**
  * Parent class for testing JAX-RS and Jersey-based applications using Jersey test framework.
@@ -616,7 +618,7 @@ public final Client client() {
     @BeforeEach
     public void setUp() throws Exception {
         synchronized (this) {
-            if (activeThreadCount.getAndIncrement() == 0) {
+            if (!isConcurrent() || activeThreadCount.getAndIncrement() == 0) {
                 registerLogHandlerIfEnabled();
                 final TestContainer testContainer = createTestContainer(context);
 
@@ -630,6 +632,24 @@ public void setUp() throws Exception {
         }
     }
 
+    /**
+     * Do not setup multiple containers for concurrent junit 5 environment not to hit Address already in use exception
+     * @return true when TestInstance.Lifecycle.PER_CLASS annotation is used and the test run in concurrent
+     */
+    private boolean isConcurrent() {
+        Annotation[] annotations = this.getClass().getAnnotations();
+        for (Annotation annotation : annotations) {
+            // check the name first for JUnit 4 only environment
+            if (annotation.annotationType().getName().equals("org.junit.jupiter.api.TestInstance")) {
+                TestInstance testInstance = (TestInstance) annotation;
+                if (testInstance != null && testInstance.value() == TestInstance.Lifecycle.PER_CLASS) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Tear down the test by {@link TestContainer#stop() stopping} the test container obtained from the
      * {@link #getTestContainerFactory() test container factory} and by {@link javax.ws.rs.client.Client#close() closing}
@@ -642,7 +662,7 @@ public void setUp() throws Exception {
     @AfterEach
     public void tearDown() throws Exception {
         synchronized (this) {
-            if (activeThreadCount.decrementAndGet() == 0) {
+            if (!isConcurrent() || activeThreadCount.decrementAndGet() == 0) {
                 if (isLogRecordingEnabled()) {
                     unregisterLogHandler();
                 }