Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java |
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java |
index 1e433d90b421694647c8879178a37bb272a7adc3..f60110871978a556ed172267b70c0b78eb16fcfd 100644 |
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java |
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java |
@@ -12,6 +12,8 @@ import android.os.Looper; |
import android.os.StrictMode; |
import android.test.suitebuilder.annotation.SmallTest; |
+import org.json.JSONObject; |
RyanSturm
2016/10/14 21:21:32
Should this import be alphabetical (i.e., after ja
tbansal1
2016/10/14 21:50:29
This is the new alphabetical order. See https://co
RyanSturm
2016/10/14 22:19:13
Acknowledged. This breaks my brain a little, but I
|
+ |
import org.chromium.base.FileUtils; |
import org.chromium.base.PathUtils; |
import org.chromium.base.annotations.JNINamespace; |
@@ -21,7 +23,6 @@ import org.chromium.net.TestUrlRequestCallback.ResponseStep; |
import org.chromium.net.impl.CronetLibraryLoader; |
import org.chromium.net.impl.CronetUrlRequestContext; |
import org.chromium.net.test.EmbeddedTestServer; |
-import org.json.JSONObject; |
import java.io.BufferedReader; |
import java.io.File; |
@@ -280,6 +281,12 @@ public class CronetUrlRequestContextTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testRealTimeNetworkQualityObservationsQuicDisabled() throws Exception { |
CronetEngine.Builder mCronetEngineBuilder = new CronetEngine.Builder(getContext()); |
+ assert CronetEngine.INVALID_RTT_THROUGHPUT < 0; |
+ |
+ // The invalid value for the estimates used by Cronet should match the invalid value for |
+ // the estimates used by the native. |
+ assertEquals(CronetEngine.INVALID_RTT_THROUGHPUT, |
+ RttThroughputValues.INVALID_RTT_THROUGHPUT_VALUE); |
Executor listenersExecutor = Executors.newSingleThreadExecutor(new ExecutorThreadFactory()); |
ConditionVariable waitForThroughput = new ConditionVariable(); |
TestNetworkQualityRttListener rttListener = |
@@ -330,6 +337,22 @@ public class CronetUrlRequestContextTest extends CronetTestBase { |
assertTrue(testFramework.mCronetEngine.getEffectiveConnectionType() |
!= EffectiveConnectionType.TYPE_UNKNOWN); |
+ // Verify that the HTTP RTT, transport RTT and downstream throughput |
+ // estimates are available. |
+ if (testFramework.mCronetEngine.getEffectiveConnectionType() |
+ != EffectiveConnectionType.TYPE_OFFLINE) { |
+ assertTrue(testFramework.mCronetEngine.getHttpRttMsec() > 0); |
+ assertTrue(testFramework.mCronetEngine.getTransportRttMsec() > 0); |
+ assertTrue(testFramework.mCronetEngine.getDownstreamThroughputKbps() > 0); |
+ } else { |
+ assertEquals(CronetEngine.INVALID_RTT_THROUGHPUT, |
+ testFramework.mCronetEngine.getHttpRttMsec()); |
+ assertEquals(CronetEngine.INVALID_RTT_THROUGHPUT, |
+ testFramework.mCronetEngine.getTransportRttMsec()); |
+ assertEquals(CronetEngine.INVALID_RTT_THROUGHPUT, |
+ testFramework.mCronetEngine.getDownstreamThroughputKbps()); |
+ } |
+ |
testFramework.mCronetEngine.shutdown(); |
} |