summaryrefslogtreecommitdiffstats
path: root/tests/src/com/android/providers
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2010-10-20 13:38:10 -0700
committerVasu Nori <vnori@google.com>2010-10-20 13:42:12 -0700
commit04f09085f85d094207d22ae8969102bd48178180 (patch)
tree356dda60d18d48385afafd44f889e6feb6a1ec16 /tests/src/com/android/providers
parentc2c87a02f42b8a9b4f419df72617c0c1ab6d5756 (diff)
downloadandroid_packages_providers_DownloadProvider-04f09085f85d094207d22ae8969102bd48178180.tar.gz
android_packages_providers_DownloadProvider-04f09085f85d094207d22ae8969102bd48178180.tar.bz2
android_packages_providers_DownloadProvider-04f09085f85d094207d22ae8969102bd48178180.zip
remove usage of hidden public constants.
Change-Id: I2edf1bef5e741de8193cb293807e3ace42003b0c
Diffstat (limited to 'tests/src/com/android/providers')
-rw-r--r--tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java6
-rw-r--r--tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java28
2 files changed, 17 insertions, 17 deletions
diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
index d04fd2de..a06597f1 100644
--- a/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
@@ -189,8 +189,8 @@ public abstract class AbstractDownloadManagerFunctionalTest extends
if (mResolver == null) {
return;
}
- String[] columns = new String[] {Downloads._DATA};
- Cursor cursor = mResolver.query(Downloads.CONTENT_URI, columns, null, null, null);
+ String[] columns = new String[] {Downloads.Impl._DATA};
+ Cursor cursor = mResolver.query(Downloads.Impl.CONTENT_URI, columns, null, null, null);
try {
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
String filePath = cursor.getString(0);
@@ -201,7 +201,7 @@ public abstract class AbstractDownloadManagerFunctionalTest extends
} finally {
cursor.close();
}
- mResolver.delete(Downloads.CONTENT_URI, null, null);
+ mResolver.delete(Downloads.Impl.CONTENT_URI, null, null);
}
/**
diff --git a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
index 0cb63e0f..bc3de1d7 100644
--- a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
@@ -46,10 +46,10 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti
String path = "/download_manager_test_path";
Uri downloadUri = requestDownload(path);
- assertEquals(Downloads.STATUS_PENDING, getDownloadStatus(downloadUri));
+ assertEquals(Downloads.Impl.STATUS_PENDING, getDownloadStatus(downloadUri));
assertTrue(mTestContext.mHasServiceBeenStarted);
- runUntilStatus(downloadUri, Downloads.STATUS_SUCCESS);
+ runUntilStatus(downloadUri, Downloads.Impl.STATUS_SUCCESS);
RecordedRequest request = takeRequest();
assertEquals("GET", request.getMethod());
assertEquals(path, request.getPath());
@@ -61,9 +61,9 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti
public void testDownloadToCache() throws Exception {
enqueueResponse(HTTP_OK, FILE_CONTENT);
Uri downloadUri = requestDownload("/path");
- updateDownload(downloadUri, Downloads.COLUMN_DESTINATION,
- Integer.toString(Downloads.DESTINATION_CACHE_PARTITION));
- runUntilStatus(downloadUri, Downloads.STATUS_SUCCESS);
+ updateDownload(downloadUri, Downloads.Impl.COLUMN_DESTINATION,
+ Integer.toString(Downloads.Impl.DESTINATION_CACHE_PARTITION));
+ runUntilStatus(downloadUri, Downloads.Impl.STATUS_SUCCESS);
assertEquals(FILE_CONTENT, getDownloadContents(downloadUri));
assertStartsWith(Environment.getDownloadCacheDirectory().getPath(),
getDownloadFilename(downloadUri));
@@ -76,18 +76,18 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti
// for a normal download, roaming is fine
enqueueResponse(HTTP_OK, FILE_CONTENT);
Uri downloadUri = requestDownload("/path");
- runUntilStatus(downloadUri, Downloads.STATUS_SUCCESS);
+ runUntilStatus(downloadUri, Downloads.Impl.STATUS_SUCCESS);
// when roaming is disallowed, the download should pause...
downloadUri = requestDownload("/path");
- updateDownload(downloadUri, Downloads.COLUMN_DESTINATION,
- Integer.toString(Downloads.DESTINATION_CACHE_PARTITION_NOROAMING));
+ updateDownload(downloadUri, Downloads.Impl.COLUMN_DESTINATION,
+ Integer.toString(Downloads.Impl.DESTINATION_CACHE_PARTITION_NOROAMING));
runUntilStatus(downloadUri, Downloads.Impl.STATUS_WAITING_FOR_NETWORK);
// ...and pick up when we're off roaming
enqueueResponse(HTTP_OK, FILE_CONTENT);
mSystemFacade.mIsRoaming = false;
- runUntilStatus(downloadUri, Downloads.STATUS_SUCCESS);
+ runUntilStatus(downloadUri, Downloads.Impl.STATUS_SUCCESS);
}
/**
@@ -108,11 +108,11 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti
}
protected int getDownloadStatus(Uri downloadUri) {
- return Integer.valueOf(getDownloadField(downloadUri, Downloads.COLUMN_STATUS));
+ return Integer.valueOf(getDownloadField(downloadUri, Downloads.Impl.COLUMN_STATUS));
}
private String getDownloadFilename(Uri downloadUri) {
- return getDownloadField(downloadUri, Downloads._DATA);
+ return getDownloadField(downloadUri, Downloads.Impl._DATA);
}
private String getDownloadField(Uri downloadUri, String column) {
@@ -132,9 +132,9 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti
*/
private Uri requestDownload(String path) throws MalformedURLException {
ContentValues values = new ContentValues();
- values.put(Downloads.COLUMN_URI, getServerUri(path));
- values.put(Downloads.COLUMN_DESTINATION, Downloads.DESTINATION_EXTERNAL);
- return mResolver.insert(Downloads.CONTENT_URI, values);
+ values.put(Downloads.Impl.COLUMN_URI, getServerUri(path));
+ values.put(Downloads.Impl.COLUMN_DESTINATION, Downloads.Impl.DESTINATION_EXTERNAL);
+ return mResolver.insert(Downloads.Impl.CONTENT_URI, values);
}
/**