From 4e1404f2017dc7db05b69ecad241f78c5bb1a4ee Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Fri, 21 Nov 2014 14:42:37 -0800 Subject: Assert finite default timeout for TLS/SSL sessions. This makes CTS tests expect 8 hours as the default timeout for TLS/SSL sessions. Prior to this change, sessions were expected to not time out by default. Bug: 18370076 Change-Id: I09ae9ee91df2fb4bb2e8cc812127dc9f05a14696 --- support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'support/src') diff --git a/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java b/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java index 8dd2085..8173e9d 100644 --- a/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java +++ b/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java @@ -53,7 +53,8 @@ public final class TestSSLContext extends Assert { private static final boolean IS_RI = StandardNames.IS_RI; public static final int EXPECTED_DEFAULT_CLIENT_SSL_SESSION_CACHE_SIZE = (IS_RI) ? 0 : 10; public static final int EXPECTED_DEFAULT_SERVER_SSL_SESSION_CACHE_SIZE = (IS_RI) ? 0 : 100; - public static final int EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT = (IS_RI) ? 86400 : 0; + public static final int EXPECTED_DEFAULT_SSL_SESSION_CACHE_TIMEOUT = + (IS_RI) ? 24 * 3600 : 8 * 3600; /** * The Android SSLSocket and SSLServerSocket implementations are -- cgit v1.1