[Cronet] Unit test refactoring and fixes

components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.test.util.CertTestUtil;
@@ skipping 48 matching lines @@
      * receive the error response.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testErrorCodeIfPinDoesNotMatch() throws Exception {
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
 
         assertErrorResponse();
     }
 
     /**
      * Tests the case when the pin hash matches. The client is expected to
      * receive the successful response with the response code 200.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testSuccessIfPinMatches() throws Exception {
         // Get PKP hash of the real certificate
         X509Certificate cert = readCertFromFileInPemFormat(CERT_USED);
         byte[] matchingHash = CertTestUtil.getPublicKeySha256(cert);
 
         addPkpSha256(mServerHost, matchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
     }
 
     /**
      * Tests the case when the pin hash does not match and the client accesses the subdomain of
      * the configured PKP host with includeSubdomains flag set to true. The client is
      * expected to receive the error response.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testIncludeSubdomainsFlagEqualTrue() throws Exception {
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mDomain, nonMatchingHash, INCLUDE_SUBDOMAINS, DISTANT_FUTURE);
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
 
         assertErrorResponse();
     }
 
     /**
      * Tests the case when the pin hash does not match and the client accesses the subdomain of
      * the configured PKP host with includeSubdomains flag set to false. The client is expected to
      * receive the successful response with the response code 200.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testIncludeSubdomainsFlagEqualFalse() throws Exception {
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mDomain, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
     }
 
     /**
      * Tests the case when the mismatching pin is set for some host that is different from the one
      * the client wants to access. In that case the other host pinning policy should not be applied
      * and the client is expected to receive the successful response with the response code 200.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testSuccessIfNoPinSpecified() throws Exception {
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256("otherhost.com", nonMatchingHash, INCLUDE_SUBDOMAINS, DISTANT_FUTURE);
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
     }
 
     /**
      * Tests mismatching pins that will expire in 10 seconds. The pins should be still valid and
      * enforced during the request; thus returning PIN mismatch error.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testSoonExpiringPin() throws Exception {
         final int tenSecondsAhead = 10;
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, tenSecondsAhead);
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
 
         assertErrorResponse();
     }
 
     /**
      * Tests mismatching pins that expired 1 second ago. Since the pins have expired, they
      * should not be enforced during the request; thus a successful response is expected.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testRecentlyExpiredPin() throws Exception {
         final int oneSecondAgo = -1;
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, oneSecondAgo);
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
     }
 
     /**
      * Tests that host pinning is not persisted between multiple CronetEngine instances.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testPinsAreNotPersisted() throws Exception {
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
         assertErrorResponse();
         shutdownCronetEngine();
 
         // Restart Cronet engine and try the same request again. Since the pins are not persisted,
         // a successful response is expected.
         createCronetEngineBuilder();
         startCronetFramework();
-        registerHostResolver();
+        registerHostResolver(mTestFramework);
         sendRequestAndWaitForResult();
         assertSuccessfulResponse();
     }
 
     /**
      * Tests that the client receives {@code InvalidArgumentException} when the pinned host name
      * is invalid.
      *
      * @throws Exception
      */
@@ skipping 118 matching lines @@
     private void startCronetFramework() {
         mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mBuilder);
     }
 
     private void shutdownCronetEngine() {
         if (mTestFramework != null && mTestFramework.mCronetEngine != null) {
             mTestFramework.mCronetEngine.shutdown();
         }
     }
 
-    private void registerHostResolver() {
-        long urlRequestContextAdapter = ((CronetUrlRequestContext) mTestFramework.mCronetEngine)
-                                                .getUrlRequestContextAdapter();
-        NativeTestServer.registerHostResolverProc(urlRequestContextAdapter, false);
-    }
-
     private byte[] generateSomeSha256() {
         byte[] sha256 = new byte[32];
         Arrays.fill(sha256, (byte) 58);
         return sha256;
     }
 
     private void addPkpSha256(
             String host, byte[] pinHashValue, boolean includeSubdomain, int maxAgeInSec) {
         Set<byte[]> hashes = new HashSet<>();
         hashes.add(pinHashValue);
@@ skipping 54 matching lines @@
             if (!shouldThrowNpe) {
                 fail("Null pointer exception was not expected: " + ex.toString());
             }
             return;
         }
         if (shouldThrowNpe) {
             fail("NullPointerException was expected");
         }
     }
 }