From 323f5ae0cafdc72f61defefaa5ba938f1b4d0dda Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 3 Apr 2013 10:13:32 -0700 Subject: Follow MockWebServer API changes. Change-Id: Icaba016bc6e098745e56a3b6367a8a6af0151158 --- .../providers/downloads/AbstractDownloadProviderFunctionalTest.java | 5 ----- .../src/com/android/providers/downloads/PublicApiFunctionalTest.java | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'tests/src') diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java index e59aff08..3b937389 100644 --- a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java @@ -34,7 +34,6 @@ 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; @@ -221,10 +220,6 @@ 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 b6fd611e..bde95815 100644 --- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java @@ -50,7 +50,6 @@ 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; @@ -141,7 +140,7 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { final long length = 3 * GB_IN_BYTES; final InputStream body = new FakeInputStream(length); - enqueueResponse(new MockStreamResponse().setResponseCode(HTTP_OK).setBody(body, length) + enqueueResponse(new MockResponse().setResponseCode(HTTP_OK).setBody(body, length) .setHeader("Content-type", "text/plain") .setSocketPolicy(SocketPolicy.DISCONNECT_AT_END)); -- cgit v1.2.3