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

Commit 74c2ab1d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use JUnit TemporaryFolder instead of... 

Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()" into qt-dev-plus-aosp
parents c43fd5f2 c655c5fc

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

+7 −14
Original line number Diff line number Diff line
@@ -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 {

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

+6 −1
Original line number Diff line number Diff line
@@ -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);

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

+8 −4
Original line number Diff line number Diff line
@@ -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