Remove unneeded mixed domain Version enums

wildfly · Mar 23, 2019 · 5429efb6fd5985f7e0657208281043ac5786e21b · 5429efb
1 parent a82a4fc
commit 5429efb6fd5985f7e0657208281043ac5786e21b
diff --git a/...mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/DomainAdjuster.java b/...mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/DomainAdjuster.java
@@ -87,9 +87,6 @@ static void adjustForVersion(final DomainClient client, final Version.AsVersion
 
         final DomainAdjuster adjuster;
         switch (asVersion) {
-            case EAP_6_2_0:
-            case EAP_6_3_0:
-                throw new UnsupportedOperationException();
             case EAP_6_4_0:
                 adjuster = new DomainAdjuster640();
                 break;

diff --git a/...domain/src/test/java/org/jboss/as/test/integration/domain/mixed/LegacyConfigAdjuster.java b/...domain/src/test/java/org/jboss/as/test/integration/domain/mixed/LegacyConfigAdjuster.java
@@ -47,9 +47,6 @@ static void adjustForVersion(final DomainClient client, final Version.AsVersion
 
         final LegacyConfigAdjuster adjuster;
         switch (asVersion) {
-            case EAP_6_2_0:
-            case EAP_6_3_0:
-                throw new UnsupportedOperationException();
             case EAP_6_4_0:
                 adjuster = new LegacyConfigAdjuster640();
                 break;

diff --git a/...omain/src/test/java/org/jboss/as/test/integration/domain/mixed/SimpleMixedDomainTest.java b/...omain/src/test/java/org/jboss/as/test/integration/domain/mixed/SimpleMixedDomainTest.java
@@ -116,9 +116,7 @@ public void test00001_ServerRunning() throws Exception {
 
     @Test
     public void test00002_Versioning() throws Exception {
-        if (version == Version.AsVersion.EAP_6_2_0
-                || version == Version.AsVersion.EAP_7_0_0) {
-            //6.2.0 (https://issues.jboss.org/browse/WFLY-3228) and
+        if (version == Version.AsVersion.EAP_7_0_0) {
             //7.0.0 (https://issues.jboss.org/browse/WFCORE-401)
             // have the slave report back its own version, rather than the one from the DC,
             //which is what should happen
@@ -226,10 +224,6 @@ public void test00010_JgroupsTransformers() throws Exception {
      */
     @Test
     public void test00011_ExampleDSConnection() throws Exception{
-        if (version == Version.AsVersion.EAP_6_2_0) {
-            // see: https://issues.jboss.org/browse/WFLY-7792
-            return;
-        }
         PathAddress exampleDSAddress = PathAddress.pathAddress(PathElement.pathElement(HOST, "slave"),
                 PathElement.pathElement(RUNNING_SERVER, "server-one"), PathElement.pathElement(SUBSYSTEM, "datasources"),
                 PathElement.pathElement("data-source", "ExampleDS"));

diff --git a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/Version.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/Version.java
@@ -41,8 +41,6 @@
     String EAP = "jboss-eap-";
 
     enum AsVersion {
-        EAP_6_2_0(EAP, 6, 2, 0),
-        EAP_6_3_0(EAP, 6, 3, 0),
         EAP_6_4_0(EAP, 6, 4, 0),
         EAP_7_0_0(EAP, 7, 0, 0),
         EAP_7_1_0(EAP, 7, 1, 0),
@@ -86,7 +84,7 @@ public String getZipFileName() {
         }
 
         public boolean isEAP6Version() {
-            return (this == EAP_6_2_0 || this == EAP_6_3_0 || this == EAP_6_4_0);
+            return (this == EAP_6_4_0);
         }
 
         public int getMajor() {