refactor: remove deprecations from test suite (#3269)

iBotPeaches · Aug 13, 2023 · 225c908 · 225c908
1 parent e99ed1c
commit 225c908
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 15 deletions.
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
@@ -77,13 +77,13 @@ public void checkControl() throws BrutException, IOException {
         checkFileDoesExist("assets" + File.separator + "ranges" + File.separator + "ranges.kotlin_builtins");
     }
 
-    private void checkFileDoesNotExist(String path) throws BrutException {
+    private void checkFileDoesNotExist(String path) {
         File f =  new File(sTestOrigDir, path);
 
         assertFalse(f.isFile());
     }
 
-    private void checkFileDoesExist(String path) throws BrutException {
+    private void checkFileDoesExist(String path) {
         File f =  new File(sTestOrigDir, path);
 
         assertTrue(f.isFile());

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
@@ -22,7 +22,6 @@
 import brut.common.BrutException;
 import brut.directory.ExtFile;
 import brut.util.OS;
-import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -34,10 +33,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static org.junit.Assert.*;
 
 public class BuildAndDecodeTest extends BaseTest {

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
@@ -59,7 +59,7 @@ public void checkifAndResDecodeRemapsRFolder() throws BrutException, IOException
     }
 
     @Test
-    public void checkifAndResDecodeRemapsRFolderInRawMode() throws BrutException, IOException {
+    public void checkIfAndResDecodeRemapsRFolderInRawMode() throws BrutException, IOException {
 
         Config config = Config.getDefaultConfig();
         config.forceDelete = true;

diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeArrayTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeArrayTest.java
@@ -16,7 +16,6 @@
  */
 package brut.androlib.decode;
 
-import brut.androlib.ApkDecoder;
 import brut.androlib.BaseTest;
 import brut.androlib.Config;
 import brut.androlib.TestUtils;
@@ -32,9 +31,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.File;
-
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 public class DecodeArrayTest extends BaseTest {
 
@@ -54,7 +51,6 @@ public static void afterClass() throws BrutException {
     public void decodeStringArray() throws BrutException {
         ExtFile apkFile = new ExtFile(sTmpDir, "issue1994.apk");
         ApkInfo apkInfo = new ApkInfo(apkFile);
-        //ApkDecoder apkDecoder = new ApkDecoder(apkFile);
         ResourcesDecoder resourcesDecoder = new ResourcesDecoder(Config.getDefaultConfig(), apkInfo);
 
         resourcesDecoder.loadMainPkg();

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
@@ -67,6 +67,6 @@ public void kotlinFolderExistsTest() {
     public void kotlinDecodeTest() throws IOException {
         File kotlinActivity = new File(sTestNewDir, "smali/org/example/kotlin/mixed/KotlinActivity.smali");
 
-        assertTrue(FileUtils.readFileToString(kotlinActivity).contains("KotlinActivity.kt"));
+        assertTrue(FileUtils.readFileToString(kotlinActivity, "UTF-8").contains("KotlinActivity.kt"));
     }
 }
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DuplicateDexTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DuplicateDexTest.java
@@ -26,7 +26,6 @@
 import java.io.File;
 import java.io.IOException;
 
-
 public class DuplicateDexTest extends BaseTest {
 
     @Before

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
@@ -58,7 +58,6 @@ public static void afterClass() throws BrutException {
 
     @Test
     public void doctypeTest() throws IOException {
-
         String expected = TestUtils.replaceNewlines("<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                 "<manifest android:versionCode=\"1\" android:versionName=\"1.0\" android:compileSdkVersion=\"23\" android:compileSdkVersionCodename=\"6.0-2438415\" " +
                 "hardwareAccelerated=\"true\" package=\"com.ibotpeaches.doctype\" platformBuildVersionCode=\"24\" platformBuildVersionName=\"6.0-2456767\"  " +