Author: markt
Date: Fri Aug 7 17:39:20 2015
New Revision: 1694714
URL: http://svn.apache.org/r1694714
Log:
Report multiple test failures in a single run rather than stopping at first.
Align with current Gump test env
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.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=1694714&r1=1694713&r2=1694714&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
Fri Aug 7 17:39:20 2015
@@ -43,30 +43,31 @@ public class TestCipher {
public void testAllOpenSSLCiphersMapped() throws Exception {
Set<String> openSSLCipherSuites =
TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL");
+ StringBuilder errors = new StringBuilder();
+
for (String openSSLCipherSuite : openSSLCipherSuites) {
List<String> jsseCipherSuites =
OpenSSLCipherConfigurationParser.parseExpression(openSSLCipherSuite);
for (JsseImpl jsseImpl : JSSE_IMPLS) {
- boolean found = false;
for (String jsseCipherSuite : jsseCipherSuites) {
if (jsseImpl.getStandardNames().contains(jsseCipherSuite))
{
- found = true;
- Assert.assertFalse("Mapping found in " +
jsseImpl.getVendor() +
+ if
(jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite)) {
+ errors.append("Mapping found in " +
jsseImpl.getVendor() +
"'s JSSE implementation for " +
openSSLCipherSuite +
- " when none was expected",
-
jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite));
- break;
+ " 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");
+ }
}
}
- if (!found) {
- Assert.assertTrue("No mapping found in " +
jsseImpl.getVendor() +
- "'s JSSE implementation for " + openSSLCipherSuite
+
- " when one was expected",
-
jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite));
- }
}
}
+ Assert.assertTrue(errors.toString(), errors.length() == 0);
}
@@ -584,7 +585,10 @@ public class TestCipher {
"DHE-DSS-CAMELLIA256-SHA+SSLv3",
"DHE-DSS-CAMELLIA256-SHA256+TLSv1.2",
"DHE-DSS-SEED-SHA+SSLv3",
+ "DHE-PSK-AES128-CBC-SHA+SSLv3",
+ "DHE-PSK-AES256-GCM-SHA384+TLSv1.2",
"DHE-PSK-NULL-SHA+SSLv3",
+ "DHE-PSK-NULL-SHA384+SSLv3",
"DHE-RSA-CAMELLIA128-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1694714&r1=1694713&r2=1694714&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Fri Aug 7 17:39:20 2015
@@ -36,6 +36,7 @@ public class TesterOpenSSL {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
// The following ciphers are not implemented in an OpenSSL
// version
+ Cipher.SSL2_DES_64_CBC_WITH_MD5,
Cipher.SSL_CK_RC2_128_CBC_WITH_MD5,
// The following are not implemented in 1.1.x onwards. They
// are implemented in 1.0.x and earlier
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
