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

Fix failing test

Browse Source
This commit is contained in:
Kris De Volder
2017-07-24 12:25:26 -07:00
parent d75d1438d2
commit 427dbe8b62
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/models/BoshCommandStemcellsProvider.java
View File

@@ -34,6 +34,9 @@ public class BoshCommandStemcellsProvider extends BoshCommandBasedModelProvider<
private static final YamlTraversal STEMCELL_OSS = STEMCELLS
.thenValAt("os");
private static final YamlTraversal STEMCELL_VERSIONS = STEMCELLS
.thenValAt("version");
@Override
public StemcellsModel getModel(DynamicSchemaContext dc) throws Exception {
JSONCursor cursor = new JSONCursor(getJsonTree());
@@ -80,6 +83,11 @@ public class BoshCommandStemcellsProvider extends BoshCommandBasedModelProvider<
public Collection<String> getStemcellOss() {
return getNames(STEMCELL_OSS);
}
@Override
public Collection<String> getVersions() {
return getNames(STEMCELL_VERSIONS);
}
};
}

1
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/models/StemcellsModel.java
View File

@@ -19,4 +19,5 @@ public interface StemcellsModel {
Collection<String> getStemcellNames();
Collection<String> getStemcellOss();
Collection<StemcellData> getStemcells();
Collection<String> getVersions();
}

4
headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
View File

@@ -936,13 +936,13 @@ public class BoshEditorTest {
editor = harness.newEditor(
"stemcells:\n" +
"- alias: good\n" +
" os: ubuntu-trusty\n" +
" os: ubuntu\n" +
"- alias: not-so-good\n" +
" os: bogus<*>"
);
editor.ignoreProblem(YamlSchemaProblems.MISSING_PROPERTY);
editor.assertProblems(
"bogus|unknown 'StemcellOs'. Valid values are: [centos-7, ubuntu-trusty]"
"bogus|unknown 'StemcellOs'. Valid values are: [ubuntu, centos]"
);
}

6
headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/models/BoshCommandStemcellsProviderTest.java
View File

@@ -57,4 +57,10 @@ public class BoshCommandStemcellsProviderTest {
provider.getModel(mock(DynamicSchemaContext.class)).getStemcellOss());
}
@Test public void getVersions() throws Exception {
assertEquals(ImmutableSet.of("3421.11"),
provider.getModel(mock(DynamicSchemaContext.class)).getVersions());
}
}