Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Unified Diff: components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java

Issue 2892013002: [Cronet] Clean up tests (Closed)
Patch Set: address comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
diff --git a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java b/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
deleted file mode 100644
index 678c70be20382e127d14adf3d7dadff09c273bbc..0000000000000000000000000000000000000000
--- a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
+++ /dev/null
@@ -1,230 +0,0 @@
-// 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.Environment;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-import org.chromium.base.Log;
-import org.chromium.base.PathUtils;
-import org.chromium.base.annotations.SuppressFBWarnings;
-import org.chromium.net.impl.CronetEngineBase;
-
-import java.io.File;
-import java.net.URLStreamHandlerFactory;
-
-/**
- * Framework for testing Cronet.
- */
-@SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-public class CronetTestFramework {
- private static final String TAG = CronetTestFramework.class.getSimpleName();
-
- public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
- public static final String POST_DATA_KEY = "postData";
- public static final String CACHE_KEY = "cache";
- public static final String SDCH_KEY = "sdch";
- public static final String LIBRARY_INIT_KEY = "libraryInit";
-
- // Uses disk cache.
- public static final String CACHE_DISK = "disk";
-
- // Uses disk cache but does not store http data.
- public static final String CACHE_DISK_NO_HTTP = "diskNoHttp";
-
- // Uses in-memory cache.
- public static final String CACHE_IN_MEMORY = "memory";
-
- // Enables Sdch.
- public static final String SDCH_ENABLE = "enable";
-
- /**
- * Library init type strings to use along with {@link #LIBRARY_INIT_KEY}.
- * If unspecified, {@link LibraryInitType#CRONET} will be used.
- */
- public static final class LibraryInitType {
- // Initializes Cronet Async API.
- public static final String CRONET = "cronet";
- // Initializes Cronet HttpURLConnection API.
- public static final String HTTP_URL_CONNECTION = "http_url_connection";
- // Do not initialize.
- public static final String NONE = "none";
-
- private LibraryInitType() {}
- }
-
- public URLStreamHandlerFactory mStreamHandlerFactory;
- public CronetEngineBase mCronetEngine;
-
- private final String[] mCommandLine;
- private final Context mContext;
-
- // CronetEngine.Builder used for this activity.
- private ExperimentalCronetEngine.Builder mCronetEngineBuilder;
-
- // TODO(crbug.com/547160): Fix this findbugs error and remove the suppression.
- @SuppressFBWarnings("EI_EXPOSE_REP2")
- public CronetTestFramework(String appUrl, String[] commandLine, Context context,
- ExperimentalCronetEngine.Builder builder) {
- mCommandLine = commandLine;
- mContext = context;
-
- // 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]);
- }
- }
-
- // Initializes CronetEngine.Builder from commandLine args.
- mCronetEngineBuilder = initializeCronetEngineBuilderWithPresuppliedBuilder(builder);
-
- String initString = getCommandLineArg(LIBRARY_INIT_KEY);
-
- if (initString == null) {
- initString = LibraryInitType.CRONET;
- }
-
- switch (initString) {
- case LibraryInitType.NONE:
- break;
- case LibraryInitType.HTTP_URL_CONNECTION:
- mCronetEngine = initCronetEngine();
- mStreamHandlerFactory = mCronetEngine.createURLStreamHandlerFactory();
- break;
- default:
- mCronetEngine = initCronetEngine();
- // Start collecting metrics.
- mCronetEngine.getGlobalMetricsDeltas();
- break;
- }
- }
-
- /**
- * Prepares the path for the test storage (http cache, QUIC server info).
- */
- public static void prepareTestStorage(Context context) {
- File storage = new File(getTestStorageDirectory());
- if (storage.exists()) {
- assertTrue(recursiveDelete(storage));
- }
- ensureTestStorageExists();
- }
-
- /**
- * 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() {
- return PathUtils.getDataDirectory() + "/test_storage";
- }
-
- /**
- * Ensures test storage directory exists, i.e. creates one if it does not exist.
- */
- private static void ensureTestStorageExists() {
- File storage = new File(getTestStorageDirectory());
- if (!storage.exists()) {
- assertTrue(storage.mkdir());
- }
- }
-
- /**
- * Returns the path for the test storage (http cache, QUIC server info).
- * Also ensures it exists.
- */
- static String getTestStorage(Context context) {
- ensureTestStorageExists();
- return getTestStorageDirectory();
- }
-
- @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
- private static boolean recursiveDelete(File path) {
- if (path.isDirectory()) {
- for (File c : path.listFiles()) {
- if (!recursiveDelete(c)) {
- return false;
- }
- }
- }
- return path.delete();
- }
-
- ExperimentalCronetEngine.Builder getCronetEngineBuilder() {
- return mCronetEngineBuilder;
- }
-
- private ExperimentalCronetEngine.Builder initializeCronetEngineBuilderWithPresuppliedBuilder(
- ExperimentalCronetEngine.Builder builder) {
- return createCronetEngineBuilderWithPresuppliedBuilder(mContext, builder);
- }
-
- ExperimentalCronetEngine.Builder createCronetEngineBuilder(Context context) {
- return createCronetEngineBuilderWithPresuppliedBuilder(context, null);
- }
-
- private ExperimentalCronetEngine.Builder createCronetEngineBuilderWithPresuppliedBuilder(
- Context context, ExperimentalCronetEngine.Builder cronetEngineBuilder) {
- if (cronetEngineBuilder == null) {
- cronetEngineBuilder = new ExperimentalCronetEngine.Builder(context);
- cronetEngineBuilder.enableHttp2(true).enableQuic(true);
- }
-
- String cacheString = getCommandLineArg(CACHE_KEY);
- if (CACHE_DISK.equals(cacheString)) {
- cronetEngineBuilder.setStoragePath(getTestStorage(context));
- cronetEngineBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
- } else if (CACHE_DISK_NO_HTTP.equals(cacheString)) {
- cronetEngineBuilder.setStoragePath(getTestStorage(context));
- cronetEngineBuilder.enableHttpCache(
- CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1000 * 1024);
- } else if (CACHE_IN_MEMORY.equals(cacheString)) {
- cronetEngineBuilder.enableHttpCache(
- CronetEngine.Builder.HTTP_CACHE_IN_MEMORY, 100 * 1024);
- }
-
- String sdchString = getCommandLineArg(SDCH_KEY);
- if (SDCH_ENABLE.equals(sdchString)) {
- cronetEngineBuilder.enableSdch(true);
- }
-
- return cronetEngineBuilder;
- }
-
- // Helper function to initialize Cronet engine. Also used in testing.
- public CronetEngineBase initCronetEngine() {
- return (CronetEngineBase) mCronetEngineBuilder.build();
- }
-
- private String getCommandLineArg(String key) {
- if (mCommandLine != null) {
- for (int i = 0; i < mCommandLine.length; ++i) {
- if (mCommandLine[i].equals(key)) {
- return mCommandLine[++i];
- }
- }
- }
- return null;
- }
-
- public void startNetLog() {
- if (mCronetEngine != null) {
- mCronetEngine.startNetLogToFile(Environment.getExternalStorageDirectory().getPath()
- + "/cronet_sample_netlog_new_api.json",
- false);
- }
- }
-
- public void stopNetLog() {
- if (mCronetEngine != null) {
- mCronetEngine.stopNetLog();
- }
- }
-}
« no previous file with comments | « components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698