commit 1048a9464c11ca12dc3094bfed9c4ed1a43ad1bb
author Jeff Sharkey <jsharkey@android.com> Fri Jan 04 16:32:49 2019 -0700
committer Jeff Sharkey <jsharkey@android.com> Fri Jan 04 16:35:12 2019 -0700
tree 015298661b84788f6cfe01d3ef7e6feede7659d6
parent 915a57d0ca16718cdf811388fccec858645d482b

Generate thumbnails from external storage.

Some of the internals make assumptions about external storage, so
stage files out there.

Bug: 122330816
Test: atest android.media.cts.ThumbnailUtilsTest
Change-Id: If62a83246254919be5cc0a2819d19f5eb3e3c34e

tests/tests/media/src/android/media/cts/ThumbnailUtilsTest.java

diff --git a/tests/tests/media/src/android/media/cts/ThumbnailUtilsTest.java b/tests/tests/media/src/android/media/cts/ThumbnailUtilsTest.java
index 3b0db75..2691775 100644
--- a/tests/tests/media/src/android/media/cts/ThumbnailUtilsTest.java
+++ b/tests/tests/media/src/android/media/cts/ThumbnailUtilsTest.java
@@ -26,6 +26,7 @@
 import android.util.Size;
 
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -43,14 +44,23 @@
             new Size(5000, 5000),
     };
 
+    private File mDir;
+
+    @Before
+    public void setUp() {
+        mDir = InstrumentationRegistry.getTargetContext().getExternalCacheDir();
+        mDir.mkdirs();
+        deleteContents(mDir);
+    }
+
     @After
     public void tearDown() {
-        deleteContents(new File(System.getProperty("java.io.tmpdir")));
+        deleteContents(mDir);
     }
 
     @Test
     public void testCreateAudioThumbnail() throws Exception {
-        final File file = stageFile(R.raw.testmp3, File.createTempFile("cts", ".mp3"));
+        final File file = stageFile(R.raw.testmp3, new File(mDir, "cts.mp3"));
         for (Size size : TEST_SIZES) {
             assertSaneThumbnail(size, ThumbnailUtils.createAudioThumbnail(file, size, null));
         }
@@ -58,12 +68,8 @@
 
     @Test
     public void testCreateAudioThumbnail_SeparateFile() throws Exception {
-        final File dir = File.createTempFile("cts", null);
-        dir.delete();
-        dir.mkdirs();
-
-        final File file = stageFile(R.raw.monotestmp3, new File(dir, "audio.mp3"));
-        stageFile(R.raw.volantis, new File(dir, "AlbumArt.jpg"));
+        final File file = stageFile(R.raw.monotestmp3, new File(mDir, "audio.mp3"));
+        stageFile(R.raw.volantis, new File(mDir, "AlbumArt.jpg"));
 
         for (Size size : TEST_SIZES) {
             assertSaneThumbnail(size, ThumbnailUtils.createAudioThumbnail(file, size, null));
@@ -72,7 +78,7 @@
 
     @Test
     public void testCreateAudioThumbnail_None() throws Exception {
-        final File file = stageFile(R.raw.monotestmp3, File.createTempFile("cts", ".mp3"));
+        final File file = stageFile(R.raw.monotestmp3, new File(mDir, "cts.mp3"));
         try {
             ThumbnailUtils.createAudioThumbnail(file, TEST_SIZES[0], null);
             fail("Somehow made a thumbnail out of nothing?");
@@ -82,7 +88,7 @@
 
     @Test
     public void testCreateImageThumbnail() throws Exception {
-        final File file = stageFile(R.raw.volantis, File.createTempFile("cts", ".jpg"));
+        final File file = stageFile(R.raw.volantis, new File(mDir, "cts.jpg"));
         for (Size size : TEST_SIZES) {
             assertSaneThumbnail(size, ThumbnailUtils.createImageThumbnail(file, size, null));
         }
@@ -92,7 +98,7 @@
     public void testCreateVideoThumbnail() throws Exception {
         final File file = stageFile(
                 R.raw.bbb_s1_720x480_mp4_h264_mp3_2mbps_30fps_aac_lc_5ch_320kbps_48000hz,
-                File.createTempFile("cts", ".mp4"));
+                new File(mDir, "cts.mp4"));
         for (Size size : TEST_SIZES) {
             assertSaneThumbnail(size, ThumbnailUtils.createVideoThumbnail(file, size, null));
         }