summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-01-31 17:10:54 -0800
committerJeff Sharkey <jsharkey@android.com>2013-01-31 17:10:54 -0800
commit70c0e1eff5ff7cd5051738f76cecd6cb87353a43 (patch)
treef2453dd9e554e051a99e1c702394a9758242283a
parent1d0a0aa2cc5bfed8107aa70f7e890fde9a7ea2b4 (diff)
downloadandroid_packages_providers_DownloadProvider-70c0e1eff5ff7cd5051738f76cecd6cb87353a43.zip
android_packages_providers_DownloadProvider-70c0e1eff5ff7cd5051738f76cecd6cb87353a43.tar.gz
android_packages_providers_DownloadProvider-70c0e1eff5ff7cd5051738f76cecd6cb87353a43.tar.bz2
Migrate to using Mockito directly.
Change-Id: Ice24d5c62bbcbcfd3d7374eac3a20580f7f31f36
-rw-r--r--tests/Android.mk2
-rw-r--r--tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java2
-rw-r--r--tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java14
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index ff3e1d4..4b20631 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -8,7 +8,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_INSTRUMENTATION_FOR := DownloadProvider
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := mockwebserver littlemock dexmaker
+LOCAL_STATIC_JAVA_LIBRARIES := mockwebserver mockito-target
LOCAL_PACKAGE_NAME := DownloadProviderTests
LOCAL_CERTIFICATE := media
diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java
index acfd473..0074a27 100644
--- a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java
@@ -16,7 +16,7 @@
package com.android.providers.downloads;
-import static com.google.testing.littlemock.LittleMock.mock;
+import static org.mockito.Mockito.mock;
import android.app.NotificationManager;
import android.content.ComponentName;
diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
index 84390aa..73f379e 100644
--- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
@@ -19,19 +19,19 @@ package com.android.providers.downloads;
import static android.app.DownloadManager.STATUS_FAILED;
import static android.app.DownloadManager.STATUS_PAUSED;
import static android.text.format.DateUtils.SECOND_IN_MILLIS;
-import static com.google.testing.littlemock.LittleMock.anyInt;
-import static com.google.testing.littlemock.LittleMock.anyString;
-import static com.google.testing.littlemock.LittleMock.atLeastOnce;
-import static com.google.testing.littlemock.LittleMock.isA;
-import static com.google.testing.littlemock.LittleMock.never;
-import static com.google.testing.littlemock.LittleMock.times;
-import static com.google.testing.littlemock.LittleMock.verify;
import static java.net.HttpURLConnection.HTTP_MOVED_TEMP;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static java.net.HttpURLConnection.HTTP_OK;
import static java.net.HttpURLConnection.HTTP_PARTIAL;
import static java.net.HttpURLConnection.HTTP_PRECON_FAILED;
import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import android.app.DownloadManager;
import android.app.Notification;