commit d4c3a6d7061e2a0abce77355b114a76808c7fe28
author Brian Muramatsu <btmura@google.com> Tue May 08 12:38:01 2012 -0700
committer Brian Muramatsu <btmura@google.com> Tue May 08 12:38:01 2012 -0700
tree 7efd01284a5fbd2a47201ee68e0e2211ddbfa279
parent c4201329bf1833d3582bce81b080708a1b70de3e

Fix ContentWrapperTest#testAccessDatabase

Bug 6294356

There is a journal database for each database now.

Change-Id: I63b521322e08fa7dbcacd3cf8a23896f73592a32

tests/tests/content/src/android/content/cts/ContextWrapperTest.java

diff --git a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
index ec17147..39c460c 100644
--- a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
@@ -49,6 +49,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -352,12 +353,10 @@
         File actualDBPath = mContextWrapper.getDatabasePath(DATABASE_NAME1);
 
         // Test databaseList()
-        assertEquals(2, mContextWrapper.databaseList().length);
-        ArrayList<String> list = new ArrayList<String>();
-        // Don't know the items storing order
-        list.add(mContextWrapper.databaseList()[0]);
-        list.add(mContextWrapper.databaseList()[1]);
-        assertTrue(list.contains(DATABASE_NAME1) && list.contains(DATABASE_NAME2));
+        List<String> list = Arrays.asList(mContextWrapper.databaseList());
+        assertEquals(4, list.size()); // Each database has a journal
+        assertTrue("1) database list: " + list, list.contains(DATABASE_NAME1));
+        assertTrue("2) database list: " + list, list.contains(DATABASE_NAME2));
 
         // Test deleteDatabase()
         for (int i = 1; i < 3; i++) {