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

Unified Diff: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java

Issue 560153002: Add Cronet Test App that uses libcronet_tests.so with net test utilities. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove JNIEXPORT from JNI_OnUnload. Created 6 years, 3 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
Index: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
diff --git a/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
similarity index 67%
rename from components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java
rename to components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
index e37b2d23a014af00a3126a12e305fa09fe1a298a..998884735bbb605cb615d73338302fa1be63a8fd 100644
--- a/components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
@@ -2,9 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.cronet_sample_apk;
+package org.chromium.cronet_test_apk;
-import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.base.test.util.Feature;
@@ -16,13 +15,24 @@ import java.util.regex.Pattern;
/**
* Tests for {@link HttpUrlRequestFactory}
*/
-public class HttpUrlRequestFactoryTest extends InstrumentationTestCase {
+public class HttpUrlRequestFactoryTest extends CronetTestBase {
+ // URL used for base tests.
+ private static final String URL = "http://127.0.0.1:8000";
+
@SmallTest
@Feature({"Cronet"})
- public void testCreateFactory() {
+ public void testCreateFactory() throws Throwable {
HttpUrlRequestFactoryConfig config = new HttpUrlRequestFactoryConfig();
- HttpUrlRequestFactory factory = HttpUrlRequestFactory.createFactory(
- getInstrumentation().getContext(), config);
+ String[] commandLineArgs = {
+ CronetTestActivity.CONFIG_KEY, config.toString() };
+ CronetTestActivity activity =
+ launchCronetTestAppWithUrlAndCommandLineArgs(URL,
+ commandLineArgs);
+ // Make sure the activity was created as expected.
+ assertNotNull(activity);
+ waitForActiveShellToBeDoneLoading();
+
+ HttpUrlRequestFactory factory = activity.mRequestFactory;
assertNotNull("Factory should be created", factory);
assertTrue("Factory should be Chromium/n.n.n.n@r but is " +
factory.getName(),

Powered by Google App Engine
This is Rietveld 408576698