ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-06-13 13:27:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1395 from iBotPeaches/issue/1394

Browse Source 
Refactor ExtFile to brut.j.dir
This commit is contained in:
Connor Tumbleson
2016-12-29 09:34:37 -05:00
committed by GitHub
parent 726bd47922 6e86fa9fcd
commit 0571cccaff
19 changed files with 92 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import java.io.File;

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

@ -15,7 +15,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

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

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.FileDirectory;
import brut.util.OS;
@ -31,7 +31,6 @@ import org.custommonkey.xmlunit.*;
import org.junit.*;
import static org.junit.Assert.*;
import org.junit.rules.ExpectedException;
import org.xml.sax.SAXException;
import javax.imageio.ImageIO;
@ -420,7 +419,7 @@ public class BuildAndDecodeTest {
String location = tmp + path;
FileDirectory fileDirectory = new FileDirectory(sTestOrigDir + location);
FileDirectory fileDirectory = new FileDirectory(sTestOrigDir, location);
Set<String> files = fileDirectory.getFiles(true);
for (String filename : files) {

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

@ -15,7 +15,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

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

@ -17,7 +17,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.apache.commons.lang3.StringUtils;

5
brut.apktool/apktool-lib/src/test/java/brut/androlib/LargeIntsInManifestTest.java
View File

@ -16,15 +16,12 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.FileDirectory;
import brut.util.OS;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
import org.custommonkey.xmlunit.*;

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

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

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

@ -16,9 +16,8 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.DirectoryException;
import brut.util.OS;
import org.junit.AfterClass;
import org.junit.BeforeClass;

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

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

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

@ -16,9 +16,8 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.DirectoryException;
import brut.util.OS;
import org.junit.AfterClass;
import org.junit.BeforeClass;

8
brut.apktool/apktool-lib/src/test/java/brut/androlib/TestUtils.java
View File

@ -98,7 +98,11 @@ public abstract class TestUtils {
URL dirURL = class_.getClassLoader().getResource(dirPath);
if (dirURL != null && dirURL.getProtocol().equals("file")) {
DirUtil.copyToDir(new FileDirectory(dirURL.getFile()), out);
try {
DirUtil.copyToDir(new FileDirectory(dirURL.getFile()), out);
} catch (UnsupportedEncodingException ex) {
throw new BrutException(ex);
}
return;
}
@ -111,10 +115,10 @@ public abstract class TestUtils {
String jarPath;
try {
jarPath = URLDecoder.decode(dirURL.getPath().substring(5, dirURL.getPath().indexOf("!")), "UTF-8");
DirUtil.copyToDir(new FileDirectory(jarPath), out);
} catch (UnsupportedEncodingException ex) {
throw new BrutException(ex);
}
DirUtil.copyToDir(new FileDirectory(jarPath), out);
}
}

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

@ -16,7 +16,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;