sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[eclipse/xtext#1455] Fixing CompletionTest.

Browse source 
The tests work with concrete offsets and hence can only work with '\n'
because '\r\n' will always lead to broken expectations. Test case in
CompletionTest is only broken because TestLanguageProposalCreator, a
class used only for testing, adds 1 to the offset but "2" would be
needed for input with '\r\n'. In other places it is already ensured that
'\n' is used (e.g. AbstractLanguageServerTest#assertEquals). Hence just
align the input text to the rest of the implementation and using '\n'.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
This commit is contained in:
Arne Deutsch 2019-12-16 13:09:29 +01:00
parent 44aafdae13
commit b18bb8ed7c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend
View file

@ -12,12 +12,12 @@ import com.google.inject.Inject
import com.google.inject.Module
import java.io.File
import java.io.FileWriter
import java.net.URI
import java.nio.file.Path
import java.nio.file.Paths
import java.util.List
import java.util.Map
import java.util.concurrent.CompletableFuture
import org.eclipse.emf.common.util.URI
import org.eclipse.lsp4j.CodeAction
import org.eclipse.lsp4j.CodeActionContext
import org.eclipse.lsp4j.CodeActionParams
@ -65,6 +65,7 @@ import org.eclipse.lsp4j.WorkspaceSymbolParams
import org.eclipse.lsp4j.jsonrpc.Endpoint
import org.eclipse.lsp4j.jsonrpc.messages.Either
import org.eclipse.lsp4j.jsonrpc.services.ServiceEndpoints
import org.eclipse.lsp4j.services.LanguageClient
import org.eclipse.lsp4j.util.SemanticHighlightingTokens
import org.eclipse.xtend.lib.annotations.Accessors
import org.eclipse.xtend.lib.annotations.Data
@ -84,9 +85,9 @@ import org.junit.Assert
import org.junit.Before
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.eclipse.lsp4j.services.LanguageClient
import static extension org.eclipse.lsp4j.util.Ranges.containsRange
import static extension org.eclipse.xtext.util.Strings.*
/**
* @author Sven Efftinge - Initial contribution and API
@ -174,7 +175,7 @@ abstract class AbstractLanguageServerTest implements Endpoint {
}
protected def Path relativize(String uri) {
val path = Paths.get(new URI(uri))
val path = Paths.get(new java.net.URI(uri))
testRootPath.relativize(path)
}
@ -210,7 +211,7 @@ abstract class AbstractLanguageServerTest implements Endpoint {
uri = fileUri
languageId = langaugeId
version = 1
text = model
text = model.toUnixLineSeparator
]
])
}
@ -416,7 +417,7 @@ abstract class AbstractLanguageServerTest implements Endpoint {
protected dispatch def String toExpectation(WorkspaceEdit it) '''
changes :
«FOR entry : changes.entrySet»
«org.eclipse.emf.common.util.URI.createURI(entry.key).lastSegment» : «entry.value.toExpectation»
«URI.createURI(entry.key).lastSegment» : «entry.value.toExpectation»
«ENDFOR»
documentChanges :
«documentChanges.toExpectation»
@ -435,7 +436,7 @@ abstract class AbstractLanguageServerTest implements Endpoint {
'''
protected def dispatch String toExpectation(VersionedTextDocumentIdentifier v)
'''«org.eclipse.emf.common.util.URI.createURI(v.uri).lastSegment» <«v.version»>'''
'''«URI.createURI(v.uri).lastSegment» <«v.version»>'''

3
org.eclipse.xtext.testing/xtend-gen/org/eclipse/xtext/testing/AbstractLanguageServerTest.java
View file

@ -107,6 +107,7 @@ import org.eclipse.xtext.testing.WorkspaceSymbolConfiguration;
import org.eclipse.xtext.util.CancelIndicator;
import org.eclipse.xtext.util.Files;
import org.eclipse.xtext.util.Modules2;
import org.eclipse.xtext.util.Strings;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Conversions;
import org.eclipse.xtext.xbase.lib.Exceptions;
@ -368,7 +369,7 @@ public abstract class AbstractLanguageServerTest implements Endpoint {
it_1.setUri(fileUri);
it_1.setLanguageId(langaugeId);
it_1.setVersion(1);
it_1.setText(model);
it_1.setText(Strings.toUnixLineSeparator(model));
};
TextDocumentItem _doubleArrow = ObjectExtensions.<TextDocumentItem>operator_doubleArrow(_textDocumentItem, _function_1);
it.setTextDocument(_doubleArrow);