You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/10/02 14:23:31 UTC
svn commit: r1706382 - in /webservices/wss4j/trunk: pom.xml
ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
Author: coheigea
Date: Fri Oct 2 12:23:31 2015
New Revision: 1706382
URL: http://svn.apache.org/viewvc?rev=1706382&view=rev
Log:
Fixing tests when run with the IBM JDM 7
Modified:
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1706382&r1=1706381&r2=1706382&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Fri Oct 2 12:23:31 2015
@@ -362,6 +362,39 @@
</pluginManagement>
</build>
</profile>
+ <profile>
+ <id>ibm</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>IBM Corporation</value>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <reportFormat>brief</reportFormat>
+ <useFile>false</useFile>
+ <childDelegation>false</childDelegation>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <systemPropertyVariables>
+ <java.io.tmpdir>${basedir}/target</java.io.tmpdir>
+<org.apache.xml.security.cipher.gcm.useIvParameterSpec>true</org.apache.xml.security.cipher.gcm.useIvParameterSpec>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java?rev=1706382&r1=1706381&r2=1706382&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java Fri Oct 2 12:23:31 2015
@@ -79,14 +79,6 @@ public class EncryptionGCMTest extends o
@org.junit.Test
public void testAES128GCM() 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;
- }
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -108,14 +100,6 @@ public class EncryptionGCMTest extends o
@org.junit.Test
public void testAES256GCM() 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;
- }
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
@@ -137,15 +121,6 @@ public class EncryptionGCMTest extends o
@org.junit.Test
public void testAES192GCM_RSAOAEP_SHA256_MGFSHA256() 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;
- }
-
WSSecEncrypt builder = new WSSecEncrypt();
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);