WFLY-12655 : exclude tests

resteasy · Nov 12, 2019 · 6872902 · 6872902
1 parent 941b146
commit 6872902
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
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
@@ -0,0 +1,9 @@
+package org.jboss.resteasy.category;
+
+/**
+ * Marker interface for tests which are expected to fail on WildFly 18.0.0.Final
+ *
+ */
+public interface ExpectedFailingOnWildFly18 {
+
+}
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
@@ -10,6 +10,7 @@
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.as.arquillian.api.ServerSetup;
+import org.jboss.resteasy.category.ExpectedFailingOnWildFly18;
 import org.jboss.resteasy.category.NotForForwardCompatibility;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
@@ -49,6 +50,7 @@
 @ServerSetup({BasicAuthTest.SecurityDomainSetup.class})
 @RunWith(Arquillian.class)
 @RunAsClient
+@Category({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
@@ -10,6 +10,7 @@
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.as.arquillian.api.ServerSetup;
+import org.jboss.resteasy.category.ExpectedFailingOnWildFly18;
 import org.jboss.resteasy.category.NotForForwardCompatibility;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
@@ -45,7 +46,7 @@
 @ServerSetup({CustomForbiddenMessageTest.SecurityDomainSetup.class})
 @RunWith(Arquillian.class)
 @RunAsClient
-@Category({NotForForwardCompatibility.class})
+@Category({NotForForwardCompatibility.class,ExpectedFailingOnWildFly18.class})
 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
@@ -10,6 +10,7 @@
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.as.arquillian.api.ServerSetup;
+import org.jboss.resteasy.category.ExpectedFailingOnWildFly18;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
@@ -24,6 +25,7 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 import javax.ws.rs.core.Response;
@@ -44,6 +46,7 @@
 @ServerSetup({TwoSecurityDomainsTest.SecurityDomainSetup1.class, TwoSecurityDomainsTest.SecurityDomainSetup2.class})
 @RunWith(Arquillian.class)
 @RunAsClient
+@Category({ExpectedFailingOnWildFly18.class}) //WFLY-12655
 public class TwoSecurityDomainsTest {
 
    private static ResteasyClient authorizedClient;

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -126,19 +126,19 @@
               </property>
             </activation>
             <properties>
-                <server.version>16.0.0.Final</server.version>
+                <server.version>17.0.0.Final</server.version>
             </properties>
         </profile>
         <profile>
-            <id>server-version-14x-exclusions</id>
+            <id>server-version-18x-exclusions</id>
             <activation>
                 <property>
                     <name>server.version</name>
-                    <value>14.0.0.Final</value>
+                    <value>18.0.0.Final</value>
                 </property>
             </activation>
             <properties>
-                <additional.surefire.excluded.groups>org.jboss.resteasy.category.ExpectedFailingOnWildFly14</additional.surefire.excluded.groups>
+                <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 -->