diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-03-25 18:34:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-25 18:34:20 +0000 |
commit | 00387b15f33d134ef58c25065a44882320d0b5d3 (patch) | |
tree | 0f392741659570294cdbd7f9b8e65fc6644d485f | |
parent | 5043edf24958e41370501cd02716b82b6477f6dc (diff) | |
parent | 1b5c0091270cdc04054c9a2af33ba4f94d652cff (diff) | |
download | android_packages_providers_DownloadProvider-00387b15f33d134ef58c25065a44882320d0b5d3.tar.gz android_packages_providers_DownloadProvider-00387b15f33d134ef58c25065a44882320d0b5d3.tar.bz2 android_packages_providers_DownloadProvider-00387b15f33d134ef58c25065a44882320d0b5d3.zip |
am 1b5c0091: Start using MockStreamResponse.
* commit '1b5c0091270cdc04054c9a2af33ba4f94d652cff':
Start using MockStreamResponse.
-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, 7 insertions, 1 deletions
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)); |