From e794508869da22dae1c682c1fc8efa20bc9fc739 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sat, 27 May 2017 15:23:39 -0400 Subject: [PATCH] cleanup tests --- .../src/test/java/brut/androlib/AndResGuardTest.java | 9 +++------ .../test/java/brut/androlib/BuildAndDecodeJarTest.java | 4 ++-- .../src/test/java/brut/androlib/BuildAndDecodeTest.java | 2 +- .../test/java/brut/androlib/DebugTagRetainedTest.java | 2 +- .../java/brut/androlib/DefaultBaksmaliVariableTest.java | 6 +++--- .../brut/androlib/DoubleExtensionUnknownFileTest.java | 7 ++----- .../test/java/brut/androlib/LargeIntsInManifestTest.java | 5 +---- .../java/brut/androlib/MissingVersionManifestTest.java | 6 ++---- .../java/brut/androlib/PositionalEnumerationTest.java | 3 --- .../test/java/brut/androlib/ProviderAttributeTest.java | 2 +- .../java/brut/androlib/ReferenceVersionCodeTest.java | 7 ++----- .../test/java/brut/androlib/UnknownCompressionTest.java | 7 ++----- .../src/test/java/brut/androlib/VectorDrawableTest.java | 3 --- 13 files changed, 20 insertions(+), 43 deletions(-) diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndResGuardTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndResGuardTest.java index 129db300..50a8c3ea 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndResGuardTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/AndResGuardTest.java @@ -21,7 +21,6 @@ import brut.common.BrutException; import brut.util.OS; import java.io.File; import java.io.IOException; -import java.util.logging.Logger; import org.junit.*; import static org.junit.Assert.*; @@ -29,10 +28,10 @@ import static org.junit.Assert.*; public class AndResGuardTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/issue1170/", sTmpDir); + TestUtils.copyResourceDir(AndResGuardTest.class, "brut/apktool/issue1170/", sTmpDir); } @AfterClass @@ -62,6 +61,4 @@ public class AndResGuardTest { private static ExtFile sTmpDir; private static ExtFile sTestOrigDir; - - private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeTest.class.getName()); -} +} \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeJarTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeJarTest.java index 5ed1fa72..e53a142c 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeJarTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeJarTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue; public class BuildAndDecodeJarTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); sTestOrigDir = new ExtFile(sTmpDir, "testjar-orig"); @@ -66,4 +66,4 @@ public class BuildAndDecodeJarTest { private static ExtFile sTestNewDir; private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); -} +} \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java index de49686c..9fa2d719 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java @@ -44,7 +44,7 @@ import javax.imageio.ImageIO; public class BuildAndDecodeTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/DebugTagRetainedTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/DebugTagRetainedTest.java index fb77867a..e1ebaf0c 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/DebugTagRetainedTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/DebugTagRetainedTest.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; public class DebugTagRetainedTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); sTestOrigDir = new ExtFile(sTmpDir, "issue1235-orig"); diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/DefaultBaksmaliVariableTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/DefaultBaksmaliVariableTest.java index f601ced3..e3a50767 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/DefaultBaksmaliVariableTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/DefaultBaksmaliVariableTest.java @@ -18,12 +18,12 @@ import static org.junit.Assert.assertEquals; public class DefaultBaksmaliVariableTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { sTmpDir = new ExtFile(OS.createTempDirectory()); sTestOrigDir = new ExtFile(sTmpDir, "testjar-orig"); sTestNewDir = new ExtFile(sTmpDir, "testjar-new"); LOGGER.info("Unpacking testjar..."); - TestUtils.copyResourceDir(BuildAndDecodeJarTest.class, "brut/apktool/issue1481/", sTestOrigDir); + TestUtils.copyResourceDir(DefaultBaksmaliVariableTest.class, "brut/apktool/issue1481/", sTestOrigDir); LOGGER.info("Building issue1481.jar..."); File testJar = new File(sTmpDir, "issue1481.jar"); @@ -99,5 +99,5 @@ public class DefaultBaksmaliVariableTest { private static ExtFile sTestOrigDir; private static ExtFile sTestNewDir; - private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); + private final static Logger LOGGER = Logger.getLogger(DefaultBaksmaliVariableTest.class.getName()); } diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/DoubleExtensionUnknownFileTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/DoubleExtensionUnknownFileTest.java index 55b745ce..d5f5c6ea 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/DoubleExtensionUnknownFileTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/DoubleExtensionUnknownFileTest.java @@ -27,7 +27,6 @@ import org.junit.Test; import java.io.File; import java.io.IOException; -import java.util.logging.Logger; import static org.junit.Assert.assertTrue; @@ -37,10 +36,10 @@ import static org.junit.Assert.assertTrue; public class DoubleExtensionUnknownFileTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/issue1244/", sTmpDir); + TestUtils.copyResourceDir(DoubleExtensionUnknownFileTest.class, "brut/apktool/issue1244/", sTmpDir); } @AfterClass @@ -67,6 +66,4 @@ public class DoubleExtensionUnknownFileTest { } private static ExtFile sTmpDir; - - private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); } \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/LargeIntsInManifestTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/LargeIntsInManifestTest.java index 74e03c99..6af2c0d1 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/LargeIntsInManifestTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/LargeIntsInManifestTest.java @@ -22,7 +22,6 @@ import brut.util.OS; import java.io.*; import java.io.File; import java.io.IOException; -import java.util.logging.Logger; import org.custommonkey.xmlunit.*; import org.junit.*; @@ -32,7 +31,7 @@ import org.xml.sax.SAXException; public class LargeIntsInManifestTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/issue767/", sTmpDir); @@ -94,6 +93,4 @@ public class LargeIntsInManifestTest { private static ExtFile sTmpDir; private static ExtFile sTestOrigDir; private static ExtFile sTestNewDir; - - private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeTest.class.getName()); } diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/MissingVersionManifestTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/MissingVersionManifestTest.java index e93e1dc9..71298ab3 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/MissingVersionManifestTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/MissingVersionManifestTest.java @@ -35,10 +35,10 @@ import static org.junit.Assert.assertEquals; public class MissingVersionManifestTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/issue1264/", sTmpDir); + TestUtils.copyResourceDir(MissingVersionManifestTest.class, "brut/apktool/issue1264/", sTmpDir); } @AfterClass @@ -61,6 +61,4 @@ public class MissingVersionManifestTest { } private static ExtFile sTmpDir; - - private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); } \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/PositionalEnumerationTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/PositionalEnumerationTest.java index e16ef0a7..ad134f2b 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/PositionalEnumerationTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/PositionalEnumerationTest.java @@ -17,7 +17,6 @@ package brut.androlib; import brut.androlib.res.xml.ResXmlEncoders; import org.junit.Test; -import java.util.logging.Logger; import static org.junit.Assert.assertEquals; @@ -54,6 +53,4 @@ public class PositionalEnumerationTest { private String enumerateArguments(String value) { return ResXmlEncoders.enumerateNonPositionalSubstitutionsIfRequired(value); } - - private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); } \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/ProviderAttributeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/ProviderAttributeTest.java index 242b4af1..8d075e82 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/ProviderAttributeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/ProviderAttributeTest.java @@ -84,4 +84,4 @@ public class ProviderAttributeTest { } private static ExtFile sTmpDir; -} +} \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/ReferenceVersionCodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/ReferenceVersionCodeTest.java index 533a739d..18e51f28 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/ReferenceVersionCodeTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/ReferenceVersionCodeTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import java.io.File; import java.io.IOException; -import java.util.logging.Logger; import static org.junit.Assert.assertEquals; @@ -35,10 +34,10 @@ import static org.junit.Assert.assertEquals; public class ReferenceVersionCodeTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/issue1234/", sTmpDir); + TestUtils.copyResourceDir(ReferenceVersionCodeTest.class, "brut/apktool/issue1234/", sTmpDir); } @AfterClass @@ -61,6 +60,4 @@ public class ReferenceVersionCodeTest { } private static ExtFile sTmpDir; - - private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); } \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java index 39e5e2bc..5b64b0c9 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import java.io.File; import java.io.IOException; -import java.util.logging.Logger; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; @@ -36,10 +35,10 @@ import static org.junit.Assert.assertNotSame; public class UnknownCompressionTest { @BeforeClass - public static void beforeClass() throws Exception, BrutException { + public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); sTmpDir = new ExtFile(OS.createTempDirectory()); - TestUtils.copyResourceDir(LargeIntsInManifestTest.class, "brut/apktool/unknown_compression/", sTmpDir); + TestUtils.copyResourceDir(UnknownCompressionTest.class, "brut/apktool/unknown_compression/", sTmpDir); String apk = "deflated_unknowns.apk"; ApkOptions apkOptions = new ApkOptions(); @@ -90,6 +89,4 @@ public class UnknownCompressionTest { private static ExtFile sOriginalFile; private static ExtFile sBuiltFile; - - private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName()); } \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/VectorDrawableTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/VectorDrawableTest.java index bc229b1f..64e93061 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/VectorDrawableTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/VectorDrawableTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import java.io.File; import java.io.IOException; -import java.util.logging.Logger; import static org.junit.Assert.assertTrue; @@ -66,6 +65,4 @@ public class VectorDrawableTest { private static ExtFile sTmpDir; private static ExtFile sTestOrigDir; - - private final static Logger LOGGER = Logger.getLogger(VectorDrawableTest.class.getName()); }