Merge "Add support for subfolders in assets folders."

10 files changed, 12 insertions, 12 deletions

diff --git a/builder/src/test/java/com/android/builder/resources/AssetMergerTest.java b/builder/src/test/java/com/android/builder/resources/AssetMergerTest.java
index baa6f7d..d9e1732 100755
--- a/builder/src/test/java/com/android/builder/resources/AssetMergerTest.java
+++ b/builder/src/test/java/com/android/builder/resources/AssetMergerTest.java
@@ -37,15 +37,15 @@ public class AssetMergerTest extends BaseTestCase {
         assertEquals(5, merger.size());
     }
 
-    public void testMergedResourcesByName() throws Exception {
+    public void testMergedAssetsByName() throws Exception {
         AssetMerger merger = getAssetMerger();
 
         verifyResourceExists(merger,
-                "icon.png",
+                "foo/icon.png",
                 "icon2.png",
                 "main.xml",
                 "values.xml",
-                "foo.dat"
+                "foo/foo.dat"
         );
     }
 
@@ -140,7 +140,7 @@ public class AssetMergerTest extends BaseTestCase {
         File overlayFolder = new File(root, "overlay");
 
         // new/removed files:
-        File overlayAdded = new File(overlayFolder, "overlay_added.png");
+        File overlayAdded = new File(new File(overlayFolder, "foo"), "overlay_added.png");
         overlaySet.updateWith(overlayFolder, overlayAdded, FileStatus.NEW, logger);
         checkLogger(logger);
 
@@ -175,7 +175,7 @@ public class AssetMergerTest extends BaseTestCase {
         assertTrue(removedItem.get(0).isRemoved());
 
         // check new overlay: two objects, last one is TOUCHED
-        List<AssetItem> overlayAddedItem = mergedMap.get("overlay_added.png");
+        List<AssetItem> overlayAddedItem = mergedMap.get("foo/overlay_added.png");
         assertEquals(2, overlayAddedItem.size());
         AssetItem newOverlay0 = overlayAddedItem.get(0);
         assertTrue(newOverlay0.isWritten());
@@ -208,7 +208,7 @@ public class AssetMergerTest extends BaseTestCase {
         checkImageColor(new File(resFolder, "touched.png"), (int) 0xFF00FF00);
         checkImageColor(new File(resFolder, "added.png"), (int) 0xFF00FF00);
         checkImageColor(new File(resFolder, "overlay_removed.png"), (int) 0xFF00FF00);
-        checkImageColor(new File(resFolder, "overlay_added.png"), (int) 0xFF00FF00);
+        checkImageColor(new File(new File(resFolder, "foo"), "overlay_added.png"), (int) 0xFF00FF00);
 
         // also check the removed file is not there.
         assertFalse(new File(resFolder, "removed.png").isFile());
diff --git a/builder/src/test/java/com/android/builder/resources/AssetSetTest.java b/builder/src/test/java/com/android/builder/resources/AssetSetTest.java
index 2c70dbc..cd4edd2 100644
--- a/builder/src/test/java/com/android/builder/resources/AssetSetTest.java
+++ b/builder/src/test/java/com/android/builder/resources/AssetSetTest.java
@@ -34,8 +34,8 @@ public class AssetSetTest extends BaseTestCase {
         AssetSet assetSet = getBaseAssetSet();
 
         verifyResourceExists(assetSet,
-                "foo.dat",
-                "icon.png",
+                "foo/foo.dat",
+                "foo/icon.png",
                 "main.xml",
                 "values.xml"
         );
diff --git a/builder/src/test/resources/testData/assets/baseMerge/merger.xml b/builder/src/test/resources/testData/assets/baseMerge/merger.xml
index c82364a..dca3713 100644
--- a/builder/src/test/resources/testData/assets/baseMerge/merger.xml
+++ b/builder/src/test/resources/testData/assets/baseMerge/merger.xml
@@ -2,16 +2,16 @@
 <merger xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
     <dataSet config="main">
         <source path="$TOP$$SEP$..$SEP$baseSet">
-            <file name="icon.png" path="$TOP$$SEP$..$SEP$baseSet$SEP$icon.png" />
+            <file name="foo/icon.png" path="$TOP$$SEP$..$SEP$baseSet$SEP$foo$SEP$icon.png" />
             <file name="main.xml" path="$TOP$$SEP$..$SEP$baseSet$SEP$main.xml" />
-            <file name="foo.dat" path="$TOP$$SEP$..$SEP$baseSet$SEP$foo.dat" />
+            <file name="foo/foo.dat" path="$TOP$$SEP$..$SEP$baseSet$SEP$foo$SEP$foo.dat" />
             <file name="value.xml" path="$TOP$$SEP$..$SEP$baseSet$SEP$value.xml" />
         </source>
     </dataSet>
     <dataSet config="overlay">
         <source path="$TOP$$SEP$overlay">
             <file name="icon2.png" path="$TOP$$SEP$overlay$SEP$icon2.png" />
-            <file name="icon.png" path="$TOP$$SEP$overlay$SEP$icon.png" />
+            <file name="foo/icon.png" path="$TOP$$SEP$overlay$SEP$foo$SEP$icon.png" />
         </source>
     </dataSet>
 </merger>
diff --git a/builder/src/test/resources/testData/assets/baseMerge/overlay/icon.png b/builder/src/test/resources/testData/assets/baseMerge/overlay/foo/icon.png
index 47e1adf..47e1adf 100644
--- a/builder/src/test/resources/testData/assets/baseMerge/overlay/icon.png
+++ b/builder/src/test/resources/testData/assets/baseMerge/overlay/foo/icon.png
diff --git a/builder/src/test/resources/testData/assets/baseSet/foo.dat b/builder/src/test/resources/testData/assets/baseSet/foo/foo.dat
index def08db..def08db 100644
--- a/builder/src/test/resources/testData/assets/baseSet/foo.dat
+++ b/builder/src/test/resources/testData/assets/baseSet/foo/foo.dat
diff --git a/builder/src/test/resources/testData/assets/baseSet/icon.png b/builder/src/test/resources/testData/assets/baseSet/foo/icon.png
index b55e544..b55e544 100644
--- a/builder/src/test/resources/testData/assets/baseSet/icon.png
+++ b/builder/src/test/resources/testData/assets/baseSet/foo/icon.png
diff --git a/builder/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/overlay_added.png b/builder/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/foo/overlay_added.png
index b55e544..b55e544 100644
--- a/builder/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/overlay_added.png
+++ b/builder/src/test/resources/testData/assets/incMergeData/basicFiles/assetOut/foo/overlay_added.png
diff --git a/builder/src/test/resources/testData/assets/incMergeData/basicFiles/main/overlay_added.png b/builder/src/test/resources/testData/assets/incMergeData/basicFiles/main/foo/overlay_added.png
index b55e544..b55e544 100644
--- a/builder/src/test/resources/testData/assets/incMergeData/basicFiles/main/overlay_added.png
+++ b/builder/src/test/resources/testData/assets/incMergeData/basicFiles/main/foo/overlay_added.png
diff --git a/builder/src/test/resources/testData/assets/incMergeData/basicFiles/merger.xml b/builder/src/test/resources/testData/assets/incMergeData/basicFiles/merger.xml
index 029155e..8edb8b3 100644
--- a/builder/src/test/resources/testData/assets/incMergeData/basicFiles/merger.xml
+++ b/builder/src/test/resources/testData/assets/incMergeData/basicFiles/merger.xml
@@ -6,7 +6,7 @@
             <file name="touched.png" path="$TOP$$SEP$main$SEP$touched.png" />
             <file name="removed.png" path="$TOP$$SEP$main$SEP$removed.png" />
             <file name="overlay_removed.png" path="$TOP$$SEP$main$SEP$overlay_removed.png" />
-            <file name="overlay_added.png" path="$TOP$$SEP$main$SEP$overlay_added.png" />
+            <file name="foo/overlay_added.png" path="$TOP$$SEP$main$SEP$foo$SEP$overlay_added.png" />
         </source>
     </dataSet>
     <dataSet config="overlay">
diff --git a/builder/src/test/resources/testData/assets/incMergeData/basicFiles/overlay/overlay_added.png b/builder/src/test/resources/testData/assets/incMergeData/basicFiles/overlay/foo/overlay_added.png
index 47e1adf..47e1adf 100644
--- a/builder/src/test/resources/testData/assets/incMergeData/basicFiles/overlay/overlay_added.png
+++ b/builder/src/test/resources/testData/assets/incMergeData/basicFiles/overlay/foo/overlay_added.png