commit 3a18718bb2f557d7a2d744c3c0f75f31648d5d2a
author android-htc-contribute <android-htc-contribute@htc.com> Wed Aug 15 12:26:06 2012 +0800
committer android-htc-contribute <android-htc-contribute@htc.com> Fri Aug 31 11:28:04 2012 +0800
tree f7fb4ed14318e3adbd6ce5f2c079cffce7519ff0
parent 318297f2efc3e34dafafb56271ac6da610a75eb9

According to external test, delete playlists after inserting internal data.
It will keep clean environment.

Change-Id: I2116cd305f40015affc410211d83a890a6bf13fb

tests/tests/provider/src/android/provider/cts/MediaStore_Audio_PlaylistsTest.java

diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_PlaylistsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_PlaylistsTest.java
index 19fa2e1..0d36212 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_PlaylistsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_PlaylistsTest.java
@@ -114,9 +114,16 @@
         values.put(Playlists.DATE_ADDED, dateAdded);
         long dateModified = System.currentTimeMillis();
         values.put(Playlists.DATE_MODIFIED, dateModified);
+        // insert
         Uri uri = mContentResolver.insert(Playlists.INTERNAL_CONTENT_URI, values);
         assertNotNull(uri);
-        assertTrue(Pattern.matches("content://media/internal/audio/playlists/\\d+",
-                uri.toString()));
+
+        try {
+            assertTrue(Pattern.matches("content://media/internal/audio/playlists/\\d+",
+                    uri.toString()));
+        } finally {
+            // delete the playlists
+            assertEquals(1, mContentResolver.delete(uri, null, null));
+        }
     }
 }

tests/tests/provider/src/android/provider/cts/MediaStore_Audio_Playlists_MembersTest.java

diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_Playlists_MembersTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_Playlists_MembersTest.java
index 9ae42ae..aa524aa 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_Playlists_MembersTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_Playlists_MembersTest.java
@@ -456,9 +456,16 @@
         values.put(Playlists.DATE_ADDED, dateAdded);
         long dateModified = System.currentTimeMillis();
         values.put(Playlists.DATE_MODIFIED, dateModified);
+        // insert
         Uri uri = mContentResolver.insert(Playlists.INTERNAL_CONTENT_URI, values);
         assertNotNull(uri);
-        assertTrue(Pattern.matches("content://media/internal/audio/playlists/\\d+",
-                uri.toString()));
+
+        try {
+            assertTrue(Pattern.matches("content://media/internal/audio/playlists/\\d+",
+                    uri.toString()));
+        } finally {
+            // delete the playlists
+            assertEquals(1, mContentResolver.delete(uri, null, null));
+        }
     }
 }