From ed67a3d94d870b282d86d387dc7a614d96fb8674 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 12 May 2013 07:21:13 -0500 Subject: [PATCH] updated unit testing -- styles.xml -- layouts.xml -- anims.xml -- drawables.xml -- attrs.xml -- raw/blank_test.png --- .../brut/androlib/BuildAndDecodeTest.java | 46 +++++++++++++++--- .../apktool/testapp/res/raw/blank_test.png | Bin 0 -> 2790 bytes .../testapp/res/values-mcc001/anims.xml | 12 +++++ .../testapp/res/values-mcc001/drawables.xml | 8 +++ .../testapp/res/values-mcc001/layouts.xml | 7 +++ .../testapp/res/values-mcc001/styles.xml | 10 ++++ .../brut/apktool/testapp/res/values/attrs.xml | 16 ++++++ 7 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/raw/blank_test.png create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/anims.xml create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/drawables.xml create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/layouts.xml create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml create mode 100644 brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values/attrs.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 569c73f9..b5b39ad8 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 @@ -67,12 +67,22 @@ public class BuildAndDecodeTest { apkDecoder.decode(); } + @Test + public void valuesAnimsTest() throws BrutException { + compareValuesFiles("values-mcc001/anims.xml"); + } + @Test public void valuesArraysTest() throws BrutException { compareValuesFiles("values-mcc001/arrays.xml"); compareValuesFiles("values-mcc002/arrays.xml"); } + @Test + public void valuesAttrsTest() throws BrutException { + compareValuesFiles("values/attrs.xml"); + } + @Test public void valuesBoolsTest() throws BrutException { compareValuesFiles("values-mcc001/bools.xml"); @@ -88,6 +98,11 @@ public class BuildAndDecodeTest { compareValuesFiles("values-mcc001/dimens.xml"); } + @Test + public void valuesDrawablesTest() throws BrutException { + compareValuesFiles("values-mcc001/drawables.xml"); + } + @Test public void valuesIdsTest() throws BrutException { compareValuesFiles("values-mcc001/ids.xml"); @@ -98,6 +113,11 @@ public class BuildAndDecodeTest { compareValuesFiles("values-mcc001/integers.xml"); } + @Test + public void valuesLayoutsTest() throws BrutException { + compareValuesFiles("values-mcc001/layouts.xml"); + } + @Test public void xmlPluralsTest() throws BrutException { compareValuesFiles("values-mcc001/plurals.xml"); @@ -108,6 +128,11 @@ public class BuildAndDecodeTest { compareValuesFiles("values-mcc001/strings.xml"); } + @Test + public void valuesStylesTest() throws BrutException { + compareValuesFiles("values-mcc001/styles.xml"); + } + @Test public void valuesReferencesTest() throws BrutException { compareValuesFiles("values-mcc002/strings.xml"); @@ -139,37 +164,42 @@ public class BuildAndDecodeTest { @Test public void drawableNoDpiTest() throws BrutException, IOException { - compareDrawablesFolder("drawable-nodpi"); + compareResFolder("drawable-nodpi"); } @Test public void drawableNumberedDpiTest() throws BrutException, IOException { - compareDrawablesFolder("drawable-534dpi"); + compareResFolder("drawable-534dpi"); } @Test public void drawableLdpiTest() throws BrutException, IOException { - compareDrawablesFolder("drawable-ldpi"); + compareResFolder("drawable-ldpi"); } @Test public void drawableMdpiTest() throws BrutException, IOException { - compareDrawablesFolder("drawable-mdpi"); + compareResFolder("drawable-mdpi"); } @Test public void drawableTvdpiTest() throws BrutException, IOException { - compareDrawablesFolder("drawable-tvdpi"); + compareResFolder("drawable-tvdpi"); } @Test public void drawableXhdpiTest() throws BrutException, IOException { - compareDrawablesFolder("drawable-xhdpi"); + compareResFolder("drawable-xhdpi"); } @Test public void drawableXxhdpiTest() throws BrutException, IOException { - compareDrawablesFolder("drawable-xxhdpi"); + compareResFolder("drawable-xxhdpi"); + } + + @Test + public void resRawTest() throws BrutException, IOException { + compareResFolder("raw"); } @Test @@ -223,7 +253,7 @@ public class BuildAndDecodeTest { }); } - private boolean compareDrawablesFolder(String path) throws BrutException, IOException { + private boolean compareResFolder(String path) throws BrutException, IOException { sResult = true; compareBinaryFolder(path, true); return sResult; diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/raw/blank_test.png b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/raw/blank_test.png new file mode 100644 index 0000000000000000000000000000000000000000..a1d202bc0ec5934d11a67049e013e730f92b72f4 GIT binary patch literal 2790 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 literal 0 HcmV?d00001 diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/anims.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/anims.xml new file mode 100644 index 00000000..e2a285e2 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/anims.xml @@ -0,0 +1,12 @@ + + + @*android:anim/grow_fade_in_from_bottom + @*android:anim/push_down_in + @*android:anim/push_down_out + @*android:anim/push_up_in + @*android:anim/push_up_out + @*android:anim/shrink_fade_out_from_bottom + @*android:anim/slide_out_down + @*android:anim/wallpaper_open_exit + @*android:anim/wallpaper_open_exit + diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/drawables.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/drawables.xml new file mode 100644 index 00000000..4301edae --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/drawables.xml @@ -0,0 +1,8 @@ + + + @*android:drawable/ab_bottom_solid_light_holo + @*android:drawable/btn_check_off_holo_light + @*android:drawable/btn_check_on_holo_light + @*android:drawable/btn_keyboard_key_fulltrans + #00000000 + diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/layouts.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/layouts.xml new file mode 100644 index 00000000..98e1b101 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/layouts.xml @@ -0,0 +1,7 @@ + + + @*android:layout/preference_header_item + @*android:layout/preference_list_fragment + @*android:layout/preference_widget_checkbox + @*android:layout/preference_widget_switch + diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml new file mode 100644 index 00000000..0dbb88f6 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values/attrs.xml b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values/attrs.xml new file mode 100644 index 00000000..d77a8838 --- /dev/null +++ b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values/attrs.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file