Merge "Drop shell access from MediaStore_Video_MediaTest" am: 0d4cde8813temp_rvc_qpr_merge

Original change: https://android-review.googlesource.com/c/platform/cts/+/1518913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd5130d2a986a5028ca90b6a5e3d91612143e159

2 files changed, 8 insertions, 6 deletions

diff --git a/tests/tests/provider/Android.bp b/tests/tests/provider/Android.bp
index 3d4c84c9775..250ae7dfa55 100644
--- a/tests/tests/provider/Android.bp
+++ b/tests/tests/provider/Android.bp
@@ -23,6 +23,8 @@ android_test {
         "junit",
         "truth-prebuilt",
         "mockito-target-minus-junit4",
+        // TODO: remove testng once Android migrates to JUnit 4.12, which provides assertThrows
+        "testng",
     ],
 
     jni_libs: [
diff --git a/tests/tests/provider/src/android/provider/cts/media/MediaStore_Video_MediaTest.java b/tests/tests/provider/src/android/provider/cts/media/MediaStore_Video_MediaTest.java
index 5026c0ed50b..d54e41dbb97 100644
--- a/tests/tests/provider/src/android/provider/cts/media/MediaStore_Video_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/media/MediaStore_Video_MediaTest.java
@@ -16,8 +16,6 @@
 
 package android.provider.cts.media;
 
-import static android.provider.cts.ProviderTestUtils.assertExists;
-import static android.provider.cts.ProviderTestUtils.assertNotExists;
 import static android.provider.cts.media.MediaStoreTest.TAG;
 
 import static org.junit.Assert.assertEquals;
@@ -26,6 +24,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.testng.Assert.assertThrows;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -60,6 +59,7 @@ import org.junit.runners.Parameterized.Parameters;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -179,13 +179,13 @@ public class MediaStore_Video_MediaTest {
             new File(externalVideoPath).delete();
         }
 
-        // check that the video file is removed when deleting the database entry
+        // check that the file is not available when deleting the database entry
         Context context = mContext;
         Uri videoUri = insertVideo(context);
-        File videofile = new File(ProviderTestUtils.stageDir(mVolumeName), "testVideo.3gp");
-        assertExists(videofile);
+        assertNotNull("Cannot open " + videoUri, mContentResolver.openFile(videoUri, "r", null));
         mContentResolver.delete(videoUri, null, null);
-        assertNotExists(videofile);
+        assertThrows(FileNotFoundException.class, () -> mContentResolver.openFile(videoUri, "r",
+                null));
     }
 
     private Uri insertVideo(Context context) throws IOException {