< prev index next >

test/jdk/java/util/Locale/Bug8040211.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. --- 1,7 ---- /* ! * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 21,33 **** * questions. */ /* * @test ! * @bug 8040211 * @summary Checks the IANA language subtag registry data updation ! * (LSR Revision: 2016-02-10) with Locale and Locale.LanguageRange * class methods. * @run main Bug8040211 */ import java.util.ArrayList; --- 21,33 ---- * questions. */ /* * @test ! * @bug 8040211 8191404 * @summary Checks the IANA language subtag registry data updation ! * (LSR Revision: 2017-08-15) with Locale and Locale.LanguageRange * class methods. * @run main Bug8040211 */ import java.util.ArrayList;
*** 66,76 **** private static void test_parse() { boolean error = false; String str = "Accept-Language: aam, adp, aue, ema, en-gb-oed," + " gti, koj, kwq, kxe, lii, lmm, mtm, ngv, oyb, phr, pub," ! + " suj, taj;q=0.9, yug;q=0.5, gfx;q=0.4"; ArrayList<LanguageRange> expected = new ArrayList<>(); expected.add(new LanguageRange("aam", 1.0)); expected.add(new LanguageRange("aas", 1.0)); expected.add(new LanguageRange("adp", 1.0)); expected.add(new LanguageRange("dz", 1.0)); --- 66,76 ---- private static void test_parse() { boolean error = false; String str = "Accept-Language: aam, adp, aue, ema, en-gb-oed," + " gti, koj, kwq, kxe, lii, lmm, mtm, ngv, oyb, phr, pub," ! + " suj, taj;q=0.9, yug;q=0.5, gfx;q=0.4, bcg, cqu"; ArrayList<LanguageRange> expected = new ArrayList<>(); expected.add(new LanguageRange("aam", 1.0)); expected.add(new LanguageRange("aas", 1.0)); expected.add(new LanguageRange("adp", 1.0)); expected.add(new LanguageRange("dz", 1.0));
*** 96,111 **** --- 96,117 ---- expected.add(new LanguageRange("ymt", 1.0)); expected.add(new LanguageRange("ngv", 1.0)); expected.add(new LanguageRange("nnx", 1.0)); expected.add(new LanguageRange("oyb", 1.0)); expected.add(new LanguageRange("thx", 1.0)); + expected.add(new LanguageRange("skk", 1.0)); + expected.add(new LanguageRange("jeg", 1.0)); expected.add(new LanguageRange("phr", 1.0)); expected.add(new LanguageRange("pmu", 1.0)); expected.add(new LanguageRange("pub", 1.0)); expected.add(new LanguageRange("puz", 1.0)); expected.add(new LanguageRange("suj", 1.0)); expected.add(new LanguageRange("xsj", 1.0)); + expected.add(new LanguageRange("bcg", 1.0)); + expected.add(new LanguageRange("bgm", 1.0)); + expected.add(new LanguageRange("cqu", 1.0)); + expected.add(new LanguageRange("quh", 1.0)); expected.add(new LanguageRange("taj", 0.9)); expected.add(new LanguageRange("tsf", 0.9)); expected.add(new LanguageRange("yug", 0.5)); expected.add(new LanguageRange("yuu", 0.5)); expected.add(new LanguageRange("gfx", 0.4));
*** 168,186 **** } private static void test_filter() { boolean error = false; ! String ranges = "mtm-RU, en-gb-oed"; ! String tags = "de-DE, en, mtm-RU, ymt-RU, en-gb-oxendict, ja-JP"; FilteringMode mode = EXTENDED_FILTERING; List<LanguageRange> priorityList = LanguageRange.parse(ranges); List<Locale> tagList = generateLocales(tags); String actualLocales = showLocales(Locale.filter(priorityList, tagList, mode)); ! String expectedLocales = "mtm-RU, ymt-RU, en-GB-oxendict"; if (!expectedLocales.equals(actualLocales)) { error = true; showErrorMessage("#1 filter(" + mode + ")", ranges, tags, expectedLocales, actualLocales); --- 174,192 ---- } private static void test_filter() { boolean error = false; ! String ranges = "mtm-RU, en-gb-oed, coy"; ! String tags = "de-DE, en, mtm-RU, ymt-RU, en-gb-oxendict, ja-JP, pij, nts"; FilteringMode mode = EXTENDED_FILTERING; List<LanguageRange> priorityList = LanguageRange.parse(ranges); List<Locale> tagList = generateLocales(tags); String actualLocales = showLocales(Locale.filter(priorityList, tagList, mode)); ! String expectedLocales = "mtm-RU, ymt-RU, en-GB-oxendict, nts, pij"; if (!expectedLocales.equals(actualLocales)) { error = true; showErrorMessage("#1 filter(" + mode + ")", ranges, tags, expectedLocales, actualLocales);
*** 210,227 **** } private static void test_filterTags() { boolean error = false; ! String ranges = "gti;q=0.2, gfx"; ! String tags = "de-DE, gti, he, nyc, mwj, vaj"; List<LanguageRange> priorityList = LanguageRange.parse(ranges); List<String> tagList = generateLanguageTags(tags); String actualTags = showLanguageTags(Locale.filterTags(priorityList, tagList)); ! String expectedTags = "mwj, vaj, gti, nyc"; if (!expectedTags.equals(actualTags)) { error = true; showErrorMessage("filterTags()", ranges, tags, expectedTags, actualTags); --- 216,233 ---- } private static void test_filterTags() { boolean error = false; ! String ranges = "gti;q=0.2, gfx, kzj"; ! String tags = "de-DE, gti, he, nyc, mwj, vaj, ktr, dtp"; List<LanguageRange> priorityList = LanguageRange.parse(ranges); List<String> tagList = generateLanguageTags(tags); String actualTags = showLanguageTags(Locale.filterTags(priorityList, tagList)); ! String expectedTags = "mwj, vaj, ktr, dtp, gti, nyc"; if (!expectedTags.equals(actualTags)) { error = true; showErrorMessage("filterTags()", ranges, tags, expectedTags, actualTags);
< prev index next >