IosSslSocket implementation: enable some SSLSocketFactory tests.

Change on 2018/10/05 by antoniocortes <antoniocortes@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=215942099
google · Oct 9, 2018 · 2dd294e · 2dd294e
1 parent aa558fa
commit 2dd294e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/...mony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketFactoryTest.java b/...mony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketFactoryTest.java
@@ -61,7 +61,7 @@ public void test_getDefault() {
     /**
      * javax.net.ssl.SSLSocketFactory#createSocket(Socket s, String host, int port, boolean autoClose)
      */
-    public void test_createSocket() throws Exception {
+    public void j2objcNotImplemented_test_createSocket() throws Exception {
         SSLSocketFactory sf = (SSLSocketFactory)SSLSocketFactory.getDefault();
         int sport = startServer("test_createSocket()");
         int[] invalid = {
@@ -103,7 +103,7 @@ public void test_createSocket() throws Exception {
     /**
      * javax.net.ssl.SSLSocketFactory#getDefaultCipherSuites()
      */
-    public void test_getDefaultCipherSuites() {
+    public void j2objcNotImplemented_test_getDefaultCipherSuites() {
         try {
             SSLSocketFactory sf = (SSLSocketFactory) SSLSocketFactory.getDefault();
             assertTrue("no default cipher suites returned",
@@ -116,7 +116,7 @@ public void test_getDefaultCipherSuites() {
     /**
      * javax.net.ssl.SSLSocketFactory#getSupportedCipherSuites()
      */
-    public void test_getSupportedCipherSuites() {
+    public void j2objcNotImplemented_test_getSupportedCipherSuites() {
         try {
             SSLSocketFactory sf = (SSLSocketFactory) SSLSocketFactory.getDefault();
             assertTrue("no supported cipher suites returned",

diff --git a/...droid/platform/libcore/luni/src/test/java/libcore/javax/net/ssl/SSLSocketFactoryTest.java b/...droid/platform/libcore/luni/src/test/java/libcore/javax/net/ssl/SSLSocketFactoryTest.java
@@ -137,7 +137,8 @@ public Socket createSocket(String host, int port) {
         }
     }
 
-    public void test_SSLSocketFactory_getDefault_cacheInvalidate() throws Exception {
+    public void j2objcNotImplemented_test_SSLSocketFactory_getDefault_cacheInvalidate()
+        throws Exception {
         String origProvider = resetSslProvider();
         try {
             SocketFactory sf1 = SSLSocketFactory.getDefault();
@@ -205,7 +206,7 @@ private String resetSslProvider() {
         return origProvider;
     }
 
-    public void test_SSLSocketFactory_defaultConfiguration() throws Exception {
+    public void j2objcNotImplemented_test_SSLSocketFactory_defaultConfiguration() throws Exception {
         SSLConfigurationAsserts.assertSSLSocketFactoryDefaultConfiguration(
                 (SSLSocketFactory) SSLSocketFactory.getDefault());
     }
@@ -220,7 +221,7 @@ public void test_SSLSocketFactory_getSupportedCipherSuitesReturnsCopies() {
         assertNotSame(sf.getSupportedCipherSuites(), sf.getSupportedCipherSuites());
     }
 
-    public void test_SSLSocketFactory_createSocket() throws Exception {
+    public void j2objcNotImplemented_test_SSLSocketFactory_createSocket() throws Exception {
         try {
             SSLSocketFactory sf = (SSLSocketFactory) SSLSocketFactory.getDefault();
             Socket s = sf.createSocket(null, null, -1, false);

diff --git a/jre_emul/test_sources.mk b/jre_emul/test_sources.mk
@@ -835,10 +835,8 @@ COPIED_ARC_TEST_SOURCES = \
 
 TESTS_TO_SKIP = \
     jsr166/ExchangerTest.java \
-    libcore/javax/net/ssl/SSLSocketFactoryTest.java \
     libcore/javax/net/ssl/SSLSocketTest.java \
-    org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java \
-    org/apache/harmony/tests/javax/net/ssl/SSLSocketFactoryTest.java
+    org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java
 
 # Most of these tests are failing for a common index-out-of-range error.
 FAILING_MATH_TESTS = \