8355443: [java.io] Use @requires tag instead of exiting based on File.separatorChar value

Brian Burkhalter · Brian Burkhalter · commit 4826a91e7a72 · 2025-05-02T16:59:56.000Z
Reviewed-by: naoto, vyazici
diff --git a/test/jdk/java/io/FileInputStream/LeadingSlash.java b/test/jdk/java/io/FileInputStream/LeadingSlash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, 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
@@ -26,22 +26,21 @@
  * @bug 4487368
  * @summary Test, if FileInputStream can handle
  *          a leading slash in file name.
+ * @requires (os.family == "windows")
  */
 
 import java.io.*;
 
 public class LeadingSlash {
     public static void main (String args[]) throws Exception {
-        if (File.separatorChar == '\\') {       // Windows
-            File file = null;
-            try {
-                file = File.createTempFile("bug", "4487368");
-                new FileInputStream("\\" + file.getPath()).close();
-                new FileOutputStream("\\" + file.getPath()).close();
-            } finally {
-                if (file != null)
-                    file.delete();
-            }
+        File file = null;
+        try {
+            file = File.createTempFile("bug", "4487368");
+            new FileInputStream("\\" + file.getPath()).close();
+            new FileOutputStream("\\" + file.getPath()).close();
+        } finally {
+            if (file != null)
+                file.delete();
         }
     }
 }
diff --git a/test/jdk/java/io/pathNames/GeneralSolaris.java b/test/jdk/java/io/pathNames/GeneralSolaris.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, 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
@@ -24,6 +24,7 @@
 /* @test
    @bug 4035924 4095767
    @summary General exhaustive test of solaris pathname handling
+   @requires (os.family != "windows")
    @author Mark Reinhold
 
    @build General GeneralSolaris
@@ -65,10 +66,6 @@ private static void checkPaths() throws Exception {
     }
 
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar != '/') {
-            /* This test is only valid on Unix systems */
-            return;
-        }
         if (args.length > 0) debug = true;
 
         initTestData(3);
diff --git a/test/jdk/java/io/pathNames/GeneralWin32.java b/test/jdk/java/io/pathNames/GeneralWin32.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, 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
@@ -24,6 +24,7 @@
 /* @test
    @bug 4032066 4039597 4046914 4054511 4065189 4109131 4875229 6983520 8009258
    @summary General exhaustive test of win32 pathname handling
+   @requires (os.family == "windows")
    @author Mark Reinhold
 
    @build General GeneralWin32
@@ -162,10 +163,6 @@ private static void checkUncPaths(int depth) throws Exception {
 
 
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar != '\\') {
-            /* This test is only valid on win32 systems */
-            return;
-        }
         if (args.length > 0) debug = true;
 
         initTestData(3);
diff --git a/test/jdk/java/io/pathNames/unix/TrailingSlash.java b/test/jdk/java/io/pathNames/unix/TrailingSlash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, 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
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4427862
  * @summary Ensure that trailing slashes are ignored when opening files
+ * @requires (os.family != "windows")
  */
 
 import java.io.*;
@@ -107,11 +108,6 @@ static void go(String fn, String fns) throws Exception {
     }
 
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar != '/') {
-            // This test is only valid on Unix systems
-            return;
-        }
-
         go("xyzzy", "xyzzy");
         go("xyzzy", "xyzzy/");
         go("xyzzy", "xyzzy//");
diff --git a/test/jdk/java/io/pathNames/win32/DriveOnly.java b/test/jdk/java/io/pathNames/win32/DriveOnly.java
@@ -24,6 +24,7 @@
 /* @test
    @bug 4096648
    @summary Make sure that isDirectory and lastModified work on "x:"
+   @requires (os.family == "windows")
  */
 
 import java.io.File;
@@ -32,7 +33,6 @@
 public class DriveOnly {
 
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar != '\\') return;
         File f = new File("").getCanonicalFile();
         while (f.getParent() != null) f = f.getParentFile();
         String p = f.getPath().substring(0, 2);
diff --git a/test/jdk/java/io/pathNames/win32/DriveRelativePath.java b/test/jdk/java/io/pathNames/win32/DriveRelativePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, 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
@@ -24,6 +24,7 @@
 /* @test
    @bug 4070044 4164823
    @summary Check getCanonicalPath's treatment of drive-relative paths (win32)
+   @requires (os.family == "windows")
  */
 
 import java.io.*;
@@ -37,11 +38,6 @@ static void fail(String s) {
 
     public static void main(String[] args) throws IOException {
 
-        if (File.separatorChar != '\\') {
-            /* This test is only valid on win32 systems */
-            return;
-        }
-
         File f = new File("foo");
         String c = f.getCanonicalPath();
         System.err.println(c);
diff --git a/test/jdk/java/io/pathNames/win32/DriveSlash.java b/test/jdk/java/io/pathNames/win32/DriveSlash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, 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
@@ -25,6 +25,7 @@
    @bug 4065189
    @summary Check that win32 pathnames of the form "C:\\"
             can be listed by the File.list method
+   @requires (os.family == "windows")
    @author Mark Reinhold
  */
 
@@ -35,9 +36,6 @@ public class DriveSlash {
 
     public static void main(String[] args) throws Exception {
 
-        /* This test is only valid on win32 systems */
-        if (File.separatorChar != '\\') return;
-
         File f = new File("c:\\");
         System.err.println(f.getCanonicalPath());
         String[] fs = f.list();
diff --git a/test/jdk/java/io/pathNames/win32/RenameDelete.java b/test/jdk/java/io/pathNames/win32/RenameDelete.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4042592 4042593
+   @requires (os.family == "windows")
  * @summary Test operation of rename and delete on win32
  */
 
@@ -40,11 +41,6 @@ public class RenameDelete {
     public static void main(String[] args) throws Exception {
         boolean success = false;
 
-        if (File.separatorChar != '\\') {
-            System.err.println("Not a win32 platform -- test inapplicable");
-            return;
-        }
-
         //construct a test file in this location
         File f1 = new File(".");
         StringBuffer location = new StringBuffer("\\");
diff --git a/test/jdk/java/io/pathNames/win32/SJIS.java b/test/jdk/java/io/pathNames/win32/SJIS.java
@@ -25,6 +25,7 @@
    @bug 4039597
    @summary Check that pathnames containing double-byte characters are not
             corrupted by win32 path processing
+   @requires (os.family == "windows")
    @author Mark Reinhold
    @library /test/lib
 */
@@ -52,7 +53,6 @@ public static void main(String[] args) throws Exception {
 
         /* This test is only valid on win32 systems
            that use the SJIS encoding */
-        if (File.separatorChar != '\\') return;
         String enc = System.getProperty("native.encoding");
         if ((enc == null) || !enc.equals("MS932")) {
             throw new SkippedException(
diff --git a/test/jdk/java/io/pathNames/win32/bug6344646.java b/test/jdk/java/io/pathNames/win32/bug6344646.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, 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
@@ -25,6 +25,7 @@
  * @bug 6344646
  * @summary tests that WinNTFileSystem.hashCode() uses
  *    locale independent case mapping.
+ * @requires (os.family == "windows")
  */
 
 import java.io.*;
@@ -34,11 +35,6 @@ public class bug6344646 {
     public static void main(String[] s) {
         Locale reservedLocale = Locale.getDefault();
         try {
-            /* This test is only valid on win32 systems */
-            if (File.separatorChar != '\\') {
-                return;
-            }
-
             Locale.setDefault(Locale.of("lt"));
             File f1 = new File("J\u0301");
             File f2 = new File("j\u0301");
