Tests: line up test console results passed/failed/skipped

Author: cconlon

src/test/com/wolfssl/provider/jsse/test/WolfSSLContextTest.java

@@ -1038,7 +1038,7 @@ public void testContextDefaultParamsExcludeAnon() throws Exception {
         }
 
         if (!haveAnon) {
-            System.out.println("\t... skipped (no anon suites)");
+            System.out.println("\t... skipped");
             return;
         }
 

src/test/com/wolfssl/provider/jsse/test/WolfSSLEngineMemoryLeakTest.java

@@ -104,8 +104,7 @@ public void testEngineMemoryLeakWithAbandonedEngines() throws Exception {
         final double maxAcceptableGrowthMB = 80.0;
 
         String javaVersion = System.getProperty("java.version");
-        System.out.print("\tmem leak test with " + numEngines +
-                         " engines (JDK " + javaVersion + ")");
+        System.out.print("\tmem leak test with " + numEngines + " engines");
 
         /* Measure baseline memory - use aggressive GC */
         for (int i = 0; i < 3; i++) {

src/test/com/wolfssl/provider/jsse/test/WolfSSLEngineTest.java

@@ -2701,7 +2701,7 @@ else if (!s.contains("_anon_") && nonAnonSuite == null) {
         }
 
         if (anonSuite == null) {
-            pass("\t... skipped (no anon suites)");
+            pass("\t... skipped");
             return;
         }
 
@@ -2760,7 +2760,7 @@ public void testSSLHandshakeExceptionCauseChain()
                KeyManagementException, KeyStoreException,
                CertificateException, IOException, UnrecoverableKeyException {
 
-        System.out.print("\tSSLEngine SSLHandshakeException cause chain");
+        System.out.print("\tSSLHandshakeException cause");
 
         final String rejectMsg = "Intentional engine test rejection";
         TrustManager[] rejectingTMs = { new X509TrustManager() {
@@ -2880,7 +2880,7 @@ public void testCloseNotifyTLS13HandshakeStatus()
 
         /* TLS 1.3 close_notify should return NOT_HANDSHAKING,
          * not NEED_WRAP (RFC 8446 Section 6.1). */
-        System.out.print("\tTesting TLS 1.3 close_notify status");
+        System.out.print("\tTLS 1.3 close_notify status");
 
         String[] proto = {"TLSv1.3"};
         this.ctx = tf.createSSLContext("TLSv1.3", engineProvider);
@@ -2977,7 +2977,7 @@ public void testBufferUnderflowPartialRecord()
 
         /* Test that unwrap() returns BUFFER_UNDERFLOW with 0 bytes
          * consumed when given a partial TLS record. */
-        System.out.print("\tTesting BUFFER_UNDERFLOW partial record");
+        System.out.print("\tUnderflow partial record");
 
         this.ctx = tf.createSSLContext("TLS", engineProvider);
         SSLEngine server = this.ctx.createSSLEngine();
@@ -3431,7 +3431,7 @@ public void testBufferOverflowSmallOutput()
 
         /* Test BUFFER_OVERFLOW with small output, then retry
          * with larger buffer. */
-        System.out.print("\tTesting BUFFER_OVERFLOW small output");
+        System.out.print("\tOverflow small output");
 
         this.ctx = tf.createSSLContext("TLS", engineProvider);
         SSLEngine server = this.ctx.createSSLEngine();

src/test/com/wolfssl/provider/jsse/test/WolfSSLKeyX509Test.java

@@ -1118,7 +1118,7 @@ public void testChooseAliasSkipsCertOnlyEntries()
                KeyManagementException, CertificateException, IOException,
                NoSuchProviderException, UnrecoverableKeyException {
 
-        System.out.print("\tTesting chooseAlias skips cert-only");
+        System.out.print("\tchooseAlias skips cert-only");
 
         KeyManager[] km = tf.createKeyManager("SunX509", tf.allJKS, provider);
         X509ExtendedKeyManager x509km = (X509ExtendedKeyManager) km[0];

src/test/com/wolfssl/provider/jsse/test/WolfSSLServerSocketFactoryTest.java

@@ -267,7 +267,7 @@ public void testServerFactoryAnonCipherSuiteFiltering()
         }
 
         if (!haveAnon) {
-            System.out.println("\t\t\t... skipped (no anon suites)");
+            System.out.println("\t\t\t... skipped");
             return;
         }
 

src/test/com/wolfssl/provider/jsse/test/WolfSSLServerSocketTest.java

@@ -918,7 +918,7 @@ else if (!s.contains("_anon_") && nonAnonSuite == null) {
         }
 
         if (anonSuite == null) {
-            System.out.println("\t\t... skipped (no anon suites)");
+            System.out.println("\t\t... skipped");
             return;
         }
 

src/test/com/wolfssl/provider/jsse/test/WolfSSLSessionContextTest.java

@@ -612,7 +612,7 @@ public void testSessionTimeoutBoundaryExpiry()
 
         /* Regression: session must expire at exactly the
          * timeout boundary (diff >= timeout, not diff > timeout) */
-        System.out.print("\tTesting session timeout boundary");
+        System.out.print("\tSession timeout boundary");
 
         String originalProp = Security.getProperty(
             "wolfjsse.clientSessionCache.disabled");
@@ -717,7 +717,7 @@ public void testSessionInvalidationFilteredFromGetIds()
 
         /* Regression: invalidated sessions must be filtered
          * from getIds() and getSession(). */
-        System.out.print("\tTesting invalidation filtered from getIds");
+        System.out.print("\tInvalidation filtered getIds");
 
         String originalProp = Security.getProperty(
             "wolfjsse.clientSessionCache.disabled");

src/test/com/wolfssl/provider/jsse/test/WolfSSLSocketFactoryTest.java

@@ -458,7 +458,7 @@ public void testFactoryAnonCipherSuiteFiltering()
         }
 
         if (!haveAnon) {
-            System.out.println("\t\t... skipped (no anon suites)");
+            System.out.println("\t\t... skipped");
             return;
         }
 

src/test/com/wolfssl/provider/jsse/test/WolfSSLSocketTest.java

@@ -4366,7 +4366,7 @@ else if (!s.contains("_anon_") && nonAnonSuite == null) {
         }
 
         if (anonSuite == null) {
-            System.out.println("\t... skipped (no anon suites)");
+            System.out.println("\t... skipped");
             return;
         }
 
@@ -4426,7 +4426,7 @@ public void testSSLHandshakeExceptionCauseChain()
                UnrecoverableKeyException, InterruptedException,
                java.util.concurrent.ExecutionException {
 
-        System.out.print("\tSSLHandshakeException cause chain");
+        System.out.print("\tSSLHandshakeException cause");
 
         /* Create server context with valid certs */
         SSLContext srvCtx = tf.createSSLContext("TLS", ctxProvider);

src/test/com/wolfssl/provider/jsse/test/WolfSSLTrustX509Test.java

@@ -3490,7 +3490,7 @@ public void testInitWithCertPathTrustManagerParameters()
                KeyStoreException, IOException, CertificateException,
                InvalidAlgorithmParameterException {
 
-        System.out.print("\tTesting init(CertPathTrustManagerParameters)");
+        System.out.print("\tinit(CPTrustManagerParameters)");
 
         /* Load CA certs and create TrustAnchors manually */
         KeyStore caStore = KeyStore.getInstance(
@@ -3543,7 +3543,7 @@ public void testInitWithKeyStoreBuilderParameters()
                KeyStoreException, IOException, CertificateException,
                InvalidAlgorithmParameterException {
 
-        System.out.print("\tTesting init(KeyStoreBuilderParameters)");
+        System.out.print("\tinit(KeyStoreBuilderParameters)");
 
         KeyStore.Builder ksBuilder = KeyStore.Builder.newInstance(
             WolfSSLTestFactory.isAndroid() ? "BKS" : "JKS",