[WFCORE-7091] Add the ability to ignore tests using the ModelTestControllerVersion

Author: yersan

core-model-test/framework/src/main/java/org/jboss/as/core/model/test/CoreModelTestDelegate.java

@@ -94,6 +94,7 @@
 import org.jboss.dmr.Property;
 import org.jboss.staxmapper.XMLMapper;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.wildfly.common.xml.XMLInputFactoryUtil;
 import org.wildfly.legacy.test.spi.Version;
 
@@ -691,6 +692,7 @@ private class LegacyKernelServicesInitializerImpl implements LegacyKernelService
         private ModelTestOperationValidatorFilter.Builder operationValidationExcludeFilterBuilder;
 
         LegacyKernelServicesInitializerImpl(ModelVersion modelVersion, ModelTestControllerVersion version) {
+            Assume.assumeFalse("This model controller version is ignored for this server.", version.isIgnored());
             this.classLoaderBuilder = new ChildFirstClassLoaderBuilder(version.isEap());
             this.modelVersion = modelVersion;
             this.testControllerVersion = version;

core-model-test/tests/src/test/java/org/jboss/as/core/model/test/deployment/DomainDeploymentTransformersTestCase.java

@@ -30,6 +30,7 @@
 import org.jboss.as.model.test.ModelTestUtils;
 import org.jboss.dmr.ModelNode;
 import org.junit.Assert;
+import org.junit.AssumptionViolatedException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -66,6 +67,9 @@ public void domainDeployment() throws Exception {
             KernelServices legacyServices = mainServices.getLegacyServices(modelVersion);
             Assert.assertTrue("Legacy services didn't boot for version " + modelVersion, legacyServices.isSuccessfulBoot());
             checkCoreModelTransformation(mainServices, modelVersion);
+        } catch (AssumptionViolatedException ex) {
+            // If the test is ignored, we want to propagate the exception
+            throw ex;
         } catch (Exception ex) {
             throw new RuntimeException("Error for version " + modelVersion + " " + ex.getMessage(), ex);
         }
@@ -86,10 +90,13 @@ public void domainExplodedDeployment() throws Exception {
 
             List<ModelNode> operations = builder.parseXmlResource("domain-exploded-deployments.xml");
             //removing the ading of "management-client-content" => "rollout-plans
-            operations = operations.subList(0, operations.size() -2);
+            operations = operations.subList(0, operations.size() - 2);
             ModelTestUtils.checkFailedTransformedBootOperations(mainServices, modelVersion, operations, getConfig());
+        } catch (AssumptionViolatedException ex) {
+            // If the test is ignored, we want to propagate the exception
+            throw ex;
         } catch (Exception ex) {
-            throw new RuntimeException("Error for version " + modelVersion + " " + ex.getMessage(), ex);
+            throw new Exception("Error for version " + modelVersion + " " + ex.getMessage(), ex);
         }
     }
 

model-test/src/main/java/org/jboss/as/model/test/ModelTestControllerVersion.java

@@ -42,19 +42,23 @@ public enum ModelTestControllerVersion {
     private final String artifactIdPrefix;
     private final Map<String, ModelVersion> subsystemModelVersions = new LinkedHashMap<>();
     private final Stability stability;
+    private final boolean ignored;
 
     ModelTestControllerVersion(String mavenGavVersion, boolean eap, String testControllerVersion, String realVersionName) {
         this(mavenGavVersion, eap, testControllerVersion, null, realVersionName);
     }
-
     ModelTestControllerVersion(String mavenGavVersion, boolean eap, String testControllerVersion, String coreVersion, String realVersionName) {
+        this(mavenGavVersion, eap, testControllerVersion, coreVersion, realVersionName, false);
+    }
+    ModelTestControllerVersion(String mavenGavVersion, boolean eap, String testControllerVersion, String coreVersion, String realVersionName, boolean ignored) {
         this.mavenGavVersion = mavenGavVersion;
         this.testControllerVersion = testControllerVersion;
         this.eap = eap;
         this.stability = eap ? Stability.DEFAULT : Stability.COMMUNITY;
         this.validLegacyController = testControllerVersion != null;
         this.coreVersion = coreVersion == null? mavenGavVersion : coreVersion; //full == core
         this.realVersionName = realVersionName;
+        this.ignored = ignored;
         if (eap) {
             if (coreVersion != null) { //eap 7+ has core version defined
                 this.coreMavenGroupId = "org.wildfly.core";
@@ -170,4 +174,8 @@ public String getMavenGav(String artifactIdPart, boolean coreArtifact) {
     public Stability getStability() {
         return stability;
     }
+
+    public boolean isIgnored() {
+        return ignored;
+    }
 }

subsystem-test/framework/src/main/java/org/jboss/as/subsystem/test/SubsystemTestDelegate.java

@@ -28,6 +28,7 @@
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
+
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -550,6 +551,7 @@ public LegacyKernelServicesInitializer createLegacyKernelServicesBuilder(Additio
         }
 
         public KernelServices build() throws Exception {
+
             bootOperationBuilder.validateNotAlreadyBuilt();
             List<ModelNode> bootOperations = bootOperationBuilder.build();
             AbstractKernelServicesImpl kernelServices = AbstractKernelServicesImpl.create(testClass, mainSubsystemName, additionalInit, ModelTestOperationValidatorFilter.createValidateAll(), cloneExtensionRegistry(additionalInit), bootOperations,
@@ -636,6 +638,7 @@ private class LegacyKernelServiceInitializerImpl implements LegacyKernelServices
         private OperationFixer reverseCheckOperationFixer = operation -> operation;
 
         public LegacyKernelServiceInitializerImpl(AdditionalInitialization additionalInit, ModelTestControllerVersion version, ModelVersion modelVersion) {
+            Assume.assumeFalse("This model controller version is ignored for this server.", version.isIgnored());
             this.classLoaderBuilder = new ChildFirstClassLoaderBuilder(version.isEap());
             this.additionalInit = additionalInit == null ? AdditionalInitialization.MANAGEMENT : additionalInit;
             this.testControllerVersion = version;