Author: markt Date: Wed Mar 2 18:04:19 2016 New Revision: 1733343 URL: http://svn.apache.org/viewvc?rev=1733343&view=rev Log: Simplify the check and make failures easier to debug
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=1733343&r1=1733342&r2=1733343&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 Wed Mar 2 18:04:19 2016 @@ -660,9 +660,9 @@ public class TestOpenSSLCipherConfigurat TesterOpenSSL.removeUnimplementedCiphersJsse(jsseCipherListFromParser); - // First check the lists have the same entries - Assert.assertEquals(jsseCipherListFromOpenSSL.size(), jsseCipherListFromParser.size()); - Assert.assertTrue(jsseCipherListFromOpenSSL.containsAll(jsseCipherListFromParser)); + // Check the lists have the same entries in the same order + Assert.assertEquals(jsseCipherListFromOpenSSL.toString(), + jsseCipherListFromParser.toString()); // 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org