Author: rgodfrey
Date: Wed Jun 10 14:29:20 2015
New Revision: 1684684
URL: http://svn.apache.org/r1684684
Log:
QPID-6576 : prevent failure of test when full strength JCE is not installed
Modified:
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/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=1684684&r1=1684683&r2=1684684&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
Wed Jun 10 14:29:20 2015
@@ -71,44 +71,48 @@ public class Encrypted010MessageFactoryT
public void setUp() throws Exception
{
super.setUp();
- final AMQSession session = mock(AMQSession.class);
- _messageFactoryRegistry =
MessageFactoryRegistry.newDefaultRegistry(session);
- _messageFactory = new
Encrypted010MessageFactory(_messageFactoryRegistry);
-
-
- _messageProps = new MessageProperties();
- final HashMap<String, Object> headers = new HashMap<>();
- _messageProps.setApplicationHeaders(headers);
- _deliveryProps = new DeliveryProperties();
- _messageProps.setContentType("text/plain");
- BBEncoder encoder = new BBEncoder(1024);
- encoder.writeStruct32(_deliveryProps);
- encoder.writeStruct32(_messageProps);
- ByteBuffer buffer = encoder.buffer();
-
- final int payloadOffset = buffer.remaining();
- _unencrypted = new byte[payloadOffset + _data.length];
- buffer.get(_unencrypted,0, payloadOffset);
- System.arraycopy(_data,0,_unencrypted,payloadOffset,_data.length);
-
- _secretKeySpec = new SecretKeySpec(_secretKeyEncoded, "AES");
- Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
- cipher.init(Cipher.ENCRYPT_MODE, _secretKeySpec, new
IvParameterSpec(_initializeVector));
- _encryptedMessage = cipher.doFinal(_unencrypted);
- _keyStore = KeyStore.getInstance("JKS");
-
_keyStore.load(getClass().getClassLoader().getResourceAsStream(TestSSLConstants.KEYSTORE),
TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
-
- final AMQConnection connection = mock(AMQConnection.class);
- final ConnectionSettings settings = mock(ConnectionSettings.class);
-
- when(session.getAMQConnection()).thenReturn(connection);
- when(connection.getConnectionSettings()).thenReturn(settings);
-
when(settings.getEncryptionTrustStore(any(ConnectionSettings.RemoteStoreFinder.class))).thenReturn(_keyStore);
- when(settings.getEncryptionKeyStore()).thenReturn(_keyStore);
-
when(settings.getEncryptionKeyStorePassword()).thenReturn(TestSSLConstants.KEYSTORE_PASSWORD);
-
- _encryptionHelper = new MessageEncryptionHelper(session);
-
when(session.getMessageEncryptionHelper()).thenReturn(_encryptionHelper);
+ if(isStrongEncryptionEnabled())
+ {
+ final AMQSession session = mock(AMQSession.class);
+ _messageFactoryRegistry =
MessageFactoryRegistry.newDefaultRegistry(session);
+ _messageFactory = new
Encrypted010MessageFactory(_messageFactoryRegistry);
+
+
+ _messageProps = new MessageProperties();
+ final HashMap<String, Object> headers = new HashMap<>();
+ _messageProps.setApplicationHeaders(headers);
+ _deliveryProps = new DeliveryProperties();
+ _messageProps.setContentType("text/plain");
+ BBEncoder encoder = new BBEncoder(1024);
+ encoder.writeStruct32(_deliveryProps);
+ encoder.writeStruct32(_messageProps);
+ ByteBuffer buffer = encoder.buffer();
+
+ final int payloadOffset = buffer.remaining();
+ _unencrypted = new byte[payloadOffset + _data.length];
+ buffer.get(_unencrypted, 0, payloadOffset);
+ System.arraycopy(_data, 0, _unencrypted, payloadOffset,
_data.length);
+
+ _secretKeySpec = new SecretKeySpec(_secretKeyEncoded, "AES");
+ Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+ cipher.init(Cipher.ENCRYPT_MODE, _secretKeySpec, new
IvParameterSpec(_initializeVector));
+ _encryptedMessage = cipher.doFinal(_unencrypted);
+ _keyStore = KeyStore.getInstance("JKS");
+
_keyStore.load(getClass().getClassLoader().getResourceAsStream(TestSSLConstants.KEYSTORE),
+ TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
+
+ final AMQConnection connection = mock(AMQConnection.class);
+ final ConnectionSettings settings = mock(ConnectionSettings.class);
+
+ when(session.getAMQConnection()).thenReturn(connection);
+ when(connection.getConnectionSettings()).thenReturn(settings);
+
when(settings.getEncryptionTrustStore(any(ConnectionSettings.RemoteStoreFinder.class))).thenReturn(_keyStore);
+ when(settings.getEncryptionKeyStore()).thenReturn(_keyStore);
+
when(settings.getEncryptionKeyStorePassword()).thenReturn(TestSSLConstants.KEYSTORE_PASSWORD);
+
+ _encryptionHelper = new MessageEncryptionHelper(session);
+
when(session.getMessageEncryptionHelper()).thenReturn(_encryptionHelper);
+ }
}
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=1684684&r1=1684683&r2=1684684&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
Wed Jun 10 14:29:20 2015
@@ -71,43 +71,45 @@ public class Encrypted091MessageFactoryT
public void setUp() throws Exception
{
super.setUp();
- final AMQSession session = mock(AMQSession.class);
- _messageFactoryRegistry =
MessageFactoryRegistry.newDefaultRegistry(session);
- _messageFactory = new
Encrypted091MessageFactory(_messageFactoryRegistry);
-
-
- _props = new BasicContentHeaderProperties();
- _props.setContentType("text/plain");
-
- final int headerLength = _props.getPropertyListSize() + 2;
- _unencrypted = new byte[headerLength + _data.length];
- BytesDataOutput output = new BytesDataOutput(_unencrypted);
- output.writeShort((short) (_props.getPropertyFlags() & 0xffff));
- _props.writePropertyListPayload(output);
-
-
-
- System.arraycopy(_data,0,_unencrypted,headerLength,_data.length);
-
- _secretKeySpec = new SecretKeySpec(_secretKeyEncoded, "AES");
- Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
- cipher.init(Cipher.ENCRYPT_MODE, _secretKeySpec, new
IvParameterSpec(_initializeVector));
- _encryptedMessage = cipher.doFinal(_unencrypted);
- _keyStore = KeyStore.getInstance("JKS");
-
_keyStore.load(getClass().getClassLoader().getResourceAsStream(TestSSLConstants.KEYSTORE),
TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
-
- final AMQConnection connection = mock(AMQConnection.class);
- final ConnectionSettings settings = mock(ConnectionSettings.class);
-
- when(session.getAMQConnection()).thenReturn(connection);
- when(connection.getConnectionSettings()).thenReturn(settings);
-
when(settings.getEncryptionTrustStore(any(ConnectionSettings.RemoteStoreFinder.class))).thenReturn(_keyStore);
- when(settings.getEncryptionKeyStore()).thenReturn(_keyStore);
-
when(settings.getEncryptionKeyStorePassword()).thenReturn(TestSSLConstants.KEYSTORE_PASSWORD);
-
- _encryptionHelper = new MessageEncryptionHelper(session);
-
when(session.getMessageEncryptionHelper()).thenReturn(_encryptionHelper);
-
+ if(isStrongEncryptionEnabled())
+ {
+ final AMQSession session = mock(AMQSession.class);
+ _messageFactoryRegistry =
MessageFactoryRegistry.newDefaultRegistry(session);
+ _messageFactory = new
Encrypted091MessageFactory(_messageFactoryRegistry);
+
+
+ _props = new BasicContentHeaderProperties();
+ _props.setContentType("text/plain");
+
+ final int headerLength = _props.getPropertyListSize() + 2;
+ _unencrypted = new byte[headerLength + _data.length];
+ BytesDataOutput output = new BytesDataOutput(_unencrypted);
+ output.writeShort((short) (_props.getPropertyFlags() & 0xffff));
+ _props.writePropertyListPayload(output);
+
+
+ System.arraycopy(_data, 0, _unencrypted, headerLength,
_data.length);
+
+ _secretKeySpec = new SecretKeySpec(_secretKeyEncoded, "AES");
+ Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+ cipher.init(Cipher.ENCRYPT_MODE, _secretKeySpec, new
IvParameterSpec(_initializeVector));
+ _encryptedMessage = cipher.doFinal(_unencrypted);
+ _keyStore = KeyStore.getInstance("JKS");
+
_keyStore.load(getClass().getClassLoader().getResourceAsStream(TestSSLConstants.KEYSTORE),
+ TestSSLConstants.KEYSTORE_PASSWORD.toCharArray());
+
+ final AMQConnection connection = mock(AMQConnection.class);
+ final ConnectionSettings settings = mock(ConnectionSettings.class);
+
+ when(session.getAMQConnection()).thenReturn(connection);
+ when(connection.getConnectionSettings()).thenReturn(settings);
+
when(settings.getEncryptionTrustStore(any(ConnectionSettings.RemoteStoreFinder.class))).thenReturn(_keyStore);
+ when(settings.getEncryptionKeyStore()).thenReturn(_keyStore);
+
when(settings.getEncryptionKeyStorePassword()).thenReturn(TestSSLConstants.KEYSTORE_PASSWORD);
+
+ _encryptionHelper = new MessageEncryptionHelper(session);
+
when(session.getMessageEncryptionHelper()).thenReturn(_encryptionHelper);
+ }
}
public void testDecryptsMessage() throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
