You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/11/26 15:06:18 UTC
svn commit: r1716661 - in /qpid/java/branches/6.0.x: ./
systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java
Author: orudyy
Date: Thu Nov 26 14:06:18 2015
New Revision: 1716661
URL: http://svn.apache.org/viewvc?rev=1716661&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
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1715447 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:06:18 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715446
+/qpid/java/trunk:1715445-1715447
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java?rev=1716661&r1=1716660&r2=1716661&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/systest/messageencryption/MessageEncryptionTest.java Thu Nov 26 14:06:18 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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org