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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java

Issue 2506653003: Instrument CronetUrlRequestTest#testThrowOrCancelInOnCanceled flaky test (Closed)
Patch Set: Changed equals to contains when comparing error messages. Created 4 years, 1 month 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
« components/cronet/android/api/src/org/chromium/net/UrlRequestException.java ('K') | « components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/TestUrlRequestCallback.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java
index 694cfebd2e4f92811b71666414cce072878046a1..0e0f574d4a472ae0ad2497a7b37c05a6f2a6a295 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java
@@ -368,7 +368,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
// only be passed along after all data has been read.
assertEquals("Response that lies about content length.", callback.mResponseAsString);
assertNotNull(callback.mError);
- assertEquals("Exception in CronetUrlRequest: net::ERR_CONTENT_LENGTH_MISMATCH",
+ assertContains("Exception in CronetUrlRequest: net::ERR_CONTENT_LENGTH_MISMATCH",
callback.mError.getMessage());
// Wait for a couple round trips to make sure there are no pending
// onFailed messages. This test relies on checks in
@@ -688,7 +688,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertNotNull(callback.mError);
assertTrue(callback.mOnErrorCalled);
assertEquals(-201, callback.mError.getCronetInternalErrorCode());
- assertEquals("Exception in CronetUrlRequest: net::ERR_CERT_DATE_INVALID",
+ assertContains("Exception in CronetUrlRequest: net::ERR_CERT_DATE_INVALID",
callback.mError.getMessage());
assertEquals(ResponseStep.ON_FAILED, callback.mResponseStep);
}
@@ -1246,8 +1246,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
callback.blockForDone();
dataProvider.assertClosed();
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Read upload data length 2 exceeds expected length 1",
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Read upload data length 2 exceeds expected length 1",
callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1279,8 +1279,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
builder.build().start();
callback.blockForDone();
dataProvider.assertClosed();
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Read upload data length 8192 exceeds expected length 8191",
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Read upload data length 8192 exceeds expected length 8191",
callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1307,8 +1307,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(1, dataProvider.getNumReadCalls());
assertEquals(0, dataProvider.getNumRewindCalls());
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Sync read failure", callback.mError.getCause().getMessage());
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Sync read failure", callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1334,8 +1334,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(0, dataProvider.getNumReadCalls());
assertEquals(0, dataProvider.getNumRewindCalls());
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Sync length failure", callback.mError.getCause().getMessage());
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Sync length failure", callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1361,8 +1361,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(1, dataProvider.getNumReadCalls());
assertEquals(0, dataProvider.getNumRewindCalls());
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Async read failure", callback.mError.getCause().getMessage());
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Async read failure", callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1394,8 +1394,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(0, dataProvider.getNumReadCalls());
assertEquals(0, dataProvider.getNumRewindCalls());
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Inline execution is prohibited for this request",
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Inline execution is prohibited for this request",
callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1430,8 +1430,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(0, dataProvider.getNumRewindCalls());
callback.mError.printStackTrace();
- assertEquals("Exception posting task to executor", callback.mError.getMessage());
- assertEquals("Inline execution is prohibited for this request",
+ assertContains("Exception posting task to executor", callback.mError.getMessage());
+ assertContains("Inline execution is prohibited for this request",
callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
dataProvider.assertClosed();
@@ -1488,8 +1488,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(1, dataProvider.getNumReadCalls());
assertEquals(0, dataProvider.getNumRewindCalls());
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Thrown read failure", callback.mError.getCause().getMessage());
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Thrown read failure", callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1513,8 +1513,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(1, dataProvider.getNumReadCalls());
assertEquals(1, dataProvider.getNumRewindCalls());
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Sync rewind failure", callback.mError.getCause().getMessage());
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Sync rewind failure", callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1538,8 +1538,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(1, dataProvider.getNumReadCalls());
assertEquals(1, dataProvider.getNumRewindCalls());
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Async rewind failure", callback.mError.getCause().getMessage());
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Async rewind failure", callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1563,8 +1563,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals(1, dataProvider.getNumReadCalls());
assertEquals(1, dataProvider.getNumRewindCalls());
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
- assertEquals("Thrown rewind failure", callback.mError.getCause().getMessage());
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Thrown rewind failure", callback.mError.getCause().getMessage());
assertEquals(null, callback.mResponseInfo);
}
@@ -1645,7 +1645,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
Throwable cause = callback.mError.getCause();
assertTrue("Exception was: " + cause, cause instanceof ConnectException);
} else {
- assertEquals("Exception in CronetUrlRequest: net::ERR_CONNECTION_REFUSED",
+ assertContains("Exception in CronetUrlRequest: net::ERR_CONNECTION_REFUSED",
callback.mError.getMessage());
}
}
@@ -1666,7 +1666,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
callback.shutdownExecutorAndWait();
assertEquals(1, callback.mRedirectCount);
if (failureType == FailureType.CANCEL_SYNC || failureType == FailureType.CANCEL_ASYNC) {
- assertEquals(ResponseStep.ON_CANCELED, callback.mResponseStep);
+ assertResponseStepCanceled(callback);
} else if (failureType == FailureType.THROW_SYNC) {
assertEquals(ResponseStep.ON_FAILED, callback.mResponseStep);
}
@@ -1784,7 +1784,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
callback.blockForDone();
// Wait for all posted tasks to be executed to ensure there is no unhandled exception.
callback.shutdownExecutorAndWait();
- assertEquals(ResponseStep.ON_CANCELED, callback.mResponseStep);
+ assertResponseStepCanceled(callback);
assertTrue(urlRequest.isDone());
assertNotNull(callback.mResponseInfo);
assertNull(callback.mError);
@@ -1875,7 +1875,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
callback.blockForDone();
assertTrue(callback.isDone());
assertTrue(callback.mOnErrorCalled);
- assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage());
+ assertContains("Exception received from UploadDataProvider", callback.mError.getMessage());
assertTrue(urlRequest.isDone());
}
@@ -1993,7 +1993,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertNotNull(callback.mError);
assertEquals(netError, callback.mError.getCronetInternalErrorCode());
assertEquals(errorCode, callback.mError.getErrorCode());
- assertEquals(
+ assertContains(
"Exception in CronetUrlRequest: net::ERR_" + name, callback.mError.getMessage());
assertEquals(0, callback.mRedirectCount);
assertTrue(callback.mOnErrorCalled);
@@ -2011,4 +2011,12 @@ public class CronetUrlRequestTest extends CronetTestBase {
duplicate.get(contents);
return new String(contents);
}
+
+ private void assertResponseStepCanceled(TestUrlRequestCallback callback) {
+ if (callback.mResponseStep == ResponseStep.ON_FAILED && callback.mError != null) {
+ throw new Error(
+ "Unexpected response state: " + ResponseStep.ON_FAILED, callback.mError);
+ }
+ assertEquals(ResponseStep.ON_CANCELED, callback.mResponseStep);
+ }
}
« components/cronet/android/api/src/org/chromium/net/UrlRequestException.java ('K') | « components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/TestUrlRequestCallback.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698