Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failing tests

Browse Source
This commit is contained in:
Kris De Volder
2018-08-01 15:48:35 -07:00
parent c48b465cb8
commit b0bff264ce
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java
View File

@@ -45,7 +45,7 @@ public abstract class AbstractPropsEditorTest {
public static final String BOOLEAN = Boolean.class.getName();
public static final String STRING = String.class.getName();
private ProjectsHarness projects = ProjectsHarness.INSTANCE;
protected ProjectsHarness projects = ProjectsHarness.INSTANCE;
protected PropertyIndexHarness md;
protected final CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder(Arrays.asList(new JavaProjectFinder() {

7
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
View File

@@ -42,6 +42,7 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguage
import org.springframework.ide.vscode.commons.maven.java.MavenJavaProject;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.languageserver.testharness.Editor;
import org.springframework.ide.vscode.project.harness.ProjectsHarness.ProjectCustomizer;
import com.google.common.collect.ImmutableList;
import com.google.common.io.Files;
@@ -53,6 +54,10 @@ import com.google.common.io.Files;
*/
public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest {
private static final ProjectCustomizer WITH_EMPTY_APPLICATION_YML = projectContents -> {
projectContents.createFile("src/main/resources/application.yml", "");
};
@Test
public void testReconcileCatchesParseError() throws Exception {
Editor editor = newEditor("key\n");
@@ -1243,7 +1248,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest {
@Test public void testClasspathResourceCompletion() throws Exception {
CachingValueProvider.TIMEOUT = Duration.ofSeconds(20);
useProject(createPredefinedMavenProject("empty-boot-1.3.0-app"));
useProject(projects.mavenProject("empty-boot-1.3.0-app", WITH_EMPTY_APPLICATION_YML));
data("my.nice.resource", "org.springframework.core.io.Resource", null, "A very nice resource.");
data("my.nice.list", "java.util.List<org.springframework.core.io.Resource>", null, "A nice list of resources.");