You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2016/11/16 02:35:51 UTC

svn commit: r1769907 - /httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java

Author: ggregory
Date: Wed Nov 16 02:35:51 2016
New Revision: 1769907

URL: http://svn.apache.org/viewvc?rev=1769907&view=rev
Log:
Tweak test for Java 9 (on Windows at least).

Modified:
    httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java?rev=1769907&r1=1769906&r2=1769907&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java Wed Nov 16 02:35:51 2016
@@ -33,6 +33,7 @@ import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.SocketException;
 import java.net.URL;
 import java.security.KeyStore;
 import java.security.Principal;
@@ -584,6 +585,8 @@ public class TestSSLContextBuilder {
         final boolean isWindows = System.getProperty("os.name").contains("Windows");
         if (isWindows && javaVersion < 1.8) {
             thrown.expect(IOException.class);
+        } else if (isWindows && javaVersion < 10) {
+            thrown.expect(SocketException.class);
         } else {
             thrown.expect(SSLHandshakeException.class);
         }