Remove workarounds from JSSE tests now that SSLServerSocket.accept no longer tries to handshake

Change-Id: I1188c34901b4c2c42d6b88e798e2eda24b0bfc4c

2 files changed, 11 insertions, 13 deletions

diff --git a/support/src/test/java/javax/net/ssl/TestSSLSessions.java b/support/src/test/java/javax/net/ssl/TestSSLSessions.java
index 061a7f2..23b8ed5 100644
--- a/support/src/test/java/javax/net/ssl/TestSSLSessions.java
+++ b/support/src/test/java/javax/net/ssl/TestSSLSessions.java
@@ -59,7 +59,7 @@ public final class TestSSLSessions {
             SSLSocketFactory sf = (SSLSocketFactory) SSLSocketFactory.getDefault();
             SSLSocket ssl = (SSLSocket) sf.createSocket();
             SSLSession invalid = ssl.getSession();
-            TestSSLSocketPair s = TestSSLSocketPair.create_workaround();
+            TestSSLSocketPair s = TestSSLSocketPair.create();
             return new TestSSLSessions(invalid, s.server.getSession(), s.client.getSession(), s);
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/support/src/test/java/javax/net/ssl/TestSSLSocketPair.java b/support/src/test/java/javax/net/ssl/TestSSLSocketPair.java
index 6347877..4409183 100644
--- a/support/src/test/java/javax/net/ssl/TestSSLSocketPair.java
+++ b/support/src/test/java/javax/net/ssl/TestSSLSocketPair.java
@@ -35,12 +35,11 @@ public final class TestSSLSocketPair {
     }
 
     /**
-     * based on test_SSLSocket_startHandshake_workaround, should
-     * be written to non-workaround form when possible
+     * based on test_SSLSocket_startHandshake
      */
-    public static TestSSLSocketPair create_workaround () {
+    public static TestSSLSocketPair create () {
         TestSSLContext c = TestSSLContext.create();
-        SSLSocket[] sockets = connect_workaround(c, null);
+        SSLSocket[] sockets = connect(c, null);
         return new TestSSLSocketPair(c, sockets[0], sockets[1]);
     }
 
@@ -49,15 +48,16 @@ public final class TestSSLSocketPair {
      * existing SSLContext. Optional clientCipherSuites allows
      * forcing new SSLSession to test SSLSessionContext caching
      */
-    public static SSLSocket[] connect_workaround (final TestSSLContext c,
-                                                  String[] clientCipherSuites) {
+    public static SSLSocket[] connect (final TestSSLContext c,
+                                       String[] clientCipherSuites) {
         try {
-            final SSLSocket[] server = new SSLSocket[1];
+            SSLSocket client = (SSLSocket)
+                c.sslContext.getSocketFactory().createSocket(c.host, c.port);
+            final SSLSocket server = (SSLSocket) c.serverSocket.accept();
             Thread thread = new Thread(new Runnable () {
                     public void run() {
                         try {
-                            server[0] = (SSLSocket) c.serverSocket.accept();
-                            server[0].startHandshake();
+                            server.startHandshake();
                         } catch (RuntimeException e) {
                             throw e;
                         } catch (Exception e) {
@@ -66,14 +66,12 @@ public final class TestSSLSocketPair {
                     }
                 });
             thread.start();
-            SSLSocket client = (SSLSocket)
-                c.sslContext.getSocketFactory().createSocket(c.host, c.port);
             if (clientCipherSuites != null) {
                 client.setEnabledCipherSuites(clientCipherSuites);
             }
             client.startHandshake();
             thread.join();
-            return new SSLSocket[] { server[0], client };
+            return new SSLSocket[] { server, client };
         } catch (RuntimeException e) {
             throw e;
         } catch (Exception e) {