Author: markt
Date: Thu Mar 3 10:57:41 2016
New Revision: 1733442
URL: http://svn.apache.org/viewvc?rev=1733442&view=rev
Log:
Restore the original checks
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?rev=1733442&r1=1733441&r2=1733442&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Thu Mar 3 10:57:41 2016
@@ -502,8 +502,10 @@ public class TestOpenSSLCipherConfigurat
TesterOpenSSL.removeUnimplementedCiphersJsse(jsseCipherListFromParser);
- // Check the lists have the same entries
- Assert.assertEquals(jsseCipherListFromOpenSSL,
jsseCipherListFromParser);
+ // First check the lists have the same entries
+ // Order is NOT important at this point. It is checked below.
+ Assert.assertEquals(jsseCipherListFromOpenSSL.size(),
jsseCipherListFromParser.size());
+
Assert.assertTrue(jsseCipherListFromOpenSSL.containsAll(jsseCipherListFromParser));
// OpenSSL treats many ciphers as having equal preference. The order
// returned depends on the order they are requested. The following code
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
