From 26b883ac3bb095fd024b2f0ce79f7080bf08aaa0 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Thu, 8 Oct 2015 06:58:32 -0500
Subject: [PATCH] Updated unit-tests to include API 23 tests

---
 .../src/test/java/brut/androlib/BuildAndDecodeTest.java   | 8 +++++++-
 .../strings.xml                                           | 0
 .../brut/apktool/testapp/res/values-notround/strings.xml  | 4 ++++
 .../brut/apktool/testapp/res/values-round/strings.xml     | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)
 rename brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/{values-mcc004-mnc04-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad => values-mcc004-mnc04-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad}/strings.xml (100%)
 create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-notround/strings.xml
 create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-round/strings.xml

diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
index 6a358d70..86ebfd76 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
@@ -178,7 +178,7 @@ public class BuildAndDecodeTest {
     @Test
     public void qualifiersTest() throws BrutException {
         compareValuesFiles("values-mcc004-mnc04-en-rUS-ldrtl-sw100dp-w200dp-h300dp"
-                + "-xlarge-long-land-desk-night-xhdpi-finger-keyssoft-12key"
+                + "-xlarge-long-round-land-desk-night-xhdpi-finger-keyssoft-12key"
                 + "-navhidden-dpad/strings.xml");
     }
 
@@ -242,6 +242,12 @@ public class BuildAndDecodeTest {
         compareValuesFiles("values-b+eng+419/strings.xml");
     }
 
+    @Test
+    public void api23ConfigurationsTest() throws BrutException, IOException {
+        compareValuesFiles("values-round/strings.xml");
+        compareValuesFiles("values-notround/strings.xml");
+    }
+
     @Test
     public void drawableNoDpiTest() throws BrutException, IOException {
         compareResFolder("drawable-nodpi");
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004-mnc04-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004-mnc04-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad/strings.xml
similarity index 100%
rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004-mnc04-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad/strings.xml
rename to brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004-mnc04-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad/strings.xml
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-notround/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-notround/strings.xml
new file mode 100644
index 00000000..9999efc0
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-notround/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello_world">Hello World</string>
+</resources>
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-round/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-round/strings.xml
new file mode 100644
index 00000000..9999efc0
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-round/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello_world">Hello World</string>
+</resources>