[Cronet] Unit test refactoring and fixes

components/cronet/android/test/src/org/chromium/net/CronetTestFramework.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.content.Context;
 import android.os.ConditionVariable;
 import android.os.Environment;
 
@@ skipping 87 matching lines @@
             mComplete.block();
         }
     }
 
     // TODO(crbug.com/547160): Fix this findbugs error and remove the suppression.
     @SuppressFBWarnings("EI_EXPOSE_REP2")
     public CronetTestFramework(
             String appUrl, String[] commandLine, Context context, CronetEngine.Builder builder) {
         mCommandLine = commandLine;
         mContext = context;
-        prepareTestStorage();
 
         // Print out extra arguments passed in starting this activity.
         if (commandLine != null) {
             assertEquals(0, commandLine.length % 2);
             for (int i = 0; i < commandLine.length / 2; i++) {
                 Log.i(TAG, "Cronet commandLine %s = %s", commandLine[i * 2],
                         commandLine[i * 2 + 1]);
             }
         }
 
@@ skipping 23 matching lines @@
                 mCronetEngine = initCronetEngine();
                 // Start collecting metrics.
                 mCronetEngine.getGlobalMetricsDeltas();
                 break;
         }
     }
 
     /**
      * Prepares the path for the test storage (http cache, QUIC server info).
      */
-    private void prepareTestStorage() {
-        File storage = new File(getTestStorageDirectory(mContext));
+    public static void prepareTestStorage(Context context) {

[xunjieli, 2015/12/07 23:09:10]

I think moving CronetTestFramework into CronetTestBase.java might be another
cleanup that might worth considering.

That way we can consolidate some of the setup/initialization logic, and some of
the member variables. 

[kapishnikov, 2015/12/08 01:09:37]

Yes, I agree that we could move some of the CronetTestFramework logic into the
CronetTestBase class and the remaining parts to some utility class/classes. Lets
do the refactoring in a new CL since this one already addresses couple of
issues.

+        File storage = new File(getTestStorageDirectory(context));
         if (storage.exists()) {
             assertTrue(recursiveDelete(storage));
         }
-        ensureTestStorageExists(mContext);
+        ensureTestStorageExists(context);
     }
 
     /**
      * Returns the path for the test storage (http cache, QUIC server info).
      * NOTE: Does not ensure it exists; tests should use {@link #getTestStorage}.
      */
     private static String getTestStorageDirectory(Context context) {
         return PathUtils.getDataDirectory(context) + "/test_storage";
     }
 
@@ skipping 10 matching lines @@
     /**
      * Returns the path for the test storage (http cache, QUIC server info).
      * Also ensures it exists.
      */
     static String getTestStorage(Context context) {
         ensureTestStorageExists(context);
         return getTestStorageDirectory(context);
     }
 
     @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
-    private boolean recursiveDelete(File path) {
+    private static boolean recursiveDelete(File path) {
         if (path.isDirectory()) {
             for (File c : path.listFiles()) {
                 if (!recursiveDelete(c)) {
                     return false;
                 }
             }
         }
         return path.delete();
     }
 
@@ skipping 110 matching lines @@
 
     public void stopNetLog() {
         if (mRequestFactory != null) {
             mRequestFactory.stopNetLog();
         }
         if (mCronetEngine != null) {
             mCronetEngine.stopNetLog();
         }
     }
 }