Add support for layout dir qualifiers.

Change-Id: I6da728d079975fa19f1ae816fa585031a9c6fe75

1 files changed, 19 insertions, 2 deletions

diff --git a/sdk_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java
index 261f9a8..5f29791 100644
--- a/sdk_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java
+++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java
@@ -55,12 +55,30 @@ public class FolderConfigurationTest extends TestCase {
     public void testVersionResMatch() {
         runConfigMatchTest(
                 "en-rUS-w600dp-h1024dp-large-port-mdpi-finger-nokeys-v12",
-                3,
+                2,
                 "",
                 "large",
                 "w540dp");
     }
 
+    public void testAddQualifier() {
+        FolderConfiguration defaultConfig = new FolderConfiguration();
+        defaultConfig.createDefault();
+
+        final int count = FolderConfiguration.getQualifierCount();
+        for (int i = 0 ; i < count ; i++) {
+            FolderConfiguration empty = new FolderConfiguration();
+
+            ResourceQualifier q = defaultConfig.getQualifier(i);
+
+            empty.addQualifier(q);
+
+            // check it was added
+            assertNotNull(
+                    "addQualifier failed for " + q.getClass().getName(), empty.getQualifier(i));
+        }
+    }
+
 
     // --- helper methods
 
@@ -90,7 +108,6 @@ public class FolderConfigurationTest extends TestCase {
         List<? extends Configurable> list = getConfigurable(configs);
 
         Configurable match = reference.findMatchingConfigurable(list);
-        System.out.println(match.toString());
         assertEquals(resultIndex, list.indexOf(match));
     }