Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67f7fdd0 authored by Paul Duffin's avatar Paul Duffin
Browse files

Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory() 

Test: atest \
    FrameworksServicesTests:com.android.server.pm.PackageParserTest \
	FrameworksCoreTests:android.content.pm.dex.DexMetadataHelperTest
Bug: 117535564
Change-Id: Ida80e99c9dfe8dc1095bd975fe2991958d01e77d
Merged-In: Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a
parent 04077d07

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

+7 −14
Original line number Original line Diff line number Diff line
@@ -45,12 +45,12 @@ import java.util.Map; 
import java.util.zip.ZipEntry;

import java.util.zip.ZipEntry;

import java.util.zip.ZipOutputStream;

import java.util.zip.ZipOutputStream;





import libcore.testing.io.TestIoUtils;



import org.junit.After;

import org.junit.After;

import org.junit.Assert;

import org.junit.Assert;

import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;

import org.junit.rules.TemporaryFolder;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;





@SmallTest

@SmallTest
@@ -59,21 +59,14 @@ public class DexMetadataHelperTest { 
    private static final String APK_FILE_EXTENSION = ".apk";

    private static final String APK_FILE_EXTENSION = ".apk";

    private static final String DEX_METADATA_FILE_EXTENSION = ".dm";

    private static final String DEX_METADATA_FILE_EXTENSION = ".dm";





    @Rule

    public TemporaryFolder mTemporaryFolder = new TemporaryFolder();



    private File mTmpDir = null;

    private File mTmpDir = null;





    @Before

    @Before

    public void setUp() {

    public void setUp() throws IOException {

        mTmpDir = TestIoUtils.createTemporaryDirectory("DexMetadataHelperTest");

        mTmpDir = mTemporaryFolder.newFolder("DexMetadataHelperTest");

    }



    @After

    public void tearDown() {

        if (mTmpDir != null) {

            File[] files = mTmpDir.listFiles();

            for (File f : files) {

                f.delete();

            }

        }

    }

    }





    private File createDexMetadataFile(String apkFileName) throws IOException {

    private File createDexMetadataFile(String apkFileName) throws IOException {

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

+8 −4
Original line number Original line Diff line number Diff line
@@ -38,13 +38,14 @@ import androidx.test.filters.MediumTest; 
import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import libcore.io.IoUtils;



import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;

import org.junit.rules.TemporaryFolder;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;





import java.io.File;

import java.io.File;

import java.io.IOException;

import java.lang.reflect.Array;

import java.lang.reflect.Array;

import java.lang.reflect.Field;

import java.lang.reflect.Field;

import java.nio.charset.StandardCharsets;

import java.nio.charset.StandardCharsets;
@@ -57,13 +58,16 @@ import java.util.Set; 
@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

@MediumTest

@MediumTest

public class PackageParserTest {

public class PackageParserTest {

    @Rule

    public TemporaryFolder mTemporaryFolder = new TemporaryFolder();



    private File mTmpDir;

    private File mTmpDir;

    private static final File FRAMEWORK = new File("/system/framework/framework-res.apk");

    private static final File FRAMEWORK = new File("/system/framework/framework-res.apk");





    @Before

    @Before

    public void setUp() {

    public void setUp() throws IOException {

        // Create a new temporary directory for each of our tests.

        // Create a new temporary directory for each of our tests.

        mTmpDir = IoUtils.createTemporaryDirectory("PackageParserTest");

        mTmpDir = mTemporaryFolder.newFolder("PackageParserTest");

    }

    }





    @Test

    @Test