Author: robbie
Date: Fri Nov 20 23:36:51 2015
New Revision: 1715447
URL: http://svn.apache.org/viewvc?rev=1715447&view=rev
Log:
QPID-6874, QPID-6576: skip these tests when using the cpp broker, pending
further examination of which if any can work against it
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java?rev=1715447&r1=1715446&r2=1715447&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java
Fri Nov 20 23:36:51 2015
@@ -53,7 +53,7 @@ public class MessageEncryptionTest exten
public void testEncryptionUsingMessageHeader() throws Exception
{
- if(isStrongEncryptionEnabled())
+ if(isStrongEncryptionEnabled() && !isCppBroker())
{
super.setUp();
Map<String, String> prodConnOptions = new HashMap<>();
@@ -94,7 +94,7 @@ public class MessageEncryptionTest exten
public void testEncryptionFromADDRAddress() throws Exception
{
- if(isStrongEncryptionEnabled())
+ if(isStrongEncryptionEnabled() && !isCppBroker())
{
super.setUp();
Map<String, String> prodConnOptions = new HashMap<>();
@@ -132,7 +132,7 @@ public class MessageEncryptionTest exten
public void testEncryptionFromBURLAddress() throws Exception
{
- if(isStrongEncryptionEnabled())
+ if(isStrongEncryptionEnabled() && !isCppBroker())
{
super.setUp();
Map<String, String> prodConnOptions = new HashMap<>();
@@ -175,7 +175,7 @@ public class MessageEncryptionTest exten
public void testBrokerAsTrustStoreProvider() throws Exception
{
- if(isStrongEncryptionEnabled())
+ if(isStrongEncryptionEnabled() && !isCppBroker())
{
addPeerStoreToBroker();
super.setUp();
@@ -218,7 +218,7 @@ public class MessageEncryptionTest exten
public void testUnknownRecipient() throws Exception
{
- if(isStrongEncryptionEnabled())
+ if(isStrongEncryptionEnabled() && !isCppBroker())
{
addPeerStoreToBroker();
super.setUp();
@@ -262,7 +262,7 @@ public class MessageEncryptionTest exten
public void testRecipientHasNoValidCert() throws Exception
{
- if(isStrongEncryptionEnabled())
+ if(isStrongEncryptionEnabled() && !isCppBroker())
{
super.setUp();
Map<String, String> prodConnOptions = new HashMap<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
