Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()

Browse Source 
Test: atest \
    FrameworksServicesTests:com.android.server.pm.PackageInstallerSessionTest
Bug: 117535564

Change-Id: Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a
Merged-In: Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a
(cherry picked from commit c655c5fc2e)
This commit is contained in:
Paul Duffin
2019-07-04 15:22:34 +01:00
committed by Anton Hansson
parent 8d96e17940
commit 5c3e9d65e3
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java
View File

@@ -36,12 +36,12 @@ import androidx.test.runner.AndroidJUnit4;
import com.android.frameworks.coretests.R;
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;
import java.io.File;
@@ -60,21 +60,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 {

7
services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java
View File

@@ -36,7 +36,9 @@ import com.android.internal.util.FastXmlSerializer;
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 org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -56,6 +58,9 @@ import java.util.List;
@RunWith(AndroidJUnit4.class)
public class PackageInstallerSessionTest {
@Rule
public TemporaryFolder mTemporaryFolder = new TemporaryFolder();
private File mTmpDir;
private AtomicFile mSessionsFile;
private static final String TAG_SESSIONS = "sessions";
@@ -65,7 +70,7 @@ public class PackageInstallerSessionTest {
@Before
public void setUp() throws Exception {
mTmpDir = IoUtils.createTemporaryDirectory("PackageInstallerSessionTest");
mTmpDir = mTemporaryFolder.newFolder("PackageInstallerSessionTest");
mSessionsFile = new AtomicFile(
new File(mTmpDir.getAbsolutePath() + "/sessions.xml"), "package-session");
MockitoAnnotations.initMocks(this);

12
services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java
View File

@@ -43,13 +43,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;
@@ -62,13 +63,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