From 2b8121584624f0a1b1602992a48fcdbf60c0347d Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
Date: Tue, 4 Jul 2023 12:47:26 -0400
Subject: [PATCH] test: add assertions for unknown files / assets (#3074)

---
 .../test/java/brut/androlib/aapt2/BuildAndDecodeTest.java    | 5 +++++
 .../apktool-lib/src/test/resources/aapt1/testapp/apktool.yml | 4 +++-
 .../resources/aapt1/testapp/unknown/AssetBundle/assets/a.txt | 1 +
 .../test/resources/aapt1/testapp/unknown/AssetBundle/b.txt   | 1 +
 .../apktool-lib/src/test/resources/aapt2/testapp/apktool.yml | 5 ++++-
 .../resources/aapt2/testapp/unknown/AssetBundle/assets/a.txt | 1 +
 .../test/resources/aapt2/testapp/unknown/AssetBundle/b.txt   | 1 +
 7 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/AssetBundle/assets/a.txt
 create mode 100644 brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/AssetBundle/b.txt
 create mode 100644 brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/unknown/AssetBundle/assets/a.txt
 create mode 100644 brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/unknown/AssetBundle/b.txt

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 97c98290..248452fc 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
@@ -141,4 +141,9 @@ public class BuildAndDecodeTest extends BaseTest {
         File classesDex = new File(sTestOrigDir, "build/apk/classes.dex");
         assertTrue(classesDex.isFile());
     }
+
+    @Test
+    public void unknownFolderTest() throws BrutException {
+        compareUnknownFiles();
+    }
 }
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 48ec1795..8362ef05 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
@@ -16,8 +16,10 @@ doNotCompress:
 - png
 - mp3
 unknownFiles:
+  AssetBundle/assets/a.txt: '8'
+  AssetBundle/b.txt: '8'
   hidden.file: '8'
   non\u007Fprintable.file: '8'
   stored.file: '0'
   unk_folder/unknown_file: '8'
-  lib_bug603/bug603: '8'
\ No newline at end of file
+  lib_bug603/bug603: '8'
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/AssetBundle/assets/a.txt b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/AssetBundle/assets/a.txt
new file mode 100644
index 00000000..25721524
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/AssetBundle/assets/a.txt
@@ -0,0 +1 @@
+issue-3038
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/AssetBundle/b.txt b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/AssetBundle/b.txt
new file mode 100644
index 00000000..25721524
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/aapt1/testapp/unknown/AssetBundle/b.txt
@@ -0,0 +1 @@
+issue-3038
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 969b2132..e83d2e54 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
@@ -12,4 +12,7 @@ versionInfo:
 compressionType: false
 doNotCompress:
 - assets/0byte_file.jpg
-sparseResources: false
\ No newline at end of file
+sparseResources: false
+unknownFiles:
+  AssetBundle/assets/a.txt: '8'
+  AssetBundle/b.txt: '8'
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/unknown/AssetBundle/assets/a.txt b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/unknown/AssetBundle/assets/a.txt
new file mode 100644
index 00000000..25721524
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/unknown/AssetBundle/assets/a.txt
@@ -0,0 +1 @@
+issue-3038
diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/unknown/AssetBundle/b.txt b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/unknown/AssetBundle/b.txt
new file mode 100644
index 00000000..25721524
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/unknown/AssetBundle/b.txt
@@ -0,0 +1 @@
+issue-3038