[RESTEASY-3388] Remove the old tags/categories and add a new @Tracing…

…Required annotation with a new tag. https://issues.redhat.com/browse/RESTEASY-3388 Signed-off-by: James R. Perkins <jperkins@redhat.com>
resteasy · Feb 16, 2024 · 796b5fc · 796b5fc
1 parent 0beb753
commit 796b5fc
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 130 deletions.
diff --git a/.github/workflows/wildfly-build.yml b/.github/workflows/wildfly-build.yml
@@ -90,7 +90,7 @@ jobs:
         profile:
           - '-Dsecurity.manager'
           - '-Dprovision.preview'
-          - '-am -Pprovision-without-resteasy,without-jackson,skip-awaiting-upgrade-tests -pl testsuite/integration-tests'
+          - '-am -Pprovision-without-resteasy,without-jackson-tests -pl testsuite/integration-tests'
 
     steps:
       - uses: actions/checkout@v4

diff --git a/...rquillian-utils/src/main/java/org/jboss/resteasy/category/ExpectedFailingOnWildFly18.java b/...rquillian-utils/src/main/java/org/jboss/resteasy/category/ExpectedFailingOnWildFly18.java
diff --git a/...rquillian-utils/src/main/java/org/jboss/resteasy/category/ExpectedFailingOnWildFly19.java b/...rquillian-utils/src/main/java/org/jboss/resteasy/category/ExpectedFailingOnWildFly19.java
diff --git a/...rquillian-utils/src/main/java/org/jboss/resteasy/category/ExpectedFailingOnWildFly20.java b/...rquillian-utils/src/main/java/org/jboss/resteasy/category/ExpectedFailingOnWildFly20.java
diff --git a/...rquillian-utils/src/main/java/org/jboss/resteasy/category/ExpectedFailingOnWildFly21.java b/...rquillian-utils/src/main/java/org/jboss/resteasy/category/ExpectedFailingOnWildFly21.java
diff --git a/...ss/resteasy/category/TracingRequired.java → ...asy/test/annotations/TracingRequired.java b/...ss/resteasy/category/TracingRequired.java → ...asy/test/annotations/TracingRequired.java
@@ -1,7 +1,7 @@
 /*
  * JBoss, Home of Professional Open Source.
  *
- * Copyright 2021 Red Hat, Inc., and individual contributors
+ * Copyright 2024 Red Hat, Inc., and individual contributors
  * as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +17,22 @@
  * limitations under the License.
  */
 
-package org.jboss.resteasy.category;
+package org.jboss.resteasy.test.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.Tag;
 
 /**
- * A marker for a test category that indicates the tracing API is required.
+ * Indicates that a tracing implementation is required
  *
  * @author <a href="mailto:jperkins@redhat.com">James R. Perkins</a>
  */
-public interface TracingRequired {
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Tag("tracing.required")
+public @interface TracingRequired {
 }
diff --git a/testsuite/integration-tests/pom.xml b/testsuite/integration-tests/pom.xml
@@ -232,13 +232,7 @@
                 </property>
             </activation>
             <properties>
-                <additional.surefire.exclude.tracing.tests>,org.jboss.resteasy.category.TracingRequired</additional.surefire.exclude.tracing.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>skip-awaiting-upgrade-tests</id>
-            <properties>
-                <additional.surefire.excluded.groups>,org.jboss.resteasy.category.AwaitingUpgradeInWildFly</additional.surefire.excluded.groups>
+                <additional.surefire.exclude.tracing.tests>,tracing.required</additional.surefire.exclude.tracing.tests>
             </properties>
         </profile>
     </profiles>

diff --git a/...on-tests/src/test/java/org/jboss/resteasy/test/core/basic/CacheControlAnnotationTest.java b/...on-tests/src/test/java/org/jboss/resteasy/test/core/basic/CacheControlAnnotationTest.java
@@ -121,8 +121,6 @@ public void testResourceCompositeNoCache() {
      * @tpSince RESTEasy 7.0.0
      */
     @Test
-    @Tag("AwaitingUpgradeInWildFly.class")
-    @FollowUpRequired("Caused by RESTEASY-3111. Once upgraded in WildFly, we can re-enable this test")
     public void testInheritedResourceValid() {
         WebTarget base = client.target(generateURL("/inheritance"));
 

diff --git a/...ion-tests/src/test/java/org/jboss/resteasy/test/exception/ClosedResponseHandlingTest.java b/...ion-tests/src/test/java/org/jboss/resteasy/test/exception/ClosedResponseHandlingTest.java
@@ -14,6 +14,7 @@
 import org.jboss.arquillian.junit5.ArquillianExtension;
 import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;
 import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
+import org.jboss.resteasy.test.annotations.TracingRequired;
 import org.jboss.resteasy.test.client.exception.ClientWebApplicationExceptionResteasyProxyTest;
 import org.jboss.resteasy.test.exception.resource.ClosedResponseHandlingEnableTracingRequestFilter;
 import org.jboss.resteasy.test.exception.resource.ClosedResponseHandlingPleaseMapExceptionMapper;
@@ -38,7 +39,7 @@
  */
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("TracingRequired.class")
+@TracingRequired
 public class ClosedResponseHandlingTest {
 
     public static final String oldBehaviorDeploymentName = "OldBehaviorClosedResponseHandlingTest";

diff --git a/...est/providers/jackson2/whitelist/WhiteListPolymorphicTypeValidatorManualOverrideTest.java b/...est/providers/jackson2/whitelist/WhiteListPolymorphicTypeValidatorManualOverrideTest.java
@@ -44,8 +44,6 @@
  */
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("AwaitingUpgradeInWildFly.class")
-@FollowUpRequired("Caused by RESTEASY-3380. Once upgraded in WildFly, we can re-enable this test")
 public class WhiteListPolymorphicTypeValidatorManualOverrideTest {
 
     protected static final Logger logger = Logger

diff --git a/...oss/resteasy/test/providers/jackson2/whitelist/WhiteListPolymorphicTypeValidatorTest.java b/...oss/resteasy/test/providers/jackson2/whitelist/WhiteListPolymorphicTypeValidatorTest.java
@@ -46,8 +46,6 @@
  */
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("AwaitingUpgradeInWildFly.class")
-@FollowUpRequired("Caused by RESTEASY-3380. Once upgraded in WildFly, we can re-enable this test")
 public class WhiteListPolymorphicTypeValidatorTest {
 
     protected static final Logger logger = Logger.getLogger(WhiteListPolymorphicTypeValidatorTest.class.getName());

diff --git a/...tion-tests/src/test/java/org/jboss/resteasy/test/resource/basic/DefaultMediaTypeTest.java b/...tion-tests/src/test/java/org/jboss/resteasy/test/resource/basic/DefaultMediaTypeTest.java
@@ -89,7 +89,6 @@ public void postDateProduce() throws Exception {
      * @tpSince RESTEasy 3.0.16
      */
     @Test
-    @Tag("ExpectedFailing.class")
     public void postDate() throws Exception {
         WebTarget target = client.target(generateURL("/postDate"));
         ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
@@ -127,7 +126,6 @@ public void postFooProduce() throws Exception {
      * @tpSince RESTEasy 3.0.16
      */
     @Test
-    @Tag("ExpectedFailing.class")
     public void postFoo() throws Exception {
         WebTarget target = client.target(generateURL("/postFoo"));
         ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);

diff --git a/...ion-tests/src/test/java/org/jboss/resteasy/test/response/CompletionStageResponseTest.java b/...ion-tests/src/test/java/org/jboss/resteasy/test/response/CompletionStageResponseTest.java
@@ -99,8 +99,6 @@ public void testText() throws Exception {
      * @tpTestDetails Resource method returns CompletableFuture<String>.
      * @tpSince RESTEasy 6.2
      */
-    @FollowUpRequired("Remove the category when 6.2.6.Final is merged into WildFly")
-    @Tag("AwaitingUpgradeInWildFly.class")
     @Test
     public void testCompletableFutureText() throws Exception {
         Invocation.Builder request = client.target(generateURL("/cftext")).request();

diff --git a/...ntegration-tests/src/test/java/org/jboss/resteasy/test/response/ResponseTrimmingTest.java b/...ntegration-tests/src/test/java/org/jboss/resteasy/test/response/ResponseTrimmingTest.java
@@ -30,8 +30,6 @@
  */
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("AwaitingUpgradeInWildFly.class")
-@FollowUpRequired("Caused by RESTEASY-3380. Once upgraded in WildFly, we can re-enable this test")
 public class ResponseTrimmingTest {
 
     static Client client;

diff --git a/...suite/integration-tests/src/test/java/org/jboss/resteasy/test/security/BasicAuthTest.java b/...suite/integration-tests/src/test/java/org/jboss/resteasy/test/security/BasicAuthTest.java
@@ -48,7 +48,6 @@
 @ServerSetup({ BasicAuthTest.SecurityDomainSetup.class })
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("ExpectedFailingOnWildFly18.class") //WFLY-12655
 public class BasicAuthTest {
 
     private static final String WRONG_RESPONSE = "Wrong response content.";

diff --git a/...tion-tests/src/test/java/org/jboss/resteasy/test/security/CustomForbiddenMessageTest.java b/...tion-tests/src/test/java/org/jboss/resteasy/test/security/CustomForbiddenMessageTest.java
@@ -42,7 +42,6 @@
 @ServerSetup({ CustomForbiddenMessageTest.SecurityDomainSetup.class })
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("ExpectedFailingOnWildFly18.class") //WFLY-12655
 public class CustomForbiddenMessageTest {
 
     private static ResteasyClient authorizedClient;

diff --git a/...egration-tests/src/test/java/org/jboss/resteasy/test/security/TwoSecurityDomainsTest.java b/...egration-tests/src/test/java/org/jboss/resteasy/test/security/TwoSecurityDomainsTest.java
@@ -43,7 +43,6 @@
 @ServerSetup(TwoSecurityDomainsTest.SecurityDomainSetup.class)
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("ExpectedFailingOnWildFly18.class") //WFLY-12655
 public class TwoSecurityDomainsTest {
 
     private static ResteasyClient authorizedClient;

diff --git a/...uite/integration-tests/src/test/java/org/jboss/resteasy/test/tracing/TracingTestBase.java b/...uite/integration-tests/src/test/java/org/jboss/resteasy/test/tracing/TracingTestBase.java
@@ -19,6 +19,7 @@
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
+import org.jboss.resteasy.test.annotations.TracingRequired;
 import org.jboss.resteasy.utils.PortProviderUtil;
 import org.jboss.resteasy.utils.TestUtil;
 import org.jboss.shrinkwrap.api.Archive;
@@ -32,7 +33,7 @@
 
 @ExtendWith(ArquillianExtension.class)
 @RunAsClient
-@Tag("TracingRequired.class")
+@TracingRequired
 public abstract class TracingTestBase {
     protected static final String WAR_BASIC_TRACING_FILE = "war_basic_tracing";
     protected static final String WAR_ON_DEMAND_TRACING_FILE = "war_on_demand_tracing";

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -111,7 +111,7 @@
                         <version.resteasy.testsuite>${version.resteasy.testsuite}</version.resteasy.testsuite>
                         <jboss.server.config.file.name>${jboss.server.config.file.name}</jboss.server.config.file.name>
                     </systemPropertyVariables>
-                    <excludedGroups>org.jboss.resteasy.category.ExpectedFailing${additional.surefire.excluded.groups}${additional.surefire.exclude.tracing.tests}</excludedGroups>
+                    <excludedGroups>${additional.surefire.excluded.groups}${additional.surefire.exclude.tracing.tests}</excludedGroups>
                 </configuration>
             </plugin>
             <plugin>
@@ -179,54 +179,6 @@
                 <jboss.home>${server.home}</jboss.home>
             </properties>
         </profile>
-        <profile>
-            <id>server-version-21x-exclusions</id>
-            <activation>
-                <property>
-                    <name>server.version</name>
-                    <value>21.0.1.Final</value>
-                </property>
-            </activation>
-            <properties>
-                <additional.surefire.excluded.groups>,org.jboss.resteasy.category.ExpectedFailingOnWildFly21</additional.surefire.excluded.groups>
-            </properties>
-        </profile>
-        <profile>
-            <id>server-version-20x-exclusions</id>
-            <activation>
-                <property>
-                    <name>server.version</name>
-                    <value>20.0.1.Final</value>
-                </property>
-            </activation>
-            <properties>
-                <additional.surefire.excluded.groups>,org.jboss.resteasy.category.ExpectedFailingOnWildFly20</additional.surefire.excluded.groups>
-            </properties>
-        </profile>
-        <profile>
-            <id>server-version-19x-exclusions</id>
-            <activation>
-                <property>
-                    <name>server.version</name>
-                    <value>19.1.0.Final</value>
-                </property>
-            </activation>
-            <properties>
-                <additional.surefire.excluded.groups>,org.jboss.resteasy.category.ExpectedFailingOnWildFly19</additional.surefire.excluded.groups>
-            </properties>
-        </profile>
-        <profile>
-            <id>server-version-18x-exclusions</id>
-            <activation>
-                <property>
-                    <name>server.version</name>
-                    <value>18.0.1.Final</value>
-                </property>
-            </activation>
-            <properties>
-                <additional.surefire.excluded.groups>,org.jboss.resteasy.category.ExpectedFailingOnWildFly18</additional.surefire.excluded.groups>
-            </properties>
-        </profile>
         <!-- If resteasy.version is specified, it will be used for tests instead of the project.version -->
         <profile>
             <id>custom-resteasy-version</id>
@@ -262,32 +214,12 @@
                                 <project.version>${project.version}</project.version>
                                 <version.resteasy.testsuite>${version.resteasy.testsuite}</version.resteasy.testsuite>
                             </systemPropertyVariables>
-                            <excludedGroups>org.jboss.resteasy.category.ExpectedFailing</excludedGroups>
                         </configuration>
                     </plugin>
 
                 </plugins>
             </build>
         </profile>
-        <!-- For testing purposes enable to run all tests including the failing ones -->
-        <profile>
-            <id>enable.expected.failing</id>
-            <activation>
-                <property>
-                    <name>enable.expected.failing</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration combine.children="append">
-                            <excludedGroups></excludedGroups>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <!-- This profile starts server with security manager -->
         <profile>
             <id>security.manager</id>