< prev index next >

test/jdk/java/util/Locale/ISO3166.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, 2023, 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.

*** 25,19 ***
   * @test
   * @bug 8071929
   * @summary Test obsolete ISO3166-1 alpha-2 country codes should not be retrieved.
   * ISO3166-1 alpha-2, ISO3166-1 alpha-3, ISO3166-3 country codes
   * from overloaded getISOCountries(Iso3166 type) are retrieved correctly.
   */
  import java.util.HashSet;
  import java.util.List;
  import java.util.Locale;
  import java.util.Locale.IsoCountryCode;
  import java.util.Set;
  import java.util.stream.Collectors;
  
! public class Bug8071929 {
  
      private static final List<String> ISO3166_1_ALPHA2_OBSOLETE_CODES = List.of("AN", "BU", "CS",
              "NT", "SF", "TP", "YU", "ZR");
  
      private static final Set<String> ISO3166_3EXPECTED = Set.of(
--- 25,23 ---
   * @test
   * @bug 8071929
   * @summary Test obsolete ISO3166-1 alpha-2 country codes should not be retrieved.
   * ISO3166-1 alpha-2, ISO3166-1 alpha-3, ISO3166-3 country codes
   * from overloaded getISOCountries(Iso3166 type) are retrieved correctly.
+  * @run junit ISO3166
   */
+ 
  import java.util.HashSet;
  import java.util.List;
  import java.util.Locale;
  import java.util.Locale.IsoCountryCode;
  import java.util.Set;
  import java.util.stream.Collectors;
  
! import org.junit.jupiter.api.Test;
+ 
+ public class ISO3166 {
  
      private static final List<String> ISO3166_1_ALPHA2_OBSOLETE_CODES = List.of("AN", "BU", "CS",
              "NT", "SF", "TP", "YU", "ZR");
  
      private static final Set<String> ISO3166_3EXPECTED = Set.of(

*** 76,11 ***
  
      /**
       * This method checks that obsolete ISO3166-1 alpha-2 country codes are not
       * retrieved in output of getISOCountries() method.
       */
!     private static void checkISO3166_1_Alpha2ObsoleteCodes() {
          Set<String> unexpectedCodes = ISO3166_1_ALPHA2_OBSOLETE_CODES.stream().
                  filter(Set.of(Locale.getISOCountries())::contains).collect(Collectors.toSet());
          if (!unexpectedCodes.isEmpty()) {
              throw new RuntimeException("Obsolete ISO3166-1 alpha2 two letter"
                      + " country Codes " + unexpectedCodes + " in output of getISOCountries() method");
--- 80,12 ---
  
      /**
       * This method checks that obsolete ISO3166-1 alpha-2 country codes are not
       * retrieved in output of getISOCountries() method.
       */
!     @Test
+     public void checkISO3166_1_Alpha2ObsoleteCodes() {
          Set<String> unexpectedCodes = ISO3166_1_ALPHA2_OBSOLETE_CODES.stream().
                  filter(Set.of(Locale.getISOCountries())::contains).collect(Collectors.toSet());
          if (!unexpectedCodes.isEmpty()) {
              throw new RuntimeException("Obsolete ISO3166-1 alpha2 two letter"
                      + " country Codes " + unexpectedCodes + " in output of getISOCountries() method");

*** 89,33 ***
  
      /**
       * This method checks that ISO3166-3 country codes which are PART3 of
       * IsoCountryCode enum, are retrieved correctly.
       */
!     private static void checkISO3166_3Codes() {
          Set<String> iso3166_3Codes = Locale.getISOCountries(IsoCountryCode.PART3);
          if (!iso3166_3Codes.equals(ISO3166_3EXPECTED)) {
              reportDifference(iso3166_3Codes, ISO3166_3EXPECTED);
          }
      }
  
      /**
       * This method checks that ISO3166-1 alpha-3 country codes which are
       * PART1_ALPHA3 of IsoCountryCode enum, are retrieved correctly.
       */
!     private static void checkISO3166_1_Alpha3Codes() {
          Set<String> iso3166_1_Alpha3Codes = Locale.getISOCountries(IsoCountryCode.PART1_ALPHA3);
          if (!iso3166_1_Alpha3Codes.equals(ISO3166_1_ALPHA3_EXPECTED)) {
              reportDifference(iso3166_1_Alpha3Codes, ISO3166_1_ALPHA3_EXPECTED);
          }
      }
  
      /**
       * This method checks that ISO3166-1 alpha-2 country codes, which are
       * PART1_ALPHA2 of IsoCountryCode enum, are retrieved correctly.
       */
!     private static void checkISO3166_1_Alpha2Codes() {
          Set<String> iso3166_1_Alpha2Codes = Locale.getISOCountries(IsoCountryCode.PART1_ALPHA2);
          Set<String> ISO3166_1_ALPHA2_EXPECTED = Set.of(Locale.getISOCountries());
          if (!iso3166_1_Alpha2Codes.equals(ISO3166_1_ALPHA2_EXPECTED)) {
              reportDifference(iso3166_1_Alpha2Codes, ISO3166_1_ALPHA2_EXPECTED);
          }
--- 94,36 ---
  
      /**
       * This method checks that ISO3166-3 country codes which are PART3 of
       * IsoCountryCode enum, are retrieved correctly.
       */
!     @Test
+     public void checkISO3166_3Codes() {
          Set<String> iso3166_3Codes = Locale.getISOCountries(IsoCountryCode.PART3);
          if (!iso3166_3Codes.equals(ISO3166_3EXPECTED)) {
              reportDifference(iso3166_3Codes, ISO3166_3EXPECTED);
          }
      }
  
      /**
       * This method checks that ISO3166-1 alpha-3 country codes which are
       * PART1_ALPHA3 of IsoCountryCode enum, are retrieved correctly.
       */
!     @Test
+     public void checkISO3166_1_Alpha3Codes() {
          Set<String> iso3166_1_Alpha3Codes = Locale.getISOCountries(IsoCountryCode.PART1_ALPHA3);
          if (!iso3166_1_Alpha3Codes.equals(ISO3166_1_ALPHA3_EXPECTED)) {
              reportDifference(iso3166_1_Alpha3Codes, ISO3166_1_ALPHA3_EXPECTED);
          }
      }
  
      /**
       * This method checks that ISO3166-1 alpha-2 country codes, which are
       * PART1_ALPHA2 of IsoCountryCode enum, are retrieved correctly.
       */
!     @Test
+     public void checkISO3166_1_Alpha2Codes() {
          Set<String> iso3166_1_Alpha2Codes = Locale.getISOCountries(IsoCountryCode.PART1_ALPHA2);
          Set<String> ISO3166_1_ALPHA2_EXPECTED = Set.of(Locale.getISOCountries());
          if (!iso3166_1_Alpha2Codes.equals(ISO3166_1_ALPHA2_EXPECTED)) {
              reportDifference(iso3166_1_Alpha2Codes, ISO3166_1_ALPHA2_EXPECTED);
          }

*** 137,13 ***
          if (expectedSet.size() > 0) {
              throw new RuntimeException("Retrieved country codes set is missing codes "
                      + expectedSet);
          }
      }
- 
-     public static void main(String[] args) {
-         checkISO3166_1_Alpha2ObsoleteCodes();
-         checkISO3166_1_Alpha2Codes();
-         checkISO3166_1_Alpha3Codes();
-         checkISO3166_3Codes();
-     }
  }
--- 145,6 ---
< prev index next >