Minor fix + more verbose assert in test to debug issue.

Change-Id: If201822e568f670f41866f490651b7060a8416e1

2 files changed, 4 insertions, 6 deletions

diff --git a/builder/src/test/java/com/android/builder/resources/BaseTestCase.java b/builder/src/test/java/com/android/builder/resources/BaseTestCase.java
index c82c587..3d1b68a 100644
--- a/builder/src/test/java/com/android/builder/resources/BaseTestCase.java
+++ b/builder/src/test/java/com/android/builder/resources/BaseTestCase.java
@@ -122,11 +122,11 @@ public abstract class BaseTestCase extends TestCase {
             DataMerger<? extends DataItem, ? extends DataFile, ? extends DataSet> dataMerger) {
 
         // Loop on all the data sets.
-        for (DataSet set : dataMerger.getDataSets()) {
+        for (DataSet<? extends DataItem, ? extends DataFile> set : dataMerger.getDataSets()) {
             // get the source files and verify they exists.
             List<File> files = set.getSourceFiles();
             for (File file : files) {
-                assertTrue(file.isDirectory());
+                assertTrue("Not a folder: " + file.getAbsolutePath(), file.isDirectory());
             }
 
             // for each source file, also check that the files inside are in fact inside
@@ -138,7 +138,8 @@ public abstract class BaseTestCase extends TestCase {
                 DataFile dataFile = item.getSource();
                 File file = dataFile.getFile();
 
-                assertNotNull(set.findMatchingSourceFile(file));
+                assertNotNull("Not in source file: " + file.getAbsolutePath(),
+                        set.findMatchingSourceFile(file));
             }
         }
     }
diff --git a/builder/src/test/java/com/android/builder/resources/ResourceMergerTest.java b/builder/src/test/java/com/android/builder/resources/ResourceMergerTest.java
index 844506b..0e8c07c 100755
--- a/builder/src/test/java/com/android/builder/resources/ResourceMergerTest.java
+++ b/builder/src/test/java/com/android/builder/resources/ResourceMergerTest.java
@@ -403,9 +403,6 @@ public class ResourceMergerTest extends BaseTestCase {
 
         // ----------------
         // first set is the main one, no change here
-        ResourceSet mainSet = sets.get(0);
-        File mainBase = new File(root, "main");
-        File mainValues = new File(mainBase, "values");
 
         // ----------------
         // second set is the overlay one