# HG changeset patch
# User lancea
# Date 1544815042 18000
# Node ID 0873841d1669a898cb0000fa36f5df790ea2a651
# Parent  5274fb04cad9558bafaf60aaba5025bfacf192f0
8215372: Incorrect nio/file/DirectoryStream/Basic.java tests for validating the use of a glob
Reviewed-by: alanb

diff -r 5274fb04cad9 -r 0873841d1669 test/jdk/java/nio/file/DirectoryStream/Basic.java
--- a/test/jdk/java/nio/file/DirectoryStream/Basic.java	Fri Dec 14 10:51:09 2018 -0800
+++ b/test/jdk/java/nio/file/DirectoryStream/Basic.java	Fri Dec 14 14:17:22 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -73,14 +73,18 @@
             private PathMatcher matcher =
                 dir.getFileSystem().getPathMatcher("glob:f*");
             public boolean accept(Path file) {
-                return matcher.matches(file);
+                return matcher.matches(file.getFileName());
             }
         };
+
+        found = false;
         try (DirectoryStream<Path> ds = newDirectoryStream(dir, filter)) {
             for (Path entry: ds) {
-                if (!entry.getFileName().equals(foo))
-                    throw new RuntimeException("entry not expected");
+                if (entry.getFileName().equals(foo))
+                   found = true;
             }
+            if (!found)
+                throw new RuntimeException(String.format("Error: entry: %s was not found", foo));
         }
 
         // check filtering: z* should not match any files
@@ -88,7 +92,7 @@
             private PathMatcher matcher =
                 dir.getFileSystem().getPathMatcher("glob:z*");
             public boolean accept(Path file) {
-                return matcher.matches(file);
+                return matcher.matches(file.getFileName());
             }
         };
         try (DirectoryStream<Path> ds = newDirectoryStream(dir, filter)) {