From 895af9c97579cb7f81cf3d146def27d48c726583 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 14 Dec 2017 14:07:32 -0500 Subject: [PATCH] refactor test --- .../java/brut/androlib/MinifiedArscTest.java | 10 +++++----- .../brut/apktool/issue1157/issue1157.apk | Bin 6636 -> 8993 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/MinifiedArscTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/MinifiedArscTest.java index 31c0fb5a..bae8dcc0 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/MinifiedArscTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/MinifiedArscTest.java @@ -46,6 +46,7 @@ public class MinifiedArscTest { // decode issue1157.apk ApkDecoder apkDecoder = new ApkDecoder(new ExtFile(sTmpDir, apk)); + apkDecoder.setForceDelete(true); apkDecoder.setOutDir(sDecodedDir); // this should not raise an exception: @@ -60,11 +61,10 @@ public class MinifiedArscTest { @Test public void checkIfMinifiedArscLayoutFileMatchesTest() throws IOException { String expected = TestUtils.replaceNewlines("\n" + - ""); + "\n" + + " \n" + + ""); byte[] encoded = Files.readAllBytes(Paths.get(sDecodedDir + File.separator + "res" + File.separator + "xml" + File.separator + "custom.xml")); String obtained = TestUtils.replaceNewlines(new String(encoded)); diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1157/issue1157.apk b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1157/issue1157.apk index ae279f496036df4767777a96bba9d5cd155ec10e..b5645a2e2b12e1f28ce8d377b44533377fb5db00 100644 GIT binary patch delta 3017 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