Author: rjung Date: Fri Sep 15 08:30:49 2017 New Revision: 1808433 URL: http://svn.apache.org/viewvc?rev=1808433&view=rev Log: Add some more info when test is failing like currently on gump.
Backport notice: String.join() is Java 8 only. Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java?rev=1808433&r1=1808432&r2=1808433&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java Fri Sep 15 08:30:49 2017 @@ -67,10 +67,14 @@ public class TestOpenSSLConf extends Tom public void testOpenSSLConfCmdCipher() throws Exception { SSLHostConfig sslHostConfig = initOpenSSLConfCmdCipher("CipherString", CIPHER); String[] ciphers = sslHostConfig.getEnabledCiphers(); - assertEquals("Checking enabled cipher count", 1, ciphers.length); + String cipherList = String.join(",", ciphers); + assertEquals("Checking enabled cipher count (ciphers " + + cipherList + ")", 1, ciphers.length); assertEquals("Checking enabled cipher", CIPHER, ciphers[0]); ciphers = SSLContext.getCiphers(sslHostConfig.getOpenSslContext().longValue()); - assertEquals("Checking context cipher count", 1, ciphers.length); + cipherList = String.join(",", ciphers); + assertEquals("Checking context cipher count (ciphers " + + cipherList + ")", 1, ciphers.length); assertEquals("Checking context cipher", CIPHER, ciphers[0]); } @@ -78,8 +82,10 @@ public class TestOpenSSLConf extends Tom public void testOpenSSLConfCmdProtocol() throws Exception { SSLHostConfig sslHostConfig = initOpenSSLConfCmdCipher("Protocol", PROTOCOL); String[] protocols = sslHostConfig.getEnabledProtocols(); - assertEquals("Checking enabled protocol count", 2, protocols.length); - assertEquals("Checking enabled protocol", EXPECTED_PROTOCOLS, - protocols[0] + "," + protocols[1]); + String protocolList = String.join(",", protocols); + assertEquals("Checking enabled protocol count (protocols " + + protocolList + ")", 2, protocols.length); + assertEquals("Checking enabled protocols", EXPECTED_PROTOCOLS, + protocolList); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org