Merge pull request #32727 from OpenLiberty/revert-32563-revert-32518-destatic-cloud

Author: joe-chacko

dev/com.ibm.ws.transaction.cloud_fat.db2.0/fat/src/suite/FATSuite.java

@@ -12,11 +12,13 @@
  *******************************************************************************/
 package suite;
 
+import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.topology.database.container.DatabaseContainerType;
@@ -30,7 +32,6 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-	static {
-		beforeSuite(DatabaseContainerType.DB2);
-	}
+    @ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.DB2);
 }

dev/com.ibm.ws.transaction.cloud_fat.db2.1/fat/src/suite/FATSuite.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2023 IBM Corporation and others.
+ * Copyright (c) 2021, 2025 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.rules.repeater.FeatureReplacementAction;
@@ -33,9 +34,8 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-	static {
-		beforeSuite(DatabaseContainerType.DB2);
-	}
+    @ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.DB2);
 
 	@ClassRule
     public static RepeatTests r = RepeatTests.withoutModificationInFullMode()

dev/com.ibm.ws.transaction.cloud_fat.db2.2/fat/src/suite/FATSuite.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2023 IBM Corporation and others.
+ * Copyright (c) 2021, 2025 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.rules.repeater.FeatureReplacementAction;
@@ -33,9 +34,8 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-	static {
-		beforeSuite(DatabaseContainerType.DB2);
-	}
+    @ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.DB2);
 
 	@ClassRule
     public static RepeatTests r = RepeatTests.withoutModificationInFullMode()

dev/com.ibm.ws.transaction.cloud_fat.db2.3/fat/src/suite/FATSuite.java

@@ -18,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.rules.repeater.FeatureReplacementAction;
@@ -33,9 +34,8 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-	static {
-		beforeSuite(DatabaseContainerType.DB2);
-	}
+    @ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.DB2);
 
 	@ClassRule
     public static RepeatTests r = RepeatTests.withoutModificationInFullMode()

dev/com.ibm.ws.transaction.cloud_fat.db2.4/fat/src/suite/FATSuite.java

@@ -18,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.rules.repeater.FeatureReplacementAction;
@@ -33,9 +34,8 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-	static {
-		beforeSuite(DatabaseContainerType.DB2);
-	}
+    @ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.DB2);
 
     @ClassRule
     public static RepeatTests r = RepeatTests.with(FeatureReplacementAction.EE8_FEATURES().forServers(DBRotationTest.serverNames));

dev/com.ibm.ws.transaction.cloud_fat.db2.5/fat/src/suite/FATSuite.java

@@ -18,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.rules.repeater.FeatureReplacementAction;
@@ -33,9 +34,8 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-	static {
-		beforeSuite(DatabaseContainerType.DB2);
-	}
+    @ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.DB2);
 
     @ClassRule
     public static RepeatTests r = RepeatTests.with(FeatureReplacementAction.EE9_FEATURES().forServers(DBRotationTest.serverNames));

dev/com.ibm.ws.transaction.cloud_fat.db2.6/fat/src/suite/FATSuite.java

@@ -18,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.rules.repeater.FeatureReplacementAction;
@@ -33,9 +34,8 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-	static {
-		beforeSuite(DatabaseContainerType.DB2);
-	}
+    @ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.DB2);
 
     @ClassRule
     public static RepeatTests r = RepeatTests.with(FeatureReplacementAction.EE10_FEATURES().forServers(DBRotationTest.serverNames));

dev/com.ibm.ws.transaction.cloud_fat.derby.0/fat/src/suite/FATSuite.java

@@ -12,11 +12,13 @@
  *******************************************************************************/
 package suite;
 
+import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.topology.database.container.DatabaseContainerType;
@@ -32,6 +34,8 @@ public class FATSuite extends TxTestContainerSuite {
 
 	static {
 		DBRotationTest.setDerby();
-		beforeSuite(DatabaseContainerType.Derby);
 	}
+
+	@ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.Derby);
 }

dev/com.ibm.ws.transaction.cloud_fat.derby.1/fat/src/suite/FATSuite.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2023 IBM Corporation and others.
+ * Copyright (c) 2021, 2025 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -18,11 +18,13 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.rules.repeater.FeatureReplacementAction;
 import componenttest.rules.repeater.RepeatTests;
 import componenttest.topology.database.container.DatabaseContainerType;
+import tests.DBRotationTest;
 import tests.DualServerDynamicDBRotationTest1;
 
 @RunWith(Suite.class)
@@ -33,9 +35,8 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-	static {
-		beforeSuite(DatabaseContainerType.Derby);
-	}
+	@ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.Derby);
 
 	@ClassRule
     public static RepeatTests r = RepeatTests.withoutModificationInFullMode()

dev/com.ibm.ws.transaction.cloud_fat.derby.2/fat/src/suite/FATSuite.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2023 IBM Corporation and others.
+ * Copyright (c) 2021, 2025 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 import com.ibm.ws.transaction.fat.util.TxTestContainerSuite;
+import com.ibm.ws.transaction.fat.util.TxTestDB;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
 import componenttest.rules.repeater.FeatureReplacementAction;
@@ -33,9 +34,8 @@
 })
 public class FATSuite extends TxTestContainerSuite {
 
-    static {
-        beforeSuite(DatabaseContainerType.Derby);
-    }
+	@ClassRule
+    public static TxTestDB p = new TxTestDB(DatabaseContainerType.Derby);
 
     @ClassRule
     public static RepeatTests r = RepeatTests.withoutModificationInFullMode()