From a1cb15d721f2a03a1ad03a5c5f0a46b1384dd031 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor@sourcetoad.com>
Date: Tue, 15 Aug 2017 17:01:53 -0400
Subject: [PATCH] add additional tests for (json/png) deflated unknown files

---
 .../brut/androlib/UnknownCompressionTest.java |  18 ++++++++++++++++++
 .../unknown_compression/deflated_unknowns.apk | Bin 33072 -> 34589 bytes
 2 files changed, 18 insertions(+)

diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java
index bbe9177b..cf6191ed 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java
@@ -85,6 +85,24 @@ public class UnknownCompressionTest {
         assertEquals(new Integer(0), rebuilt);
     }
 
+    @Test
+    public void confirmJsonFileIsDeflatedTest() throws BrutException, IOException {
+        Integer control = sOriginalFile.getDirectory().getCompressionLevel("test.json");
+        Integer rebuilt = sOriginalFile.getDirectory().getCompressionLevel("test.json");
+
+        assertEquals(control, rebuilt);
+        assertEquals(new Integer(8), rebuilt);
+    }
+
+    @Test
+    public void confirmPngFileIsCorrectlyDeflatedTest() throws BrutException, IOException {
+        Integer control = sOriginalFile.getDirectory().getCompressionLevel("950x150.png");
+        Integer rebuilt = sOriginalFile.getDirectory().getCompressionLevel("950x150.png");
+
+        assertEquals(control, rebuilt);
+        assertEquals(new Integer(8), rebuilt);
+    }
+
     private static ExtFile sTmpDir;
 
     private static ExtFile sOriginalFile;
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/unknown_compression/deflated_unknowns.apk b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/unknown_compression/deflated_unknowns.apk
index 2ec5db2d68b0bb9cd75824cb54173b210539a6cd..1c2e46a2e67266b89fd5cdf454091761a65e5531 100644
GIT binary patch
delta 1915
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

delta 381
zcmbQ+$F!k|i9NuZnMH(wW3qgc_(nM$CQ)_{%fj=1!b}VdPgocjpt76&nVeaGQa&jc
z@+5)6n~|iZv#n(WO3h!pBfo`_f#EGsC(O);P2!sqIGP#x*g3csOq!Mpl)eCz-u#fW
zjggUKa|X9J3s6dGd*gj|pn)wMK&g%Vr*haCnM4>MZgOGdnC#CaKDoMyOD+Pa)z>w|
zQP<PYP2bryC`2zP*fGExrg(9aqU;7XbS1%V2o(>T6q$-RCdYAzO_plbVp8Oq?AC0|
z=r*~k*@7{D^2cW3$;X<t80P|6u8ba&&0BPVmZ!ETGA^9l-eSSTC@}e8iyve0WPw(H
z#>mMDtpSXyCvR*GWcCSUm@FBnHd(t(OJi{v14B`2aeir0a%!<&Vo`B&fHy19Q49<M
NKo|)0<;fZl4*-9#Vz2-J