Author: markt
Date: Sat Aug 8 13:44:15 2015
New Revision: 1694799
URL: http://svn.apache.org/r1694799
Log:
Try again to track multiple failures.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1694799&r1=1694798&r2=1694799&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Sat Aug 8 13:44:15 2015
@@ -50,21 +50,23 @@ public class TestCipher {
OpenSSLCipherConfigurationParser.parseExpression(openSSLCipherSuite);
for (JsseImpl jsseImpl : JSSE_IMPLS) {
+ boolean found = false;
for (String jsseCipherSuite : jsseCipherSuites) {
if (jsseImpl.getStandardNames().contains(jsseCipherSuite))
{
- if
(jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite)) {
+ found = true;
+ if
(!jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite)) {
errors.append("Mapping found in " +
jsseImpl.getVendor() +
"'s JSSE implementation for " +
openSSLCipherSuite +
" when none was expected\n");
}
- } else {
- if
(!jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite)) {
- errors.append("No mapping found in " +
jsseImpl.getVendor() +
- "'s JSSE implementation for " +
openSSLCipherSuite +
- " when one was expected\n");
- }
+ break;
}
}
+ if (!found &&
jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite)) {
+ errors.append("No mapping found in " +
jsseImpl.getVendor() +
+ "'s JSSE implementation for " + openSSLCipherSuite
+
+ " when one was expected");
+ }
}
}
Assert.assertTrue(errors.toString(), errors.length() == 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
