diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/AndroidOreoNotSparseTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/AndroidOreoNotSparseTest.java index 6b2eeb21..a094e885 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/AndroidOreoNotSparseTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/AndroidOreoNotSparseTest.java @@ -39,7 +39,7 @@ public class AndroidOreoNotSparseTest extends BaseTest { sTestOrigDir = new ExtFile(sTmpDir, "issue1594-orig"); sTestNewDir = new ExtFile(sTmpDir, "issue1594-new"); LOGGER.info("Unpacking not_sparse.apk..."); - TestUtils.copyResourceDir(AndroidOreoNotSparseTest.class, "brut/apktool/aapt1/issue1594", sTestOrigDir); + TestUtils.copyResourceDir(AndroidOreoNotSparseTest.class, "aapt1/issue1594", sTestOrigDir); File testApk = new File(sTestOrigDir, "not_sparse.apk"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/AndroidOreoSparseTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/AndroidOreoSparseTest.java index b1b3c156..fae22b65 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/AndroidOreoSparseTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/AndroidOreoSparseTest.java @@ -39,7 +39,7 @@ public class AndroidOreoSparseTest extends BaseTest { sTestOrigDir = new ExtFile(sTmpDir, "issue1594-orig"); sTestNewDir = new ExtFile(sTmpDir, "issue1594-new"); LOGGER.info("Unpacking sparse.apk..."); - TestUtils.copyResourceDir(AndroidOreoSparseTest.class, "brut/apktool/aapt1/issue1594", sTestOrigDir); + TestUtils.copyResourceDir(AndroidOreoSparseTest.class, "aapt1/issue1594", sTestOrigDir); File testApk = new File(sTestOrigDir, "sparse.apk"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeJarTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeJarTest.java index 991b59e9..27db7ae6 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeJarTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeJarTest.java @@ -43,7 +43,7 @@ public class BuildAndDecodeJarTest extends BaseTest { sTestOrigDir = new ExtFile(sTmpDir, "testjar-orig"); sTestNewDir = new ExtFile(sTmpDir, "testjar-new"); LOGGER.info("Unpacking testjar..."); - TestUtils.copyResourceDir(BuildAndDecodeJarTest.class, "brut/apktool/aapt1/testjar/", sTestOrigDir); + TestUtils.copyResourceDir(BuildAndDecodeJarTest.class, "aapt1/testjar/", sTestOrigDir); LOGGER.info("Building testjar.jar..."); File testJar = new File(sTmpDir, "testjar.jar"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java index 6a1bccc1..de08096b 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java @@ -49,7 +49,7 @@ public class BuildAndDecodeTest extends BaseTest { sTestOrigDir = new ExtFile(sTmpDir, "testapp-orig"); sTestNewDir = new ExtFile(sTmpDir, "testapp-new"); LOGGER.info("Unpacking testapp..."); - TestUtils.copyResourceDir(BuildAndDecodeTest.class, "brut/apktool/aapt1/testapp/", sTestOrigDir); + TestUtils.copyResourceDir(BuildAndDecodeTest.class, "aapt1/testapp/", sTestOrigDir); LOGGER.info("Building testapp.apk..."); File testApk = new File(sTmpDir, "testapp.apk"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/DebugTagRetainedTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/DebugTagRetainedTest.java index cfa15265..2e0658fc 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/DebugTagRetainedTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/DebugTagRetainedTest.java @@ -44,7 +44,7 @@ public class DebugTagRetainedTest extends BaseTest { sTestOrigDir = new ExtFile(sTmpDir, "issue1235-orig"); sTestNewDir = new ExtFile(sTmpDir, "issue1235-new"); LOGGER.info("Unpacking issue1235..."); - TestUtils.copyResourceDir(DebugTagRetainedTest.class, "brut/apktool/aapt1/issue1235/", sTestOrigDir); + TestUtils.copyResourceDir(DebugTagRetainedTest.class, "aapt1/issue1235/", sTestOrigDir); LOGGER.info("Building issue1235.apk..."); ApkOptions apkOptions = new ApkOptions(); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/DefaultBaksmaliVariableTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/DefaultBaksmaliVariableTest.java index e941c48d..4704f180 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/DefaultBaksmaliVariableTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/DefaultBaksmaliVariableTest.java @@ -42,7 +42,7 @@ public class DefaultBaksmaliVariableTest extends BaseTest { sTestOrigDir = new ExtFile(sTmpDir, "testjar-orig"); sTestNewDir = new ExtFile(sTmpDir, "testjar-new"); LOGGER.info("Unpacking testjar..."); - TestUtils.copyResourceDir(DefaultBaksmaliVariableTest.class, "brut/apktool/aapt1/issue1481/", sTestOrigDir); + TestUtils.copyResourceDir(DefaultBaksmaliVariableTest.class, "aapt1/issue1481/", sTestOrigDir); LOGGER.info("Building issue1481.jar..."); File testJar = new File(sTmpDir, "issue1481.jar"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/EmptyResourcesArscTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/EmptyResourcesArscTest.java index f8443f42..db88ad08 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/EmptyResourcesArscTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/EmptyResourcesArscTest.java @@ -43,7 +43,7 @@ public class EmptyResourcesArscTest { sTestOrigDir = new ExtFile(sTmpDir, "issue1730-orig"); sTestNewDir = new ExtFile(sTmpDir, "issue1730-new"); LOGGER.info("Unpacking issue1730.apk..."); - TestUtils.copyResourceDir(EmptyResourcesArscTest.class, "brut/apktool/aapt1/issue1730", sTestOrigDir); + TestUtils.copyResourceDir(EmptyResourcesArscTest.class, "aapt1/issue1730", sTestOrigDir); File testApk = new File(sTestOrigDir, "issue1730.apk"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/LargeIntsInManifestTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/LargeIntsInManifestTest.java index 12c00a1c..6ca3a757 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/LargeIntsInManifestTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/LargeIntsInManifestTest.java @@ -34,7 +34,7 @@ public class LargeIntsInManifestTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/aapt1/issue767/", sTmpDir); + TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "aapt1/issue767/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/ProviderAttributeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/ProviderAttributeTest.java index a516124a..e6cb4b8f 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/ProviderAttributeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/ProviderAttributeTest.java @@ -41,7 +41,7 @@ public class ProviderAttributeTest extends BaseTest { public static void beforeClass() throws BrutException { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(ProviderAttributeTest.class, "brut/apktool/aapt1/issue636/", sTmpDir); + TestUtils.copyResourceDir(ProviderAttributeTest.class, "aapt1/issue636/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/ReferenceVersionCodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/ReferenceVersionCodeTest.java index 681db9c4..5eda5314 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/ReferenceVersionCodeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/ReferenceVersionCodeTest.java @@ -42,7 +42,7 @@ public class ReferenceVersionCodeTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(ReferenceVersionCodeTest.class, "brut/apktool/aapt1/issue1234/", sTmpDir); + TestUtils.copyResourceDir(ReferenceVersionCodeTest.class, "aapt1/issue1234/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SharedLibraryTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SharedLibraryTest.java index 97372a3e..ec67750e 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SharedLibraryTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SharedLibraryTest.java @@ -37,7 +37,7 @@ public class SharedLibraryTest extends BaseTest { public static void beforeClass() throws BrutException { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(SharedLibraryTest.class, "brut/apktool/aapt1/shared_libraries/", sTmpDir); + TestUtils.copyResourceDir(SharedLibraryTest.class, "aapt1/shared_libraries/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SkipAssetTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SkipAssetTest.java index 39d4ce9a..7dfac5d6 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SkipAssetTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SkipAssetTest.java @@ -34,7 +34,7 @@ public class SkipAssetTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(SkipAssetTest.class, "brut/apktool/aapt1/issue1605/", sTmpDir); + TestUtils.copyResourceDir(SkipAssetTest.class, "aapt1/issue1605/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/UnknownCompressionTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/UnknownCompressionTest.java index 080af748..0318887a 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/UnknownCompressionTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/UnknownCompressionTest.java @@ -39,7 +39,7 @@ public class UnknownCompressionTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(UnknownCompressionTest.class, "brut/apktool/aapt1/unknown_compression/", sTmpDir); + TestUtils.copyResourceDir(UnknownCompressionTest.class, "aapt1/unknown_compression/", sTmpDir); String apk = "deflated_unknowns.apk"; ApkOptions apkOptions = new ApkOptions(); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java index 7df80f01..20c77d35 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java @@ -41,7 +41,7 @@ public class BuildAndDecodeTest extends BaseTest { sTestOrigDir = new ExtFile(sTmpDir, "testapp-orig"); sTestNewDir = new ExtFile(sTmpDir, "testapp-new"); LOGGER.info("Unpacking testapp..."); - TestUtils.copyResourceDir(BuildAndDecodeTest.class, "brut/apktool/aapt2/testapp/", sTestOrigDir); + TestUtils.copyResourceDir(BuildAndDecodeTest.class, "aapt2/testapp/", sTestOrigDir); ApkOptions apkOptions = new ApkOptions(); apkOptions.useAapt2 = true; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java index 6b376a1d..2560981a 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/NonStandardPkgIdTest.java @@ -41,7 +41,7 @@ public class NonStandardPkgIdTest extends BaseTest { sTestOrigDir = new ExtFile(sTmpDir, "pkgid8-orig"); sTestNewDir = new ExtFile(sTmpDir, "pkgid8-new"); LOGGER.info("Unpacking pkgid8..."); - TestUtils.copyResourceDir(BuildAndDecodeTest.class, "brut/apktool/aapt2/pkgid8/", sTestOrigDir); + TestUtils.copyResourceDir(BuildAndDecodeTest.class, "aapt2/pkgid8/", sTestOrigDir); ApkOptions apkOptions = new ApkOptions(); apkOptions.useAapt2 = true; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/AndResGuardTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/AndResGuardTest.java index 94cb0705..d4f78f93 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/AndResGuardTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/AndResGuardTest.java @@ -34,7 +34,7 @@ public class AndResGuardTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(AndResGuardTest.class, "brut/apktool/decode/issue1170/", sTmpDir); + TestUtils.copyResourceDir(AndResGuardTest.class, "decode/issue1170/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinTest.java index aea1d800..a50331f7 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinTest.java @@ -41,7 +41,7 @@ public class DecodeKotlinTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(DecodeKotlinTest.class, "brut/apktool/decode/testkotlin/", sTmpDir); + TestUtils.copyResourceDir(DecodeKotlinTest.class, "decode/testkotlin/", sTmpDir); String apk = "testkotlin.apk"; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java index 1a6061ce..9290b05b 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java @@ -43,7 +43,7 @@ public class DoubleExtensionUnknownFileTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(DoubleExtensionUnknownFileTest.class, "brut/apktool/decode/issue1244/", sTmpDir); + TestUtils.copyResourceDir(DoubleExtensionUnknownFileTest.class, "decode/issue1244/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ExternalEntityTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ExternalEntityTest.java index 3d909f10..dceaca5d 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ExternalEntityTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ExternalEntityTest.java @@ -42,7 +42,7 @@ public class ExternalEntityTest extends BaseTest { @BeforeClass public static void beforeClass() throws Exception { sTestOrigDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(ExternalEntityTest.class, "brut/apktool/decode/doctype/", sTestOrigDir); + TestUtils.copyResourceDir(ExternalEntityTest.class, "decode/doctype/", sTestOrigDir); LOGGER.info("Building doctype.apk..."); File testApk = new File(sTestOrigDir, "doctype.apk"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ForceManifestDecodeNoResourcesTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ForceManifestDecodeNoResourcesTest.java index 89524d42..74be0e1c 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ForceManifestDecodeNoResourcesTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ForceManifestDecodeNoResourcesTest.java @@ -48,7 +48,7 @@ public class ForceManifestDecodeNoResourcesTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(ForceManifestDecodeNoResourcesTest.class, "brut/apktool/decode/issue1680/", sTmpDir); + TestUtils.copyResourceDir(ForceManifestDecodeNoResourcesTest.class, "decode/issue1680/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MinifiedArscTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MinifiedArscTest.java index 5a1162c9..1a794b8f 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MinifiedArscTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MinifiedArscTest.java @@ -42,7 +42,7 @@ public class MinifiedArscTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(MinifiedArscTest.class, "brut/apktool/decode/issue1157/", sTmpDir); + TestUtils.copyResourceDir(MinifiedArscTest.class, "decode/issue1157/", sTmpDir); String apk = "issue1157.apk"; sTestNewDir = new ExtFile(sTmpDir, "issue1157"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MissingVersionManifestTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MissingVersionManifestTest.java index 14675665..13b5c336 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MissingVersionManifestTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MissingVersionManifestTest.java @@ -42,7 +42,7 @@ public class MissingVersionManifestTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(MissingVersionManifestTest.class, "brut/apktool/decode/issue1264/", sTmpDir); + TestUtils.copyResourceDir(MissingVersionManifestTest.class, "decode/issue1264/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/OutsideOfDirectoryEntryTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/OutsideOfDirectoryEntryTest.java index 7f0746b7..948bbac8 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/OutsideOfDirectoryEntryTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/OutsideOfDirectoryEntryTest.java @@ -40,7 +40,7 @@ public class OutsideOfDirectoryEntryTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(OutsideOfDirectoryEntryTest.class, "brut/apktool/decode/issue1589/", sTmpDir); + TestUtils.copyResourceDir(OutsideOfDirectoryEntryTest.class, "decode/issue1589/", sTmpDir); String apk = "issue1589.apk"; diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ParentDirectoryTraversalTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ParentDirectoryTraversalTest.java index 9aa1c537..53a85d9d 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ParentDirectoryTraversalTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ParentDirectoryTraversalTest.java @@ -35,7 +35,7 @@ public class ParentDirectoryTraversalTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(ParentDirectoryTraversalTest.class, "brut/apktool/decode/issue1498/", sTmpDir); + TestUtils.copyResourceDir(ParentDirectoryTraversalTest.class, "decode/issue1498/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/VectorDrawableTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/VectorDrawableTest.java index 4d041fc8..dcb2a4e2 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/VectorDrawableTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/VectorDrawableTest.java @@ -37,7 +37,7 @@ public class VectorDrawableTest extends BaseTest { public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(VectorDrawableTest.class, "brut/apktool/decode/issue1456/", sTmpDir); + TestUtils.copyResourceDir(VectorDrawableTest.class, "decode/issue1456/", sTmpDir); } @AfterClass diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/util/UnknownDirectoryTraversalTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/util/UnknownDirectoryTraversalTest.java index f5baf711..c9cba4ab 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/util/UnknownDirectoryTraversalTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/util/UnknownDirectoryTraversalTest.java @@ -43,7 +43,7 @@ public class UnknownDirectoryTraversalTest extends BaseTest { @BeforeClass public static void beforeClass() throws Exception { sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(UnknownDirectoryTraversalTest.class, "brut/apktool/util/traversal", sTmpDir); + TestUtils.copyResourceDir(UnknownDirectoryTraversalTest.class, "util/traversal", sTmpDir); } @Test