Revert "Update CTS tests as part of ContentProvider cleanup."
This reverts commit fcfd502de1270c2d5565b386799240d9b68c2df5.
diff --git a/tests/tests/content/src/android/content/cts/ContentProviderTest.java b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
index aa09112..eabd470 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
@@ -330,6 +330,12 @@
assertSame(mockContentProvider, ContentProvider.coerceToLocalContentProvider(transport));
IContentProvider iContentProvider = new IContentProvider() {
+ public IBulkCursor bulkQuery(Uri url, String[] projection, String selection,
+ String[] selectionArgs, String sortOrder, IContentObserver observer,
+ CursorWindow window) throws RemoteException {
+ return null;
+ }
+
public int bulkInsert(Uri url, ContentValues[] initialValues) {
return 0;
}
diff --git a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
index 5ae0a49..8f5fead 100644
--- a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
@@ -546,6 +546,19 @@
assertEquals(COLUMN_NAMES1.length, mDatabaseCursor.getColumnCount());
}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "deactivateInternal",
+ args = {}
+ )
+ public void testDeactivateInternal() {
+ MockDataSetObserver mock = new MockDataSetObserver();
+ mDatabaseCursor.registerDataSetObserver(mock);
+ assertFalse(mock.hadCalledOnInvalid());
+ mDatabaseCursor.deactivateInternal();
+ assertTrue(mock.hadCalledOnInvalid());
+ }
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
