svn commit: r1615011 - in /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl: TestOpenSSLCipherConfigurationParser.java TesterOpenSSL.java

[markt]

Author: markt
Date: Thu Jul 31 22:00:19 2014
New Revision: 1615011

URL: http://svn.apache.org/r1615011
Log:
More unit tests for individual alias strings
Handle the case when OpenSSL has no ciphers that match the specification

Modified:
    
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
    tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java?rev=1615011&r1=1615010&r2=1615011&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
 Thu Jul 31 22:00:19 2014
@@ -116,6 +116,64 @@ public class TestOpenSSLCipherConfigurat
     }
 
 
+    @Test
+    public void testkDHr() throws Exception {
+        testSpecification("kDHr");
+    }
+
+
+    @Test
+    public void testkDHd() throws Exception {
+        testSpecification("kDHd");
+    }
+
+
+    @Test
+    public void testkDH() throws Exception {
+        testSpecification("kDH");
+    }
+
+
+    @Test
+    public void testkECDHr() throws Exception {
+        testSpecification("kECDHr");
+    }
+
+
+    @Test
+    public void testkECDHe() throws Exception {
+        testSpecification("kECDHe");
+    }
+
+
+    @Test
+    public void testkECDH() throws Exception {
+        testSpecification("kECDH");
+    }
+
+
+    @Test
+    public void testkEECDH() throws Exception {
+        testSpecification("kEECDH");
+    }
+
+
+    // TODO
+    @Test
+    @Ignore("Currently failing - needs investigation")
+    public void testECDH() throws Exception {
+        testSpecification("ECDH");
+    }
+
+
+    // TODO
+    @Test
+    @Ignore("Currently failing - needs investigation")
+    public void testkECDHE() throws Exception {
+        testSpecification("kECDHE");
+    }
+
+
     private void testSpecification(String specification) throws Exception {
         // Filter out cipher suites that OpenSSL does not implement
         String parserSpecification = "" + specification;

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=1615011&r1=1615010&r2=1615011&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 
Thu Jul 31 22:00:19 2014
@@ -25,8 +25,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Assert;
-
 import org.apache.catalina.util.IOTools;
 import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
 
@@ -141,7 +139,9 @@ public class TesterOpenSSL {
         ByteArrayOutputStream stderrBytes = new ByteArrayOutputStream();
         IOTools.flow(stderr, stderrBytes);
         String errorText = stderrBytes.toString();
-        Assert.assertTrue(errorText, errorText.length() == 0);
+        if (errorText.length() > 0) {
+            System.err.println(errorText);
+        }
 
         ByteArrayOutputStream stdoutBytes = new ByteArrayOutputStream();
         IOTools.flow(stdout, stdoutBytes);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org