ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-13 06:17:46 +01:00
Code Issues Projects Releases Wiki Activity

style: use new form of junit assertions

Browse Source
This commit is contained in:
Connor Tumbleson 2021-05-31 06:43:40 -04:00
parent de03c8b689
commit 66b1c30fa0
No known key found for this signature in database
GPG Key ID: C3CC0A201EC7DA75
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java
View File

@ -31,9 +31,8 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.logging.Logger; import java.util.logging.Logger;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
import static org.junit.Assert.*;
public class BaseTest { public class BaseTest {
@ -45,16 +44,16 @@ public class BaseTest {
Map<String, String> controlFiles = control.unknownFiles; Map<String, String> controlFiles = control.unknownFiles;
Map<String, String> testFiles = test.unknownFiles; Map<String, String> testFiles = test.unknownFiles;
assertTrue(controlFiles.size() == testFiles.size()); assertEquals(controlFiles.size(), testFiles.size());
// Make sure that the compression methods are still the same // Make sure that the compression methods are still the same
for (Map.Entry<String, String> controlEntry : controlFiles.entrySet()) { for (Map.Entry<String, String> controlEntry : controlFiles.entrySet()) {
assertTrue(controlEntry.getValue().equals(testFiles.get(controlEntry.getKey()))); assertEquals(controlEntry.getValue(), testFiles.get(controlEntry.getKey()));
} }
} }
protected void compareBinaryFolder(String path, boolean res) throws BrutException, IOException { protected void compareBinaryFolder(String path, boolean res) throws BrutException, IOException {
Boolean exists = true; boolean exists = true;
String prefixPath = ""; String prefixPath = "";
if (res) { if (res) {

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java
View File

@ -495,7 +495,7 @@ public class BuildAndDecodeTest extends BaseTest {
MetaInfo metaInfo = new Androlib().readMetaFile(sTestNewDir); MetaInfo metaInfo = new Androlib().readMetaFile(sTestNewDir);
for (String item : metaInfo.doNotCompress) { for (String item : metaInfo.doNotCompress) {
assertFalse(item.equals("jpg")); assertNotEquals("jpg", item);
} }
} }

3
brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/Empty9PatchTest.java
View File

@ -29,6 +29,7 @@ import org.junit.Test;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
public class Empty9PatchTest extends BaseTest { public class Empty9PatchTest extends BaseTest {
@ -58,6 +59,6 @@ public class Empty9PatchTest extends BaseTest {
File aPng = new File(sTestOrigDir,"res/drawable-xhdpi/empty.9.png"); File aPng = new File(sTestOrigDir,"res/drawable-xhdpi/empty.9.png");
assertTrue(aPng.isFile()); assertTrue(aPng.isFile());
assertTrue(aPng.length() == 0); assertEquals(0, aPng.length());
} }
} }

11
brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/ForceManifestDecodeNoResourcesTest.java
View File

@ -30,12 +30,11 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.*;
import static org.junit.Assert.assertTrue;
public class ForceManifestDecodeNoResourcesTest extends BaseTest { public class ForceManifestDecodeNoResourcesTest extends BaseTest {
private byte[] xmlHeader = new byte[] { private final byte[] xmlHeader = new byte[] {
0x3C, // < 0x3C, // <
0x3F, // ? 0x3F, // ?
0x78, // x 0x78, // x
@ -68,7 +67,7 @@ public class ForceManifestDecodeNoResourcesTest extends BaseTest {
// lets probe filetype of manifest, we should detect XML // lets probe filetype of manifest, we should detect XML
File manifestFile = new File(output + File.separator + "AndroidManifest.xml"); File manifestFile = new File(output + File.separator + "AndroidManifest.xml");
byte[] magic = TestUtils.readHeaderOfFile(manifestFile, 6); byte[] magic = TestUtils.readHeaderOfFile(manifestFile, 6);
assertTrue(Arrays.equals(this.xmlHeader, magic)); assertArrayEquals(this.xmlHeader, magic);
// confirm resources.arsc still exists, as its raw // confirm resources.arsc still exists, as its raw
File resourcesArsc = new File(output + File.separator + "resources.arsc"); File resourcesArsc = new File(output + File.separator + "resources.arsc");
@ -87,7 +86,7 @@ public class ForceManifestDecodeNoResourcesTest extends BaseTest {
// lets probe filetype of manifest, we should detect XML // lets probe filetype of manifest, we should detect XML
File manifestFile = new File(output + File.separator + "AndroidManifest.xml"); File manifestFile = new File(output + File.separator + "AndroidManifest.xml");
byte[] magic = TestUtils.readHeaderOfFile(manifestFile, 6); byte[] magic = TestUtils.readHeaderOfFile(manifestFile, 6);
assertTrue(Arrays.equals(this.xmlHeader, magic)); assertArrayEquals(this.xmlHeader, magic);
// confirm resources.arsc does not exist // confirm resources.arsc does not exist
File resourcesArsc = new File(output + File.separator + "resources.arsc"); File resourcesArsc = new File(output + File.separator + "resources.arsc");
@ -106,7 +105,7 @@ public class ForceManifestDecodeNoResourcesTest extends BaseTest {
// lets probe filetype of manifest, we should detect XML // lets probe filetype of manifest, we should detect XML
File manifestFile = new File(output + File.separator + "AndroidManifest.xml"); File manifestFile = new File(output + File.separator + "AndroidManifest.xml");
byte[] magic = TestUtils.readHeaderOfFile(manifestFile, 6); byte[] magic = TestUtils.readHeaderOfFile(manifestFile, 6);
assertTrue(Arrays.equals(this.xmlHeader, magic)); assertArrayEquals(this.xmlHeader, magic);
// confirm resources.arsc does not exist // confirm resources.arsc does not exist
File resourcesArsc = new File(output + File.separator + "resources.arsc"); File resourcesArsc = new File(output + File.separator + "resources.arsc");

6
brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/MissingVersionManifestTest.java
View File

@ -21,8 +21,8 @@ import brut.androlib.ApkDecoder;
import brut.androlib.BaseTest; import brut.androlib.BaseTest;
import brut.androlib.TestUtils; import brut.androlib.TestUtils;
import brut.androlib.meta.MetaInfo; import brut.androlib.meta.MetaInfo;
import brut.directory.ExtFile;
import brut.common.BrutException; import brut.common.BrutException;
import brut.directory.ExtFile;
import brut.util.OS; import brut.util.OS;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -31,7 +31,7 @@ import org.junit.Test;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull;
public class MissingVersionManifestTest extends BaseTest { public class MissingVersionManifestTest extends BaseTest {
@ -58,6 +58,6 @@ public class MissingVersionManifestTest extends BaseTest {
apkDecoder.decode(); apkDecoder.decode();
MetaInfo metaInfo = new Androlib().readMetaFile(decodedApk); MetaInfo metaInfo = new Androlib().readMetaFile(decodedApk);
assertEquals(null, metaInfo.versionInfo.versionName); assertNull(metaInfo.versionInfo.versionName);
} }
} }