Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove deprecations from test suite #3269

Merged
merged 1 commit into from
Aug 13, 2023
Merged

refactor: remove deprecations from test suite #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/SkipAssetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 0 additions & 4 deletions brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/AndResGuardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package brut.androlib.decode;

import brut.androlib.ApkDecoder;
import brut.androlib.BaseTest;
import brut.androlib.Config;
import brut.androlib.TestUtils;
Expand All @@ -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 {

Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
}
1 change: 0 additions & 1 deletion brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DuplicateDexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.io.File;
import java.io.IOException;


public class DuplicateDexTest extends BaseTest {

@Before
Expand Down
1 change: 0 additions & 1 deletion brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ExternalEntityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\" " +
Expand Down