Some android.database CTS Cleanup
- Remove another usage of IContentProvider.
- Get rid of private API dependency on com.google.android.collect...
Change-Id: I37e04686c2420e4cb495e6b95ae3907dda07fc70
diff --git a/tests/tests/database/src/android/database/cts/CursorWindowTest.java b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
index 90ae695..65ce3fd 100644
--- a/tests/tests/database/src/android/database/cts/CursorWindowTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
@@ -16,10 +16,6 @@
package android.database.cts;
-import com.google.android.collect.Lists;
-
-
-import android.database.AbstractCursor;
import android.database.CharArrayBuffer;
import android.database.CursorWindow;
import android.database.MatrixCursor;
@@ -39,9 +35,9 @@
// create cursor
String[] colNames = new String[]{"_id", "name", "number", "profit"};
int colsize = colNames.length;
- ArrayList<ArrayList> list = createTestList(10, colsize);
+ ArrayList<ArrayList<Integer>> list = createTestList(10, colsize);
MatrixCursor cursor = new MatrixCursor(colNames, list.size());
- for (ArrayList row : list) {
+ for (ArrayList<Integer> row : list) {
cursor.addRow(row);
}
@@ -51,10 +47,10 @@
// read from cursor window
for (int i = 0; i < list.size(); i++) {
- ArrayList col = list.get(i);
+ ArrayList<Integer> col = list.get(i);
for (int j = 0; j < colsize; j++) {
String s = window.getString(i, j);
- int r2 = (Integer) col.get(j);
+ int r2 = col.get(j);
int r1 = Integer.parseInt(s);
assertEquals(r2, r1);
}
@@ -65,10 +61,10 @@
cursor.fillWindow(1, window);
// read from cursor from window
for (int i = 1; i < list.size(); i++) {
- ArrayList col = list.get(i);
+ ArrayList<Integer> col = list.get(i);
for (int j = 0; j < colsize; j++) {
String s = window.getString(i, j);
- int r2 = (Integer) col.get(j);
+ int r2 = col.get(j);
int r1 = Integer.parseInt(s);
assertEquals(r2, r1);
}
@@ -411,12 +407,12 @@
}
}
- private static ArrayList<ArrayList> createTestList(int rows, int cols) {
- ArrayList<ArrayList> list = Lists.newArrayList();
+ private static ArrayList<ArrayList<Integer>> createTestList(int rows, int cols) {
+ ArrayList<ArrayList<Integer>> list = new ArrayList<ArrayList<Integer>>();
Random generator = new Random();
for (int i = 0; i < rows; i++) {
- ArrayList<Integer> col = Lists.newArrayList();
+ ArrayList<Integer> col = new ArrayList<Integer>();
list.add(col);
for (int j = 0; j < cols; j++) {
// generate random number
diff --git a/tests/tests/database/src/android/database/cts/CursorWrapperTest.java b/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
index cc89a6e..9d517dc 100644
--- a/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
@@ -17,9 +17,7 @@
package android.database.cts;
-import android.content.ContentResolver;
import android.content.Context;
-import android.content.IContentProvider;
import android.database.CharArrayBuffer;
import android.database.ContentObserver;
import android.database.Cursor;
@@ -27,7 +25,6 @@
import android.database.DataSetObserver;
import android.database.StaleDataException;
import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.test.AndroidTestCase;
@@ -440,30 +437,6 @@
cursorWrapper.close();
}
- public void testSetNotificationUri() {
- String MOCK_URI = "content://cursorwrappertest/testtable";
- CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
- MockContentResolver contentResolver = new MockContentResolver(null);
- cursorWrapper.setNotificationUri(contentResolver, Uri.parse(MOCK_URI));
- }
-
- private class MockContentResolver extends ContentResolver {
-
- public MockContentResolver(Context context) {
- super(context);
- }
-
- @Override
- protected IContentProvider acquireProvider(Context c, String name) {
- return null;
- }
-
- @Override
- public boolean releaseProvider(IContentProvider icp) {
- return false;
- }
- }
-
private class MockContentObserver extends ContentObserver {
public MockContentObserver(Handler handler) {
