[WFLY-11688] Update mixed domain tests to use EAP 7.2.0 rather than WF14

wildfly · Feb 8, 2019 · b1dc661 · b1dc661
1 parent b933c7e
commit b1dc661
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 18 deletions.
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
@@ -99,7 +99,7 @@ static void adjustForVersion(final DomainClient client, final Version.AsVersion
             case EAP_7_1_0:
                 adjuster = new DomainAdjuster710();
                 break;
-            case EAP_7_2_0_TEMP:
+            case EAP_7_2_0:
                 adjuster = new DomainAdjuster720();
                 break;
             default:

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
@@ -46,9 +46,7 @@ enum AsVersion {
         EAP_6_4_0(EAP, 6, 4, 0),
         EAP_7_0_0(EAP, 7, 0, 0),
         EAP_7_1_0(EAP, 7, 1, 0),
-        // TODO https://issues.jboss.org/browse/WFLY-10971 Remove EAP_7_2_0_TEMP and enable EAP_7_2_0
-        EAP_7_2_0_TEMP(WILDFLY, 14, 0, 0),
-        //EAP_7_2_0(EAP, 7, 2, 0),
+        EAP_7_2_0(EAP, 7, 2, 0),
         ;
 
 

diff --git a/...java/org/jboss/as/test/integration/domain/mixed/eap720/DomainHostExcludes720TestCase.java b/...java/org/jboss/as/test/integration/domain/mixed/eap720/DomainHostExcludes720TestCase.java
@@ -36,7 +36,7 @@
  *
  * @author Brian Stansberry
  */
-@Version(Version.AsVersion.EAP_7_2_0_TEMP)
+@Version(Version.AsVersion.EAP_7_2_0)
 public class DomainHostExcludes720TestCase extends DomainHostExcludesTest {
 
     @BeforeClass

diff --git a/...java/org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMaster720TestSuite.java b/...java/org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMaster720TestSuite.java
@@ -34,7 +34,7 @@
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses(value= {ElytronOnlyMasterSmoke720TestCase.class})
-@Version(Version.AsVersion.EAP_7_2_0_TEMP)
+@Version(Version.AsVersion.EAP_7_2_0)
 @Ignore("Ignore until WFCORE-2882 is integrated")
 public class ElytronOnlyMaster720TestSuite extends ElytronOnlyMasterTestSuite {
 

diff --git a/.../org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMasterSmoke720TestCase.java b/.../org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMasterSmoke720TestCase.java
@@ -29,7 +29,7 @@
 /**
  * @author Martin Simka
  */
-@Version(Version.AsVersion.EAP_7_2_0_TEMP)
+@Version(Version.AsVersion.EAP_7_2_0)
 public class ElytronOnlyMasterSmoke720TestCase extends ElytronOnlyMasterSmokeTestCase {
 
     @BeforeClass

diff --git a/...st/java/org/jboss/as/test/integration/domain/mixed/eap720/KernelBehavior720TestSuite.java b/...st/java/org/jboss/as/test/integration/domain/mixed/eap720/KernelBehavior720TestSuite.java
@@ -34,7 +34,7 @@
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses(value= {RBACConfig720TestCase.class, WildcardReads720TestCase.class})
-@Version(Version.AsVersion.EAP_7_2_0_TEMP)
+@Version(Version.AsVersion.EAP_7_2_0)
 public class KernelBehavior720TestSuite extends KernelBehaviorTestSuite {
 
     @BeforeClass

diff --git a/.../test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestCase.java b/.../test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestCase.java
@@ -31,7 +31,7 @@
  *
  * @author Brian Stansberry
  */
-@Version(Version.AsVersion.EAP_7_2_0_TEMP)
+@Version(Version.AsVersion.EAP_7_2_0)
 public class LegacyConfig720TestCase extends LegacyConfigTest {
 
     @BeforeClass

diff --git a/...test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestSuite.java b/...test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestSuite.java
@@ -35,11 +35,11 @@
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses(value= {LegacyConfig720TestCase.class, DomainHostExcludes720TestCase.class})
-@Version(Version.AsVersion.EAP_7_2_0_TEMP)
+@Version(Version.AsVersion.EAP_7_2_0)
 public class LegacyConfig720TestSuite extends MixedDomainTestSuite {
 
     @BeforeClass
     public static void initializeDomain() {
-        MixedDomainTestSuite.getSupportForLegacyConfig(LegacyConfig720TestSuite.class, Version.AsVersion.EAP_7_2_0_TEMP);
+        MixedDomainTestSuite.getSupportForLegacyConfig(LegacyConfig720TestSuite.class, Version.AsVersion.EAP_7_2_0);
     }
 }
diff --git a/.../test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomain720TestSuite.java b/.../test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomain720TestSuite.java
@@ -36,7 +36,7 @@
  */
 @RunWith(Suite.class)
 @SuiteClasses(value= {SimpleMixedDomain720TestCase.class, MixedDomainDeployment720TestCase.class})
-@Version(AsVersion.EAP_7_2_0_TEMP)
+@Version(AsVersion.EAP_7_2_0)
 public class MixedDomain720TestSuite extends MixedDomainTestSuite {
 
     @BeforeClass

diff --git a/...a/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeployment720TestCase.java b/...a/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeployment720TestCase.java
@@ -31,7 +31,7 @@
  *
  * @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
  */
-@Version(AsVersion.EAP_7_2_0_TEMP)
+@Version(AsVersion.EAP_7_2_0)
 public class MixedDomainDeployment720TestCase extends MixedDomainDeploymentTest {
     @BeforeClass
     public static void beforeClass() {

diff --git a/...boss/as/test/integration/domain/mixed/eap720/MixedDomainDeploymentOverlay720TestCase.java b/...boss/as/test/integration/domain/mixed/eap720/MixedDomainDeploymentOverlay720TestCase.java
@@ -30,7 +30,7 @@
 /**
  * @author Emmanuel Hugonnet (c) 2017 Red Hat, inc.
  */
-@Version(AsVersion.EAP_7_2_0_TEMP)
+@Version(AsVersion.EAP_7_2_0)
 public class MixedDomainDeploymentOverlay720TestCase extends MixedDeploymentOverlayTestCase {
     @BeforeClass
     public static void beforeClass() {

diff --git a/...ava/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainOverlay720TestSuite.java b/...ava/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainOverlay720TestSuite.java
@@ -35,7 +35,7 @@
  */
 @RunWith(Suite.class)
 @SuiteClasses(value= {MixedDomainDeploymentOverlay720TestCase.class})
-@Version(AsVersion.EAP_7_2_0_TEMP)
+@Version(AsVersion.EAP_7_2_0)
 public class MixedDomainOverlay720TestSuite extends MixedDomainTestSuite {
 
     @BeforeClass

diff --git a/...rc/test/java/org/jboss/as/test/integration/domain/mixed/eap720/RBACConfig720TestCase.java b/...rc/test/java/org/jboss/as/test/integration/domain/mixed/eap720/RBACConfig720TestCase.java
@@ -31,7 +31,7 @@
  *
  * @author Brian Stansberry
  */
-@Version(Version.AsVersion.EAP_7_2_0_TEMP)
+@Version(Version.AsVersion.EAP_7_2_0)
 public class RBACConfig720TestCase extends RBACConfigTestCase {
 
     @BeforeClass

diff --git a/.../java/org/jboss/as/test/integration/domain/mixed/eap720/SimpleMixedDomain720TestCase.java b/.../java/org/jboss/as/test/integration/domain/mixed/eap720/SimpleMixedDomain720TestCase.java
@@ -31,7 +31,7 @@
  *
  * @author <a href="kabir.khan@jboss.com">Kabir Khan</a>
  */
-@Version(AsVersion.EAP_7_2_0_TEMP)
+@Version(AsVersion.EAP_7_2_0)
 public class SimpleMixedDomain720TestCase extends SimpleMixedDomainTest {
 
     @BeforeClass

diff --git a/...test/java/org/jboss/as/test/integration/domain/mixed/eap720/WildcardReads720TestCase.java b/...test/java/org/jboss/as/test/integration/domain/mixed/eap720/WildcardReads720TestCase.java
@@ -30,7 +30,7 @@
  *
  * @author Brian Stansberry
  */
-@Version(Version.AsVersion.EAP_7_2_0_TEMP)
+@Version(Version.AsVersion.EAP_7_2_0)
 public class WildcardReads720TestCase extends WildcardReadsTestCase {
 
     @BeforeClass