Commit 03efa26c authored by Paul Jensen's avatar Paul Jensen Committed by Commit Bot

[Cronet] Adjust some tests to run on fast devices/emulators.

Some devices/emulators run quickly so requests take less than 1ms,
which causes some test failures.  Fix them using MetricsTestUtil.assertAfter()
and also clean up copies of that code.

Bug: 751184
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester
Change-Id: Icdce80479a887276b8921b4168a96c65b12d0143
Reviewed-on: https://chromium-review.googlesource.com/596073
Commit-Queue: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: default avatarMiriam Gershenson <mgersh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491076}
parent c865af52
...@@ -1240,8 +1240,7 @@ public class BidirectionalStreamTest extends CronetTestBase { ...@@ -1240,8 +1240,7 @@ public class BidirectionalStreamTest extends CronetTestBase {
MetricsTestUtil.assertAfter(metrics.getRequestStart(), startTime); MetricsTestUtil.assertAfter(metrics.getRequestStart(), startTime);
assertNotNull(metrics.getRequestEnd()); assertNotNull(metrics.getRequestEnd());
MetricsTestUtil.assertAfter(endTime, metrics.getRequestEnd()); MetricsTestUtil.assertAfter(endTime, metrics.getRequestEnd());
// Entire request should take more than 0 ms MetricsTestUtil.assertAfter(metrics.getRequestEnd(), metrics.getRequestStart());
assertTrue(metrics.getRequestEnd().getTime() - metrics.getRequestStart().getTime() > 0);
} }
assertEquals(expectError, callback.mError != null); assertEquals(expectError, callback.mError != null);
assertEquals(expectError, callback.mOnErrorCalled); assertEquals(expectError, callback.mOnErrorCalled);
......
...@@ -112,8 +112,7 @@ public class MetricsTestUtil { ...@@ -112,8 +112,7 @@ public class MetricsTestUtil {
assertAfter(metrics.getResponseStart(), startTime); assertAfter(metrics.getResponseStart(), startTime);
assertNotNull(metrics.getRequestEnd()); assertNotNull(metrics.getRequestEnd());
assertAfter(endTime, metrics.getRequestEnd()); assertAfter(endTime, metrics.getRequestEnd());
// Entire request should take more than 0 ms assertAfter(metrics.getRequestEnd(), metrics.getRequestStart());
assertTrue(metrics.getRequestEnd().getTime() - metrics.getRequestStart().getTime() > 0);
} }
/** /**
......
...@@ -234,17 +234,14 @@ public class RequestFinishedInfoTest extends CronetTestBase { ...@@ -234,17 +234,14 @@ public class RequestFinishedInfoTest extends CronetTestBase {
// Check the timing metrics // Check the timing metrics
assertNotNull(metrics.getRequestStart()); assertNotNull(metrics.getRequestStart());
assertTrue(metrics.getRequestStart().after(startTime) MetricsTestUtil.assertAfter(metrics.getRequestStart(), startTime);
|| metrics.getRequestStart().equals(startTime));
MetricsTestUtil.checkNoConnectTiming(metrics); MetricsTestUtil.checkNoConnectTiming(metrics);
assertNull(metrics.getSendingStart()); assertNull(metrics.getSendingStart());
assertNull(metrics.getSendingEnd()); assertNull(metrics.getSendingEnd());
assertNull(metrics.getResponseStart()); assertNull(metrics.getResponseStart());
assertNotNull(metrics.getRequestEnd()); assertNotNull(metrics.getRequestEnd());
assertTrue( MetricsTestUtil.assertAfter(endTime, metrics.getRequestEnd());
metrics.getRequestEnd().before(endTime) || metrics.getRequestEnd().equals(endTime)); MetricsTestUtil.assertAfter(metrics.getRequestEnd(), metrics.getRequestStart());
// Entire request should take more than 0 ms
assertTrue(metrics.getRequestEnd().getTime() - metrics.getRequestStart().getTime() > 0);
assertTrue(metrics.getSentByteCount() == 0); assertTrue(metrics.getSentByteCount() == 0);
assertTrue(metrics.getReceivedByteCount() == 0); assertTrue(metrics.getReceivedByteCount() == 0);
mTestFramework.mCronetEngine.shutdown(); mTestFramework.mCronetEngine.shutdown();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment