svn commit: r1562033 - in /webservices/wss4j/trunk: integration/src/test/java/org/apache/wss4j/integration/test/kerberos/ ws-security-stax/src/test/java/org/apache/wss4j/stax/test/

[coheigea]

Author: coheigea
Date: Tue Jan 28 11:01:21 2014
New Revision: 1562033

URL: http://svn.apache.org/r1562033
Log:
Skipping some tests with the IBM JDK

Modified:
    
webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
    
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java
    
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java

Modified: 
webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java?rev=1562033&r1=1562032&r2=1562033&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
 (original)
+++ 
webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
 Tue Jan 28 11:01:21 2014
@@ -85,19 +85,23 @@ public class KerberosTest extends Abstra
 
         WSSConfig.init();
 
-        kerberosServerStarted = KerberosServiceStarter.startKerberosServer();
+        //
+        // This test fails with the IBM JDK
+        //
+        if (!"IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            kerberosServerStarted = 
KerberosServiceStarter.startKerberosServer();
+
+            String basedir = System.getProperty("basedir");
+            if (basedir == null) {
+                basedir = new File(".").getCanonicalPath();
+            } else {
+                basedir += "/..";
+            }
 
-        String basedir = System.getProperty("basedir");
-        if (basedir == null) {
-            basedir = new File(".").getCanonicalPath();
-        } else {
-            basedir += "/..";
+            //System.setProperty("sun.security.krb5.debug", "true");
+            System.setProperty("java.security.auth.login.config", basedir + 
"/integration/src/test/resources/kerberos/kerberos.jaas");
+            System.setProperty("java.security.krb5.conf", basedir + 
"/integration/src/test/resources/kerberos/krb5.conf");
         }
-
-        //System.setProperty("sun.security.krb5.debug", "true");
-        System.setProperty("java.security.auth.login.config", basedir + 
"/integration/src/test/resources/kerberos/kerberos.jaas");
-        System.setProperty("java.security.krb5.conf", basedir + 
"/integration/src/test/resources/kerberos/krb5.conf");
-
     }
 
     @AfterClass

Modified: 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java?rev=1562033&r1=1562032&r2=1562033&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java
 Tue Jan 28 11:01:21 2014
@@ -301,6 +301,13 @@ public class PrincipalTest extends Abstr
 
     @Test
     public void testECKeyValue() throws Exception {
+        
+        //
+        // This test fails with the IBM JDK
+        //
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            return;
+        }
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         {

Modified: 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java?rev=1562033&r1=1562032&r2=1562033&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
 Tue Jan 28 11:01:21 2014
@@ -1433,6 +1433,13 @@ public class SignatureTest extends Abstr
     @Test
     public void testSignatureECKeyValue() throws Exception {
         
+        //
+        // This test fails with the IBM JDK
+        //
+        if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+            return;
+        }
+        
         if (Security.getProvider("BC") == null) {
             return;
         }