From 800394cf30ba906988ebc28d03b9e1e4a873bcec Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Wed, 23 Aug 2017 17:53:33 -0400 Subject: [PATCH] new qualifiers require v26 naming --- .../test/java/brut/androlib/BuildAndDecodeTest.java | 12 ++++++------ .../{values-lowdr => values-lowdr-v26}/strings.xml | 0 .../strings.xml | 0 .../strings.xml | 0 .../{values-widecg => values-widecg-v26}/strings.xml | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/{values-lowdr => values-lowdr-v26}/strings.xml (100%) rename brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/{values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad => values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad-v26}/strings.xml (100%) rename brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/{values-nowidecg => values-nowidecg-v26}/strings.xml (100%) rename brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/{values-widecg => values-widecg-v26}/strings.xml (100%) 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 3302d5d5..9abc7f8c 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 @@ -205,8 +205,8 @@ public class BuildAndDecodeTest { @Test public void qualifiersTest() throws BrutException { compareValuesFiles("values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp" - + "-xlarge-long-round-land-desk-night-xhdpi-finger-keyssoft-12key" - + "-navhidden-dpad/strings.xml"); + + "-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key" + + "-navhidden-dpad-v26/strings.xml"); } @Test @@ -297,10 +297,10 @@ public class BuildAndDecodeTest { @Test public void api26ConfigurationsTest() throws BrutException, IOException { - //compareValuesFiles("values-widecg/strings.xml"); - //compareValuesFiles("values-lowdr/strings.xml"); - //compareValuesFiles("values-nowidecg/strings.xml"); - //compareValuesFiles("values-vrheadset-v26/strings.xml"); + compareValuesFiles("values-widecg-v26/strings.xml"); + compareValuesFiles("values-lowdr-v26/strings.xml"); + compareValuesFiles("values-nowidecg-v26/strings.xml"); + compareValuesFiles("values-vrheadset-v26/strings.xml"); } @Test diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-lowdr/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-lowdr-v26/strings.xml similarity index 100% rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-lowdr/strings.xml rename to brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-lowdr-v26/strings.xml diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-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-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad-v26/strings.xml similarity index 100% rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-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-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key-navhidden-dpad-v26/strings.xml diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-nowidecg/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-nowidecg-v26/strings.xml similarity index 100% rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-nowidecg/strings.xml rename to brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-nowidecg-v26/strings.xml diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-widecg/strings.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-widecg-v26/strings.xml similarity index 100% rename from brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-widecg/strings.xml rename to brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-widecg-v26/strings.xml