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

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2018, 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 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;
--- 21,33 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 8040211 8191404 8203872
!  * @summary Checks the IANA language subtag registry data update
!  *          (LSR Revision: 2018-04-23) with Locale and Locale.LanguageRange
   *          class methods.
   * @run main Bug8040211
   */
  
  import java.util.ArrayList;
*** 65,76 ****
      }
  
      private static void test_parse() {
          boolean error = false;
          String str = "Accept-Language: aam, adp, aue, bcg, cqu, 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));
--- 65,76 ----
      }
  
      private static void test_parse() {
          boolean error = false;
          String str = "Accept-Language: aam, adp, aue, bcg, cqu, ema,"
!                 + " en-gb-oed, gti, kdz, koj, kwq, kxe, lii, lmm, mtm, ngv,"
!                 + " oyb, phr, pub, suj, taj;q=0.9, ar-hyw;q=0.8, 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));
*** 84,93 ****
--- 84,95 ----
          expected.add(new LanguageRange("uok", 1.0));
          expected.add(new LanguageRange("en-gb-oed", 1.0));
          expected.add(new LanguageRange("en-gb-oxendict", 1.0));
          expected.add(new LanguageRange("gti", 1.0));
          expected.add(new LanguageRange("nyc", 1.0));
+         expected.add(new LanguageRange("kdz", 1.0));
+         expected.add(new LanguageRange("ncp", 1.0));
          expected.add(new LanguageRange("koj", 1.0));
          expected.add(new LanguageRange("kwv", 1.0));
          expected.add(new LanguageRange("kwq", 1.0));
          expected.add(new LanguageRange("yam", 1.0));
          expected.add(new LanguageRange("kxe", 1.0));
*** 110,119 ****
--- 112,123 ----
          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("taj", 0.9));
          expected.add(new LanguageRange("tsf", 0.9));
+         expected.add(new LanguageRange("ar-hyw", 0.8));
+         expected.add(new LanguageRange("ar-arevmda", 0.8));
          expected.add(new LanguageRange("yug", 0.5));
          expected.add(new LanguageRange("yuu", 0.5));
          expected.add(new LanguageRange("gfx", 0.4));
          expected.add(new LanguageRange("oun", 0.4));
          expected.add(new LanguageRange("mwj", 0.4));
*** 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);
--- 178,196 ----
      }
  
      private static void test_filter() {
          boolean error = false;
  
!         String ranges = "mtm-RU, en-gb-oed, coy, ar-HY";
!         String tags = "de-DE, en, mtm-RU, ymt-RU, en-gb-oxendict, ja-JP, pij, nts, ar-arevela";
          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, ar-arevela";
  
          if (!expectedLocales.equals(actualLocales)) {
              error = true;
              showErrorMessage("#1 filter(" + mode + ")",
                      ranges, tags, expectedLocales, actualLocales);