This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch coheigea/CXF-9256
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 7047839347ca846a69c7cad97f2cf545b5071b49
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Mon Nov 16 17:39:44 2026 +0000

    CXF-9256 - Re-enable kerberos tests on IBM
---
 .../jaxrs/kerberos/JAXRSKerberosBookTest.java      | 17 -------
 .../kerberos/wssec/kerberos/KerberosTokenTest.java | 53 ++++++----------------
 .../kerberos/wssec/spnego/SpnegoTokenTest.java     | 23 +++-------
 3 files changed, 21 insertions(+), 72 deletions(-)

diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
index 05923b3080a..20dbdf834bf 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
@@ -46,20 +46,11 @@ public class JAXRSKerberosBookTest extends 
AbstractBusClientServerTestBase {
     private static final String KERBEROS_CONFIG_FILE =
         "org/apache/cxf/systest/kerberos/jaxrs/kerberos/kerberosClient.xml";
 
-    private static boolean runTests;
-
     private static SimpleKdcServer kerbyServer;
 
     @BeforeClass
     public static void startServers() throws Exception {
 
-        //
-        // This test fails with the IBM JDK
-        //
-        if (!"IBM Corporation".equals(System.getProperty("java.vendor"))) {
-            runTests = true;
-        }
-
         String basedir = System.getProperty("basedir");
         if (basedir == null) {
             basedir = new File(".").getCanonicalPath();
@@ -107,10 +98,6 @@ public class JAXRSKerberosBookTest extends 
AbstractBusClientServerTestBase {
 
     @Test
     public void testGetBookWithConfigInHttpConduit() throws Exception {
-        if (!runTests) {
-            return;
-        }
-
         doTestGetBook123Proxy(KERBEROS_CONFIG_FILE);
     }
 
@@ -134,10 +121,6 @@ public class JAXRSKerberosBookTest extends 
AbstractBusClientServerTestBase {
 
     @Test
     public void testGetBookWithInterceptor() throws Exception {
-        if (!runTests) {
-            return;
-        }
-
         WebClient wc = WebClient.create("http://localhost:"; + PORT + 
"/bookstore/books/123");
 
         KerberosAuthOutInterceptor kbInterceptor = new 
KerberosAuthOutInterceptor();
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index 7d36b3ffd2e..1cd496d86dd 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -61,8 +61,6 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     private static boolean unrestrictedPoliciesInstalled =
         SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
 
-    private static boolean runTests;
-
     private static SimpleKdcServer kerbyServer;
 
     @BeforeClass
@@ -70,13 +68,6 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
 
         WSSConfig.init();
 
-        //
-        // This test fails with the IBM JDK
-        //
-        if (!"IBM Corporation".equals(System.getProperty("java.vendor"))) {
-            runTests = true;
-        }
-
         String basedir = System.getProperty("basedir");
         if (basedir == null) {
             basedir = new File(".").getCanonicalPath();
@@ -152,10 +143,6 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testKerberosOverTransport() throws Exception {
-        if (!runTests) {
-            return;
-        }
-
         String portName = "DoubleItKerberosTransportPort";
         runKerberosTest(portName, false, PORT2);
         runKerberosTest(portName, false, STAX_PORT2);
@@ -165,10 +152,6 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testKerberosOverTransportDifferentConfiguration() throws 
Exception {
-        if (!runTests) {
-            return;
-        }
-
         String portName = "DoubleItKerberosTransportPort2";
         runKerberosTest(portName, false, PORT2);
         runKerberosTest(portName, false, STAX_PORT2);
@@ -178,10 +161,6 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testKerberosOverTransportKeytabs() throws Exception {
-        if (!runTests) {
-            return;
-        }
-
         String portName = "DoubleItKerberosTransportPort3";
         runKerberosTest(portName, false, PORT2);
         runKerberosTest(portName, true, PORT2);
@@ -190,7 +169,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverSymmetric() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -204,7 +183,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverSymmetricSupporting() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -218,7 +197,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosSupporting() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -232,7 +211,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverAsymmetric() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -246,7 +225,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverTransportEndorsing() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -260,7 +239,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverAsymmetricEndorsing() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -275,7 +254,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverSymmetricProtection() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -289,7 +268,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverSymmetricDerivedProtection() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -305,7 +284,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverAsymmetricSignedEndorsing() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -320,7 +299,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverAsymmetricSignedEncrypted() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -334,7 +313,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverSymmetricEndorsingEncrypted() throws Exception 
{
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -349,7 +328,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverSymmetricSignedEndorsingEncrypted() throws 
Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -364,7 +343,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testKerberosOverSymmetricSecureConversation() throws Exception 
{
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -383,7 +362,7 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testWSTrustKerberosToken() throws Exception {
 
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -396,10 +375,6 @@ public class KerberosTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testKerberosViaCustomTokenAction() throws Exception {
-        if (!runTests) {
-            return;
-        }
-
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = KerberosTokenTest.class.getResource("client.xml");
 
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index 225892f8629..fea6e0f67a3 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -54,21 +54,12 @@ public class SpnegoTokenTest extends 
AbstractBusClientServerTestBase {
     private static boolean unrestrictedPoliciesInstalled =
             SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
 
-    private static boolean runTests;
-
     private static SimpleKdcServer kerbyServer;
 
     @BeforeClass
     public static void startServers() throws Exception {
         WSSConfig.init();
 
-        //
-        // This test fails with the IBM JDK
-        //
-        if (!"IBM Corporation".equals(System.getProperty("java.vendor"))) {
-            runTests = true;
-        }
-
         String basedir = System.getProperty("basedir");
         if (basedir == null) {
             basedir = new File(".").getCanonicalPath();
@@ -123,7 +114,7 @@ public class SpnegoTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testSpnegoOverSymmetric() throws Exception {
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -136,7 +127,7 @@ public class SpnegoTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testSpnegoOverSymmetricDerived() throws Exception {
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -149,7 +140,7 @@ public class SpnegoTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testSpnegoOverSymmetricEncryptBeforeSigning() throws Exception 
{
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -162,7 +153,7 @@ public class SpnegoTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testSpnegoOverTransport() throws Exception {
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -176,7 +167,7 @@ public class SpnegoTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testSpnegoOverTransportEndorsing() throws Exception {
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -190,7 +181,7 @@ public class SpnegoTokenTest extends 
AbstractBusClientServerTestBase {
 
     @org.junit.Test
     public void testSpnegoOverTransportEndorsingSP11() throws Exception {
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 
@@ -205,7 +196,7 @@ public class SpnegoTokenTest extends 
AbstractBusClientServerTestBase {
     @org.junit.Test
     @org.junit.Ignore
     public void testSpnegoOverSymmetricSecureConversation() throws Exception {
-        if (!runTests || !unrestrictedPoliciesInstalled) {
+        if (!unrestrictedPoliciesInstalled) {
             return;
         }
 

Reply via email to