diff options
| -rw-r--r-- | luni/src/test/java/libcore/javax/net/ssl/SSLEngineTest.java | 20 | ||||
| -rw-r--r-- | support/src/test/java/libcore/javax/net/ssl/TestSSLEnginePair.java | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/luni/src/test/java/libcore/javax/net/ssl/SSLEngineTest.java b/luni/src/test/java/libcore/javax/net/ssl/SSLEngineTest.java index a7d0df2..7adbdf5 100644 --- a/luni/src/test/java/libcore/javax/net/ssl/SSLEngineTest.java +++ b/luni/src/test/java/libcore/javax/net/ssl/SSLEngineTest.java @@ -578,13 +578,19 @@ public class SSLEngineTest extends TestCase { } public void test_SSLEngine_setEnableSessionCreation_server() throws Exception { - TestSSLEnginePair p = TestSSLEnginePair.create(new TestSSLEnginePair.Hooks() { - @Override - void beforeBeginHandshake(SSLEngine client, SSLEngine server) { - server.setEnableSessionCreation(false); - } - }); - assertNotConnected(p); + try { + TestSSLEnginePair p = TestSSLEnginePair.create(new TestSSLEnginePair.Hooks() { + @Override + void beforeBeginHandshake(SSLEngine client, SSLEngine server) { + server.setEnableSessionCreation(false); + } + }); + // For some reason, the RI doesn't throw an SSLException. + assertTrue(StandardNames.IS_RI); + assertNotConnected(p); + } catch (SSLException maybeExpected) { + assertFalse(StandardNames.IS_RI); + } } public void test_SSLEngine_setEnableSessionCreation_client() throws Exception { diff --git a/support/src/test/java/libcore/javax/net/ssl/TestSSLEnginePair.java b/support/src/test/java/libcore/javax/net/ssl/TestSSLEnginePair.java index 79d5d00..709f568 100644 --- a/support/src/test/java/libcore/javax/net/ssl/TestSSLEnginePair.java +++ b/support/src/test/java/libcore/javax/net/ssl/TestSSLEnginePair.java @@ -125,7 +125,7 @@ public final class TestSSLEnginePair extends Assert { if (finished != null) { assertEquals(2, finished.length); finished[0] = clientFinished[0]; - finished[1] = clientFinished[0]; + finished[1] = serverFinished[0]; } return new SSLEngine[] { server, client }; } |