[core] fixed failing tests

This commit is contained in:
Sven Efftinge 2016-06-13 11:36:27 +02:00
parent 70c0eb7f90
commit ec6a69ef30
2 changed files with 6 additions and 4 deletions

View file

@ -18,7 +18,6 @@ dependencies {
sourceSets.main {
java.srcDir 'packrat'
resources.exclude 'packrat'
}
jar {

View file

@ -42,10 +42,9 @@ import org.eclipse.xtext.resource.IResourceServiceProvider
import org.eclipse.xtext.util.CancelIndicator
import org.eclipse.xtext.util.Files
import org.eclipse.xtext.util.Modules2
import org.junit.Assert
import org.junit.Before
import static org.junit.Assert.*
import static extension io.typefox.lsapi.util.LsapiFactories.*
/**
@ -207,7 +206,7 @@ abstract class AbstractLanguageServerTest implements Consumer<PublishDiagnostics
val actualCompletionItems = completionItems.get.items.toExpectation
assertEquals(expectedCompletionItems, actualCompletionItems)
}
protected def void testDefinition((DefinitionTestConfiguration)=>void configurator) {
val extension configuration = new DefinitionTestConfiguration
configuration.filePath = 'MyModel.' + fileExtension
@ -282,6 +281,10 @@ abstract class AbstractLanguageServerTest implements Consumer<PublishDiagnostics
val actualDefinitions = definitions.get.toExpectation
assertEquals(expectedReferences, actualDefinitions)
}
def void assertEquals(String expected, String actual) {
Assert.assertEquals(expected.replace('\t',' '), actual)
}
}