diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-04-03 10:13:32 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2013-05-09 10:08:29 -0700 |
commit | ccdd40c7230a1e82394e73d8f4c265f58095530d (patch) | |
tree | b27b0119fbfc4f62e1fe6f67fabb45d72773d508 | |
parent | 672a5be2fb115a4480d6867c06b9da2a36d5353c (diff) | |
download | android_packages_providers_DownloadProvider-ccdd40c7230a1e82394e73d8f4c265f58095530d.tar.gz android_packages_providers_DownloadProvider-ccdd40c7230a1e82394e73d8f4c265f58095530d.tar.bz2 android_packages_providers_DownloadProvider-ccdd40c7230a1e82394e73d8f4c265f58095530d.zip |
Follow MockWebServer API changes.
(cherry picked from commit 323f5ae0cafdc72f61defefaa5ba938f1b4d0dda)
Change-Id: I11627a5efebddf7b832bb63e6a7588accbc04fe8
-rw-r--r-- | tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java | 5 | ||||
-rw-r--r-- | tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java | 3 |
2 files changed, 1 insertions, 7 deletions
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)); |