From b57fdc8d1fc0c362c2fd4213889fefbbb89bf35d Mon Sep 17 00:00:00 2001
From: Yeray Borges <yborgess@redhat.com>
Date: Thu, 9 May 2024 09:16:25 +0100
Subject: [PATCH] [WFCORE-6815] Move Domain Mode stability test case outside of
 the Domain testsuite Jira issue: https://issues.redhat.com/browse/WFCORE-6815

---
 .../domain/{suites => }/DomainStabilityTestCase.java   | 10 ++++++----
 .../integration/domain/suites/DomainTestSuite.java     |  3 +--
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/{suites => }/DomainStabilityTestCase.java (95%)

diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/suites/DomainStabilityTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/DomainStabilityTestCase.java
similarity index 95%
rename from testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/suites/DomainStabilityTestCase.java
rename to testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/DomainStabilityTestCase.java
index 8bfe28cb60c..d532cb480e9 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/suites/DomainStabilityTestCase.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/DomainStabilityTestCase.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.jboss.as.test.integration.domain.suites;
+package org.jboss.as.test.integration.domain;
 
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.BLOCKING;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CORE_SERVICE;
@@ -61,7 +61,7 @@ public DomainStabilityTestCase(Stability desiredStability) {
 
     @BeforeClass
     public static void setupDomain() throws Exception {
-        testSupport = DomainTestSuite.createSupport(DomainStabilityTestCase.class.getSimpleName());
+        testSupport = DomainTestSupport.createAndStartDefaultSupport(DomainStabilityTestCase.class.getSimpleName());
     }
 
     @Before
@@ -77,8 +77,10 @@ public void tearDown() throws Exception {
 
     @AfterClass
     public static void tearDownDomain() throws Exception {
-        testSupport = null;
-        DomainTestSuite.stopSupport();
+        if (testSupport != null) {
+            testSupport.close();
+            testSupport = null;
+        }
     }
 
     @Test
diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/suites/DomainTestSuite.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/suites/DomainTestSuite.java
index 8825fee6057..5301342f644 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/suites/DomainTestSuite.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/suites/DomainTestSuite.java
@@ -57,8 +57,7 @@
         ValidateAddressOperationTestCase.class,
         ValidateOperationOperationTestCase.class,
         WildcardOperationsTestCase.class,
-        ServerAuthenticationTestCase.class,
-        DomainStabilityTestCase.class
+        ServerAuthenticationTestCase.class
 })
 public class DomainTestSuite {