--- a/jdk/test/tools/jlink/plugins/ResourceFilterTest.java	Wed Jun 15 23:24:08 2016 +0000
+++ b/jdk/test/tools/jlink/plugins/ResourceFilterTest.java	Thu Jun 16 09:09:53 2016 -0300
@@ -24,13 +24,13 @@
 /*
  * @test
  * @summary Test ResourceFilter class
- * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal.plugins
  * @run main ResourceFilterTest
  */
 
 import java.io.File;
 import java.nio.file.Files;
+import java.util.Arrays;
 import jdk.tools.jlink.internal.plugins.ResourceFilter;
 
 public class ResourceFilterTest {
@@ -41,14 +41,16 @@
 
     public void test() throws Exception {
         String[] samples = {"toto.jcov", "/module/META-INF/services/MyProvider"};
-        String[] patterns = {"*.jcov", "*/META-INF/*"};
-        ResourceFilter rf = new ResourceFilter(patterns);
+        String[] patterns = {"*.jcov", "**/META-INF/**",
+                             "glob:*.jcov", "glob:**/META-INF/**",
+                             "regex:.*\\.jcov", "regex:.*/META-INF/.*"};
+        ResourceFilter rf = ResourceFilter.includeFilter(Arrays.asList(patterns));
         for (String s : samples) {
             if (!rf.test(s)) {
                 throw new Exception("Sample " + s + "not accepted");
             }
         }
-        ResourceFilter rf2 = new ResourceFilter(patterns, true);
+        ResourceFilter rf2 = ResourceFilter.excludeFilter(Arrays.asList(patterns));
         for (String s : samples) {
             if (rf2.test(s)) {
                 throw new Exception("Sample " + s + " accepted");
@@ -64,14 +66,14 @@
         }
         Files.write(resources.toPath(), builder.toString().getBytes());
 
-        String[] input = {resources.getAbsolutePath()};
-        ResourceFilter rf3 = new ResourceFilter(input);
+        String[] input = {"@" + resources.getAbsolutePath()};
+        ResourceFilter rf3 = ResourceFilter.includeFilter(Arrays.asList(input));
         for (String s : samples) {
             if (!rf3.test(s)) {
                 throw new Exception("Sample " + s + "not accepted");
             }
         }
-        ResourceFilter rf4 = new ResourceFilter(input, true);
+        ResourceFilter rf4 = ResourceFilter.excludeFilter(Arrays.asList(input));
         for (String s : samples) {
             if (rf4.test(s)) {
                 throw new Exception("Sample " + s + " accepted");