Add support for <item> elements in dimension resource files.

Closes #987. Closes #977.
robolectric · Feb 28, 2014 · db90fed · db90fed
1 parent 72fb90a
commit db90fed
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/main/java/org/robolectric/res/PackageResourceLoader.java b/src/main/java/org/robolectric/res/PackageResourceLoader.java
@@ -33,6 +33,7 @@ private void loadEverything() throws Exception {
         new ValueResourceLoader(data, "/resources/bool", "bool", ResType.BOOLEAN),
         new ValueResourceLoader(data, "/resources/color", "color", ResType.COLOR),
         new ValueResourceLoader(data, "/resources/dimen", "dimen", ResType.DIMEN),
+        new ValueResourceLoader(data, "/resources/item[@type='dimen']", "dimen", ResType.DIMEN),
         new ValueResourceLoader(data, "/resources/integer", "integer", ResType.INTEGER),
         new ValueResourceLoader(data, "/resources/integer-array", "array", ResType.INTEGER_ARRAY),
         new ValueResourceLoader(data, "/resources/item", "layout", ResType.LAYOUT),

diff --git a/src/test/java/org/robolectric/res/PackageResourceLoaderTest.java b/src/test/java/org/robolectric/res/PackageResourceLoaderTest.java
@@ -15,4 +15,19 @@ public void shouldLoadResourcesFromGradleOutputDirectories() {
     assertThat(value.asString()).isEqualTo("string example taken from gradle output directory");
   }
 
+  @Test
+  public void shouldLoadDimenResourcesFromGradleOutputDirectoriesDefinedByDimenTag() {
+    PackageResourceLoader loader = new PackageResourceLoader(gradleAppResources());
+    TypedResource value = loader.getValue(new ResName("org.robolectric.gradleapp", "dimen", "example_dimen"), "");
+    assertThat(value).describedAs("Dimen from gradle output is not loaded").isNotNull();
+    assertThat(value.asString()).isEqualTo("8dp");
+  }
+
+  @Test
+  public void shouldLoadDimenResourcesFromGradleOutputDirectoriesDefinedByItemTag() {
+    PackageResourceLoader loader = new PackageResourceLoader(gradleAppResources());
+    TypedResource value = loader.getValue(new ResName("org.robolectric.gradleapp", "dimen", "example_item_dimen"), "");
+    assertThat(value).describedAs("Item dimen from gradle output is not loaded").isNotNull();
+    assertThat(value.asString()).isEqualTo("3.14");
+  }
 }
diff --git a/src/test/resources/gradle/res/layoutFlavor/menuBuildType/values/dimens.xml b/src/test/resources/gradle/res/layoutFlavor/menuBuildType/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="example_item_dimen" format="integer" type="dimen">3.14</item>
+    <dimen name="example_dimen">8dp</dimen>
+</resources>