commit 213bcbfc082996cfd5096e6a67d3a160e0c46da1
author Vasu Nori <vnori@google.com> Thu Jul 01 16:59:26 2010 -0700
committer Vasu Nori <vnori@google.com> Thu Jul 01 17:08:02 2010 -0700
tree 6b42c0d08b139a868a3e0545fd15399510de8a61
parent 01ea71ea202c6c7374a77907cdd73d7f4baa3ef0

fix cts database tests annotated with "to-be-fixed"

I think one shouldn't allow such annotations to be used because the submitter
will never fix them and who else will HAVE to fix them - yours truly.
so please don't +2 if someone says "to-be-fixed-later"
ask them to fix it later and submit later-than-that-later :)

Change-Id: I6db80feabb2c980858b036977bb336a3954b4d79

tests/tests/database/src/android/database/cts/AbstractCursorTest.java

diff --git a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
index 88902ee..3c03af7 100644
--- a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
@@ -451,16 +451,9 @@
         method = "getUpdatedField",
         args = {int.class}
     )
-    @ToBeFixed(bug = "1569265", explanation = "All other updating-related methods are 'hide' and "
-        + "'deprecated.")
     public void testGetUpdatedField() {
         mTestAbstractCursor.moveToFirst();
-        try {
-            assertEquals("hello", mTestAbstractCursor.getUpdatedField(0));
-            fail("getUpdatedField should throws a NullPointerException here.");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        assertNull(mTestAbstractCursor.getUpdatedField(0));
     }
 
     @TestTargetNew(

tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java

diff --git a/tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java b/tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java
index 89918a1..285dffb 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java
@@ -106,7 +106,7 @@
         assertTrue(statementOne.getUniqueId() > 0);
         int nStatement = statementOne.getUniqueId();
         statementOne.releaseReference();
-        assertTrue(statementOne.getUniqueId() == nStatement);
+        assertEquals(0, statementOne.getUniqueId());
         statementOne.close();
     }
 
@@ -126,7 +126,7 @@
         assertTrue(statementOne.getUniqueId() > 0);
         int nStatement = statementOne.getUniqueId();
         statementOne.releaseReferenceFromContainer();
-        assertTrue(statementOne.getUniqueId() == nStatement);
+        assertEquals(0, statementOne.getUniqueId());
         statementOne.close();
     }