From 09148902ef8f1dc1f8dab8a3c228abf1b4097572 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor@sourcetoad.com>
Date: Wed, 28 Feb 2018 13:27:13 -0500
Subject: [PATCH] aapt2: start of tests for aapt2

---
 .../java/brut/androlib/aapt2/BuildAndDecodeTest.java | 12 +++++++++++-
 .../resources/brut/apktool/aapt2/testapp/apktool.yml |  5 +++--
 .../aapt2/testapp/{ => res}/values/strings.xml       |  0
 3 files changed, 14 insertions(+), 3 deletions(-)
 rename brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/{ => res}/values/strings.xml (100%)

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 af183295..7df80f01 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
@@ -63,7 +63,17 @@ public class BuildAndDecodeTest extends BaseTest {
     }
 
     @Test
-    public void buildAndDecodeTest() throws BrutException {
+    public void buildAndDecodeTest() {
         assertTrue(sTestNewDir.isDirectory());
     }
+
+    @Test
+    public void valuesStringsTest() throws BrutException {
+        compareValuesFiles("values/strings.xml");
+    }
+
+    @Test
+    public void confirmManifestStructureTest() throws BrutException {
+        compareXmlFiles("AndroidManifest.xml");
+    }
 }
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/apktool.yml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/apktool.yml
index 83c8492e..9e943178 100644
--- a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/apktool.yml
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/apktool.yml
@@ -1,4 +1,4 @@
-version: 2.0.0
+version: 2.3.2
 apkFileName: testapp.apk
 isFrameworkApk: false
 usesFramework:
@@ -9,4 +9,5 @@ packageInfo:
 versionInfo:
   versionCode: '1'
   versionName: '1.0'
-compressionType: false
\ No newline at end of file
+compressionType: false
+sparseResources: false
\ No newline at end of file
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/values/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/res/values/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/values/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/brut/apktool/aapt2/testapp/res/values/strings.xml