[Cronet] Clean up tests

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

 // Copyright 2014 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.AndroidTestCase;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.PathUtils;
 import org.chromium.net.impl.CronetEngineBase;
 import org.chromium.net.impl.JavaCronetEngine;
 import org.chromium.net.impl.JavaCronetProvider;
 import org.chromium.net.impl.UserAgent;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.AnnotatedElement;
 import java.net.URL;
+import java.net.URLStreamHandlerFactory;
 
 /**
  * Base test class for all CronetTest based tests.
  */
 public class CronetTestBase extends AndroidTestCase {
     /**
      * Name of the file that contains the test server certificate in PEM format.
      */
     static final String SERVER_CERT_PEM = "quic_test.example.com.crt";
 
     /**
      * Name of the file that contains the test server private key in PKCS8 PEM format.
      */
     static final String SERVER_KEY_PKCS8_PEM = "quic_test.example.com.key.pkcs8.pem";
 
     private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "cronet_test";
     private static final String LOOPBACK_ADDRESS = "127.0.0.1";
 
     private CronetTestFramework mCronetTestFramework;
+    private URLStreamHandlerFactory mStreamHandlerFactory;
+
     // {@code true} when test is being run against system HttpURLConnection implementation.
     private boolean mTestingSystemHttpURLConnection;
     private boolean mTestingJavaImpl = false;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         System.loadLibrary("cronet_tests");
         ContextUtils.initApplicationContext(getContext().getApplicationContext());
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
         CronetTestFramework.prepareTestStorage(getContext());
     }
 
     /**
      * Starts the CronetTest framework.
      */
     protected CronetTestFramework startCronetTestFramework() {
-        return startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, null);
+        return startCronetTestFrameworkWithCronetEngineBuilder(null);
     }
 
     /**
-     * Starts the CronetTest framework and loads the given URL. The URL can be
-     * null.
+     * Starts the CronetTest framework using the provided CronetEngine.Builder.
      */
-    protected CronetTestFramework startCronetTestFrameworkWithUrl(String url) {
-        return startCronetTestFrameworkWithUrlAndCronetEngineBuilder(url, null);
-    }
-
-    /**
-     * Starts the CronetTest framework using the provided CronetEngine.Builder
-     * and loads the given URL. The URL can be null.
-     */
-    protected CronetTestFramework startCronetTestFrameworkWithUrlAndCronetEngineBuilder(
-            String url, ExperimentalCronetEngine.Builder builder) {
-        mCronetTestFramework = new CronetTestFramework(url, null, getContext(), builder);
+    protected CronetTestFramework startCronetTestFrameworkWithCronetEngineBuilder(
+            ExperimentalCronetEngine.Builder builder) {
+        mCronetTestFramework = new CronetTestFramework(getContext(), builder);
         return mCronetTestFramework;
     }
 
-    /**
-     * Starts the CronetTest framework appending the provided command line
-     * arguments and loads the given URL. The URL can be null.
-     */
-    protected CronetTestFramework startCronetTestFrameworkWithUrlAndCommandLineArgs(
-            String url, String[] commandLineArgs) {
-        mCronetTestFramework = new CronetTestFramework(url, commandLineArgs, getContext(), null);
-        return mCronetTestFramework;
-    }
-
-    // Helper method to tell the framework to skip library init during construction.
-    protected CronetTestFramework startCronetTestFrameworkAndSkipLibraryInit() {
-        String[] commandLineArgs = {
-                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.NONE};
-        mCronetTestFramework =
-                startCronetTestFrameworkWithUrlAndCommandLineArgs(null, commandLineArgs);
-        return mCronetTestFramework;
-    }
-
     /**
      * Returns {@code true} when test is being run against system HttpURLConnection implementation.
      */
     protected boolean testingSystemHttpURLConnection() {
         return mTestingSystemHttpURLConnection;
     }
 
     /**
      * Returns {@code true} when test is being run against the java implementation of CronetEngine.
      */
     protected boolean testingJavaImpl() {
         return mTestingJavaImpl;
     }
 
     @Override
     protected void runTest() throws Throwable {
         mTestingSystemHttpURLConnection = false;
         mTestingJavaImpl = false;
         String packageName = getClass().getPackage().getName();
         if (packageName.equals("org.chromium.net.urlconnection")) {
             try {
                 AnnotatedElement method = getClass().getMethod(getName(), (Class[]) null);
                 if (method.isAnnotationPresent(CompareDefaultWithCronet.class)) {
                     // Run with the default HttpURLConnection implementation first.
                     mTestingSystemHttpURLConnection = true;
                     super.runTest();
                     // Use Cronet's implementation, and run the same test.
                     mTestingSystemHttpURLConnection = false;
-                    URL.setURLStreamHandlerFactory(mCronetTestFramework.mStreamHandlerFactory);
+                    URL.setURLStreamHandlerFactory(mStreamHandlerFactory);
                     super.runTest();
                 } else if (method.isAnnotationPresent(OnlyRunCronetHttpURLConnection.class)) {
                     // Run only with Cronet's implementation.
-                    URL.setURLStreamHandlerFactory(mCronetTestFramework.mStreamHandlerFactory);
+                    URL.setURLStreamHandlerFactory(mStreamHandlerFactory);
                     super.runTest();
                 } else {
                     // For all other tests.
                     super.runTest();
                 }
             } catch (Throwable e) {
                 throw new Throwable("CronetTestBase#runTest failed.", e);
             }
         } else if (packageName.equals("org.chromium.net")) {
             try {
@@ skipping 30 matching lines @@
     }
 
     public void assertResponseEquals(UrlResponseInfo expected, UrlResponseInfo actual) {
         assertEquals(expected.getAllHeaders(), actual.getAllHeaders());
         assertEquals(expected.getAllHeadersAsList(), actual.getAllHeadersAsList());
         assertEquals(expected.getHttpStatusCode(), actual.getHttpStatusCode());
         assertEquals(expected.getHttpStatusText(), actual.getHttpStatusText());
         assertEquals(expected.getUrlChain(), actual.getUrlChain());
         assertEquals(expected.getUrl(), actual.getUrl());
         // Transferred bytes and proxy server are not supported in pure java
-        if (!(mCronetTestFramework.mCronetEngine instanceof JavaCronetEngine)) {
+        if (!testingJavaImpl()) {
             assertEquals(expected.getReceivedByteCount(), actual.getReceivedByteCount());
             assertEquals(expected.getProxyServer(), actual.getProxyServer());
             // This is a place where behavior intentionally differs between native and java
             assertEquals(expected.getNegotiatedProtocol(), actual.getNegotiatedProtocol());
         }
     }
 
     public static void assertContains(String expectedSubstring, String actualString) {
         assertNotNull(actualString);
         if (!actualString.contains(expectedSubstring)) {
             fail("String [" + actualString + "] doesn't contain substring [" + expectedSubstring
                     + "]");
         }
     }
 
+    public CronetEngine.Builder enableDiskCache(CronetEngine.Builder cronetEngineBuilder) {
+        cronetEngineBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
+        cronetEngineBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
+        return cronetEngineBuilder;
+    }
+
+    /**
+     * Sets the {@link UrlStreamHandlerFactory} from {@code cronetEngine}.  This should be called

[mgersh, 2017/05/23 18:12:13]

nit: Url... -> URL...

[pauljensen, 2017/05/25 15:15:14]

Done.

[mgersh, 2017/05/25 18:11:16]

This and the one below aren't actually done?

[pauljensen, 2017/05/26 00:14:03]

Done.

+     * during setup() and is installed by {@link runTest()} as the default when Cronet is tested.

[mgersh, 2017/05/23 18:12:13]

nit: setup() -> setUp()

[pauljensen, 2017/05/25 15:15:14]

Done.

+     */
+    public void setStreamHandlerFactory(CronetEngine cronetEngine) {
+        mStreamHandlerFactory = cronetEngine.createURLStreamHandlerFactory();
+    }
+
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.RUNTIME)
     public @interface CompareDefaultWithCronet {
     }
 
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.RUNTIME)
     public @interface OnlyRunCronetHttpURLConnection {
     }
 
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.RUNTIME)
     public @interface OnlyRunNativeCronet {}
 }