joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "TestUrlRequestCallback: assert internal states using matchers"

Browse source
This commit is contained in:
Stefano Duo 2023-02-27 13:28:00 +00:00 • committed by Gerrit Code Review
commit 02970ff18b
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Cronet/tests/cts/src/android/net/http/cts/util/TestUrlRequestCallback.java
View file

@ -17,11 +17,14 @@
package android.net.http.cts.util;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.core.AnyOf.anyOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
@ -288,8 +291,9 @@ public class TestUrlRequestCallback extends UrlRequest.Callback {
UrlRequest request, UrlResponseInfo info, String newLocationUrl) {
checkExecutorThread();
assertFalse(request.isDone());
assertTrue(mResponseStep == ResponseStep.NOTHING
|| mResponseStep == ResponseStep.ON_RECEIVED_REDIRECT);
assertThat(mResponseStep, anyOf(
equalTo(ResponseStep.NOTHING),
equalTo(ResponseStep.ON_RECEIVED_REDIRECT)));
assertNull(mError);
mResponseStep = ResponseStep.ON_RECEIVED_REDIRECT;
@ -306,8 +310,9 @@ public class TestUrlRequestCallback extends UrlRequest.Callback {
public void onResponseStarted(UrlRequest request, UrlResponseInfo info) {
checkExecutorThread();
assertFalse(request.isDone());
assertTrue(mResponseStep == ResponseStep.NOTHING
|| mResponseStep == ResponseStep.ON_RECEIVED_REDIRECT);
assertThat(mResponseStep, anyOf(
equalTo(ResponseStep.NOTHING),
equalTo(ResponseStep.ON_RECEIVED_REDIRECT)));
assertNull(mError);
mResponseStep = ResponseStep.ON_RESPONSE_STARTED;
@ -322,8 +327,9 @@ public class TestUrlRequestCallback extends UrlRequest.Callback {
public void onReadCompleted(UrlRequest request, UrlResponseInfo info, ByteBuffer byteBuffer) {
checkExecutorThread();
assertFalse(request.isDone());
assertTrue(mResponseStep == ResponseStep.ON_RESPONSE_STARTED
|| mResponseStep == ResponseStep.ON_READ_COMPLETED);
assertThat(mResponseStep, anyOf(
equalTo(ResponseStep.ON_RESPONSE_STARTED),
equalTo(ResponseStep.ON_READ_COMPLETED)));
assertNull(mError);
mResponseStep = ResponseStep.ON_READ_COMPLETED;
@ -349,8 +355,9 @@ public class TestUrlRequestCallback extends UrlRequest.Callback {
public void onSucceeded(UrlRequest request, UrlResponseInfo info) {
checkExecutorThread();
assertTrue(request.isDone());
assertTrue(mResponseStep == ResponseStep.ON_RESPONSE_STARTED
|| mResponseStep == ResponseStep.ON_READ_COMPLETED);
assertThat(mResponseStep, anyOf(
equalTo(ResponseStep.ON_RESPONSE_STARTED),
equalTo(ResponseStep.ON_READ_COMPLETED)));
assertFalse(mOnErrorCalled);
assertFalse(mOnCanceledCalled);
assertNull(mError);
@ -373,7 +380,7 @@ public class TestUrlRequestCallback extends UrlRequest.Callback {
checkExecutorThread();
assertTrue(request.isDone());
// Shouldn't happen after success.
assertTrue(mResponseStep != ResponseStep.ON_SUCCEEDED);
assertNotEquals(ResponseStep.ON_SUCCEEDED, mResponseStep);
// Should happen at most once for a single request.
assertFalse(mOnErrorCalled);
assertFalse(mOnCanceledCalled);