Merge pull request #31700 from KyleAure/bb304880-kerberos-tests-windows

Author: KyleAure

dev/com.ibm.ws.jdbc_fat_krb5/fat/src/com/ibm/ws/jdbc/fat/krb5/DB2KerberosTest.java

@@ -27,6 +27,7 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
 import com.ibm.websphere.simplicity.ShrinkHelper;
@@ -36,6 +37,7 @@
 import com.ibm.websphere.simplicity.log.Log;
 import com.ibm.ws.jdbc.fat.krb5.containers.DB2KerberosContainer;
 import com.ibm.ws.jdbc.fat.krb5.containers.KerberosContainer;
+import com.ibm.ws.jdbc.fat.krb5.rules.KerberosPlatformRule;
 
 import componenttest.annotation.AllowedFFDC;
 import componenttest.annotation.Server;
@@ -57,9 +59,11 @@ public class DB2KerberosTest extends FATServletClient {
 
     public static final String APP_NAME = "krb5-db2-app";
 
-    @ClassRule
     public static final DB2KerberosContainer db2 = new DB2KerberosContainer(FATSuite.network);
 
+    @ClassRule
+    public static RuleChain chain = RuleChain.outerRule(KerberosPlatformRule.instance()).around(db2);
+
     @Server("com.ibm.ws.jdbc.fat.krb5")
     @TestServlet(servlet = DB2KerberosTestServlet.class, contextRoot = APP_NAME)
     public static LibertyServer server;

dev/com.ibm.ws.jdbc_fat_krb5/fat/src/com/ibm/ws/jdbc/fat/krb5/ErrorPathTest.java

@@ -22,6 +22,7 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
 import com.ibm.websphere.simplicity.ShrinkHelper;
@@ -30,6 +31,7 @@
 import com.ibm.websphere.simplicity.config.ServerConfiguration;
 import com.ibm.websphere.simplicity.log.Log;
 import com.ibm.ws.jdbc.fat.krb5.containers.DB2KerberosContainer;
+import com.ibm.ws.jdbc.fat.krb5.rules.KerberosPlatformRule;
 
 import componenttest.annotation.AllowedFFDC;
 import componenttest.annotation.Server;
@@ -48,9 +50,11 @@ public class ErrorPathTest extends FATServletClient {
     @Server("com.ibm.ws.jdbc.fat.krb5")
     public static LibertyServer server;
 
-    @ClassRule
     public static final DB2KerberosContainer db2 = DB2KerberosTest.db2;
 
+    @ClassRule
+    public static RuleChain chain = RuleChain.outerRule(KerberosPlatformRule.instance()).around(db2);
+
     private static final String APP_NAME = DB2KerberosTest.APP_NAME;
 
     private static ServerConfiguration originalConfig;

dev/com.ibm.ws.jdbc_fat_krb5/fat/src/com/ibm/ws/jdbc/fat/krb5/FATSuite.java

@@ -14,7 +14,6 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -37,34 +36,42 @@
 })
 public class FATSuite extends TestContainerSuite {
 
+    static {
+        Log.info(FATSuite.class, "<init>", "Setting overrideDefaultTLS to true, needed for IBM JDK 8 support.");
+        java.lang.System.setProperty("com.ibm.jsse2.overrideDefaultTLS", "true");
+    }
+
     public static Network network;
     public static KerberosContainer krb5;
 
-    @ClassRule
-    public static KerberosPlatformRule krbRule = new KerberosPlatformRule();
-
     @BeforeClass
-    public static void startKerberos() throws Exception {
-        network = Network.newNetwork();
-        krb5 = new KerberosContainer(network);
-        krb5.start();
+    public static void setup() throws Exception {
+        // Manually apply rule so that the AlwaysPassesTest runs since having zero test results is considered an error
+        if (KerberosPlatformRule.shouldRun(null)) {
+            network = Network.newNetwork();
+            krb5 = new KerberosContainer(network);
+            krb5.start();
+        }
     }
 
     @AfterClass
-    public static void tearDown() throws Exception {
+    public static void teardown() throws Exception {
+        if (krb5 == null && network == null) {
+            return; // Nothing to cleanup
+        }
+
         Exception firstError = null;
 
         try {
             krb5.stop();
-            network.close();
         } catch (Exception e) {
-            if (firstError == null)
-                firstError = e;
-            Log.error(FATSuite.class, "tearDown", e);
+            firstError = e;
+            Log.error(FATSuite.class, "teardown", e);
+        } finally {
+            network.close();
         }
 
         if (firstError != null)
             throw firstError;
     }
-
 }

dev/com.ibm.ws.jdbc_fat_krb5/fat/src/com/ibm/ws/jdbc/fat/krb5/OracleKerberosTest.java

@@ -32,6 +32,7 @@
 import com.ibm.websphere.simplicity.log.Log;
 import com.ibm.ws.jdbc.fat.krb5.containers.OracleKerberosContainer;
 import com.ibm.ws.jdbc.fat.krb5.rules.IBMJava8Rule;
+import com.ibm.ws.jdbc.fat.krb5.rules.KerberosPlatformRule;
 
 import componenttest.annotation.AllowedFFDC;
 import componenttest.annotation.MaximumJavaLevel;
@@ -60,12 +61,10 @@ public class OracleKerberosTest extends FATServletClient {
     @TestServlet(servlet = OracleKerberosTestServlet.class, contextRoot = APP_NAME)
     public static LibertyServer server;
 
-    public static IBMJava8Rule skipOnIBMJava8 = new IBMJava8Rule();
-
     public static OracleKerberosContainer oracle = new OracleKerberosContainer(FATSuite.network);
 
     @ClassRule
-    public static RuleChain chain = RuleChain.outerRule(skipOnIBMJava8).around(oracle);
+    public static RuleChain chain = RuleChain.outerRule(KerberosPlatformRule.instance()).around(IBMJava8Rule.instance()).around(oracle);
 
     @BeforeClass
     public static void setUp() throws Exception {

dev/com.ibm.ws.jdbc_fat_krb5/fat/src/com/ibm/ws/jdbc/fat/krb5/PostgresKerberosTest.java

@@ -25,6 +25,7 @@
 
 import com.ibm.websphere.simplicity.ShrinkHelper;
 import com.ibm.ws.jdbc.fat.krb5.containers.PostgresKerberosContainer;
+import com.ibm.ws.jdbc.fat.krb5.rules.KerberosPlatformRule;
 
 import componenttest.annotation.Server;
 import componenttest.annotation.TestServlet;
@@ -58,7 +59,7 @@ public class PostgresKerberosTest extends FATServletClient {
                                     .fullFATOnly());
 
     @ClassRule
-    public static RuleChain chain = RuleChain.outerRule(postgresql).around(repeat);
+    public static RuleChain chain = RuleChain.outerRule(KerberosPlatformRule.instance()).around(postgresql).around(repeat);
 
     @BeforeClass
     public static void setUp() throws Exception {

dev/com.ibm.ws.jdbc_fat_krb5/fat/src/com/ibm/ws/jdbc/fat/krb5/rules/IBMJava8Rule.java

@@ -27,13 +27,19 @@
  */
 public class IBMJava8Rule implements TestRule {
 
+    public static IBMJava8Rule instance() {
+        return new IBMJava8Rule();
+    }
+
     @Override
     public Statement apply(Statement stmt, Description desc) {
         return new Statement() {
             @Override
             public void evaluate() throws Throwable {
                 if (shouldRun(desc)) {
                     stmt.evaluate();
+                } else {
+                    Log.info(IBMJava8Rule.class, "evaluate", "Rule chain broken, skipping next statement: " + stmt.toString());
                 }
             }
         };

dev/com.ibm.ws.jdbc_fat_krb5/fat/src/com/ibm/ws/jdbc/fat/krb5/rules/KerberosPlatformRule.java

@@ -36,9 +36,8 @@
  */
 public class KerberosPlatformRule implements TestRule {
 
-    static {
-        // Needed for IBM JDK 8 support.
-        java.lang.System.setProperty("com.ibm.jsse2.overrideDefaultTLS", "true");
+    public static KerberosPlatformRule instance() {
+        return new KerberosPlatformRule();
     }
 
     @Override
@@ -48,6 +47,8 @@ public Statement apply(Statement stmt, Description desc) {
             public void evaluate() throws Throwable {
                 if (shouldRun(desc)) {
                     stmt.evaluate();
+                } else {
+                    Log.info(KerberosPlatformRule.class, "evaluate", "Rule chain broken, skipping next statement: " + stmt.toString());
                 }
             }
         };