From 1b5c0091270cdc04054c9a2af33ba4f94d652cff Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 21 Mar 2013 14:24:25 -0700 Subject: Start using MockStreamResponse. Change-Id: Ida4a0a85883ccd6763b07e958ddc6ecf7eedf790 --- .../providers/downloads/AbstractDownloadProviderFunctionalTest.java | 5 +++++ .../src/com/android/providers/downloads/PublicApiFunctionalTest.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java index 3b937389..e59aff08 100644 --- a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java @@ -34,6 +34,7 @@ import android.test.mock.MockContentResolver; import android.util.Log; import com.google.mockwebserver.MockResponse; +import com.google.mockwebserver.MockStreamResponse; import com.google.mockwebserver.MockWebServer; import com.google.mockwebserver.RecordedRequest; import com.google.mockwebserver.SocketPolicy; @@ -220,6 +221,10 @@ public abstract class AbstractDownloadProviderFunctionalTest extends mServer.enqueue(resp); } + void enqueueResponse(MockStreamResponse resp) { + mServer.enqueue(resp); + } + MockResponse buildResponse(int status, String body) { return new MockResponse().setResponseCode(status).setBody(body) .setHeader("Content-type", "text/plain") diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java index bde95815..b6fd611e 100644 --- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java @@ -50,6 +50,7 @@ import android.test.suitebuilder.annotation.Suppress; import android.text.format.DateUtils; import com.google.mockwebserver.MockResponse; +import com.google.mockwebserver.MockStreamResponse; import com.google.mockwebserver.RecordedRequest; import com.google.mockwebserver.SocketPolicy; @@ -140,7 +141,7 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { final long length = 3 * GB_IN_BYTES; final InputStream body = new FakeInputStream(length); - enqueueResponse(new MockResponse().setResponseCode(HTTP_OK).setBody(body, length) + enqueueResponse(new MockStreamResponse().setResponseCode(HTTP_OK).setBody(body, length) .setHeader("Content-type", "text/plain") .setSocketPolicy(SocketPolicy.DISCONNECT_AT_END)); -- cgit v1.2.3