Minor cleanup (#688)

Clean up some unused variable and method ErrorProne warnings.

Eliminate debug logging from NativeLibraryLoader in tests.

Author: flooey

openjdk-integ-tests/src/test/java/org/conscrypt/java/security/SignatureTest.java

@@ -101,7 +101,7 @@ public void test_getInstance() throws Exception {
             .run(new ServiceTester.Test() {
                 @Override
                 public void test(Provider provider, String algorithm) throws Exception {
-                    KeyPair kp = keyPair(algorithm, provider.getName());
+                    KeyPair kp = keyPair(algorithm);
                     // Signature.getInstance(String)
                     Signature sig1 = Signature.getInstance(algorithm);
                     assertEquals(algorithm, sig1.getAlgorithm());
@@ -125,7 +125,7 @@ public void test(Provider provider, String algorithm) throws Exception {
     private final Map<String, KeyPair> keypairAlgorithmToInstance
             = new HashMap<String, KeyPair>();
 
-    private KeyPair keyPair(String sigAlgorithm, String providerName) throws Exception {
+    private KeyPair keyPair(String sigAlgorithm) throws Exception {
         String sigAlgorithmUpperCase = sigAlgorithm.toUpperCase(Locale.US);
         if (sigAlgorithmUpperCase.endsWith("ENCRYPTION")) {
             sigAlgorithm = sigAlgorithm.substring(0, sigAlgorithm.length()-"ENCRYPTION".length());
@@ -161,15 +161,15 @@ private KeyPair keyPair(String sigAlgorithm, String providerName) throws Excepti
         return kp;
     }
 
-    private AlgorithmParameterSpec getAlgParamSpec(String algorithm, Provider p) {
+    private AlgorithmParameterSpec getAlgParamSpec(String algorithm) {
         if (algorithm.equalsIgnoreCase("RSASSA-PSS")) {
             return PSSParameterSpec.DEFAULT;
         }
         return null;
     }
 
     private void test_Signature(Signature sig, KeyPair keyPair) throws Exception {
-        AlgorithmParameterSpec params = getAlgParamSpec(sig.getAlgorithm(), sig.getProvider());
+        AlgorithmParameterSpec params = getAlgParamSpec(sig.getAlgorithm());
         sig.initSign(keyPair.getPrivate());
         if (params != null) {
             sig.setParameter(params);
@@ -2729,7 +2729,7 @@ public void testVerify_NONEwithRSA_Key_SignatureTooLarge_Failure() throws Except
 
     @Test
     public void testSign_NONEwithECDSA_Key_Success() throws Exception {
-        KeyPair keys = keyPair("NONEwithECDSA", null);
+        KeyPair keys = keyPair("NONEwithECDSA");
         Signature sig = Signature.getInstance("NONEwithECDSA");
 
         sig.initSign(keys.getPrivate());

openjdk-integ-tests/src/test/java/org/conscrypt/javax/crypto/CipherTest.java

@@ -4321,6 +4321,7 @@ public void test_DefaultGCMTagSizeAlgorithmParameterSpec() throws Exception {
             (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0 });
         cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, AES), param);
         byte[] ciphertext = cipher.update(input);
+        assertEquals(16, ciphertext.length);
         byte[] tag = cipher.doFinal();
         assertEquals(12, tag.length);
     }

openjdk-integ-tests/src/test/java/org/conscrypt/javax/net/ssl/SSLEngineVersionCompatibilityTest.java

@@ -729,18 +729,10 @@ private void assertConnected(TestSSLEnginePair e) {
         assertConnected(e.client, e.server);
     }
 
-    private void assertNotConnected(TestSSLEnginePair e) {
-        assertNotConnected(e.client, e.server);
-    }
-
     private void assertConnected(SSLEngine a, SSLEngine b) {
         assertTrue(connected(a, b));
     }
 
-    private void assertNotConnected(SSLEngine a, SSLEngine b) {
-        assertFalse(connected(a, b));
-    }
-
     private boolean connected(SSLEngine a, SSLEngine b) {
         return (a.getHandshakeStatus() == HandshakeStatus.NOT_HANDSHAKING
                 && b.getHandshakeStatus() == HandshakeStatus.NOT_HANDSHAKING

openjdk-integ-tests/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketTest.java

@@ -388,7 +388,6 @@ public void test_SSLSocket_setEnabledProtocols() throws Exception {
     @Test
     public void test_SSLSocket_noncontiguousProtocols_useLower() throws Exception {
         TestSSLContext c = TestSSLContext.create();
-        SSLContext serverContext = c.serverContext;
         SSLContext clientContext = c.clientContext;
         SSLSocket client = (SSLSocket)
                 clientContext.getSocketFactory().createSocket(c.host, c.port);
@@ -420,7 +419,6 @@ public void test_SSLSocket_noncontiguousProtocols_useLower() throws Exception {
     @Test
     public void test_SSLSocket_noncontiguousProtocols_canNegotiate() throws Exception {
         TestSSLContext c = TestSSLContext.create();
-        SSLContext serverContext = c.serverContext;
         SSLContext clientContext = c.clientContext;
         SSLSocket client = (SSLSocket)
                 clientContext.getSocketFactory().createSocket(c.host, c.port);

test_logging.properties

@@ -8,5 +8,6 @@ org.conscrypt.level=ALL
 org.conscrypt.handler=java.util.logging.ConsoleHandler
 
 # Avoid nuisance logs in tests.
+org.conscrypt.NativeLibraryLoader.level=INFO
 org.conscrypt.NativeSslSession.level=SEVERE
 org.conscrypt.TrustManagerImpl.level=INFO