From b1dc66121fba26d2d528603d6625a8b9504206ef Mon Sep 17 00:00:00 2001 From: Kabir Khan Date: Fri, 8 Feb 2019 14:59:04 +0100 Subject: [PATCH] [WFLY-11688] Update mixed domain tests to use EAP 7.2.0 rather than WF14 --- .../as/test/integration/domain/mixed/DomainAdjuster.java | 2 +- .../org/jboss/as/test/integration/domain/mixed/Version.java | 4 +--- .../domain/mixed/eap720/DomainHostExcludes720TestCase.java | 2 +- .../domain/mixed/eap720/ElytronOnlyMaster720TestSuite.java | 2 +- .../mixed/eap720/ElytronOnlyMasterSmoke720TestCase.java | 2 +- .../domain/mixed/eap720/KernelBehavior720TestSuite.java | 2 +- .../domain/mixed/eap720/LegacyConfig720TestCase.java | 2 +- .../domain/mixed/eap720/LegacyConfig720TestSuite.java | 4 ++-- .../domain/mixed/eap720/MixedDomain720TestSuite.java | 2 +- .../domain/mixed/eap720/MixedDomainDeployment720TestCase.java | 2 +- .../mixed/eap720/MixedDomainDeploymentOverlay720TestCase.java | 2 +- .../domain/mixed/eap720/MixedDomainOverlay720TestSuite.java | 2 +- .../domain/mixed/eap720/RBACConfig720TestCase.java | 2 +- .../domain/mixed/eap720/SimpleMixedDomain720TestCase.java | 2 +- .../domain/mixed/eap720/WildcardReads720TestCase.java | 2 +- 15 files changed, 16 insertions(+), 18 deletions(-) diff --git a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/DomainAdjuster.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/DomainAdjuster.java index 71288630dda0..17a341801c49 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/DomainAdjuster.java +++ b/testsuite/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 index 998e6558af33..034b0c44d098 100644 --- 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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/DomainHostExcludes720TestCase.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/DomainHostExcludes720TestCase.java index faffe37bcaac..a8d35d97f105 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/DomainHostExcludes720TestCase.java +++ b/testsuite/mixed-domain/src/test/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMaster720TestSuite.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMaster720TestSuite.java index e77b5d3322f2..4f391e1e27a8 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMaster720TestSuite.java +++ b/testsuite/mixed-domain/src/test/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMasterSmoke720TestCase.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMasterSmoke720TestCase.java index 428aef304d04..fbab4d3067f4 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/ElytronOnlyMasterSmoke720TestCase.java +++ b/testsuite/mixed-domain/src/test/java/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/KernelBehavior720TestSuite.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/KernelBehavior720TestSuite.java index 3dd37a99ad61..787d280dd307 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/KernelBehavior720TestSuite.java +++ b/testsuite/mixed-domain/src/test/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestCase.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestCase.java index 4656fb5df960..24ab393a9014 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestCase.java +++ b/testsuite/mixed-domain/src/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestSuite.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestSuite.java index 508d21023e75..03f40a185f73 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/LegacyConfig720TestSuite.java +++ b/testsuite/mixed-domain/src/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomain720TestSuite.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomain720TestSuite.java index 44f7085e24d3..75a30108f7f3 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomain720TestSuite.java +++ b/testsuite/mixed-domain/src/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeployment720TestCase.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeployment720TestCase.java index f165bec9c8b6..cc796266cca6 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeployment720TestCase.java +++ b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeployment720TestCase.java @@ -31,7 +31,7 @@ * * @author Kabir Khan */ -@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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeploymentOverlay720TestCase.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeploymentOverlay720TestCase.java index 13dfe80ccda1..00820becb4fc 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainDeploymentOverlay720TestCase.java +++ b/testsuite/mixed-domain/src/test/java/org/jboss/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainOverlay720TestSuite.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainOverlay720TestSuite.java index b0d4076068b8..fae9079aeeb4 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/MixedDomainOverlay720TestSuite.java +++ b/testsuite/mixed-domain/src/test/java/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/RBACConfig720TestCase.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/RBACConfig720TestCase.java index ab8c1c653089..6c04eb440839 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/RBACConfig720TestCase.java +++ b/testsuite/mixed-domain/src/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/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/SimpleMixedDomain720TestCase.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/SimpleMixedDomain720TestCase.java index f265c7bc0bff..620c54d2756a 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/SimpleMixedDomain720TestCase.java +++ b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/SimpleMixedDomain720TestCase.java @@ -31,7 +31,7 @@ * * @author Kabir Khan */ -@Version(AsVersion.EAP_7_2_0_TEMP) +@Version(AsVersion.EAP_7_2_0) public class SimpleMixedDomain720TestCase extends SimpleMixedDomainTest { @BeforeClass diff --git a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/WildcardReads720TestCase.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/WildcardReads720TestCase.java index 6fef8c5f316b..01d36ba27321 100644 --- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/eap720/WildcardReads720TestCase.java +++ b/testsuite/mixed-domain/src/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