From f092c4446f5f2d2c81a904070ab773857e99fa88 Mon Sep 17 00:00:00 2001 From: eguven Date: Wed, 15 Mar 2017 07:49:51 -0700 Subject: [PATCH] Move TestUtil.createTempFolder and TestUtil.recursiveDelete to Util class ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=150190520 --- .../upstream/cache/CacheDataSourceTest.java | 6 +++--- .../cache/CachedContentIndexTest.java | 6 +++--- .../cache/CachedRegionTrackerTest.java | 5 +++-- .../upstream/cache/SimpleCacheSpanTest.java | 6 +++--- .../upstream/cache/SimpleCacheTest.java | 5 ++--- .../exoplayer2/util/AtomicFileTest.java | 5 ++--- .../google/android/exoplayer2/util/Util.java | 19 +++++++++++++++++++ .../android/exoplayer2/testutil/TestUtil.java | 19 ------------------- 8 files changed, 35 insertions(+), 36 deletions(-) diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java index a5b272cebd..6689d73ff1 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java @@ -20,9 +20,9 @@ import android.test.InstrumentationTestCase; import android.test.MoreAsserts; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.testutil.FakeDataSource; -import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.FileDataSource; +import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -42,13 +42,13 @@ public class CacheDataSourceTest extends InstrumentationTestCase { @Override protected void setUp() throws Exception { - cacheDir = TestUtil.createTempFolder(getInstrumentation().getContext()); + cacheDir = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest"); simpleCache = new SimpleCache(cacheDir, new NoOpCacheEvictor()); } @Override protected void tearDown() throws Exception { - TestUtil.recursiveDelete(cacheDir); + Util.recursiveDelete(cacheDir); } public void testMaxCacheFileSize() throws Exception { diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java index 4fbcc92e3d..7f6e203c20 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java @@ -4,7 +4,7 @@ import android.test.InstrumentationTestCase; import android.test.MoreAsserts; import android.util.SparseArray; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.testutil.TestUtil; +import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -36,13 +36,13 @@ public class CachedContentIndexTest extends InstrumentationTestCase { @Override public void setUp() throws Exception { - cacheDir = TestUtil.createTempFolder(getInstrumentation().getContext()); + cacheDir = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest"); index = new CachedContentIndex(cacheDir); } @Override protected void tearDown() throws Exception { - TestUtil.recursiveDelete(cacheDir); + Util.recursiveDelete(cacheDir); } public void testAddGetRemove() throws Exception { diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java index 799027f4b5..f2e199578c 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java @@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream.cache; import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.ChunkIndex; import com.google.android.exoplayer2.testutil.TestUtil; +import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.IOException; import org.mockito.Mock; @@ -49,13 +50,13 @@ public final class CachedRegionTrackerTest extends InstrumentationTestCase { tracker = new CachedRegionTracker(cache, CACHE_KEY, CHUNK_INDEX); - cacheDir = TestUtil.createTempFolder(getInstrumentation().getContext()); + cacheDir = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest"); index = new CachedContentIndex(cacheDir); } @Override protected void tearDown() throws Exception { - TestUtil.recursiveDelete(cacheDir); + Util.recursiveDelete(cacheDir); } public void testGetRegion_noSpansInCache() { diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java index 0b40cd7735..8c684b1cb3 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java @@ -16,7 +16,7 @@ package com.google.android.exoplayer2.upstream.cache; import android.test.InstrumentationTestCase; -import com.google.android.exoplayer2.testutil.TestUtil; +import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -48,13 +48,13 @@ public class SimpleCacheSpanTest extends InstrumentationTestCase { @Override protected void setUp() throws Exception { - cacheDir = TestUtil.createTempFolder(getInstrumentation().getContext()); + cacheDir = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest"); index = new CachedContentIndex(cacheDir); } @Override protected void tearDown() throws Exception { - TestUtil.recursiveDelete(cacheDir); + Util.recursiveDelete(cacheDir); } public void testCacheFile() throws Exception { diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java index 93d7a123bc..1a6beeb6ba 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.upstream.cache; import android.test.InstrumentationTestCase; import android.test.MoreAsserts; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.FileInputStream; @@ -39,12 +38,12 @@ public class SimpleCacheTest extends InstrumentationTestCase { @Override protected void setUp() throws Exception { - this.cacheDir = TestUtil.createTempFolder(getInstrumentation().getContext()); + cacheDir = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest"); } @Override protected void tearDown() throws Exception { - TestUtil.recursiveDelete(cacheDir); + Util.recursiveDelete(cacheDir); } public void testCommittingOneFile() throws Exception { diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java index 7cdbb9a5b1..6c5d7c76f7 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.util; import android.test.InstrumentationTestCase; -import com.google.android.exoplayer2.testutil.TestUtil; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -34,14 +33,14 @@ public class AtomicFileTest extends InstrumentationTestCase { @Override public void setUp() throws Exception { - tempFolder = TestUtil.createTempFolder(getInstrumentation().getContext()); + tempFolder = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest"); file = new File(tempFolder, "atomicFile"); atomicFile = new AtomicFile(file); } @Override protected void tearDown() throws Exception { - TestUtil.recursiveDelete(tempFolder); + Util.recursiveDelete(tempFolder); } public void testDelete() throws Exception { diff --git a/library/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/src/main/java/com/google/android/exoplayer2/util/Util.java index 8a32c54356..60846170b9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -36,6 +36,7 @@ import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import java.io.ByteArrayOutputStream; import java.io.Closeable; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Method; @@ -946,6 +947,24 @@ public final class Util { throw (T) t; } + /** Recursively deletes a directory and its content. */ + public static void recursiveDelete(File fileOrDirectory) { + if (fileOrDirectory.isDirectory()) { + for (File child : fileOrDirectory.listFiles()) { + recursiveDelete(child); + } + } + fileOrDirectory.delete(); + } + + /** Creates an empty directory in the directory returned by {@link Context#getCacheDir()}. */ + public static File createTempDirectory(Context context, String prefix) throws IOException { + File tempFile = File.createTempFile(prefix, null, context.getCacheDir()); + tempFile.delete(); // Delete the temp file. + tempFile.mkdir(); // Create a directory with the same name. + return tempFile; + } + /** * Returns the result of updating a CRC with the specified bytes in a "most significant bit first" * order. diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java index fd971892b4..75a4a01923 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.testutil; import android.app.Instrumentation; -import android.content.Context; import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.Extractor; @@ -25,7 +24,6 @@ import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; @@ -375,21 +373,4 @@ public class TestUtil { } } - public static void recursiveDelete(File fileOrDirectory) { - if (fileOrDirectory.isDirectory()) { - for (File child : fileOrDirectory.listFiles()) { - recursiveDelete(child); - } - } - fileOrDirectory.delete(); - } - - /** Creates an empty folder in the application specific cache directory. */ - public static File createTempFolder(Context context) throws IOException { - File tempFolder = File.createTempFile("ExoPlayerTest", null, context.getCacheDir()); - Assert.assertTrue(tempFolder.delete()); - Assert.assertTrue(tempFolder.mkdir()); - return tempFolder; - } - }