test/jdk/java/util/Locale/LocaleProvidersRun.java

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 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) 2012, 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.
*** 23,33 ****
  
  /*
   * @test
   * @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8008577
   *      8010666 8013086 8013233 8013903 8015960 8028771 8054482 8062006
!  *      8150432
   * @summary tests for "java.locale.providers" system property
   * @library /test/lib
   * @build LocaleProviders
   *        providersrc.spi.src.tznp
   *        providersrc.spi.src.tznp8013086
--- 23,33 ----
  
  /*
   * @test
   * @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8008577
   *      8010666 8013086 8013233 8013903 8015960 8028771 8054482 8062006
!  *      8150432 8215913
   * @summary tests for "java.locale.providers" system property
   * @library /test/lib
   * @build LocaleProviders
   *        providersrc.spi.src.tznp
   *        providersrc.spi.src.tznp8013086
*** 141,151 ****
          testRun("HOST,COMPAT", "bug8013903Test", "", "", "");
  
          //testing 8027289 fix, if the platform format default is zh_CN
          // this assumes Windows' currency symbol for zh_CN is \u00A5, the yen
          // (yuan) sign.
!         if (!defLang.equals("en") && !defCtry.equals("CN")){
              testRun("JRE,HOST", "bug8027289Test", "FFE5", "", "");
              testRun("COMPAT,HOST", "bug8027289Test", "FFE5", "", "");
              testRun("HOST", "bug8027289Test", "00A5", "", "");
          }
      }
--- 141,151 ----
          testRun("HOST,COMPAT", "bug8013903Test", "", "", "");
  
          //testing 8027289 fix, if the platform format default is zh_CN
          // this assumes Windows' currency symbol for zh_CN is \u00A5, the yen
          // (yuan) sign.
!         if (defFmtLang.equals("zh") && defFmtCtry.equals("CN")) {
              testRun("JRE,HOST", "bug8027289Test", "FFE5", "", "");
              testRun("COMPAT,HOST", "bug8027289Test", "FFE5", "", "");
              testRun("HOST", "bug8027289Test", "00A5", "", "");
          }
      }