test/java/io/File/MacPathTest.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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.

@@ -22,24 +22,23 @@
  */
 
 /* @test
  * @bug 7130915
  * @summary Tests file path with nfc/nfd forms on MacOSX
+ * @requires (os.family == "mac")
  * @build MacPathTest
- * @run shell MacPathTest.sh
+ * @run main/othervm -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 MacPathTest
  */
 
-import java.io.*;
-import java.text.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.text.Normalizer;
 
 public class MacPathTest {
 
     public static void main(String args[]) throws Throwable {
-        String osname = System.getProperty("os.name");
-        if (!osname.contains("OS X") && !osname.contains("Darwin"))
-            return;
 
         // English
         test("TestDir_apple",                                    // test dir
              "dir_macosx",                                       // dir
              "file_macosx");                                     // file