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

rev 54600 : [mq]: 8222980

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2019, 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 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;
--- 21,33 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 8040211 8191404 8203872 8222980
   * @summary Checks the IANA language subtag registry data update
!  *          (LSR Revision: 2019-04-03) with Locale and Locale.LanguageRange
   *          class methods.
   * @run main Bug8040211
   */
  
  import java.util.ArrayList;
*** 113,123 ****
          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));
--- 113,122 ----
*** 186,196 ****
  
          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);
--- 185,195 ----
  
          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);