Added Network Quality Estimator Real-time interface to Cronet

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.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.content.ContextWrapper;
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ skipping 61 matching lines @@
 
         @Override
         public void onFailed(UrlRequest request,
                 ResponseInfo info,
                 UrlRequestException error) {
             super.onFailed(request, info, error);
             mActivity.mUrlRequestContext.shutdown();
         }
     }
 
+    static class TestNetworkQualityObserver
+            implements NetworkQualityRTTObserver, NetworkQualityThroughputObserver {
+        int mRTTObservationCount;
+        int mThroughputObservationCount;
+
+        public void onRTTObservation(int rttMs, int when, int source) {
+            mRTTObservationCount++;
+        }
+
+        public void onThroughputObservation(int throughputKbps, int when, int source) {
+            mThroughputObservationCount++;
+        }
+
+        public int rttObservationCount() {
+            return mRTTObservationCount;
+        }
+
+        public int throughputObservationCount() {
+            return mThroughputObservationCount;
+        }
+    }
+
     @SmallTest
     @Feature({"Cronet"})
     public void testConfigUserAgent() throws Exception {
         String userAgentName = "User-Agent";
         String userAgentValue = "User-Agent-Value";
         UrlRequestContextConfig config = new UrlRequestContextConfig();
         config.setUserAgent(userAgentValue);
         config.setLibraryName("cronet_tests");
         String[] commandLineArgs = {
                 CronetTestActivity.CONFIG_KEY, config.toString()
@@ skipping 55 matching lines @@
         // Proxy logic configured to use the test server as its proxy.
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals(serverHostPort, listener.mResponseInfo.getProxyServer());
         assertEquals(
                 "http://DomainThatDoesnt.Resolve/datareductionproxysuccess.txt",
                 listener.mResponseInfo.getUrl());
     }
 
     @SmallTest
     @Feature({"Cronet"})
+    public void testRealTimeNetworkQualityObservations() throws Exception {
+        mActivity = launchCronetTestApp();
+        TestNetworkQualityObserver networkQualityObserver = new TestNetworkQualityObserver();
+        mActivity.mUrlRequestContext.enableNetworkQualityEstimator(true, true);
+        mActivity.mUrlRequestContext.addRTTObserver(networkQualityObserver);

[mef, 2015/08/28 20:53:16]

add tests for removeXYZObserver and for doing those things before enabling NQE.

[bengr, 2015/08/28 23:51:37]

Done.

+        mActivity.mUrlRequestContext.addThroughputObserver(networkQualityObserver);
+        TestUrlRequestListener listener = new TestUrlRequestListener();
+        UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+                TEST_URL, listener, listener.getExecutor());
+        urlRequest.start();
+        listener.blockForDone();
+        assertTrue(networkQualityObserver.rttObservationCount() > 0);
+        assertTrue(networkQualityObserver.throughputObservationCount() > 0);

[mef, 2015/08/28 20:53:16]

add mActivity.mUrlRequestContext.shutdown() to make sure that it works properly.

[bengr, 2015/08/28 23:51:37]

Done.

+    }
+
+    @SmallTest
+    @Feature({"Cronet"})
     public void testShutdown() throws Exception {
         mActivity = launchCronetTestApp();
         TestUrlRequestListener listener = new ShutdownTestUrlRequestListener();
         // Block listener when response starts to verify that shutdown fails
         // if there are active requests.
         listener.setAutoAdvance(false);
         UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
                 TEST_URL, listener, listener.getExecutor());
         urlRequest.start();
         try {
@@ skipping 501 matching lines @@
                 new CronetUrlRequestContext(mActivity, mActivity.getContextConfig());
         CronetUrlRequestContext secondContext = new CronetUrlRequestContext(
                 mActivity.getApplicationContext(), mActivity.getContextConfig());
         CronetUrlRequestContext thirdContext = new CronetUrlRequestContext(
                 new ContextWrapper(mActivity), mActivity.getContextConfig());
         firstContext.shutdown();
         secondContext.shutdown();
         thirdContext.shutdown();
     }
 }