提交 2dd0b245 编写于 作者: M mfang

7044019: LocaleEnhanceTest.java needs to be updated for 7004603

Reviewed-by: naoto
上级 e2d42b99
...@@ -45,7 +45,7 @@ import java.util.Set; ...@@ -45,7 +45,7 @@ import java.util.Set;
/** /**
* @test * @test
* @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 * @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603 7044019
* @summary test API changes to Locale * @summary test API changes to Locale
* @compile LocaleEnhanceTest.java * @compile LocaleEnhanceTest.java
* @run main/othervm -esa LocaleEnhanceTest * @run main/othervm -esa LocaleEnhanceTest
...@@ -616,11 +616,9 @@ public class LocaleEnhanceTest extends LocaleTestFmwk { ...@@ -616,11 +616,9 @@ public class LocaleEnhanceTest extends LocaleTestFmwk {
assertEquals("latn US", "Latin", latnLocale.getDisplayScript()); assertEquals("latn US", "Latin", latnLocale.getDisplayScript());
assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript()); assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript());
// note, no localization data yet other than US
// this should break when we have localization data for DE
Locale.setDefault(Locale.GERMANY); Locale.setDefault(Locale.GERMANY);
assertEquals("latn DE", "Latin", latnLocale.getDisplayScript()); assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript());
assertEquals("hans DE", "Simplified Han", hansLocale.getDisplayScript()); assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript());
Locale.setDefault(oldLocale); Locale.setDefault(oldLocale);
} }
...@@ -632,10 +630,8 @@ public class LocaleEnhanceTest extends LocaleTestFmwk { ...@@ -632,10 +630,8 @@ public class LocaleEnhanceTest extends LocaleTestFmwk {
assertEquals("latn US", "Latin", latnLocale.getDisplayScript(Locale.US)); assertEquals("latn US", "Latin", latnLocale.getDisplayScript(Locale.US));
assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript(Locale.US)); assertEquals("hans US", "Simplified Han", hansLocale.getDisplayScript(Locale.US));
// note, no localization data yet other than US assertEquals("latn DE", "Lateinisch", latnLocale.getDisplayScript(Locale.GERMANY));
// this should break when we have localization data for DE assertEquals("hans DE", "Vereinfachte Chinesische Schrift", hansLocale.getDisplayScript(Locale.GERMANY));
assertEquals("latn DE", "Latin", latnLocale.getDisplayScript(Locale.GERMANY));
assertEquals("hans DE", "Simplified Han", hansLocale.getDisplayScript(Locale.GERMANY));
} }
public void testGetDisplayName() { public void testGetDisplayName() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册