archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8027481: jdeps to handle classes with the same package name and correct profile for javax.crypto.*

Browse source 
Reviewed-by: alanb, dfuchs
This commit is contained in:
Mandy Chung 2013-10-30 08:35:52 -07:00
parent 14d87a0e5a
commit fa729039be
8 changed files with 458 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

57
langtools/test/tools/jdeps/Basic.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013, 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
@ -23,9 +23,9 @@
/*
* @test
* @bug 8003562 8005428 8015912
* @bug 8003562 8005428 8015912 8027481
* @summary Basic tests for jdeps tool
* @build Test p.Foo
* @build Test p.Foo p.Bar javax.activity.NotCompactProfile
* @run main Basic
*/
@ -33,10 +33,12 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.regex.*;
import static java.nio.file.StandardCopyOption.*;
public class Basic {
private static boolean symbolFileExist = initProfiles();
@ -74,23 +76,25 @@ public class Basic {
new String[] {"java.lang", "p"},
new String[] {"compact1", "not found"});
// test a directory
// also test non-SE javax.activity class dependency
test(new File(testDir, "p"),
new String[] {"java.lang", "java.util", "java.lang.management"},
new String[] {"compact1", "compact1", "compact3"});
new String[] {"java.lang", "java.util", "java.lang.management", "javax.activity", "javax.crypto"},
new String[] {"compact1", "compact1", "compact3", testDir.getName(), "compact1"},
new String[] {"-classpath", testDir.getPath()});
// test class-level dependency output
test(new File(testDir, "Test.class"),
new String[] {"java.lang.Object", "java.lang.String", "p.Foo"},
new String[] {"compact1", "compact1", "not found"},
new String[] {"java.lang.Object", "java.lang.String", "p.Foo", "p.Bar"},
new String[] {"compact1", "compact1", "not found", "not found"},
new String[] {"-verbose:class"});
// test -p option
test(new File(testDir, "Test.class"),
new String[] {"p.Foo"},
new String[] {"not found"},
new String[] {"p.Foo", "p.Bar"},
new String[] {"not found", "not found"},
new String[] {"-verbose:class", "-p", "p"});
// test -e option
test(new File(testDir, "Test.class"),
new String[] {"p.Foo"},
new String[] {"not found"},
new String[] {"p.Foo", "p.Bar"},
new String[] {"not found", "not found"},
new String[] {"-verbose:class", "-e", "p\\..*"});
test(new File(testDir, "Test.class"),
new String[] {"java.lang"},
@ -99,13 +103,34 @@ public class Basic {
// test -classpath and -include options
test(null,
new String[] {"java.lang", "java.util",
"java.lang.management"},
new String[] {"compact1", "compact1", "compact3"},
"java.lang.management", "javax.crypto"},
new String[] {"compact1", "compact1", "compact3", "compact1"},
new String[] {"-classpath", testDir.getPath(), "-include", "p.+|Test.class"});
test(new File(testDir, "Test.class"),
new String[] {"java.lang.Object", "java.lang.String", "p.Foo"},
new String[] {"compact1", "compact1", testDir.getName()},
new String[] {"java.lang.Object", "java.lang.String", "p.Foo", "p.Bar"},
new String[] {"compact1", "compact1", testDir.getName(), testDir.getName()},
new String[] {"-v", "-classpath", testDir.getPath(), "Test.class"});
// split package p - move p/Foo.class to dir1 and p/Bar.class to dir2
Path testClassPath = testDir.toPath();
Path dirP = testClassPath.resolve("p");
Path dir1 = testClassPath.resolve("dir1");
Path subdir1P = dir1.resolve("p");
Path dir2 = testClassPath.resolve("dir2");
Path subdir2P = dir2.resolve("p");
if (!Files.exists(subdir1P))
Files.createDirectories(subdir1P);
if (!Files.exists(subdir2P))
Files.createDirectories(subdir2P);
Files.move(dirP.resolve("Foo.class"), subdir1P.resolve("Foo.class"), REPLACE_EXISTING);
Files.move(dirP.resolve("Bar.class"), subdir2P.resolve("Bar.class"), REPLACE_EXISTING);
StringBuilder cpath = new StringBuilder(testDir.toString());
cpath.append(File.pathSeparator).append(dir1.toString());
cpath.append(File.pathSeparator).append(dir2.toString());
test(new File(testDir, "Test.class"),
new String[] {"java.lang.Object", "java.lang.String", "p.Foo", "p.Bar"},
new String[] {"compact1", "compact1", dir1.toFile().getName(), dir2.toFile().getName()},
new String[] {"-v", "-classpath", cpath.toString(), "Test.class"});
return errors;
}
@ -148,7 +173,7 @@ public class Basic {
// Use the linePattern to break the given String into lines, applying
// the pattern to each line to see if we have a match
private static Map<String,String> findDeps(String out) {
Map<String,String> result = new HashMap<>();
Map<String,String> result = new LinkedHashMap<>();
Matcher lm = linePattern.matcher(out); // Line matcher
Matcher pm = null; // Pattern matcher
int lines = 0;