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

Fix failing test case

Browse Source
This commit is contained in:
Kris De Volder
2016-10-17 12:04:18 -07:00
parent 7954fa2bb5
commit b3d85501a2
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/Editor.java
View File

@@ -103,7 +103,7 @@ public class Editor {
bad = "Wrong number of problems (expecting "+expectedProblems.length+" but found "+actualProblems.size()+")";
} else {
for (int i = 0; i < expectedProblems.length; i++) {
if (!matchProblem(editor, actualProblems.get(i), expectedProblems[i])) {
if (!matchProblem(actualProblems.get(i), expectedProblems[i])) {
bad = "First mismatch at index "+i+": "+expectedProblems[i]+"\n";
break;
}
@@ -166,7 +166,7 @@ public class Editor {
}
private boolean matchProblem(Editor editor, Diagnostic problem, String expect) {
private boolean matchProblem(Diagnostic problem, String expect) {
String[] parts = expect.split("\\|");
assertEquals(2, parts.length);
String badSnippet = parts[0];
@@ -174,8 +174,8 @@ public class Editor {
boolean spaceSensitive = badSnippet.trim().length()<badSnippet.length();
boolean emptyRange = problem.getRange().getStart().equals(problem.getRange().getEnd());
String actualBadSnippet = emptyRange
? editor.getCharAt(problem.getRange().getStart())
: editor.getText(problem.getRange());
? getCharAt(problem.getRange().getStart())
: getText(problem.getRange());
if (!spaceSensitive) {
actualBadSnippet = actualBadSnippet.trim();
}
@@ -184,8 +184,11 @@ public class Editor {
}
private String getCharAt(Position start) {
String text = document.getText();
int offset = document.toOffset(start);
return document.getText().substring(offset, offset+1);
return offset<text.length()
? text.substring(offset, offset+1)
: "";
}
@SuppressWarnings("unchecked")

7
vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/testharness/TextDocumentInfo.java
View File

@@ -48,9 +48,10 @@ public class TextDocumentInfo {
}
public String getText(Range rng) {
int start = toOffset(rng.getStart());
int end = toOffset(rng.getEnd());
return getText().substring(start, end);
String txt = getText();
int start = Math.max(0, toOffset(rng.getStart()));
int end = Math.min(txt.length(), toOffset(rng.getEnd()));
return txt.substring(start, end);
}
public int toOffset(Position p) {