Changeset 14664 in josm

Timestamp:

2019-01-08T13:13:46+01:00 (6 years ago)

Author:

stoecker

Message:

fix test cases, see #17173

File:

• trunk/test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/LanguageInfoTest.java

@@ -32 +32 @@
     private static final Locale ZN_CN = Locale.SIMPLIFIED_CHINESE;
     private static final Locale ZN_TW = Locale.TRADITIONAL_CHINESE;
+    private static final Locale EN_GB = new Locale("en", "GB");
+    private static final Locale RU = new Locale("ru");
+    private static final Locale NB = new Locale("nb");
+    private static final Locale AST = new Locale("ast");
 
     /**
@@ -39 +43 @@
     public void getWikiLanguagePrefix() {
         testWikiLanguagePrefixes(LanguageInfo.LocaleType.DEFAULT,
-                "En:", "De:", "Pt_BR:", "Ca-Valencia:", "Zh_CN:", "Zh_TW:");
+                "En:", "De:", "Pt_BR:", "Ca-Valencia:", "Zh_CN:", "Zh_TW:", "Ast:", "En_GB:", "Ru:", "Nb:");
         testWikiLanguagePrefixes(LanguageInfo.LocaleType.DEFAULTNOTENGLISH,
-                null, "De:", "Pt_BR:", "Ca-Valencia:", "Zh_CN:", "Zh_TW:");
+                null, "De:", "Pt_BR:", "Ca-Valencia:", "Zh_CN:", "Zh_TW:", "Ast:", "En_GB:", "Ru:", "Nb:");
         testWikiLanguagePrefixes(LanguageInfo.LocaleType.BASELANGUAGE,
-                null, null, "Pt:", null, "Zh:", "Zh:");
+                null, null, "Pt:", null, "Zh:", "Zh:", null, null, null, null);
         testWikiLanguagePrefixes(LanguageInfo.LocaleType.ENGLISH,
-                "", "", "", "", "", "");
+                "", "", "", "", "", "", "", "", "", "");
         testWikiLanguagePrefixes(LanguageInfo.LocaleType.OSM_WIKI,
-                "", "de:", "pt:", "ca:", "Zh-hans:", "Zh-hant:");
+                "", "DE:", "Pt:", "Ca:", "Zh-hans:", "Zh-hant:", "Ast:", "", "RU:", "No:");
     }
 
     private static void testWikiLanguagePrefixes(LanguageInfo.LocaleType type, String...expected) {
-        final List<String> actual = Stream.of(EN_CA, DE_DE, PT_BR, CA_ES_VALENCIA, ZN_CN, ZN_TW)
+        final List<String> actual = Stream.of(EN_CA, DE_DE, PT_BR, CA_ES_VALENCIA, ZN_CN, ZN_TW, AST, EN_GB, RU, NB)
                 .map(locale -> LanguageInfo.getWikiLanguagePrefix(locale, type))
                 .collect(Collectors.toList());