test/jdk/java/nio/charset/Charset/DefaultCharsetTest.java

rev 59383 : [mq]: final

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, 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,11 +23,11 @@
 
 /*
  * @test
  * @bug 4772857
  * @summary Unit test for Charset.defaultCharset
- * @requires (os.family == "linux" | os.family == "solaris")
+ * @requires os.family == "linux"
  * @library /test/lib
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.JDKToolFinder
  *        jdk.test.lib.JDKToolLauncher

@@ -68,22 +68,14 @@
         List<Object[]> data = new ArrayList<>();
         data.add(new String[]{"en_US", "iso-8859-1"});
         data.add(new String[]{"ja_JP.utf8", "utf-8"});
         data.add(new String[]{"tr_TR", "iso-8859-9"});
         data.add(new String[]{"C", "us-ascii"});
-        if (Platform.isLinux()) {
             data.add(new String[]{"ja_JP", "x-euc-jp-linux"});
             data.add(new String[]{"ja_JP.eucjp", "x-euc-jp-linux"});
             data.add(new String[]{"ja_JP.ujis", "x-euc-jp-linux"});
             data.add(new String[]{"ja_JP.utf8", "utf-8"});
-        }
-        if (Platform.isSolaris()) {
-            data.add(new String[]{"ja", "x-eucjp-open"});
-            data.add(new String[]{"ja_JP.eucJP", "x-eucjp-open"});
-            data.add(new String[]{"ja_JP.PCK", "x-PCK"});
-            data.add(new String[]{"ja_JP.UTF-8", "utf-8"});
-        }
         return data.iterator();
     }
 
     @Test(dataProvider = "locales")
     public void testDefaultCharset(String locale, String expectedCharset)