Merge "Cronet: Test cleanup"

3 files changed, 11 insertions, 17 deletions

diff --git a/Android.extras.bp b/Android.extras.bp
index 6bb96a59c..70e8f23ca 100644
--- a/Android.extras.bp
+++ b/Android.extras.bp
@@ -87,7 +87,10 @@ java_defaults {
     static_libs: [
         "androidx.annotation_annotation",
         "junit",
-        "cronet_aml_java__testing",
+    ],
+    test_suites: [
+        "general-tests",
+        "mts-tethering",
     ],
 }
 
@@ -141,10 +144,7 @@ android_test_helper_app {
     jni_libs: [
         "cronet_aml_components_cronet_android_cronet_unittests_android__library__testing",
     ],
-    test_suites: [
-        "general-tests",
-        "mts-tethering",
-    ],
+    static_libs: ["cronet_aml_java__testing"],
 }
 
 android_test_helper_app {
@@ -157,11 +157,7 @@ android_test_helper_app {
     static_libs: ["cronet_for_testing_net_java"],
     resource_dirs : [
         "net/android/unittest_support/res",
-    ],
-    test_suites: [
-        "general-tests",
-        "mts-tethering",
-    ],
+    ]
 }
 
 // ------------------------------ JAVA TEST TARGETS --------------------------------------------
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
index d9d1e0ada..14c834ed8 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
@@ -91,9 +91,8 @@ public class ExperimentalOptionsTest {
     public void setUp() throws Exception {
         mBuilder = new ExperimentalHttpEngine.Builder(getContext());
         mHangingUrlLatch = new CountDownLatch(1);
-        // TODO(b/267353182 enable cert verifier)
-        // CronetTestUtil.setMockCertVerifierForTesting(
-        //        mBuilder, QuicTestServer.createMockCertVerifier());
+        CronetTestUtil.setMockCertVerifierForTesting(
+               mBuilder, QuicTestServer.createMockCertVerifier());
         assertTrue(Http2TestServer.startHttp2TestServer(
                 getContext(), SERVER_CERT_PEM, SERVER_KEY_PKCS8_PEM, mHangingUrlLatch));
     }
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java
index f89a094cb..83ec7c65f 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java
@@ -283,7 +283,7 @@ public final class CronetLoggerTest {
         builder.setEnableBrotli(isBrotliEnabled);
         builder.setEnableHttpCache(cacheMode, 0);
 
-        // builder.enableNetworkQualityEstimator(isNetworkQualityEstimatorEnabled);
+        builder.enableNetworkQualityEstimator(isNetworkQualityEstimatorEnabled);
         builder.setThreadPriority(threadPriority);
 
         mTestFramework.startEngine();
@@ -300,9 +300,8 @@ public final class CronetLoggerTest {
         assertEquals(isBrotliEnabled, builderInfo.isBrotliEnabled());
         assertEquals(cacheMode, builderInfo.getHttpCacheMode());
         assertEquals(experimentalOptions, builderInfo.getExperimentalOptions());
-        // TODO(b/267353182): re-enable setting and asserting the value of network quality estimator
-        // assertEquals(
-        //        isNetworkQualityEstimatorEnabled, builderInfo.isNetworkQualityEstimatorEnabled());
+        assertEquals(
+               isNetworkQualityEstimatorEnabled, builderInfo.isNetworkQualityEstimatorEnabled());
         assertEquals(threadPriority, builderInfo.getThreadPriority());
         assertEquals(ImplVersion.getCronetVersion(), version.toString());
         if (mTestRule.testingJavaImpl()) {