Getting rid of old exclusion categories not needed anymore as we don'…

…t test against too old containers
resteasy · Jun 13, 2018 · 4131c3b · 4131c3b
1 parent c81a687
commit 4131c3b
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 80 deletions.
diff --git a/testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/category/NotForWildFly10.java b/testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/category/NotForWildFly10.java
diff --git a/testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/category/NotForWildFly101.java b/testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/category/NotForWildFly101.java
diff --git a/testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/category/NotForWildFly9.java b/testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/category/NotForWildFly9.java
diff --git a/...org/jboss/resteasy/test/spring/deployment/ContextRefreshDependenciesInDeploymentTest.java b/...org/jboss/resteasy/test/spring/deployment/ContextRefreshDependenciesInDeploymentTest.java
@@ -3,7 +3,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
-import org.jboss.resteasy.category.NotForWildFly9;
 import org.jboss.resteasy.test.spring.deployment.resource.ContextRefreshResource;
 import org.jboss.resteasy.test.spring.deployment.resource.ContextRefreshTrigger;
 import org.jboss.resteasy.utils.PermissionUtil;
@@ -13,7 +12,6 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -31,7 +29,6 @@
  * @tpSince RESTEasy 3.0.16
  */
 @RunWith(Arquillian.class)
-@Category(NotForWildFly9.class) //requires WildFly 10+
 public class ContextRefreshDependenciesInDeploymentTest {
 
 
@@ -43,7 +40,6 @@ private static Archive<?> deploy() {
                 .addClass(ContextRefreshResource.class)
                 .addClass(ContextRefreshTrigger.class)
                 .addClass(ContextRefreshDependenciesInDeploymentTest.class)
-                .addClass(NotForWildFly9.class) //required as this test is not @RunAsClient annotated
                 .addAsWebInfResource(ContextRefreshDependenciesInDeploymentTest.class.getPackage(), "web.xml", "web.xml")
                 .addAsWebInfResource(ContextRefreshDependenciesInDeploymentTest.class.getPackage(), "contextRefresh/applicationContext.xml", "applicationContext.xml");
 

diff --git a/...ng/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/ContextRefreshTest.java b/...ng/inmodule/src/test/java/org/jboss/resteasy/test/spring/inmodule/ContextRefreshTest.java
@@ -4,7 +4,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
-import org.jboss.resteasy.category.NotForWildFly9;
 import org.jboss.resteasy.test.spring.inmodule.resource.ContextRefreshResource;
 import org.jboss.resteasy.test.spring.inmodule.resource.ContextRefreshTrigger;
 import org.jboss.resteasy.utils.PermissionUtil;
@@ -14,7 +13,6 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -32,7 +30,6 @@
  * @tpSince RESTEasy 3.0.16
  */
 @RunWith(Arquillian.class)
-@Category(NotForWildFly9.class) //requires WildFly 10+
 public class ContextRefreshTest {
 
 
@@ -44,7 +41,6 @@ private static Archive<?> deploy() {
                 .addClass(ContextRefreshResource.class)
                 .addClass(ContextRefreshTrigger.class)
                 .addClass(ContextRefreshTest.class)
-                .addClass(NotForWildFly9.class) //required as this test is not @RunAsClient annotated
                 .addAsWebInfResource(ContextRefreshTest.class.getPackage(), "web.xml", "web.xml")
                 .addAsWebInfResource(ContextRefreshTest.class.getPackage(), "contextRefresh/applicationContext.xml", "applicationContext.xml");
         archive.addAsManifestResource(new StringAsset("Dependencies: org.springframework.spring meta-inf\n"), "MANIFEST.MF");

diff --git a/...tegration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/MDBInjectionTest.java b/...tegration-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/MDBInjectionTest.java
@@ -15,7 +15,6 @@
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.resteasy.category.NotForWildFly9;
 import org.jboss.resteasy.test.cdi.injection.resource.CDIInjectionBook;
 import org.jboss.resteasy.test.cdi.injection.resource.CDIInjectionBookBag;
 import org.jboss.resteasy.test.cdi.injection.resource.CDIInjectionBookBagLocal;
@@ -42,15 +41,13 @@
 import org.jboss.resteasy.utils.PortProviderUtil;
 import org.jboss.resteasy.utils.TestUtil;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.asset.Asset;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 /**
@@ -62,7 +59,6 @@
  */
 @RunWith(Arquillian.class)
 @RunAsClient
-@Category(NotForWildFly9.class) //fails on 9.x due to: [WFLY-3355] MDB fails to deploy on reload
 public class MDBInjectionTest extends AbstractInjectionTestBase {
     protected static final Logger log = LogManager.getLogger(MDBInjectionTest.class.getName());
 

diff --git a/...ation-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/ReverseInjectionTest.java b/...ation-tests/src/test/java/org/jboss/resteasy/test/cdi/injection/ReverseInjectionTest.java
@@ -3,7 +3,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
-import org.jboss.resteasy.category.NotForWildFly9;
 import org.jboss.resteasy.test.cdi.injection.resource.CDIInjectionBook;
 import org.jboss.resteasy.test.cdi.injection.resource.CDIInjectionBookBag;
 import org.jboss.resteasy.test.cdi.injection.resource.CDIInjectionBookBagLocal;
@@ -48,7 +47,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 import javax.jms.Connection;
@@ -95,7 +93,6 @@
  * @tpSince RESTEasy 3.0.16
  */
 @RunWith(Arquillian.class)
-@Category(NotForWildFly9.class) //fails on 9.x due to: [WFLY-3355] MDB fails to deploy on reload
 public class ReverseInjectionTest extends AbstractInjectionTestBase {
     private static Logger log = Logger.getLogger(ReverseInjectionTest.class);
 
@@ -149,7 +146,6 @@ public static Archive<?> createTestArchive() throws Exception {
                 .addClasses(ReverseInjectionEJBHolderRemote.class, ReverseInjectionEJBHolderLocal.class, ReverseInjectionEJBHolder.class)
                 .addClasses(ReverseInjectionResource.class)
                 .addClasses(CDIInjectionNewBean.class, CDIInjectionStereotypedApplicationScope.class, CDIInjectionStereotypedDependentScope.class)
-                .addClass(NotForWildFly9.class) //required as this test is not @RunAsClient annotated
                 .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
                 .addAsResource(ReverseInjectionTest.class.getPackage(), "persistence.xml", "META-INF/persistence.xml");
         // Arquillian in the deployment

diff --git a/...n-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/JacksonDatatypeTest.java b/...n-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/JacksonDatatypeTest.java
@@ -4,7 +4,6 @@
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.logging.Logger;
-import org.jboss.resteasy.category.NotForWildFly101;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.test.core.basic.resource.ApplicationTestScannedApplication;
@@ -19,7 +18,6 @@
 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.client.WebTarget;
@@ -37,8 +35,6 @@
  */
 @RunWith(Arquillian.class)
 @RunAsClient
-// This test passes with WildFly master branch, but don't pass with WildFly 10.1
-@Category({NotForWildFly101.class})
 public class JacksonDatatypeTest {
     private static final String DEFAULT_DEPLOYMENT = String.format("%sDefault",
             JacksonDatatypeTest.class.getSimpleName());

diff --git a/...ion-tests/src/test/java/org/jboss/resteasy/test/resource/basic/ResponseCommittedTest.java b/...ion-tests/src/test/java/org/jboss/resteasy/test/resource/basic/ResponseCommittedTest.java
@@ -8,7 +8,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.resteasy.category.NotForWildFly10;
 import org.jboss.resteasy.test.resource.basic.resource.ResponseCommittedResource;
 import org.jboss.resteasy.utils.PortProviderUtil;
 import org.jboss.resteasy.utils.TestUtil;
@@ -18,7 +17,6 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 /**
@@ -29,7 +27,6 @@
  */
 @RunWith(Arquillian.class)
 @RunAsClient
-@Category(NotForWildFly10.class) 
 public class ResponseCommittedTest
 {
    public static int TEST_STATUS = 444;

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -116,42 +116,6 @@
                 <server.version>12.0.0.Final</server.version>
             </properties>
         </profile>
-        <profile>
-            <id>server-version-9x-exclusions</id>
-            <activation>
-              <property>
-                <name>server.version</name>
-                <value>9.0.2.Final</value>
-              </property>
-            </activation>
-            <properties>
-              <additional.surefire.excluded.groups>org.jboss.resteasy.category.NotForWildFly9</additional.surefire.excluded.groups>
-            </properties>
-        </profile>
-        <profile>
-            <id>server-version-1000-exclusions</id>
-            <activation>
-              <property>
-                <name>server.version</name>
-                <value>10.0.0.Final</value>
-              </property>
-            </activation>
-            <properties>
-              <additional.surefire.excluded.groups>org.jboss.resteasy.category.NotForWildFly10</additional.surefire.excluded.groups>
-            </properties>
-        </profile>
-        <profile>
-            <id>server-version-1010-exclusions</id>
-            <activation>
-                <property>
-                    <name>server.version</name>
-                    <value>10.1.0.Final</value>
-                </property>
-            </activation>
-            <properties>
-                <additional.surefire.excluded.groups>org.jboss.resteasy.category.NotForWildFly101</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>