diff options
| -rw-r--r-- | core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java | 21 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java | 12 |
2 files changed, 15 insertions, 18 deletions
diff --git a/core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java b/core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java index e248a7771cab..586b47266e4e 100644 --- a/core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java +++ b/core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java @@ -45,12 +45,12 @@ import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import libcore.testing.io.TestIoUtils; - import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; @SmallTest @@ -59,21 +59,14 @@ public class DexMetadataHelperTest { private static final String APK_FILE_EXTENSION = ".apk"; private static final String DEX_METADATA_FILE_EXTENSION = ".dm"; + @Rule + public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); + private File mTmpDir = null; @Before - public void setUp() { - mTmpDir = TestIoUtils.createTemporaryDirectory("DexMetadataHelperTest"); - } - - @After - public void tearDown() { - if (mTmpDir != null) { - File[] files = mTmpDir.listFiles(); - for (File f : files) { - f.delete(); - } - } + public void setUp() throws IOException { + mTmpDir = mTemporaryFolder.newFolder("DexMetadataHelperTest"); } private File createDexMetadataFile(String apkFileName) throws IOException { diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java index 9736e68144ae..c56a393c094f 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java @@ -38,13 +38,14 @@ import androidx.test.filters.MediumTest; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; -import libcore.io.IoUtils; - import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import java.io.File; +import java.io.IOException; import java.lang.reflect.Array; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; @@ -57,13 +58,16 @@ import java.util.Set; @RunWith(AndroidJUnit4.class) @MediumTest public class PackageParserTest { + @Rule + public TemporaryFolder mTemporaryFolder = new TemporaryFolder(); + private File mTmpDir; private static final File FRAMEWORK = new File("/system/framework/framework-res.apk"); @Before - public void setUp() { + public void setUp() throws IOException { // Create a new temporary directory for each of our tests. - mTmpDir = IoUtils.createTemporaryDirectory("PackageParserTest"); + mTmpDir = mTemporaryFolder.newFolder("PackageParserTest"); } @Test |