You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/11/21 11:56:41 UTC
svn commit: r1412054 -
/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
Author: coheigea
Date: Wed Nov 21 10:56:40 2012
New Revision: 1412054
URL: http://svn.apache.org/viewvc?rev=1412054&view=rev
Log:
Merged revisions 1412049 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1412049 | coheigea | 2012-11-21 10:44:23 +0000 (Wed, 21 Nov 2012) | 10 lines
Merged revisions 1412045 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1412045 | coheigea | 2012-11-21 10:31:17 +0000 (Wed, 21 Nov 2012) | 2 lines
Disable GCM tests on IBM JDK 7
........
........
Modified:
cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java?rev=1412054&r1=1412053&r2=1412054&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java Wed Nov 21 10:56:40 2012
@@ -62,6 +62,15 @@ public class GCMTest extends AbstractBus
@org.junit.Test
public void testAESGCM128() throws Exception {
+ //
+ // This test fails with the IBM JDK 7
+ //
+ if ("IBM Corporation".equals(System.getProperty("java.vendor"))
+ && System.getProperty("java.version") != null
+ && System.getProperty("java.version").startsWith("1.7")) {
+ return;
+ }
+
SpringBusFactory bf = new SpringBusFactory();
URL busFile = GCMTest.class.getResource("client/client.xml");
@@ -86,6 +95,15 @@ public class GCMTest extends AbstractBus
if (!unrestrictedPoliciesInstalled) {
return;
}
+
+ //
+ // This test fails with the IBM JDK 7
+ //
+ if ("IBM Corporation".equals(System.getProperty("java.vendor"))
+ && System.getProperty("java.version") != null
+ && System.getProperty("java.version").startsWith("1.7")) {
+ return;
+ }
SpringBusFactory bf = new SpringBusFactory();
URL busFile = GCMTest.class.getResource("client/client.xml");
@@ -111,6 +129,15 @@ public class GCMTest extends AbstractBus
if (!unrestrictedPoliciesInstalled) {
return;
}
+
+ //
+ // This test fails with the IBM JDK 7
+ //
+ if ("IBM Corporation".equals(System.getProperty("java.vendor"))
+ && System.getProperty("java.version") != null
+ && System.getProperty("java.version").startsWith("1.7")) {
+ return;
+ }
SpringBusFactory bf = new SpringBusFactory();
URL busFile = GCMTest.class.getResource("client/client.xml");