diff options
author | George Fraser <george@fivetran.com> | 2017-05-06 10:31:20 -0400 |
---|---|---|
committer | George Fraser <george@fivetran.com> | 2017-05-06 10:31:20 -0400 |
commit | 630df6ba27dcb88e2997c0897766ea1b6c7913ed (patch) | |
tree | bd0b05d24f244dd876384f1c9904b8915dd462ee /src/test | |
parent | 748fe64c7f4fd0bb7308a481699cb318d8de2b6c (diff) | |
download | java-language-server-630df6ba27dcb88e2997c0897766ea1b6c7913ed.zip |
Figure out sourcePath automatically
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/org/javacs/CodeActionsTest.java | 38 | ||||
-rw-r--r-- | src/test/java/org/javacs/CompilerProfiling.java | 6 | ||||
-rw-r--r-- | src/test/java/org/javacs/FindResource.java | 4 | ||||
-rw-r--r-- | src/test/java/org/javacs/InferConfigTest.java | 25 | ||||
-rw-r--r-- | src/test/java/org/javacs/JavaCompilerTest.java | 16 | ||||
-rw-r--r-- | src/test/java/org/javacs/JavadocsTest.java | 23 | ||||
-rw-r--r-- | src/test/java/org/javacs/LanguageServerFixture.java | 12 | ||||
-rw-r--r-- | src/test/java/org/javacs/LinterTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/javacs/RecompileTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/javacs/RefactorFileTest.java | 6 | ||||
-rw-r--r-- | src/test/java/org/javacs/SearchTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/javacs/SymbolUnderCursorTest.java | 16 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/docs/InterfaceDoc.java (renamed from src/test/resources/org/javacs/docs/InterfaceDoc.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/docs/SubDoc.java (renamed from src/test/resources/org/javacs/docs/SubDoc.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/docs/SuperDoc.java (renamed from src/test/resources/org/javacs/docs/SuperDoc.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/docs/TrickyDocstring.java (renamed from src/test/resources/org/javacs/docs/TrickyDocstring.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteBetweenLines.java (renamed from src/test/resources/org/javacs/example/AutocompleteBetweenLines.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteClasses.java (renamed from src/test/resources/org/javacs/example/AutocompleteClasses.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteConstructor.java (renamed from src/test/resources/org/javacs/example/AutocompleteConstructor.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteContext.java (renamed from src/test/resources/org/javacs/example/AutocompleteContext.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteDocstring.java (renamed from src/test/resources/org/javacs/example/AutocompleteDocstring.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteEditMethodName.java (renamed from src/test/resources/org/javacs/example/AutocompleteEditMethodName.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteFromClasspath.java (renamed from src/test/resources/org/javacs/example/AutocompleteFromClasspath.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteInners.java (renamed from src/test/resources/org/javacs/example/AutocompleteInners.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteMember.java (renamed from src/test/resources/org/javacs/example/AutocompleteMember.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteMemberFixed.java (renamed from src/test/resources/org/javacs/example/AutocompleteMemberFixed.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteMembers.java (renamed from src/test/resources/org/javacs/example/AutocompleteMembers.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteOther.java (renamed from src/test/resources/org/javacs/example/AutocompleteOther.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteOuter.java (renamed from src/test/resources/org/javacs/example/AutocompleteOuter.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompletePackage.java (renamed from src/test/resources/org/javacs/example/AutocompletePackage.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteReference.java (renamed from src/test/resources/org/javacs/example/AutocompleteReference.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteRest.java (renamed from src/test/resources/org/javacs/example/AutocompleteRest.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteScopes.java (renamed from src/test/resources/org/javacs/example/AutocompleteScopes.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticImport.java (renamed from src/test/resources/org/javacs/example/AutocompleteStaticImport.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticMember.java (renamed from src/test/resources/org/javacs/example/AutocompleteStaticMember.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticReference.java (renamed from src/test/resources/org/javacs/example/AutocompleteStaticReference.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/Bad.java (renamed from src/test/resources/org/javacs/example/Bad.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/CompileTwice.java (renamed from src/test/resources/org/javacs/example/CompileTwice.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/DependsOnTarget.java (renamed from src/test/resources/org/javacs/example/DependsOnTarget.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/DeprecatedClass.java (renamed from src/test/resources/org/javacs/example/DeprecatedClass.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/DeprecationWarning.java (renamed from src/test/resources/org/javacs/example/DeprecationWarning.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/ErrorInDependency.java (renamed from src/test/resources/org/javacs/example/ErrorInDependency.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/ExposesStaticMembers.java (renamed from src/test/resources/org/javacs/example/ExposesStaticMembers.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/FixParseErrorAfter.java (renamed from src/test/resources/org/javacs/example/FixParseErrorAfter.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/FixParseErrorBefore.java (renamed from src/test/resources/org/javacs/example/FixParseErrorBefore.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/FixTypeErrorAfter.java (renamed from src/test/resources/org/javacs/example/FixTypeErrorAfter.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/FixTypeErrorBefore.java (renamed from src/test/resources/org/javacs/example/FixTypeErrorBefore.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/FooString.java (renamed from src/test/resources/org/javacs/example/FooString.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/Goto.java (renamed from src/test/resources/org/javacs/example/Goto.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/GotoDefaultConstructor.java (renamed from src/test/resources/org/javacs/example/GotoDefaultConstructor.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/GotoEnum.java (renamed from src/test/resources/org/javacs/example/GotoEnum.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/GotoOther.java (renamed from src/test/resources/org/javacs/example/GotoOther.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/HelloWorld.java (renamed from src/test/resources/org/javacs/example/HelloWorld.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/IncompleteAssignment.java (renamed from src/test/resources/org/javacs/example/IncompleteAssignment.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/LargeFile.java (renamed from src/test/resources/org/javacs/example/LargeFile.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/MissingImport.java (renamed from src/test/resources/org/javacs/example/MissingImport.java) | 2 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/MissingMethodBody.java (renamed from src/test/resources/org/javacs/example/MissingMethodBody.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/MissingSemicolon.java (renamed from src/test/resources/org/javacs/example/MissingSemicolon.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/NotJava.java.txt (renamed from src/test/resources/org/javacs/example/NotJava.java.txt) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/ReferenceConstructor.java (renamed from src/test/resources/org/javacs/example/ReferenceConstructor.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/ReferenceFrom.java (renamed from src/test/resources/org/javacs/example/ReferenceFrom.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/ReferenceTo.java (renamed from src/test/resources/org/javacs/example/ReferenceTo.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/SignatureHelp.java (renamed from src/test/resources/org/javacs/example/SignatureHelp.java) | 2 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/SingleLineUndefinedSymbol.java (renamed from src/test/resources/org/javacs/example/SingleLineUndefinedSymbol.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/SymbolUnderCursor.java (renamed from src/test/resources/org/javacs/example/SymbolUnderCursor.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/Target.java (renamed from src/test/resources/org/javacs/example/Target.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/example/UndefinedSymbol.java (renamed from src/test/resources/org/javacs/example/UndefinedSymbol.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/other/OtherPackagePrivate.java (renamed from src/test/resources/org/javacs/other/OtherPackagePrivate.java) | 0 | ||||
-rw-r--r-- | src/test/test-project/workspace/src/org/javacs/other/OtherPackagePublic.java (renamed from src/test/resources/org/javacs/other/OtherPackagePublic.java) | 0 |
69 files changed, 72 insertions, 84 deletions
diff --git a/src/test/java/org/javacs/CodeActionsTest.java b/src/test/java/org/javacs/CodeActionsTest.java index 36924c8..71bf488 100644 --- a/src/test/java/org/javacs/CodeActionsTest.java +++ b/src/test/java/org/javacs/CodeActionsTest.java @@ -5,9 +5,9 @@ import org.eclipse.lsp4j.services.LanguageClient; import org.junit.Before; import org.junit.Test; -import java.io.BufferedReader; -import java.io.InputStreamReader; +import java.io.*; import java.net.URI; +import java.nio.file.Files; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -80,21 +80,27 @@ public class CodeActionsTest { private List<? extends Command> commands(String file, int row, int column) { URI uri = FindResource.uri(file); TextDocumentIdentifier document = new TextDocumentIdentifier(uri.toString()); - String content = new BufferedReader(new InputStreamReader(FindResource.class.getResourceAsStream(file))).lines() - .collect(Collectors.joining("\n")); - TextDocumentItem open = new TextDocumentItem(); - open.setText(content); - open.setUri(uri.toString()); - open.setLanguageId("java"); - - server.getTextDocumentService().didOpen(new DidOpenTextDocumentParams(open, content)); - server.getTextDocumentService().didSave(new DidSaveTextDocumentParams(document, content)); - - return diagnostics.stream() - .filter(diagnostic -> includes(diagnostic.getRange(), row - 1, column - 1)) - .flatMap(diagnostic -> codeActionsAt(document, diagnostic)) - .collect(Collectors.toList()); + try { + InputStream in = Files.newInputStream(new File(uri).toPath()); + String content = new BufferedReader(new InputStreamReader(in)).lines() + .collect(Collectors.joining("\n")); + TextDocumentItem open = new TextDocumentItem(); + + open.setText(content); + open.setUri(uri.toString()); + open.setLanguageId("java"); + + server.getTextDocumentService().didOpen(new DidOpenTextDocumentParams(open, content)); + server.getTextDocumentService().didSave(new DidSaveTextDocumentParams(document, content)); + + return diagnostics.stream() + .filter(diagnostic -> includes(diagnostic.getRange(), row - 1, column - 1)) + .flatMap(diagnostic -> codeActionsAt(document, diagnostic)) + .collect(Collectors.toList()); + } catch (IOException e) { + throw new RuntimeException(e); + } } private boolean includes(Range range, int line, int character) { diff --git a/src/test/java/org/javacs/CompilerProfiling.java b/src/test/java/org/javacs/CompilerProfiling.java index 1114b3e..020bbf7 100644 --- a/src/test/java/org/javacs/CompilerProfiling.java +++ b/src/test/java/org/javacs/CompilerProfiling.java @@ -29,7 +29,11 @@ public class CompilerProfiling { private Duration compileLargeFile(URI file) { long start = System.nanoTime(); - JavacHolder compiler = JavacHolder.create(Collections.emptySet(), Collections.emptySet(), Paths.get("target/test-output")); + JavacHolder compiler = JavacHolder.create( + Collections.singleton(Paths.get("src/test/test-project/workspace/src")), + Collections.emptySet(), + Paths.get("target/test-output") + ); BatchResult result = compiler.compileBatch(Collections.singletonMap(file, Optional.empty())); long finish = System.nanoTime(); diff --git a/src/test/java/org/javacs/FindResource.java b/src/test/java/org/javacs/FindResource.java index 355223a..0f26115 100644 --- a/src/test/java/org/javacs/FindResource.java +++ b/src/test/java/org/javacs/FindResource.java @@ -6,14 +6,14 @@ import java.nio.file.Path; import java.nio.file.Paths; /** - * Represents a java source on the system resource path. + * Find java sources in test-project/workspace/src */ public class FindResource { public static URI uri(String resourcePath) { if (resourcePath.startsWith("/")) resourcePath = resourcePath.substring(1); - Path path = Paths.get("./src/test/resources").resolve(resourcePath).normalize(); + Path path = Paths.get("./src/test/test-project/workspace/src").resolve(resourcePath).normalize(); File file = path.toFile(); if (!file.exists()) diff --git a/src/test/java/org/javacs/InferConfigTest.java b/src/test/java/org/javacs/InferConfigTest.java index 46be918..0c42e2d 100644 --- a/src/test/java/org/javacs/InferConfigTest.java +++ b/src/test/java/org/javacs/InferConfigTest.java @@ -1,28 +1,27 @@ package org.javacs; import com.google.common.collect.ImmutableList; +import org.junit.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import org.junit.Test; -import static org.junit.Assert.*; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; +import static org.junit.Assert.assertThat; public class InferConfigTest { - Path workspaceRoot = Paths.get("src/test/test-project/workspace"); - Path mavenHome = Paths.get("src/test/test-project/home/.m2"); - Path gradleHome = Paths.get("src/test/test-project/home/.gradle"); - Path outputDirectory = createOutputDir(); - List<Artifact> externalDependencies = ImmutableList.of(new Artifact("com.external", "external-library", "1.2")); - InferConfig both = new InferConfig(workspaceRoot, externalDependencies, mavenHome, gradleHome, outputDirectory), + private Path workspaceRoot = Paths.get("src/test/test-project/workspace"); + private Path mavenHome = Paths.get("src/test/test-project/home/.m2"); + private Path gradleHome = Paths.get("src/test/test-project/home/.gradle"); + private Path outputDirectory = createOutputDir(); + private List<Artifact> externalDependencies = ImmutableList.of(new Artifact("com.external", "external-library", "1.2")); + private InferConfig both = new InferConfig(workspaceRoot, externalDependencies, mavenHome, gradleHome, outputDirectory), gradle = new InferConfig(workspaceRoot, externalDependencies, Paths.get("nowhere"), gradleHome, outputDirectory); - Path createOutputDir() { + private Path createOutputDir() { try { return Files.createTempDirectory("output").toAbsolutePath(); } catch (IOException e) { @@ -33,7 +32,7 @@ public class InferConfigTest { @Test public void workspaceSourcePath() { assertThat( - both.workspaceSourcePath(), + InferConfig.workspaceSourcePath(workspaceRoot), contains(workspaceRoot.resolve("src")) ); } diff --git a/src/test/java/org/javacs/JavaCompilerTest.java b/src/test/java/org/javacs/JavaCompilerTest.java index 657b125..3575afc 100644 --- a/src/test/java/org/javacs/JavaCompilerTest.java +++ b/src/test/java/org/javacs/JavaCompilerTest.java @@ -3,15 +3,10 @@ package org.javacs; import com.google.common.collect.ImmutableList; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.util.JavacTask; -import com.sun.source.util.TaskEvent; -import com.sun.source.util.TaskEvent.Kind; -import com.sun.source.util.TaskListener; import com.sun.tools.javac.api.JavacTool; -import java.util.EnumMap; import org.junit.Test; import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; @@ -25,9 +20,6 @@ import java.util.List; import java.util.Optional; import java.util.logging.Logger; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; - public class JavaCompilerTest { private static final Logger LOG = Logger.getLogger("main"); @@ -49,8 +41,12 @@ public class JavaCompilerTest { @Test public void javacHolder() { - JavacHolder javac = JavacHolder.create(Collections.emptySet(), Collections.singleton(Paths.get("src/test/resources")), Paths.get("target/test-output")); - File file = Paths.get("src/test/resources/org/javacs/example/Bad.java").toFile(); + JavacHolder javac = JavacHolder.create( + Collections.singleton(Paths.get("src/test/test-project/workspace/src")), + Collections.emptySet(), + Paths.get("target/test-output") + ); + File file = Paths.get("src/test/test-project/workspace/src/org/javacs/example/Bad.java").toFile(); BatchResult compile = javac.compileBatch(Collections.singletonMap(file.toURI(), Optional.empty())); } diff --git a/src/test/java/org/javacs/JavadocsTest.java b/src/test/java/org/javacs/JavadocsTest.java index ae20f42..ce248f7 100644 --- a/src/test/java/org/javacs/JavadocsTest.java +++ b/src/test/java/org/javacs/JavadocsTest.java @@ -2,31 +2,25 @@ package org.javacs; import com.sun.javadoc.MethodDoc; import com.sun.javadoc.RootDoc; -import com.sun.source.util.Trees; import org.junit.Ignore; import org.junit.Test; -import javax.lang.model.element.ExecutableElement; import java.io.IOException; import java.nio.file.Paths; import java.util.Collections; import java.util.Optional; import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public class JavadocsTest { - private final Javadocs docs = new Javadocs(Collections.singleton(Paths.get("src/test/resources"))); - private final JavacHolder compiler = newCompiler(); - - private static JavacHolder newCompiler() { - return JavacHolder.create( - Collections.emptySet(), - Collections.singleton(Paths.get("src/test/resources")), - Paths.get("target/test-output") - ); - } + private final Javadocs docs = new Javadocs( + Collections.singleton(Paths.get("src/test/test-project/workspace/src")), + Collections.emptySet(), + __ -> Optional.empty() + ); @Test public void findSystemDoc() throws IOException { @@ -45,7 +39,8 @@ public class JavadocsTest { assertTrue("Found method", docs.methodDoc("org.javacs.docs.TrickyDocstring#parameterized(java.lang.Object)").isPresent()); } - @Test + @Test + @Ignore // Blocked by emptyFileManager public void findInheritedDoc() { Optional<MethodDoc> found = docs.methodDoc("org.javacs.docs.SubDoc#method()"); diff --git a/src/test/java/org/javacs/LanguageServerFixture.java b/src/test/java/org/javacs/LanguageServerFixture.java index e803bdb..656ed59 100644 --- a/src/test/java/org/javacs/LanguageServerFixture.java +++ b/src/test/java/org/javacs/LanguageServerFixture.java @@ -5,8 +5,6 @@ import org.eclipse.lsp4j.services.LanguageClient; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Collections; -import java.util.Set; import java.util.concurrent.CompletableFuture; class LanguageServerFixture { @@ -45,16 +43,12 @@ class LanguageServerFixture { } static JavaLanguageServer getJavaLanguageServer(LanguageClient client) { - Set<Path> classPath = Collections.emptySet(); - Set<Path> sourcePath = Collections.singleton(Paths.get("src/test/resources").toAbsolutePath()); - Path outputDirectory = Paths.get("target/test-output").toAbsolutePath(); - JavacHolder javac = JavacHolder.create(classPath, sourcePath, outputDirectory); - JavaLanguageServer server = new JavaLanguageServer(javac); + Path workspaceRoot = Paths.get("src/test/test-project/workspace").toAbsolutePath(); + JavaLanguageServer server = new JavaLanguageServer(); InitializeParams init = new InitializeParams(); - String workspaceRoot = Paths.get(".").toAbsolutePath().toString(); - init.setRootPath(workspaceRoot); + init.setRootPath(workspaceRoot.toString()); server.initialize(init); server.installClient(client); diff --git a/src/test/java/org/javacs/LinterTest.java b/src/test/java/org/javacs/LinterTest.java index ddad1a8..76d37e1 100644 --- a/src/test/java/org/javacs/LinterTest.java +++ b/src/test/java/org/javacs/LinterTest.java @@ -19,8 +19,8 @@ public class LinterTest { private static final Logger LOG = Logger.getLogger("main"); private static final JavacHolder compiler = JavacHolder.create( + Collections.singleton(Paths.get("src/test/test-project/workspace/src")), Collections.emptySet(), - Collections.singleton(Paths.get("src/test/resources")), Paths.get("target/test-output") ); diff --git a/src/test/java/org/javacs/RecompileTest.java b/src/test/java/org/javacs/RecompileTest.java index 5c02b3c..05b3aa2 100644 --- a/src/test/java/org/javacs/RecompileTest.java +++ b/src/test/java/org/javacs/RecompileTest.java @@ -63,8 +63,8 @@ public class RecompileTest { private static JavacHolder newCompiler() { return JavacHolder.create( + Collections.singleton(Paths.get("src/test/test-project/workspace/src")), Collections.emptySet(), - Collections.singleton(Paths.get("src/test/resources")), Paths.get("target/test-output") ); } diff --git a/src/test/java/org/javacs/RefactorFileTest.java b/src/test/java/org/javacs/RefactorFileTest.java index 258a5f6..8d8bc62 100644 --- a/src/test/java/org/javacs/RefactorFileTest.java +++ b/src/test/java/org/javacs/RefactorFileTest.java @@ -200,7 +200,11 @@ public class RefactorFileTest { } private ParseResult file(String content) { - JavacHolder compiler = JavacHolder.create(Collections.emptySet(), Collections.emptySet(), Paths.get("test-output")); + JavacHolder compiler = JavacHolder.create( + Collections.singleton(Paths.get("src/test/test-project/workspace/src")), + Collections.emptySet(), + Paths.get("target/test-output") + ); return compiler.parse(FAKE_FILE, Optional.of(content), error -> LOG.warning(error.toString())); } diff --git a/src/test/java/org/javacs/SearchTest.java b/src/test/java/org/javacs/SearchTest.java index 75fe289..7e2b4cd 100644 --- a/src/test/java/org/javacs/SearchTest.java +++ b/src/test/java/org/javacs/SearchTest.java @@ -25,7 +25,7 @@ public class SearchTest { @BeforeClass public static void openSource() throws URISyntaxException, IOException { - URI uri = SearchTest.class.getResource("/org/javacs/example/AutocompleteBetweenLines.java").toURI(); + URI uri = FindResource.uri("/org/javacs/example/AutocompleteBetweenLines.java"); String textContent = Joiner.on("\n").join(Files.readAllLines(Paths.get(uri))); TextDocumentItem document = new TextDocumentItem(); diff --git a/src/test/java/org/javacs/SymbolUnderCursorTest.java b/src/test/java/org/javacs/SymbolUnderCursorTest.java index fa68618..5608fbf 100644 --- a/src/test/java/org/javacs/SymbolUnderCursorTest.java +++ b/src/test/java/org/javacs/SymbolUnderCursorTest.java @@ -4,8 +4,6 @@ import org.junit.Ignore; import org.junit.Test; import javax.lang.model.element.Element; -import java.nio.file.Paths; -import java.util.Collections; import java.util.Optional; import static org.junit.Assert.assertEquals; @@ -78,19 +76,11 @@ public class SymbolUnderCursorTest { assertEquals("localVariable", symbolAt("/org/javacs/example/SymbolUnderCursor.java", 10, 16)); } + private final JavaLanguageServer server = LanguageServerFixture.getJavaLanguageServer(); + private String symbolAt(String file, int line, int character) { - Optional<Element> symbol = new JavaLanguageServer(compiler).findSymbol(FindResource.uri(file), line, character); + Optional<Element> symbol = server.findSymbol(FindResource.uri(file), line, character); return symbol.map(s -> s.getSimpleName().toString()).orElse(null); } - - private static JavacHolder compiler = newCompiler(); - - private static JavacHolder newCompiler() { - return JavacHolder.create( - Collections.emptySet(), - Collections.singleton(Paths.get("src/test/resources")), - Paths.get("target/test-output") - ); - } } diff --git a/src/test/resources/org/javacs/docs/InterfaceDoc.java b/src/test/test-project/workspace/src/org/javacs/docs/InterfaceDoc.java index 26e4aaa..26e4aaa 100644 --- a/src/test/resources/org/javacs/docs/InterfaceDoc.java +++ b/src/test/test-project/workspace/src/org/javacs/docs/InterfaceDoc.java diff --git a/src/test/resources/org/javacs/docs/SubDoc.java b/src/test/test-project/workspace/src/org/javacs/docs/SubDoc.java index bb687f6..bb687f6 100644 --- a/src/test/resources/org/javacs/docs/SubDoc.java +++ b/src/test/test-project/workspace/src/org/javacs/docs/SubDoc.java diff --git a/src/test/resources/org/javacs/docs/SuperDoc.java b/src/test/test-project/workspace/src/org/javacs/docs/SuperDoc.java index b116eda..b116eda 100644 --- a/src/test/resources/org/javacs/docs/SuperDoc.java +++ b/src/test/test-project/workspace/src/org/javacs/docs/SuperDoc.java diff --git a/src/test/resources/org/javacs/docs/TrickyDocstring.java b/src/test/test-project/workspace/src/org/javacs/docs/TrickyDocstring.java index 445e4ee..445e4ee 100644 --- a/src/test/resources/org/javacs/docs/TrickyDocstring.java +++ b/src/test/test-project/workspace/src/org/javacs/docs/TrickyDocstring.java diff --git a/src/test/resources/org/javacs/example/AutocompleteBetweenLines.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteBetweenLines.java index 49d26bd..49d26bd 100644 --- a/src/test/resources/org/javacs/example/AutocompleteBetweenLines.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteBetweenLines.java diff --git a/src/test/resources/org/javacs/example/AutocompleteClasses.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteClasses.java index a92b404..a92b404 100644 --- a/src/test/resources/org/javacs/example/AutocompleteClasses.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteClasses.java diff --git a/src/test/resources/org/javacs/example/AutocompleteConstructor.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteConstructor.java index 5b21493..5b21493 100644 --- a/src/test/resources/org/javacs/example/AutocompleteConstructor.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteConstructor.java diff --git a/src/test/resources/org/javacs/example/AutocompleteContext.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteContext.java index 970da5a..970da5a 100644 --- a/src/test/resources/org/javacs/example/AutocompleteContext.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteContext.java diff --git a/src/test/resources/org/javacs/example/AutocompleteDocstring.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteDocstring.java index 96ab552..96ab552 100644 --- a/src/test/resources/org/javacs/example/AutocompleteDocstring.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteDocstring.java diff --git a/src/test/resources/org/javacs/example/AutocompleteEditMethodName.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteEditMethodName.java index c8f619b..c8f619b 100644 --- a/src/test/resources/org/javacs/example/AutocompleteEditMethodName.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteEditMethodName.java diff --git a/src/test/resources/org/javacs/example/AutocompleteFromClasspath.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteFromClasspath.java index a74d775..a74d775 100644 --- a/src/test/resources/org/javacs/example/AutocompleteFromClasspath.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteFromClasspath.java diff --git a/src/test/resources/org/javacs/example/AutocompleteInners.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteInners.java index 608e1f2..608e1f2 100644 --- a/src/test/resources/org/javacs/example/AutocompleteInners.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteInners.java diff --git a/src/test/resources/org/javacs/example/AutocompleteMember.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteMember.java index 3c555e2..3c555e2 100644 --- a/src/test/resources/org/javacs/example/AutocompleteMember.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteMember.java diff --git a/src/test/resources/org/javacs/example/AutocompleteMemberFixed.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteMemberFixed.java index 0c2e575..0c2e575 100644 --- a/src/test/resources/org/javacs/example/AutocompleteMemberFixed.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteMemberFixed.java diff --git a/src/test/resources/org/javacs/example/AutocompleteMembers.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteMembers.java index c36449a..c36449a 100644 --- a/src/test/resources/org/javacs/example/AutocompleteMembers.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteMembers.java diff --git a/src/test/resources/org/javacs/example/AutocompleteOther.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteOther.java index 8491f72..8491f72 100644 --- a/src/test/resources/org/javacs/example/AutocompleteOther.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteOther.java diff --git a/src/test/resources/org/javacs/example/AutocompleteOuter.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteOuter.java index c7a4c0d..c7a4c0d 100644 --- a/src/test/resources/org/javacs/example/AutocompleteOuter.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteOuter.java diff --git a/src/test/resources/org/javacs/example/AutocompletePackage.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompletePackage.java index e9b11f7..e9b11f7 100644 --- a/src/test/resources/org/javacs/example/AutocompletePackage.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompletePackage.java diff --git a/src/test/resources/org/javacs/example/AutocompleteReference.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteReference.java index 2ba5ca4..2ba5ca4 100644 --- a/src/test/resources/org/javacs/example/AutocompleteReference.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteReference.java diff --git a/src/test/resources/org/javacs/example/AutocompleteRest.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteRest.java index ac0dc7a..ac0dc7a 100644 --- a/src/test/resources/org/javacs/example/AutocompleteRest.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteRest.java diff --git a/src/test/resources/org/javacs/example/AutocompleteScopes.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteScopes.java index 2a2fa58..2a2fa58 100644 --- a/src/test/resources/org/javacs/example/AutocompleteScopes.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteScopes.java diff --git a/src/test/resources/org/javacs/example/AutocompleteStaticImport.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticImport.java index 4f382e4..4f382e4 100644 --- a/src/test/resources/org/javacs/example/AutocompleteStaticImport.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticImport.java diff --git a/src/test/resources/org/javacs/example/AutocompleteStaticMember.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticMember.java index 93191c1..93191c1 100644 --- a/src/test/resources/org/javacs/example/AutocompleteStaticMember.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticMember.java diff --git a/src/test/resources/org/javacs/example/AutocompleteStaticReference.java b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticReference.java index 75a5d8f..75a5d8f 100644 --- a/src/test/resources/org/javacs/example/AutocompleteStaticReference.java +++ b/src/test/test-project/workspace/src/org/javacs/example/AutocompleteStaticReference.java diff --git a/src/test/resources/org/javacs/example/Bad.java b/src/test/test-project/workspace/src/org/javacs/example/Bad.java index f21f237..f21f237 100644 --- a/src/test/resources/org/javacs/example/Bad.java +++ b/src/test/test-project/workspace/src/org/javacs/example/Bad.java diff --git a/src/test/resources/org/javacs/example/CompileTwice.java b/src/test/test-project/workspace/src/org/javacs/example/CompileTwice.java index e905afc..e905afc 100644 --- a/src/test/resources/org/javacs/example/CompileTwice.java +++ b/src/test/test-project/workspace/src/org/javacs/example/CompileTwice.java diff --git a/src/test/resources/org/javacs/example/DependsOnTarget.java b/src/test/test-project/workspace/src/org/javacs/example/DependsOnTarget.java index 60cd332..60cd332 100644 --- a/src/test/resources/org/javacs/example/DependsOnTarget.java +++ b/src/test/test-project/workspace/src/org/javacs/example/DependsOnTarget.java diff --git a/src/test/resources/org/javacs/example/DeprecatedClass.java b/src/test/test-project/workspace/src/org/javacs/example/DeprecatedClass.java index 221051f..221051f 100644 --- a/src/test/resources/org/javacs/example/DeprecatedClass.java +++ b/src/test/test-project/workspace/src/org/javacs/example/DeprecatedClass.java diff --git a/src/test/resources/org/javacs/example/DeprecationWarning.java b/src/test/test-project/workspace/src/org/javacs/example/DeprecationWarning.java index 558ba6a..558ba6a 100644 --- a/src/test/resources/org/javacs/example/DeprecationWarning.java +++ b/src/test/test-project/workspace/src/org/javacs/example/DeprecationWarning.java diff --git a/src/test/resources/org/javacs/example/ErrorInDependency.java b/src/test/test-project/workspace/src/org/javacs/example/ErrorInDependency.java index f9ca67c..f9ca67c 100644 --- a/src/test/resources/org/javacs/example/ErrorInDependency.java +++ b/src/test/test-project/workspace/src/org/javacs/example/ErrorInDependency.java diff --git a/src/test/resources/org/javacs/example/ExposesStaticMembers.java b/src/test/test-project/workspace/src/org/javacs/example/ExposesStaticMembers.java index f164f15..f164f15 100644 --- a/src/test/resources/org/javacs/example/ExposesStaticMembers.java +++ b/src/test/test-project/workspace/src/org/javacs/example/ExposesStaticMembers.java diff --git a/src/test/resources/org/javacs/example/FixParseErrorAfter.java b/src/test/test-project/workspace/src/org/javacs/example/FixParseErrorAfter.java index 00ba976..00ba976 100644 --- a/src/test/resources/org/javacs/example/FixParseErrorAfter.java +++ b/src/test/test-project/workspace/src/org/javacs/example/FixParseErrorAfter.java diff --git a/src/test/resources/org/javacs/example/FixParseErrorBefore.java b/src/test/test-project/workspace/src/org/javacs/example/FixParseErrorBefore.java index 624136e..624136e 100644 --- a/src/test/resources/org/javacs/example/FixParseErrorBefore.java +++ b/src/test/test-project/workspace/src/org/javacs/example/FixParseErrorBefore.java diff --git a/src/test/resources/org/javacs/example/FixTypeErrorAfter.java b/src/test/test-project/workspace/src/org/javacs/example/FixTypeErrorAfter.java index 130aebb..130aebb 100644 --- a/src/test/resources/org/javacs/example/FixTypeErrorAfter.java +++ b/src/test/test-project/workspace/src/org/javacs/example/FixTypeErrorAfter.java diff --git a/src/test/resources/org/javacs/example/FixTypeErrorBefore.java b/src/test/test-project/workspace/src/org/javacs/example/FixTypeErrorBefore.java index 42107f9..42107f9 100644 --- a/src/test/resources/org/javacs/example/FixTypeErrorBefore.java +++ b/src/test/test-project/workspace/src/org/javacs/example/FixTypeErrorBefore.java diff --git a/src/test/resources/org/javacs/example/FooString.java b/src/test/test-project/workspace/src/org/javacs/example/FooString.java index 2be005a..2be005a 100644 --- a/src/test/resources/org/javacs/example/FooString.java +++ b/src/test/test-project/workspace/src/org/javacs/example/FooString.java diff --git a/src/test/resources/org/javacs/example/Goto.java b/src/test/test-project/workspace/src/org/javacs/example/Goto.java index 2dd774f..2dd774f 100644 --- a/src/test/resources/org/javacs/example/Goto.java +++ b/src/test/test-project/workspace/src/org/javacs/example/Goto.java diff --git a/src/test/resources/org/javacs/example/GotoDefaultConstructor.java b/src/test/test-project/workspace/src/org/javacs/example/GotoDefaultConstructor.java index 52a1f65..52a1f65 100644 --- a/src/test/resources/org/javacs/example/GotoDefaultConstructor.java +++ b/src/test/test-project/workspace/src/org/javacs/example/GotoDefaultConstructor.java diff --git a/src/test/resources/org/javacs/example/GotoEnum.java b/src/test/test-project/workspace/src/org/javacs/example/GotoEnum.java index 12344cf..12344cf 100644 --- a/src/test/resources/org/javacs/example/GotoEnum.java +++ b/src/test/test-project/workspace/src/org/javacs/example/GotoEnum.java diff --git a/src/test/resources/org/javacs/example/GotoOther.java b/src/test/test-project/workspace/src/org/javacs/example/GotoOther.java index 3afaf4b..3afaf4b 100644 --- a/src/test/resources/org/javacs/example/GotoOther.java +++ b/src/test/test-project/workspace/src/org/javacs/example/GotoOther.java diff --git a/src/test/resources/org/javacs/example/HelloWorld.java b/src/test/test-project/workspace/src/org/javacs/example/HelloWorld.java index 425854f..425854f 100644 --- a/src/test/resources/org/javacs/example/HelloWorld.java +++ b/src/test/test-project/workspace/src/org/javacs/example/HelloWorld.java diff --git a/src/test/resources/org/javacs/example/IncompleteAssignment.java b/src/test/test-project/workspace/src/org/javacs/example/IncompleteAssignment.java index d8d8b76..d8d8b76 100644 --- a/src/test/resources/org/javacs/example/IncompleteAssignment.java +++ b/src/test/test-project/workspace/src/org/javacs/example/IncompleteAssignment.java diff --git a/src/test/resources/org/javacs/example/LargeFile.java b/src/test/test-project/workspace/src/org/javacs/example/LargeFile.java index b41cdc0..b41cdc0 100644 --- a/src/test/resources/org/javacs/example/LargeFile.java +++ b/src/test/test-project/workspace/src/org/javacs/example/LargeFile.java diff --git a/src/test/resources/org/javacs/example/MissingImport.java b/src/test/test-project/workspace/src/org/javacs/example/MissingImport.java index a697cdc..84233be 100644 --- a/src/test/resources/org/javacs/example/MissingImport.java +++ b/src/test/test-project/workspace/src/org/javacs/example/MissingImport.java @@ -1,4 +1,4 @@ -package org.javacs; +package org.javacs.example; class MissingImport { void test() { diff --git a/src/test/resources/org/javacs/example/MissingMethodBody.java b/src/test/test-project/workspace/src/org/javacs/example/MissingMethodBody.java index 02f395e..02f395e 100644 --- a/src/test/resources/org/javacs/example/MissingMethodBody.java +++ b/src/test/test-project/workspace/src/org/javacs/example/MissingMethodBody.java diff --git a/src/test/resources/org/javacs/example/MissingSemicolon.java b/src/test/test-project/workspace/src/org/javacs/example/MissingSemicolon.java index aa32602..aa32602 100644 --- a/src/test/resources/org/javacs/example/MissingSemicolon.java +++ b/src/test/test-project/workspace/src/org/javacs/example/MissingSemicolon.java diff --git a/src/test/resources/org/javacs/example/NotJava.java.txt b/src/test/test-project/workspace/src/org/javacs/example/NotJava.java.txt index bde7ea4..bde7ea4 100644 --- a/src/test/resources/org/javacs/example/NotJava.java.txt +++ b/src/test/test-project/workspace/src/org/javacs/example/NotJava.java.txt diff --git a/src/test/resources/org/javacs/example/ReferenceConstructor.java b/src/test/test-project/workspace/src/org/javacs/example/ReferenceConstructor.java index 1076674..1076674 100644 --- a/src/test/resources/org/javacs/example/ReferenceConstructor.java +++ b/src/test/test-project/workspace/src/org/javacs/example/ReferenceConstructor.java diff --git a/src/test/resources/org/javacs/example/ReferenceFrom.java b/src/test/test-project/workspace/src/org/javacs/example/ReferenceFrom.java index e437318..e437318 100644 --- a/src/test/resources/org/javacs/example/ReferenceFrom.java +++ b/src/test/test-project/workspace/src/org/javacs/example/ReferenceFrom.java diff --git a/src/test/resources/org/javacs/example/ReferenceTo.java b/src/test/test-project/workspace/src/org/javacs/example/ReferenceTo.java index bf23e95..bf23e95 100644 --- a/src/test/resources/org/javacs/example/ReferenceTo.java +++ b/src/test/test-project/workspace/src/org/javacs/example/ReferenceTo.java diff --git a/src/test/resources/org/javacs/example/SignatureHelp.java b/src/test/test-project/workspace/src/org/javacs/example/SignatureHelp.java index 3e1aa38..6f61525 100644 --- a/src/test/resources/org/javacs/example/SignatureHelp.java +++ b/src/test/test-project/workspace/src/org/javacs/example/SignatureHelp.java @@ -1,4 +1,4 @@ -package org.javacs; +package org.javacs.example; import java.util.concurrent.CompletableFuture; import java.util.ArrayList; diff --git a/src/test/resources/org/javacs/example/SingleLineUndefinedSymbol.java b/src/test/test-project/workspace/src/org/javacs/example/SingleLineUndefinedSymbol.java index 0f99554..0f99554 100644 --- a/src/test/resources/org/javacs/example/SingleLineUndefinedSymbol.java +++ b/src/test/test-project/workspace/src/org/javacs/example/SingleLineUndefinedSymbol.java diff --git a/src/test/resources/org/javacs/example/SymbolUnderCursor.java b/src/test/test-project/workspace/src/org/javacs/example/SymbolUnderCursor.java index 8ec75ec..8ec75ec 100644 --- a/src/test/resources/org/javacs/example/SymbolUnderCursor.java +++ b/src/test/test-project/workspace/src/org/javacs/example/SymbolUnderCursor.java diff --git a/src/test/resources/org/javacs/example/Target.java b/src/test/test-project/workspace/src/org/javacs/example/Target.java index 3aa1dbf..3aa1dbf 100644 --- a/src/test/resources/org/javacs/example/Target.java +++ b/src/test/test-project/workspace/src/org/javacs/example/Target.java diff --git a/src/test/resources/org/javacs/example/UndefinedSymbol.java b/src/test/test-project/workspace/src/org/javacs/example/UndefinedSymbol.java index f1e18f2..f1e18f2 100644 --- a/src/test/resources/org/javacs/example/UndefinedSymbol.java +++ b/src/test/test-project/workspace/src/org/javacs/example/UndefinedSymbol.java diff --git a/src/test/resources/org/javacs/other/OtherPackagePrivate.java b/src/test/test-project/workspace/src/org/javacs/other/OtherPackagePrivate.java index 12fda5c..12fda5c 100644 --- a/src/test/resources/org/javacs/other/OtherPackagePrivate.java +++ b/src/test/test-project/workspace/src/org/javacs/other/OtherPackagePrivate.java diff --git a/src/test/resources/org/javacs/other/OtherPackagePublic.java b/src/test/test-project/workspace/src/org/javacs/other/OtherPackagePublic.java index c159ced..c159ced 100644 --- a/src/test/resources/org/javacs/other/OtherPackagePublic.java +++ b/src/test/test-project/workspace/src/org/javacs/other/OtherPackagePublic.java |