diff --git a/vscode-extensions/commons/commons-java/.classpath b/vscode-extensions/commons/commons-java/.classpath index fae1a2b37..af1430be1 100644 --- a/vscode-extensions/commons/commons-java/.classpath +++ b/vscode-extensions/commons/commons-java/.classpath @@ -6,22 +6,12 @@ - - - - - - - - - - diff --git a/vscode-extensions/commons/commons-language-server/.classpath b/vscode-extensions/commons/commons-language-server/.classpath index fae1a2b37..af1430be1 100644 --- a/vscode-extensions/commons/commons-language-server/.classpath +++ b/vscode-extensions/commons/commons-language-server/.classpath @@ -6,22 +6,12 @@ - - - - - - - - - - diff --git a/vscode-extensions/commons/commons-util/.classpath b/vscode-extensions/commons/commons-util/.classpath index fae1a2b37..af1430be1 100644 --- a/vscode-extensions/commons/commons-util/.classpath +++ b/vscode-extensions/commons/commons-util/.classpath @@ -6,22 +6,12 @@ - - - - - - - - - - diff --git a/vscode-extensions/commons/commons-yaml/.classpath b/vscode-extensions/commons/commons-yaml/.classpath index fae1a2b37..af1430be1 100644 --- a/vscode-extensions/commons/commons-yaml/.classpath +++ b/vscode-extensions/commons/commons-yaml/.classpath @@ -6,22 +6,12 @@ - - - - - - - - - - diff --git a/vscode-extensions/commons/language-server-test-harness/.classpath b/vscode-extensions/commons/language-server-test-harness/.classpath index fae1a2b37..af1430be1 100644 --- a/vscode-extensions/commons/language-server-test-harness/.classpath +++ b/vscode-extensions/commons/language-server-test-harness/.classpath @@ -6,22 +6,12 @@ - - - - - - - - - - diff --git a/vscode-extensions/commons/pom.xml b/vscode-extensions/commons/pom.xml index bfb2fc15f..85f060c76 100644 --- a/vscode-extensions/commons/pom.xml +++ b/vscode-extensions/commons/pom.xml @@ -1,75 +1,76 @@ - - 4.0.0 - - org.springframework.ide.vscode - commons-parent - pom - 0.0.1-SNAPSHOT - commons-parent - - - commons-language-server - language-server-test-harness - commons-yaml - commons-util - commons-java - java-properties - application-properties-metadata - commons-maven - project-test-harness - - - - 1.17 - 4.11 - 3.5.2 - 1.7.21 - 19.0 - 2.5.0 - 2.10 - 0.3.0 - 3.0.2.RELEASE - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - - - - - org.slf4j - slf4j-api - ${slf4j-version} - - - org.slf4j - slf4j-simple - ${slf4j-version} - - - junit - junit - ${junit-version} - test - - - org.assertj - assertj-core - ${assertj-version} - test - - - + + 4.0.0 + + org.springframework.ide.vscode + commons-parent + pom + 0.0.1-SNAPSHOT + commons-parent + + + commons-language-server + language-server-test-harness + commons-yaml + commons-util + commons-java + java-properties + application-properties-metadata + commons-maven + project-test-harness + properties-editor-test-harness + + + + 1.17 + 4.11 + 3.5.2 + 1.7.21 + 19.0 + 2.5.0 + 2.10 + 0.3.0 + 3.0.2.RELEASE + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + + + + org.slf4j + slf4j-api + ${slf4j-version} + + + org.slf4j + slf4j-simple + ${slf4j-version} + + + junit + junit + ${junit-version} + test + + + org.assertj + assertj-core + ${assertj-version} + test + + + diff --git a/vscode-extensions/commons/properties-editor-test-harness/.gitignore b/vscode-extensions/commons/properties-editor-test-harness/.gitignore new file mode 100644 index 000000000..d8fe4fa70 --- /dev/null +++ b/vscode-extensions/commons/properties-editor-test-harness/.gitignore @@ -0,0 +1 @@ +/.project diff --git a/vscode-extensions/commons/properties-editor-test-harness/.settings/org.eclipse.jdt.core.prefs b/vscode-extensions/commons/properties-editor-test-harness/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..714351aec --- /dev/null +++ b/vscode-extensions/commons/properties-editor-test-harness/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/vscode-extensions/commons/properties-editor-test-harness/.settings/org.eclipse.m2e.core.prefs b/vscode-extensions/commons/properties-editor-test-harness/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/vscode-extensions/commons/properties-editor-test-harness/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/vscode-extensions/commons/properties-editor-test-harness/pom.xml b/vscode-extensions/commons/properties-editor-test-harness/pom.xml new file mode 100644 index 000000000..606b64188 --- /dev/null +++ b/vscode-extensions/commons/properties-editor-test-harness/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + + org.springframework.ide.vscode + commons-parent + 0.0.1-SNAPSHOT + ../pom.xml + + + properties-editor-test-harness + properties-editor-test-harness + Properties Editor Test Harness + + + + org.springframework.ide.vscode + language-server-test-harness + ${project.version} + + + org.springframework.ide.vscode + application-properties-metadata + ${project.version} + + + org.springframework.ide.vscode + commons-yaml + ${project.version} + + + junit + junit + ${junit-version} + + + \ No newline at end of file diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/AbstractPropsEditorTest.java b/vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/AbstractPropsEditorTest.java similarity index 92% rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/AbstractPropsEditorTest.java rename to vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/AbstractPropsEditorTest.java index 7e9882864..0dec319f4 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/AbstractPropsEditorTest.java +++ b/vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/AbstractPropsEditorTest.java @@ -1,4 +1,5 @@ -package org.springframework.ide.vscode.application.yaml; +package org.springframework.ide.vscode.properties.editor.test.harness; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -13,24 +14,23 @@ import org.junit.Before; import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; -import org.springframework.ide.vscode.application.yaml.ApplicationYamlLanguageServer; -import org.springframework.ide.vscode.application.yaml.PropertyIndexHarness.ItemConfigurer; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.util.IDocument; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.languageserver.testharness.Editor; import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness; +import org.springframework.ide.vscode.properties.editor.test.harness.PropertyIndexHarness.ItemConfigurer; import io.typefox.lsapi.CompletionItem; -public class AbstractPropsEditorTest { +public abstract class AbstractPropsEditorTest { - private PropertyIndexHarness md; + protected PropertyIndexHarness md; private LanguageServerHarness harness; private IJavaProject testProject; private TypeUtil typeUtil; - private TypeUtilProvider typeUtilProvider = (IDocument doc) -> { + protected TypeUtilProvider typeUtilProvider = (IDocument doc) -> { if (typeUtil==null) { typeUtil = new TypeUtil(testProject); } @@ -48,9 +48,7 @@ public class AbstractPropsEditorTest { harness.intialize(null); } - private SimpleLanguageServer newLanguageServer() { - return new ApplicationYamlLanguageServer(md.getIndexProvider(), typeUtilProvider); - } + protected abstract SimpleLanguageServer newLanguageServer(); public ItemConfigurer data(String id, String type, Object deflt, String description, String... sources) { return md.data(id, type, deflt, description, sources); diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/PropertyIndexHarness.java b/vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/PropertyIndexHarness.java similarity index 99% rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/PropertyIndexHarness.java rename to vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/PropertyIndexHarness.java index 62a6dbb90..279df8099 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/PropertyIndexHarness.java +++ b/vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/PropertyIndexHarness.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.yaml; +package org.springframework.ide.vscode.properties.editor.test.harness; import java.nio.file.Path; import java.util.LinkedHashMap; diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/StyledStringMatcher.java b/vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/StyledStringMatcher.java similarity index 97% rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/StyledStringMatcher.java rename to vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/StyledStringMatcher.java index 057374484..5a3de9ff0 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/StyledStringMatcher.java +++ b/vscode-extensions/commons/properties-editor-test-harness/src/main/java/org/springframework/ide/vscode/properties/editor/test/harness/StyledStringMatcher.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.yaml; +package org.springframework.ide.vscode.properties.editor.test.harness; //import org.eclipse.jface.viewers.StyledString; //import org.eclipse.swt.custom.StyleRange; diff --git a/vscode-extensions/vscode-application-yaml/pom.xml b/vscode-extensions/vscode-application-yaml/pom.xml index fbff35022..914637c73 100644 --- a/vscode-extensions/vscode-application-yaml/pom.xml +++ b/vscode-extensions/vscode-application-yaml/pom.xml @@ -82,6 +82,12 @@ ${project.version} test + + org.springframework.ide.vscode + properties-editor-test-harness + ${project.version} + test + diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java index 447a9ca35..87f508feb 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java +++ b/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java @@ -21,8 +21,11 @@ import org.junit.Test; import org.springframework.ide.vscode.application.properties.metadata.CachingValueProvider; import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.languageserver.testharness.Editor; +import org.springframework.ide.vscode.properties.editor.test.harness.AbstractPropsEditorTest; +import org.springframework.ide.vscode.properties.editor.test.harness.StyledStringMatcher; import io.typefox.lsapi.CompletionItem; import io.typefox.lsapi.Diagnostic; @@ -3513,5 +3516,10 @@ public class ApplicationYamlEditorTest extends AbstractPropsEditorTest { } return string; } + + @Override + protected SimpleLanguageServer newLanguageServer() { + return new ApplicationYamlLanguageServer(md.getIndexProvider(), typeUtilProvider); + } }