[WFLY-2218] Make the conditional ignore check for transformers tests …

…against old EAP versions less intrusive
schakko · Nov 14, 2013 · 486ea8a · 486ea8a
1 parent 0b632b3
commit 486ea8a
Show file tree

Hide file tree

Showing 21 changed files with 19 additions and 153 deletions.
diff --git a/ee/src/test/java/org/jboss/as/ee/subsystem/EeSubsystemTestCase.java b/ee/src/test/java/org/jboss/as/ee/subsystem/EeSubsystemTestCase.java
@@ -82,10 +82,6 @@ private void testTransformers712(ModelTestControllerVersion controllerVersion) t
         //Due to https://issues.jboss.org/browse/AS7-4892 the jboss-descriptor-property-replacement
         //does not get set properly on 7.1.2, so let's do a reject test
 
-        if (controllerVersion.isEap()){
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-
         ModelVersion modelVersion = ModelVersion.create(1, 0, 0);
 
         try {
@@ -151,9 +147,6 @@ public void testTransformersEAP611() throws Exception {
     }
 
     private void testTransformers1_0_0_post712(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         //Do a normal transformation test containing parts of the subsystem that work everywhere
         String subsystemXml = readResource("subsystem-transformers.xml");
         ModelVersion modelVersion = ModelVersion.create(1, 0, 0);
@@ -199,10 +192,6 @@ public void testTransformersEAP611Reject() throws Exception {
     }
 
     private void testTransformers1_0_0_reject(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-
         String subsystemXml = readResource("subsystem.xml");
         ModelVersion modelVersion = ModelVersion.create(1, 0, 0);
         //Use the non-runtime version of the extension which will happen on the HC
@@ -253,9 +242,6 @@ public void testTransformersDiscardGlobalModulesEAP611() throws Exception {
     }
 
     private void testTransformersDiscardGlobalModules1_0_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = readResource("subsystem-transformers-discard.xml");
         ModelVersion modelVersion = ModelVersion.create(1, 0, 0);
         //Use the non-runtime version of the extension which will happen on the HC

diff --git a/ejb3/src/test/java/org/jboss/as/ejb3/subsystem/Ejb3SubsystemUnitTestCase.java b/ejb3/src/test/java/org/jboss/as/ejb3/subsystem/Ejb3SubsystemUnitTestCase.java
@@ -86,9 +86,6 @@ public void testTransformerEAP601() throws Exception {
      * @throws Exception
      */
     private void testTransformer_1_1_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = "transform_1_1_0.xml";   //This has no expressions not understood by 1.1.0
         ModelVersion modelVersion = ModelVersion.create(1, 1, 0); //The old model version
         //Use the non-runtime version of the extension which will happen on the HC
@@ -132,9 +129,6 @@ public void testTransformerEAP611() throws Exception {
      * @throws Exception
      */
     private void testTransformer_1_2_x(ModelTestControllerVersion controllerVersion, int modelVersionMicro) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = "transform_1_2_0.xml";
         ModelVersion modelVersion = ModelVersion.create(1, 2, modelVersionMicro);
         //Use the non-runtime version of the extension which will happen on the HC
@@ -175,10 +169,6 @@ public void testRejectExpressionsAS601() throws Exception {
     }
 
     private void testRejectExpressions_1_1_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-        // create builder for current subsystem version
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization());
 
         // create builder for legacy subsystem version

diff --git a/jaxrs/src/test/java/org/jboss/as/jaxrs/JaxrsSubsystemTestCase.java b/jaxrs/src/test/java/org/jboss/as/jaxrs/JaxrsSubsystemTestCase.java
@@ -83,9 +83,6 @@ public void testTransformersEAP611() throws Exception {
     }
 
     private void testTransformers_1_0_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         ModelVersion modelVersion = ModelVersion.create(1, 0, 0);
         //Use the non-runtime version of the extension which will happen on the HC
         KernelServicesBuilder builder = createKernelServicesBuilder(AdditionalInitialization.MANAGEMENT)

diff --git a/jdr/jboss-as-jdr/src/test/java/org/jboss/as/jdr/JdrSubsystemTestCase.java b/jdr/jboss-as-jdr/src/test/java/org/jboss/as/jdr/JdrSubsystemTestCase.java
@@ -104,9 +104,6 @@ public void testTransformersEAP611() throws Exception {
     }
 
     private void testJdrTransformers(ModelTestControllerVersion controllerVersion, ModelVersion modelVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = "subsystem.xml";
         //Use the non-runtime version of the extension which will happen on the HC
         KernelServicesBuilder builder = createKernelServicesBuilder(AdditionalInitialization.MANAGEMENT)

diff --git a/jmx/src/test/java/org/jboss/as/jmx/JMXSubsystemTestCase.java b/jmx/src/test/java/org/jboss/as/jmx/JMXSubsystemTestCase.java
@@ -625,9 +625,6 @@ public void testTransformationAS600() throws Exception {
     }
 
     private void testTransformation_1_0_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml =
                 "<subsystem xmlns=\"" + Namespace.CURRENT.getUriString() + "\">" +
                 "   <expose-resolved-model domain-name=\"jboss.as\" proper-property-format=\"false\"/>" +
@@ -792,9 +789,6 @@ public void testTransformationEAP611() throws Exception {
     }
 
     private void testTransformation_1_1_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml =
                 "<subsystem xmlns=\"" + Namespace.CURRENT.getUriString() + "\">" +
                 "   <expose-resolved-model domain-name=\"jboss.as\" proper-property-format=\"false\"/>" +
@@ -903,9 +897,6 @@ public void testRejectExpressionsEAP601() throws Exception {
      * @throws Exception
      */
     private void testRejectExpressions_1_0_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml =
             "<subsystem xmlns=\"" + Namespace.CURRENT.getUriString() + "\">" +
                     "   <expose-resolved-model domain-name=\"${test.domain-name:non-standard}\" proper-property-format=\"${test.proper-property-format:true}\"/>" +
@@ -981,9 +972,6 @@ public void testRejectionEAP611() throws Exception {
      * @throws Exception
      */
     private void testRejectExpressions_1_1_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml =
             "<subsystem xmlns=\"" + Namespace.CURRENT.getUriString() + "\">" +
                     "   <expose-resolved-model domain-name=\"${test.domain-name:non-standard}\" proper-property-format=\"${test.proper-property-format:true}\"/>" +

diff --git a/jsr77/src/test/java/org/jboss/as/jsr77/subsystem/JSR77ManagementSubsystemTestCase.java b/jsr77/src/test/java/org/jboss/as/jsr77/subsystem/JSR77ManagementSubsystemTestCase.java
@@ -85,10 +85,6 @@ public void testTransformersEAP611() throws Exception {
 
 
     private void testTransformers_1_0_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-
         ModelVersion modelVersion = ModelVersion.create(1, 0, 0);
         //Use the non-runtime version of the extension which will happen on the HC
         KernelServicesBuilder builder = createKernelServicesBuilder(AdditionalInitialization.MANAGEMENT)

diff --git a/legacy/web/src/test/java/org/jboss/as/web/test/WebSubsystemTestCase.java b/legacy/web/src/test/java/org/jboss/as/web/test/WebSubsystemTestCase.java
@@ -192,10 +192,6 @@ public void testRejectExpressionsEAP601() throws Exception {
     }
 
     private void testRejectExpressions_1_1_x(ModelTestControllerVersion controllerVersion, ModelVersion modelVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization());
 
         builder.createLegacyKernelServicesBuilder(null, controllerVersion, modelVersion)
@@ -291,9 +287,6 @@ public void testTransformationEAP601() throws Exception {
     }
 
     private void testTransformation_1_1_0(ModelTestControllerVersion controllerVersion, ModelVersion modelVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = readResource("subsystem-1.1.0.xml");
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization())
                 .setSubsystemXml(subsystemXml);
@@ -435,9 +428,6 @@ public void testTransformationEAP611() throws Exception {
     }
 
     private void testTransformation_1_2_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         ModelVersion modelVersion = ModelVersion.create(1, 2, 0);
         String subsystemXml = readResource("subsystem-1.2.0.xml");
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization())
@@ -473,9 +463,6 @@ public void testRejectingTransformersAS611() throws Exception {
     }
 
     private void testRejectingTransformers_1_2_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         ModelVersion modelVersion = ModelVersion.create(1, 2, 0);
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization());
 

diff --git a/messaging/src/test/java/org/jboss/as/messaging/test/MessagingSubsystem20TestCase.java b/messaging/src/test/java/org/jboss/as/messaging/test/MessagingSubsystem20TestCase.java
@@ -43,7 +43,6 @@
 import static org.jboss.as.messaging.MessagingExtension.VERSION_1_2_0;
 import static org.jboss.as.messaging.MessagingExtension.VERSION_1_2_1;
 import static org.jboss.as.messaging.jms.ConnectionFactoryAttributes.Regular.FACTORY_TYPE;
-import static org.jboss.as.messaging.test.TransformerUtils.RejectExpressionsConfigWithAddOnlyParam;
 import static org.jboss.as.messaging.test.TransformerUtils.concat;
 import static org.jboss.as.messaging.test.TransformerUtils.createChainedConfig;
 import static org.jboss.as.model.test.ModelTestControllerVersion.EAP_6_0_0;
@@ -95,6 +94,7 @@
 import org.jboss.as.messaging.jms.JMSTopicDefinition;
 import org.jboss.as.messaging.jms.PooledConnectionFactoryDefinition;
 import org.jboss.as.messaging.jms.bridge.JMSBridgeDefinition;
+import org.jboss.as.messaging.test.TransformerUtils.RejectExpressionsConfigWithAddOnlyParam;
 import org.jboss.as.model.test.FailedOperationTransformationConfig;
 import org.jboss.as.model.test.FailedOperationTransformationConfig.RejectExpressionsConfig;
 import org.jboss.as.model.test.ModelFixer;
@@ -256,11 +256,6 @@ private void clusteredTo120Test(ModelVersion version120, KernelServices mainServ
      * @throws Exception
      */
     private void doTestRejectExpressions_1_1_0(ModelTestControllerVersion controllerVersion, KernelServicesBuilder builder) throws Exception {
-
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-
         KernelServices mainServices = builder.build();
         assertTrue(mainServices.isSuccessfulBoot());
         KernelServices legacyServices = mainServices.getLegacyServices(VERSION_1_1_0);
@@ -405,10 +400,6 @@ public boolean expectFailed(ModelNode operation) {
      */
     private void doTestRejectExpressions_1_2_0(ModelTestControllerVersion controllerVersion, KernelServicesBuilder builder) throws Exception {
 
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-
         KernelServices mainServices = builder.build();
         assertTrue(mainServices.isSuccessfulBoot());
         KernelServices legacyServices = mainServices.getLegacyServices(VERSION_1_2_0);
@@ -448,10 +439,6 @@ private void doTestRejectExpressions_1_2_0(ModelTestControllerVersion controller
      */
     private void doTestRejectExpressions_1_2_1(ModelTestControllerVersion controllerVersion, KernelServicesBuilder builder) throws Exception {
 
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-
         KernelServices mainServices = builder.build();
         assertTrue(mainServices.isSuccessfulBoot());
         KernelServices legacyServices = mainServices.getLegacyServices(VERSION_1_2_1);
@@ -495,9 +482,6 @@ private KernelServicesBuilder createKernelServicesBuilder(ModelTestControllerVer
     }
 
     private void testTransformers(ModelTestControllerVersion controllerVersion, ModelVersion messagingVersion, ModelFixer fixer) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         //Boot up empty controllers with the resources needed for the ops coming from the xml to work
         KernelServicesBuilder builder = createKernelServicesBuilder(AdditionalInitialization.MANAGEMENT)
                 .setSubsystemXmlResource("subsystem_2_0.xml");

diff --git a/...xtension/src/test/java/org/wildfly/extension/mod_cluster/ModClusterSubsystemTestCase.java b/...xtension/src/test/java/org/wildfly/extension/mod_cluster/ModClusterSubsystemTestCase.java
@@ -102,20 +102,15 @@ public void testTransformers713() throws Exception {
 
     @Test
     public void testTransformersEAP600() throws Exception {
-        ignoreThisTestIfEAPRepositoryIsNotReachable();
         testTransformers_1_2_0(ModelTestControllerVersion.EAP_6_0_0);
     }
 
     @Test
     public void testTransformers601() throws Exception {
-        ignoreThisTestIfEAPRepositoryIsNotReachable();
         testTransformers_1_2_0(ModelTestControllerVersion.EAP_6_0_1);
     }
 
     private void testTransformers_1_2_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = readResource("subsystem_1_1.xml");
         ModelVersion modelVersion = ModelVersion.create(1, 2, 0);
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization())
@@ -166,20 +161,15 @@ public void testTransformers720() throws Exception {
 
     @Test
     public void testTransformersEAP610() throws Exception {
-        ignoreThisTestIfEAPRepositoryIsNotReachable();
         testTransformers_1_3_0(ModelTestControllerVersion.EAP_6_1_0);
     }
 
     @Test
     public void testTransformers611() throws Exception {
-        ignoreThisTestIfEAPRepositoryIsNotReachable();
         testTransformers_1_3_0(ModelTestControllerVersion.EAP_6_1_1);
     }
 
     private void testTransformers_1_3_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = readResource("subsystem_1_1.xml");
         ModelVersion modelVersion = ModelVersion.create(1, 3, 0);
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization())
@@ -228,9 +218,6 @@ public void testExpressionsAreRejectedEAP601() throws Exception {
     }
 
     private void testExpressionsAreRejectedByVersion_1_2(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = readResource("subsystem_1_2.xml");
         ModelVersion modelVersion = ModelVersion.create(1, 2, 0);
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization());
@@ -306,9 +293,6 @@ public void testRejectionEAP611() throws Exception {
     }
 
     private void testRejection1_3_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         String subsystemXml = readResource("subsystem_1_2.xml");
         ModelVersion modelVersion = ModelVersion.create(1, 3, 0);
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization());

diff --git a/naming/src/test/java/org/jboss/as/naming/subsystem/NamingTransformersTestCase.java b/naming/src/test/java/org/jboss/as/naming/subsystem/NamingTransformersTestCase.java
@@ -129,9 +129,6 @@ public void testTransformers_EAP601() throws Exception {
     }
 
     private void testTransformers_1_1_0(ModelTestControllerVersion version) throws Exception {
-        if (version.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization())
                 .setSubsystemXmlResource("subsystem_with_expressions_compatible_1.1.0.xml");
 
@@ -257,9 +254,6 @@ public void testRejectExpressionsEAP601() throws Exception {
      * @throws Exception
      */
     private void doTestRejectExpressions_1_1_0(ModelTestControllerVersion controllerVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         KernelServicesBuilder builder = createKernelServicesBuilder(AdditionalInitialization.MANAGEMENT);
 
         // create builder for legacy subsystem version
@@ -297,10 +291,6 @@ public void testTransformers_EAP611() throws Exception {
     }
 
     private void testTransformers_1_2_0(ModelTestControllerVersion version) throws Exception {
-        if (version.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
-
         KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization())
                 .setSubsystemXmlResource("subsystem_with_expressions_compatible_1.2.0.xml");
 

diff --git a/pojo/src/test/java/org/jboss/as/pojo/PojoSubsystemTestCase.java b/pojo/src/test/java/org/jboss/as/pojo/PojoSubsystemTestCase.java
@@ -80,13 +80,10 @@ public void testTransformersEAP610() throws Exception {
 
     @Test
     public void testTransformersEAP611() throws Exception {
-        ignoreThisTestIfEAPRepositoryIsNotReachable();
+        testTransformers_1_0_0(ModelTestControllerVersion.EAP_6_1_1, null);
     }
 
     private void testTransformers_1_0_0(ModelTestControllerVersion controllerVersion, String commonBeansVersion) throws Exception {
-        if (controllerVersion.isEap()) {
-            ignoreThisTestIfEAPRepositoryIsNotReachable();
-        }
         ModelVersion modelVersion = ModelVersion.create(1, 0, 0);
         //Use the non-runtime version of the extension which will happen on the HC
         KernelServicesBuilder builder = createKernelServicesBuilder(AdditionalInitialization.MANAGEMENT)