8140766: langtools/make/test/sym/CreateSymbolsTest.java contains incorrect paths
authorjlahoda
Fri, 30 Oct 2015 17:00:33 +0100
changeset 33551 1cd3c95fb546
parent 33425 dce6b447e07a
child 33552 5fac23e49bef
8140766: langtools/make/test/sym/CreateSymbolsTest.java contains incorrect paths Summary: Fixing paths in CreateSymbolsTest; fixing imports in CreateSymbolsTestImpl. Reviewed-by: mcimadamore
langtools/make/test/sym/CreateSymbolsTest.java
langtools/make/test/sym/CreateSymbolsTestImpl.java
--- a/langtools/make/test/sym/CreateSymbolsTest.java	Thu Oct 29 12:40:37 2015 -0700
+++ b/langtools/make/test/sym/CreateSymbolsTest.java	Fri Oct 30 17:00:33 2015 +0100
@@ -56,21 +56,21 @@
         Path compileDir = testClasses.resolve("data");
         deleteRecursively(compileDir);
         Files.createDirectories(compileDir);
-        Path createSymbols = findFile("../../make/src/build/tools/symbolgenerator/CreateSymbols.java");
+        Path createSymbols = findFile("../../make/src/classes/build/tools/symbolgenerator/CreateSymbols.java");
 
         if (createSymbols == null) {
             System.err.println("Warning: cannot find CreateSymbols, skipping.");
             return ;
         }
 
-        Path createTestImpl = findFile("../../make/test/tools/sym/CreateSymbolsTestImpl.java");
+        Path createTestImpl = findFile("../../make/test/sym/CreateSymbolsTestImpl.java");
 
         if (createTestImpl == null) {
-            System.err.println("Warning: cannot find CreateSymbols, skipping.");
+            System.err.println("Warning: cannot find CreateSymbolsTestImpl, skipping.");
             return ;
         }
 
-        Path toolBox = findFile("../../langtools/test/tools/lib/ToolBox.java");
+        Path toolBox = findFile("../../test/tools/lib/ToolBox.java");
 
         if (toolBox == null) {
             System.err.println("Warning: cannot find ToolBox, skipping.");
--- a/langtools/make/test/sym/CreateSymbolsTestImpl.java	Thu Oct 29 12:40:37 2015 -0700
+++ b/langtools/make/test/sym/CreateSymbolsTestImpl.java	Fri Oct 30 17:00:33 2015 +0100
@@ -41,12 +41,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import symbolgenerator.CreateSymbols;
-import symbolgenerator.CreateSymbols.ClassDescription;
-import symbolgenerator.CreateSymbols.ClassList;
-import symbolgenerator.CreateSymbols.CtSymKind;
-import symbolgenerator.CreateSymbols.ExcludeIncludeList;
-import symbolgenerator.CreateSymbols.VersionDescription;
+import build.tools.symbolgenerator.CreateSymbols;
+import build.tools.symbolgenerator.CreateSymbols.ClassDescription;
+import build.tools.symbolgenerator.CreateSymbols.ClassList;
+import build.tools.symbolgenerator.CreateSymbols.CtSymKind;
+import build.tools.symbolgenerator.CreateSymbols.ExcludeIncludeList;
+import build.tools.symbolgenerator.CreateSymbols.VersionDescription;
 
 public class CreateSymbolsTestImpl {