Backport 46b5e588ab18a68d164b1d97e71d769585c7c4b8

Author: duke

test/jdk/java/nio/file/FileStore/Basic.java

@@ -38,6 +38,7 @@
 
 import jdk.test.lib.Platform;
 import jdk.test.lib.util.FileUtils;
+import static jdk.test.lib.Asserts.*;
 
 public class Basic {
 
@@ -52,11 +53,6 @@ public static void main(String[] args) throws IOException {
         }
     }
 
-    static void assertTrue(boolean okay) {
-        if (!okay)
-            throw new RuntimeException("Assertion failed");
-    }
-
     static void checkWithin1GB(String space, long expected, long actual) {
         long diff = Math.abs(actual - expected);
         if (diff > G) {
@@ -73,8 +69,11 @@ static <V extends FileAttributeView> void testFileAttributes(Path file,
         FileStore store = Files.getFileStore(file);
         boolean supported = store.supportsFileAttributeView(viewClass);
         assertTrue(store.supportsFileAttributeView(viewName) == supported);
-        boolean haveView = Files.getFileAttributeView(file, viewClass) != null;
-        assertTrue(haveView == supported);
+        // If the file attribute view is supported by the FileStore then
+        // Files.getFileAttributeView should return that view
+        if (supported) {
+            assertNotNull(Files.getFileAttributeView(file, viewClass));
+        }
     }
 
     static void doTests(Path dir) throws IOException {