diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-05 20:08:34 +0000 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-05 20:08:34 +0000 |
commit | 40a32f628089f338f823b34ed832e18a164aec23 (patch) | |
tree | 301569d0a81c340425d54787155120c03c320c11 /tests | |
parent | 907bcd0c7cf8a44e07b3cf426b605ca7694ee24d (diff) | |
parent | a839ee4c19bfebac961f4b0aaa8aecaba114bac9 (diff) | |
download | android_packages_providers_DownloadProvider-40a32f628089f338f823b34ed832e18a164aec23.tar.gz android_packages_providers_DownloadProvider-40a32f628089f338f823b34ed832e18a164aec23.tar.bz2 android_packages_providers_DownloadProvider-40a32f628089f338f823b34ed832e18a164aec23.zip |
Merge tag 'android-4.4_r1' into cm-11.0
Android 4.4 Release 1.0
Change-Id: I6eadeafdb9d3219bebd28325b4e290b6d5282499
Diffstat (limited to 'tests')
-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)); |