1.1 --- a/test/tools/jdeps/Basic.java Thu Oct 17 13:50:00 2013 +0200
1.2 +++ b/test/tools/jdeps/Basic.java Thu Oct 17 13:19:48 2013 -0700
1.3 @@ -23,7 +23,7 @@
1.4
1.5 /*
1.6 * @test
1.7 - * @bug 8003562 8005428
1.8 + * @bug 8003562 8005428 8015912
1.9 * @summary Basic tests for jdeps tool
1.10 * @build Test p.Foo
1.11 * @run main Basic
1.12 @@ -79,40 +79,33 @@
1.13 new String[] {"compact1", "compact1", "compact3"});
1.14 // test class-level dependency output
1.15 test(new File(testDir, "Test.class"),
1.16 - new String[] {"java.lang.Object", "p.Foo"},
1.17 - new String[] {"compact1", "not found"},
1.18 - new String[] {"-V", "class"});
1.19 + new String[] {"java.lang.Object", "java.lang.String", "p.Foo"},
1.20 + new String[] {"compact1", "compact1", "not found"},
1.21 + new String[] {"-verbose:class"});
1.22 // test -p option
1.23 test(new File(testDir, "Test.class"),
1.24 new String[] {"p.Foo"},
1.25 new String[] {"not found"},
1.26 - new String[] {"--verbose-level=class", "-p", "p"});
1.27 + new String[] {"-verbose:class", "-p", "p"});
1.28 // test -e option
1.29 test(new File(testDir, "Test.class"),
1.30 new String[] {"p.Foo"},
1.31 new String[] {"not found"},
1.32 - new String[] {"-V", "class", "-e", "p\\..*"});
1.33 + new String[] {"-verbose:class", "-e", "p\\..*"});
1.34 test(new File(testDir, "Test.class"),
1.35 new String[] {"java.lang"},
1.36 new String[] {"compact1"},
1.37 - new String[] {"-V", "package", "-e", "java\\.lang\\..*"});
1.38 - // test -classpath and wildcard options
1.39 + new String[] {"-verbose:package", "-e", "java\\.lang\\..*"});
1.40 + // test -classpath and -include options
1.41 test(null,
1.42 - new String[] {"com.sun.tools.jdeps", "java.lang", "java.util",
1.43 - "java.util.regex", "java.io", "java.nio.file",
1.44 + new String[] {"java.lang", "java.util",
1.45 "java.lang.management"},
1.46 - new String[] {(symbolFileExist? "not found" : "JDK internal API (classes)"),
1.47 - "compact1", "compact1", "compact1",
1.48 - "compact1", "compact1", "compact3"},
1.49 - new String[] {"--classpath", testDir.getPath(), "*"});
1.50 - /* Temporary disable this test case. Test.class has a dependency
1.51 - * on java.lang.String on certain windows machine (8008479).
1.52 - // -v shows intra-dependency
1.53 - test(new File(testDir, "Test.class"),
1.54 - new String[] {"java.lang.Object", "p.Foo"},
1.55 - new String[] {"compact1", testDir.getName()},
1.56 - new String[] {"-v", "--classpath", testDir.getPath(), "Test.class"});
1.57 - */
1.58 + new String[] {"compact1", "compact1", "compact3"},
1.59 + new String[] {"-classpath", testDir.getPath(), "-include", "p.+|Test.class"});
1.60 + test(new File(testDir, "Test.class"),
1.61 + new String[] {"java.lang.Object", "java.lang.String", "p.Foo"},
1.62 + new String[] {"compact1", "compact1", testDir.getName()},
1.63 + new String[] {"-v", "-classpath", testDir.getPath(), "Test.class"});
1.64 return errors;
1.65 }
1.66
