Author: violetagg
Date: Thu Nov 24 13:06:37 2016
New Revision: 1771126
URL: http://svn.apache.org/viewvc?rev=1771126&view=rev
Log:
If there are test failures, provide more detailed information. Patch provided
by Emmanuel Bourg.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
tomcat/trunk/webapps/docs/changelog.xml
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=1771126&r1=1771125&r2=1771126&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 Nov 24 13:06:37 2016
@@ -17,6 +17,7 @@
package org.apache.tomcat.util.net.openssl.ciphers;
import java.util.List;
+import java.util.TreeSet;
import org.junit.Assert;
import org.junit.Ignore;
@@ -562,8 +563,11 @@ public class TestOpenSSLCipherConfigurat
// 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));
+ Assert.assertEquals(
+ "Expected " + jsseCipherListFromParser.size() + " ciphers but
got "
+ + jsseCipherListFromOpenSSL.size() + " for the
specification '"
+ + specification + "'",
+ new TreeSet<>(jsseCipherListFromParser), new
TreeSet<>(jsseCipherListFromOpenSSL));
// OpenSSL treats many ciphers as having equal preference. The order
// returned depends on the order they are requested. The following code
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1771126&r1=1771125&r2=1771126&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 24 13:06:37 2016
@@ -171,6 +171,11 @@
whether the output of the tests is displayed on the console or not.
Patch provided by Emmanuel Bourg. (violetagg)
</add>
+ <scode>
+ <code>TestOpenSSLCipherConfigurationParser.testSpecification</code>
+ - if there are test failures, provide more detailed information. Patch
+ provided by Emmanuel Bourg. (violetagg)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
