From 05f81f9dd0cf7ea33b60e77dc4245ed2798fe358 Mon Sep 17 00:00:00 2001
From: Peter Retzlaff <peter@playtestcloud.com>
Date: Tue, 21 Apr 2020 10:18:22 +0200
Subject: [PATCH] Change zero-byte-file tests so they test the correct
 behavior.

* The empty test file needs to be STORED in the testapp, so put it on
  the initial doNotCompress list.
* It needs to have a file extension that matches the NO_COMPRESS_PATTERN.
* assertNotSame tests for object equality, which doesn't work for String
  comparisons.
---
 .../src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java | 4 ++--
 .../src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java | 2 +-
 .../apktool-lib/src/test/resources/aapt1/testapp/apktool.yml  | 1 +
 .../aapt1/testapp/assets/{0byte_file.empty => 0byte_file.jpg} | 0
 .../apktool-lib/src/test/resources/aapt2/testapp/apktool.yml  | 2 ++
 .../aapt2/testapp/assets/{0byte_file.empty => 0byte_file.jpg} | 0
 6 files changed, 6 insertions(+), 3 deletions(-)
 rename brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/{0byte_file.empty => 0byte_file.jpg} (100%)
 rename brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/assets/{0byte_file.empty => 0byte_file.jpg} (100%)

diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java
index 25118213..540b2db4 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java
@@ -493,11 +493,11 @@ public class BuildAndDecodeTest extends BaseTest {
     }
 
     @Test
-    public void confirmZeroByteFileIsNotStored() throws BrutException {
+    public void confirmZeroByteFileExtensionIsNotStored() throws BrutException {
         MetaInfo metaInfo = new Androlib().readMetaFile(sTestNewDir);
 
         for (String item : metaInfo.doNotCompress) {
-            assertNotSame(item, "empty");
+            assertFalse(item.equals("jpg"));
         }
     }
 
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java
index 03141b25..c2afaced 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java
@@ -80,7 +80,7 @@ public class BuildAndDecodeTest extends BaseTest {
     }
 
     @Test
-    public void confirmZeroByteFileIsNotStored() throws BrutException {
+    public void confirmZeroByteFileExtensionIsNotStored() throws BrutException {
         MetaInfo metaInfo = new Androlib().readMetaFile(sTestNewDir);
         assertNull(metaInfo.doNotCompress);
     }
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/apktool.yml
index fa9a6379..48ec1795 100644
--- a/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/apktool.yml
+++ b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/apktool.yml
@@ -11,6 +11,7 @@ versionInfo:
   versionName: '1.0'
 compressionType: false
 doNotCompress:
+- assets/0byte_file.jpg
 - arsc
 - png
 - mp3
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/0byte_file.empty b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/0byte_file.jpg
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/0byte_file.empty
rename to brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/assets/0byte_file.jpg
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/apktool.yml
index 57bb4fef..969b2132 100644
--- a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/apktool.yml
+++ b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/apktool.yml
@@ -10,4 +10,6 @@ versionInfo:
   versionCode: '1'
   versionName: '1.0'
 compressionType: false
+doNotCompress:
+- assets/0byte_file.jpg
 sparseResources: false
\ No newline at end of file
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/assets/0byte_file.empty b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/assets/0byte_file.jpg
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/assets/0byte_file.empty
rename to brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/assets/0byte_file.jpg