dont use sqlite_stmt_journals dir.
diff --git a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
index bc404fe..e20bee1 100644
--- a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
@@ -22,6 +22,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.content.Context;
import android.database.AbstractCursor;
import android.database.CharArrayBuffer;
import android.database.ContentObserver;
@@ -67,6 +68,15 @@
mTestAbstractCursor = new TestAbstractCursor(COLUMN_NAMES, list);
}
+ @Override
+ protected void tearDown() throws Exception {
+ mDatabaseCursor.close();
+ mTestAbstractCursor.close();
+ mDatabase.close();
+ mDatabaseFile.delete();
+ super.tearDown();
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "AbstractCursor",
@@ -642,7 +652,9 @@
}
private void setupDatabase() {
- mDatabaseFile = new File("/sqlite_stmt_journals", "database_test.db");
+ File dbDir = getInstrumentation().getTargetContext().getDir("tests",
+ Context.MODE_WORLD_WRITEABLE);
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
diff --git a/tests/tests/database/src/android/database/cts/AbstractWindowedCursorTest.java b/tests/tests/database/src/android/database/cts/AbstractWindowedCursorTest.java
index bcce519..3dfaa53 100644
--- a/tests/tests/database/src/android/database/cts/AbstractWindowedCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/AbstractWindowedCursorTest.java
@@ -47,6 +47,13 @@
mWindow = new CursorWindow(false);
}
+ @Override
+ protected void tearDown() throws Exception {
+ mCursor.close();
+ mWindow.close();
+ super.tearDown();
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "isNull",
diff --git a/tests/tests/database/src/android/database/cts/CursorJoinerTest.java b/tests/tests/database/src/android/database/cts/CursorJoinerTest.java
index b76c23b..b54cd35 100644
--- a/tests/tests/database/src/android/database/cts/CursorJoinerTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorJoinerTest.java
@@ -21,6 +21,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import android.content.Context;
import android.database.Cursor;
import android.database.CursorJoiner;
import android.database.CursorJoiner.Result;
@@ -243,7 +244,8 @@
}
private void setupDatabase() {
- mDatabaseFile = new File("/sqlite_stmt_journals", "database_test.db");
+ File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
diff --git a/tests/tests/database/src/android/database/cts/CursorWrapperTest.java b/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
index c32cd89..1373db8 100644
--- a/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
@@ -300,6 +300,7 @@
assertEquals(DEFAULT_COLUMN_COUNT, cursorWrapper.getColumnCount());
assertEquals("_id", columnNames[0]);
assertEquals("number", columnNames[1]);
+ cursorWrapper.close();
}
@TestTargets({
@@ -444,6 +445,7 @@
assertTrue(cursorWrapper.moveToFirst());
assertEquals(0, cursorWrapper.getPosition());
assertTrue(cursorWrapper.isFirst());
+ cursorWrapper.close();
}
@TestTargets({
@@ -619,6 +621,7 @@
string = new String(charArrayBuffer.data);
assertTrue(charArrayBuffer.sizeCopied > 0);
assertEquals(SECOND_NUMBER, string.substring(0, charArrayBuffer.sizeCopied));
+ cursorWrapper.close();
}
@TestTargetNew(
@@ -632,6 +635,7 @@
CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
Bundle bundle = cursorWrapper.respond(b);
assertSame(Bundle.EMPTY, bundle);
+ cursorWrapper.close();
}
@TestTargetNew(
@@ -643,6 +647,7 @@
public void testGetWantsAllOnMoveCalls() {
CursorWrapper cursorWrapper = new CursorWrapper(getCursor());
assertFalse(cursorWrapper.getWantsAllOnMoveCalls());
+ cursorWrapper.close();
}
@TestTargets({
@@ -691,6 +696,7 @@
fail("testUnregisterContentObserver failed");
}catch(IllegalStateException e){
}
+ cursorWrapper.close();
}
@TestTargetNew(
@@ -743,7 +749,8 @@
}
private void setupDatabase() {
- mDatabaseFile = new File("/sqlite_stmt_journals", "database_test.db");
+ File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
diff --git a/tests/tests/database/src/android/database/cts/DatabaseCursorTest.java b/tests/tests/database/src/android/database/cts/DatabaseCursorTest.java
index 241dd26..9000972 100644
--- a/tests/tests/database/src/android/database/cts/DatabaseCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/DatabaseCursorTest.java
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
import android.content.ContentValues;
+import android.content.Context;
import android.database.Cursor;
import android.database.CursorIndexOutOfBoundsException;
import android.database.CursorWrapper;
@@ -35,13 +36,14 @@
import android.database.sqlite.SQLiteQuery;
import android.database.sqlite.SQLiteStatement;
import android.os.Looper;
+import android.test.AndroidTestCase;
import android.test.PerformanceTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.Suppress;
import android.util.Log;
-public class DatabaseCursorTest extends TestCase implements PerformanceTestCase {
+public class DatabaseCursorTest extends AndroidTestCase implements PerformanceTestCase {
private static final String sString1 = "this is a test";
private static final String sString2 = "and yet another test";
private static final String sString3 = "this string is a little longer, but still a test";
@@ -56,7 +58,8 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mDatabaseFile = new File("/sqlite_stmt_journals", "database_test.db");
+ File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
diff --git a/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java b/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
index ad89d5f..c67002c 100644
--- a/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
+++ b/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
@@ -23,6 +23,7 @@
import dalvik.annotation.ToBeFixed;
import android.content.ContentValues;
+import android.content.Context;
import android.database.Cursor;
import android.database.DatabaseUtils;
import android.database.DatabaseUtils.InsertHelper;
@@ -53,7 +54,8 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mDatabaseFile = new File("/sqlite_stmt_journals", "database_test.db");
+ File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
diff --git a/tests/tests/database/src/android/database/cts/MergeCursorTest.java b/tests/tests/database/src/android/database/cts/MergeCursorTest.java
index 25e6aec..33e2a5c 100644
--- a/tests/tests/database/src/android/database/cts/MergeCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/MergeCursorTest.java
@@ -21,6 +21,7 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import android.content.Context;
import android.database.ContentObserver;
import android.database.Cursor;
import android.database.DataSetObserver;
@@ -450,7 +451,8 @@
}
private void setupDatabase() {
- mDatabaseFile = new File("/sqlite_stmt_journals", "database_test.db");
+ File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
diff --git a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
index 1798a84..9627b6f 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
@@ -66,7 +66,8 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mDatabaseFile = new File("/sqlite_stmt_journals", "database_test.db");
+ File dbDir = getContext().getDir("tests", Context.MODE_WORLD_WRITEABLE);
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
diff --git a/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
index 93b2e90..0927b61 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
@@ -91,7 +91,8 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- mDatabaseFile = new File("/sqlite_stmt_journals", "database_test.db");
+ File dbDir = getContext().getDir("tests", Context.MODE_WORLD_WRITEABLE);
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
