Clean up test files and db entries
If the test was ever aborted mid-run for some reason, test files
might have been left behind which would then cause the test to fail
on subsequent runs.
b/8508308
Change-Id: I536ec47589fd9c666681ec867a926bdbfd6e63b9
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
index 740e31b..e68286f 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
@@ -191,12 +191,21 @@
assertNull(mContentResolver.query(Media.getContentUri(volume), null, null, null, null));
}
+ private void cleanExternalMediaFile(String path) {
+ mContentResolver.delete(Media.EXTERNAL_CONTENT_URI, "_data=?", new String[] { path });
+ new File(path).delete();
+ }
+
public void testStoreImagesMediaExternal() throws Exception {
final String externalPath = Environment.getExternalStorageDirectory().getPath() +
"/testimage.jpg";
final String externalPath2 = Environment.getExternalStorageDirectory().getPath() +
"/testimage1.jpg";
+ // clean up any potential left over entries from a previous aborted run
+ cleanExternalMediaFile(externalPath);
+ cleanExternalMediaFile(externalPath2);
+
int numBytes = 1337;
FileUtils.createFile(new File(externalPath), numBytes);
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
index c3eb0b8..c9461b4 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
@@ -58,12 +58,21 @@
assertNull(mContentResolver.query(Media.getContentUri(volume), null, null, null, null));
}
+ private void cleanExternalMediaFile(String path) {
+ mContentResolver.delete(Media.EXTERNAL_CONTENT_URI, "_data=?", new String[] { path });
+ new File(path).delete();
+ }
+
public void testStoreVideoMediaExternal() throws Exception {
final String externalVideoPath = Environment.getExternalStorageDirectory().getPath() +
"/video/testvideo.3gp";
final String externalVideoPath2 = Environment.getExternalStorageDirectory().getPath() +
"/video/testvideo1.3gp";
+ // clean up any potential left over entries from a previous aborted run
+ cleanExternalMediaFile(externalVideoPath);
+ cleanExternalMediaFile(externalVideoPath2);
+
int numBytes = 1337;
File videoFile = new File(externalVideoPath);
FileUtils.createFile(videoFile, numBytes);
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
index 8f6f729..287551c 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
@@ -105,6 +105,10 @@
private Uri insertVideo() throws IOException {
File file = new File(Environment.getExternalStorageDirectory(), "testVideo.3gp");
+ // clean up any potential left over entries from a previous aborted run
+ mResolver.delete(Media.EXTERNAL_CONTENT_URI,
+ "_data=?", new String[] { file.getAbsolutePath() });
+ file.delete();
mFileHelper.copyToExternalStorage(R.raw.testvideo, file);
ContentValues values = new ContentValues();
