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

Commit b63261b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()"

parents db31e6d0 67f7fdd0
Loading
Loading
Loading
Loading
+7 −14
Original line number Diff line number Diff line
@@ -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 {
+8 −4
Original line number Diff line number Diff line
@@ -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