1 files changed, 11 insertions, 12 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java
index a9e39fb..5b07d7b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java
@@ -15,11 +15,10 @@
  */
 package com.android.ide.eclipse.adt.internal.editors.layout.configuration;
 
-import static com.android.ide.common.resources.configuration.LanguageQualifier.FAKE_LANG_VALUE;
-import static com.android.ide.common.resources.configuration.RegionQualifier.FAKE_REGION_VALUE;
+import static com.android.ide.common.resources.configuration.LocaleQualifier.FAKE_VALUE;
 
 import com.android.ide.common.resources.configuration.FolderConfiguration;
-import com.android.ide.common.resources.configuration.LanguageQualifier;
+import com.android.ide.common.resources.configuration.LocaleQualifier;
 import com.android.resources.Density;
 import com.android.sdklib.devices.Device;
 import com.android.sdklib.devices.DeviceManager;
@@ -62,18 +61,18 @@ public class ConfigurationTest extends TestCase {
 
         // Check syncing
         FolderConfiguration folderConfig = configuration.getFullConfig();
-        assertEquals(FAKE_LANG_VALUE, folderConfig.getLanguageQualifier().getValue());
-        assertEquals(FAKE_REGION_VALUE, folderConfig.getRegionQualifier().getValue());
+        assertEquals(FAKE_VALUE, folderConfig.getLocaleQualifier().getLanguage());
+        assertEquals(FAKE_VALUE, folderConfig.getLocaleQualifier().getRegion());
         assertEquals(Locale.ANY, configuration.getLocale());
 
-        Locale language = Locale.create(new LanguageQualifier("nb"));
+        Locale language = Locale.create(new LocaleQualifier("nb"));
         configuration.setLocale(language, true /* skipSync */);
-        assertEquals(FAKE_LANG_VALUE, folderConfig.getLanguageQualifier().getValue());
-        assertEquals(FAKE_REGION_VALUE, folderConfig.getRegionQualifier().getValue());
+        assertEquals(FAKE_VALUE, folderConfig.getLocaleQualifier().getLanguage());
+        assertEquals(FAKE_VALUE, folderConfig.getLocaleQualifier().getRegion());
 
         configuration.setLocale(language, false /* skipSync */);
-        assertEquals(FAKE_REGION_VALUE, folderConfig.getRegionQualifier().getValue());
-        assertEquals("nb", folderConfig.getLanguageQualifier().getValue());
+        assertEquals(FAKE_VALUE, folderConfig.getLocaleQualifier().getRegion());
+        assertEquals("nb", folderConfig.getLocaleQualifier().getLanguage());
 
         assertEquals("2.7in QVGA::nb-__:+Theme::notnight::", configuration.toPersistentString());
 
@@ -121,7 +120,7 @@ public class ConfigurationTest extends TestCase {
         configuration.setDevice(devices.get(0), false);
         configuration.setActivity("foo.bar.FooActivity");
         configuration.setTheme("@android:style/Theme.Holo.Light");
-        Locale locale = Locale.create(new LanguageQualifier("nb"));
+        Locale locale = Locale.create(new LocaleQualifier("nb"));
         configuration.setLocale(locale, false /* skipSync */);
 
         Configuration copy = Configuration.copy(configuration);
@@ -135,7 +134,7 @@ public class ConfigurationTest extends TestCase {
         configuration.setTheme("@android:style/Theme.Holo");
         configuration.setDevice(devices.get(1), true);
 
-        assertTrue(copy.getFullConfig().getLanguageQualifier().equals(locale.language));
+        assertTrue(copy.getFullConfig().getLocaleQualifier().equals(locale.qualifier));
         assertEquals(locale, copy.getLocale());
         assertEquals("foo.bar.FooActivity", copy.getActivity());
         assertEquals("@android:style/Theme.Holo.Light", copy.getTheme());