Bradford's comments

Author: myankelev

test/jdk/sun/security/ssl/X509KeyManager/NullCases.java

@@ -100,12 +100,32 @@ public void JDK6302304Test() throws Exception {
 
         final X509KeyManager km = generateNullKm();
 
-        km.getServerAliases(null, null);
-        km.getClientAliases(null, null);
-        km.getCertificateChain(null);
-        km.getPrivateKey(null);
-        km.chooseServerAlias(null, null, null);
-        km.chooseClientAlias(null, null, null);
+        final String[] serverAliases =
+                km.getServerAliases(null, null);
+        Asserts.assertNull(serverAliases,
+                "Should return null if server alias not found");
+        final String[] clientAliases =
+                km.getClientAliases(null, null);
+        Asserts.assertNull(clientAliases,
+                "Should return null if client alias not found");
+
+        final X509Certificate[] certs =
+                km.getCertificateChain(null);
+        final PrivateKey priv =
+                km.getPrivateKey(null);
+        Asserts.assertNull(certs,
+                "Should return null if the alias can't be found");
+        Asserts.assertNull(priv,
+                "Should return null if the alias can't be found");
+
+        final String serverAlias =
+                km.chooseServerAlias(null, null, null);
+        Asserts.assertNull(serverAlias,
+                "Should return null if the alias can't be chosen");
+        final String clientAlias =
+                km.chooseClientAlias(null, null, null);
+        Asserts.assertNull(clientAlias,
+                "Should return null if the alias can't be chosen");
     }
 
     @Test
@@ -164,7 +184,6 @@ public void nonexistentBuilderTest() {
 
     @Test
     public void nonexistentKSTest() {
-
         final X509Certificate[] certs = km.getCertificateChain("RSA.0.1");
         final PrivateKey priv = km.getPrivateKey("RSA.0.1");
 

test/jdk/sun/security/ssl/X509KeyManager/X509KeyManagerNegativeTests.java

@@ -67,7 +67,7 @@ public static void beforeAll() throws Exception {
         exceptionThrowingKS.load(null, null);
 
         exceptionThrowingKMF
-                .init((KeyStore) exceptionThrowingKS, null);
+                .init(exceptionThrowingKS, null);
         exceptionThrowingKM =
                 (X509KeyManager) exceptionThrowingKMF.getKeyManagers()[0];
     }
@@ -80,7 +80,6 @@ public static void cleanup() {
 
     @Test
     public void ksExceptionTest() {
-        // recording logs to the output stream
         Asserts.assertThrows(ConcurrentModificationException.class,
                 () -> exceptionThrowingKM.getCertificateChain("RSA.0.0"));
         Asserts.assertThrows(ConcurrentModificationException.class,
@@ -100,7 +99,8 @@ public static class MyExceptionKS extends KeyStoreSpi {
 
         @Override
         public KeyStore.Entry engineGetEntry(String alias,
-                                             KeyStore.ProtectionParameter param) {
+                                             KeyStore.ProtectionParameter param)
+        {
             throw new ConcurrentModificationException("getEntry exception");
         }