From d2cecfd3759d6785c5a2ed3f2f35fa1a30f757db Mon Sep 17 00:00:00 2001
From: Vasu Nori <vnori@google.com>
Date: Thu, 3 Jun 2010 23:29:18 -0700
Subject: fix broken-test
Change-Id: I3d33cda2e4f1ba68843d6a81b8c624ce4af8519f
---
.../src/android/database/DatabaseGeneralTest.java | 24 +++-------------------
1 file changed, 3 insertions(+), 21 deletions(-)
(limited to 'core/tests')
diff --git a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java
index c584398..c86bdfa 100644
--- a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java
+++ b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java
@@ -1385,8 +1385,8 @@ public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceT
assertTrue(statementIds.contains(stmt0Id));
assertEquals(1, statementIds.size());
- // close the database. native method dbclose() will finalize all statements
- // before closing the database.
+ // close the database. everything from mClosedStatementIds in mDatabase
+ // should be finalized and cleared from the list
// again do it in a separate thread
Thread t3 = new Thread() {
@Override public void run() {
@@ -1396,25 +1396,7 @@ public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceT
t3.start();
t3.join();
- // check mClosedStatementIds in mDatabase. it should still have 'stmt0Id'
- statementIds = mDatabase.getQueuedUpStmtList();
- assertTrue(statementIds.contains(stmt0Id));
-
- // try to finalize the pending statements. and there should be no exceptions from anywhere
- // just for the heck of it, do it in a separate thread
- Thread t4 = new Thread() {
- @Override public void run() {
- try {
- mDatabase.closePendingStatements();
- } catch (Exception e) {
- fail("not expected");
- }
- }
- };
- t4.start();
- t4.join();
-
- // mClosedStatementIds in mDatabase should be empty
+ // check mClosedStatementIds in mDatabase. it should be empty
statementIds = mDatabase.getQueuedUpStmtList();
assertEquals(0, statementIds.size());
}
--
cgit v1.1