You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/06/08 19:38:31 UTC
svn commit: r1684230 - in /qpid/java/trunk/client: pom.xml
src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
Author: rgodfrey
Date: Mon Jun 8 17:38:31 2015
New Revision: 1684230
URL: http://svn.apache.org/r1684230
Log:
QPID-6576 : Fix unit client unit tests to locate keystore
Modified:
qpid/java/trunk/client/pom.xml
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
Modified: qpid/java/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/pom.xml?rev=1684230&r1=1684229&r2=1684230&view=diff
==============================================================================
--- qpid/java/trunk/client/pom.xml (original)
+++ qpid/java/trunk/client/pom.xml Mon Jun 8 17:38:31 2015
@@ -86,10 +86,16 @@
<exclude>**/*.java/</exclude>
</excludes>
</resource>
- </resources>
+ </resources>
<testResources>
<testResource>
+ <directory>${basedir}/../</directory>
+ <includes>
+ <include>test-profiles/**/*.jks</include>
+ </includes>
+ </testResource>
+ <testResource>
<directory>${basedir}/src/test/java</directory>
<excludes>
<exclude>**/*.java/</exclude>
Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java?rev=1684230&r1=1684229&r2=1684230&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java Mon Jun 8 17:38:31 2015
@@ -96,7 +96,7 @@ public class Encrypted010MessageFactoryT
cipher.init(Cipher.ENCRYPT_MODE, _secretKeySpec, new IvParameterSpec(_initializeVector));
_encryptedMessage = cipher.doFinal(_unencrypted);
_keyStore = KeyStore.getInstance("JKS");
- _keyStore.load(new FileInputStream(TestSSLConstants.KEYSTORE), TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
+ _keyStore.load(getClass().getClassLoader().getResourceAsStream(TestSSLConstants.KEYSTORE), TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
final AMQConnection connection = mock(AMQConnection.class);
final ConnectionSettings settings = mock(ConnectionSettings.class);
Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java?rev=1684230&r1=1684229&r2=1684230&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java Mon Jun 8 17:38:31 2015
@@ -94,7 +94,7 @@ public class Encrypted091MessageFactoryT
cipher.init(Cipher.ENCRYPT_MODE, _secretKeySpec, new IvParameterSpec(_initializeVector));
_encryptedMessage = cipher.doFinal(_unencrypted);
_keyStore = KeyStore.getInstance("JKS");
- _keyStore.load(new FileInputStream(TestSSLConstants.KEYSTORE), TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
+ _keyStore.load(getClass().getClassLoader().getResourceAsStream(TestSSLConstants.KEYSTORE), TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
final AMQConnection connection = mock(AMQConnection.class);
final ConnectionSettings settings = mock(ConnectionSettings.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org