Better assertions

common/src/test/java/org/conscrypt/javax/net/ssl/SSLSessionTest.java

@@ -83,7 +83,7 @@ public void test_SSLSession_getCipherSuite() {
 
     @Test
     public void test_SSLSession_getCreationTime() {
-        // TODO(prb) seems to fail regularly on Windows with sTime <= t1
+        // TODO(prb) seems to fail regularly on Windows with sTime > t1
         assumeFalse("Skipping SSLSession_getCreationTime() test on Windows", isWindows());
 
         // We use OpenSSL, which only returns times accurate to the nearest second.

openjdk/src/test/java/org/conscrypt/NativeCryptoTest.java

@@ -26,7 +26,6 @@
 import static org.conscrypt.NativeConstants.TLS1_1_VERSION;
 import static org.conscrypt.NativeConstants.TLS1_2_VERSION;
 import static org.conscrypt.NativeConstants.TLS1_VERSION;
-import static org.conscrypt.TestUtils.isWindows;
 import static org.conscrypt.TestUtils.openTestFile;
 import static org.conscrypt.TestUtils.readTestFile;
 import static org.junit.Assert.assertEquals;
@@ -36,7 +35,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.when;
 
@@ -853,7 +851,7 @@
                     // Create a NULL-terminated modified UTF-8 representation of pskIdentity.
                     byte[] b;
                     try {
                         b = pskIdentity.getBytes("UTF-8");
                     } catch (UnsupportedEncodingException e) {
                         throw new RuntimeException("UTF-8 encoding not supported", e);
                     }
@@ -1394,7 +1392,7 @@
         ServerHooks sHooks = new ServerHooks();
         cHooks.pskEnabled = true;
         sHooks.pskEnabled = true;
         cHooks.pskKey = "1, 2, 3, 4, Testing...".getBytes("UTF-8");
         sHooks.pskKey = cHooks.pskKey;
         Future<TestSSLHandshakeCallbacks> client = handshake(listener, 0, true, cHooks, null, null);
         Future<TestSSLHandshakeCallbacks> server =
@@ -2496,18 +2494,16 @@
 
     @Test
     public void test_SSL_SESSION_get_time() throws Exception {
-        // TODO(prb) seems to fail regularly on Windows with time < System.currentTimeMillis()
-        assumeFalse("Skipping SSLSession_getCreationTime() test on Windows", isWindows());
-
         final ServerSocket listener = newServerSocket();
         {
             Hooks cHooks = new Hooks() {
                 @Override
                 public void afterHandshake(long session, long s, long c, Socket sock,
                         FileDescriptor fd, SSLHandshakeCallbacks callback) throws Exception {
                     long time = NativeCrypto.SSL_SESSION_get_time(session);
-                    assertTrue(time != 0);
-                    assertTrue(time < System.currentTimeMillis());
+                    long now = System.currentTimeMillis();
+                    assertTrue(time + " != 0", time != 0);
+                    assertTrue(time + " <= " + now, time <= now);
                     super.afterHandshake(session, s, c, sock, fd, callback);
                 }
             };