svn commit: r1695163 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java

[markt]

Author: markt
Date: Mon Aug 10 20:34:00 2015
New Revision: 1695163

URL: http://svn.apache.org/r1695163
Log:
Get the tests to pass with 1.0.2 and 1.1.0

Modified:
    
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java?rev=1695163&r1=1695162&r2=1695163&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
 Mon Aug 10 20:34:00 2015
@@ -26,13 +26,17 @@ public class TestOpenSSLCipherConfigurat
 
     @Test
     public void testDEFAULT() throws Exception {
-        testSpecification("DEFAULT");
+        // EXPORT was removed from DEFAULT in 1.1.0 but we prefer the old
+        // behaviour
+        testSpecification("DEFAULT:!EXPORT");
     }
 
 
     @Test
     public void testCOMPLEMENTOFDEFAULT() throws Exception {
-        testSpecification("COMPLEMENTOFDEFAULT");
+        // EXPORT was removed from DEFAULT in 1.1.0 but we prefer the old
+        // behaviour
+        testSpecification("COMPLEMENTOFDEFAULT:EXPORT");
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org