[Cronet] Clean up tests

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.support.test.filters.SmallTest;
 
 import org.json.JSONObject;
 
@@ skipping 16 matching lines @@
     private static final String CERT_USED = "quic_test.example.com.crt";
     private static final String[] CERTS_USED = {CERT_USED};
     private static final int DISTANT_FUTURE = Integer.MAX_VALUE;
     private static final boolean INCLUDE_SUBDOMAINS = true;
     private static final boolean EXCLUDE_SUBDOMAINS = false;
     private static final boolean KNOWN_ROOT = true;
     private static final boolean UNKNOWN_ROOT = false;
     private static final boolean ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS = true;
     private static final boolean DISABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS = false;
 
-    private CronetTestFramework mTestFramework;
+    private CronetEngine mCronetEngine;
     private ExperimentalCronetEngine.Builder mBuilder;
     private TestUrlRequestCallback mListener;
     private String mServerUrl; // https://test.example.com:6121
     private String mServerHost; // test.example.com
     private String mDomain; // example.com
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         // Start QUIC Test Server
@@ skipping 17 matching lines @@
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
     public void testErrorCodeIfPinDoesNotMatch() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         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"})
     @OnlyRunNativeCronet
     public void testSuccessIfPinMatches() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         // 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();
+        startCronetEngine();
         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"})
     @OnlyRunNativeCronet
     public void testIncludeSubdomainsFlagEqualTrue() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mDomain, nonMatchingHash, INCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         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"})
     @OnlyRunNativeCronet
     public void testIncludeSubdomainsFlagEqualFalse() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mDomain, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         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"})
     @OnlyRunNativeCronet
     public void testSuccessIfNoPinSpecified() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256("otherhost.com", nonMatchingHash, INCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         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"})
     @OnlyRunNativeCronet
     public void testSoonExpiringPin() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         final int tenSecondsAhead = 10;
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, tenSecondsAhead);
-        startCronetFramework();
+        startCronetEngine();
         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"})
     @OnlyRunNativeCronet
     public void testRecentlyExpiredPin() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         final int oneSecondAgo = -1;
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, oneSecondAgo);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
     }
 
     /**
      * Tests that the pinning of local trust anchors is enforced when pinning bypass for local
      * trust anchors is disabled.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testLocalTrustAnchorPinningEnforced() throws Exception {
         createCronetEngineBuilder(DISABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, UNKNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertErrorResponse();
     }
 
     /**
      * Tests that the pinning of local trust anchors is not enforced when pinning bypass for local
      * trust anchors is enabled.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     public void testLocalTrustAnchorPinningNotEnforced() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, UNKNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
     }
 
     /**
      * Tests that host pinning is not persisted between multiple CronetEngine instances.
      *
      * @throws Exception
      */
     @SmallTest
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
     public void testPinsAreNotPersisted() throws Exception {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
         assertErrorResponse();
         shutdownCronetEngine();
 
         // Restart Cronet engine and try the same request again. Since the pins are not persisted,
         // a successful response is expected.
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
         assertSuccessfulResponse();
     }
 
     /**
      * Tests that the client receives {@code InvalidArgumentException} when the pinned host name
      * is invalid.
      *
      * @throws Exception
      */
@@ skipping 120 matching lines @@
         // Set common CronetEngine parameters
         mBuilder = new ExperimentalCronetEngine.Builder(getContext());
         mBuilder.enablePublicKeyPinningBypassForLocalTrustAnchors(bypassPinningForLocalAnchors);
         mBuilder.enableQuic(true);
         mBuilder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),
                 QuicTestServer.getServerPort());
         JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules();
         JSONObject experimentalOptions = new JSONObject()
                                                  .put("HostResolverRules", hostResolverParams);
         mBuilder.setExperimentalOptions(experimentalOptions.toString());
-        mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
+        mBuilder.setStoragePath(getTestStorage(getContext()));
         mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1000 * 1024);
         CronetTestUtil.setMockCertVerifierForTesting(
                 mBuilder, MockCertVerifier.createMockCertVerifier(CERTS_USED, knownRoot));
     }
 
-    private void startCronetFramework() {
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mBuilder);
+    private void startCronetEngine() {
+        mCronetEngine = mBuilder.build();
     }
 
     private void shutdownCronetEngine() {
-        if (mTestFramework != null && mTestFramework.mCronetEngine != null) {
-            mTestFramework.mCronetEngine.shutdown();
+        if (mCronetEngine != null) {
+            mCronetEngine.shutdown();
         }
     }
 
     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);
         mBuilder.addPublicKeyPins(host, hashes, includeSubdomain, dateInFuture(maxAgeInSec));
     }
 
     private void sendRequestAndWaitForResult() {
         mListener = new TestUrlRequestCallback();
 
         String quicURL = mServerUrl + "/simple.txt";
-        UrlRequest.Builder requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                quicURL, mListener, mListener.getExecutor());
+        UrlRequest.Builder requestBuilder =
+                mCronetEngine.newUrlRequestBuilder(quicURL, mListener, mListener.getExecutor());
         requestBuilder.build().start();
         mListener.blockForDone();
     }
 
     private X509Certificate readCertFromFileInPemFormat(String certFileName) throws Exception {
         byte[] certDer = CertTestUtil.pemToDer(CertTestUtil.CERTS_DIRECTORY + certFileName);
         CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
         return (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(certDer));
     }
 
@@ skipping 35 matching lines @@
             if (!shouldThrowNpe) {
                 fail("Null pointer exception was not expected: " + ex.toString());
             }
             return;
         }
         if (shouldThrowNpe) {
             fail("NullPointerException was expected");
         }
     }
 }