ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-10-12 15:58:33 +02:00
Code Issues Projects Releases Wiki Activity

cleanup unit-tests to remove hacky renaming of control

Browse Source
This commit is contained in:
Connor Tumbleson 2015-04-22 07:20:29 -05:00
parent 4fc78b2508
commit 960d111a1e
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,37 +325,39 @@ public class BuildAndDecodeTest {
} }
} }
private boolean compareBinaryFolder(String path, boolean res) private void compareBinaryFolder(String path, boolean res)
throws BrutException, IOException { throws BrutException, IOException {
Boolean exists = true;
String tmp = ""; String tmp = "";
if (res) { if (res) {
tmp = File.separatorChar + "res" + File.separatorChar; tmp = File.separatorChar + "res" + File.separatorChar;
} }
FileDirectory fileDirectory = new FileDirectory(sTestOrigDir + tmp + path); String location = tmp + path;
FileDirectory fileDirectory = new FileDirectory(sTestOrigDir + location);
Set<String> files = fileDirectory.getFiles(true); Set<String> files = fileDirectory.getFiles(true);
for (String filename : files) { for (String filename : files) {
File control = new File(filename);
// hacky fix - load test by changing name of control File control = new File((sTestOrigDir + location), filename);
File test = new File(control.toString().replace("testapp-orig", "testapp-new")); File test = new File((sTestNewDir + location), filename);
if (test.isFile() && control.isFile()) { if (! test.isFile() || ! control.isFile()) {
if (control.hashCode() != test.hashCode()) { exists = false;
return false;
}
} }
} }
return true;
assertTrue(exists);
} }
private boolean compareResFolder(String path) throws BrutException, IOException { private void compareResFolder(String path) throws BrutException, IOException {
return compareBinaryFolder(path, true); compareBinaryFolder(path, true);
} }
private boolean compareLibsFolder(String path) throws BrutException, IOException { private void compareLibsFolder(String path) throws BrutException, IOException {
return compareBinaryFolder(File.separatorChar + path,false); compareBinaryFolder(File.separatorChar + path, false);
} }
private void compareValuesFiles(String path) throws BrutException { private void compareValuesFiles(String path) throws BrutException {
@ -380,9 +382,7 @@ public class BuildAndDecodeTest {
Reader test = new FileReader(new File(sTestNewDir, path)); Reader test = new FileReader(new File(sTestNewDir, path));
diff = new DetailedDiff(new Diff(control, test)); diff = new DetailedDiff(new Diff(control, test));
} catch (SAXException ex) { } catch (SAXException | IOException ex) {
throw new BrutException(ex);
} catch (IOException ex) {
throw new BrutException(ex); throw new BrutException(ex);
} }