Windows tests fix (linesep)

Signed-off-by: Mikhail Muhin <delred@yandex.ru>
This commit is contained in:
Mikhail Muhin 2017-05-17 15:50:06 +03:00
parent add40fa675
commit 66a57d59e5
21 changed files with 145 additions and 56 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
out
/.m2/
bin/
build/

View file

@ -58,7 +58,7 @@ interface TestLangLSPExtension extends ILanguageServerExtension {
override getTextOfLine(TextOfLineParam param) {
return access.doRead(param.uri) [ ctx |
val start = ctx.document.getOffSet(new Position(param.line, 0 ))
val end = ctx.document.getOffSet(new Position(param.line + 1, 0 )) -1
val end = ctx.document.getOffSet(new Position(param.line + 1, 0 )) -System.lineSeparator.length
return new TextOfLineResult => [
text = ctx.document.contents.substring(start, end)
]

View file

@ -80,7 +80,8 @@ public interface TestLangLSPExtension extends ILanguageServerExtension {
final int start = ctx.getDocument().getOffSet(_position);
Position _position_1 = new Position((param.line + 1), 0);
int _offSet = ctx.getDocument().getOffSet(_position_1);
final int end = (_offSet - 1);
int _length = System.lineSeparator().length();
final int end = (_offSet - _length);
TestLangLSPExtension.TextOfLineResult _textOfLineResult = new TestLangLSPExtension.TextOfLineResult();
final Procedure1<TestLangLSPExtension.TextOfLineResult> _function_1 = (TestLangLSPExtension.TextOfLineResult it) -> {
it.text = ctx.getDocument().getContents().substring(start, end);

View file

@ -457,7 +457,9 @@ abstract class AbstractLanguageServerTest implements Endpoint {
}
def void assertEquals(String expected, String actual) {
Assert.assertEquals(expected.replace('\t', ' '), actual.replace('\t', ' '))
val expectedM = expected.replace(System.lineSeparator, '\n')
val actualM = actual.replace(System.lineSeparator, '\n')
Assert.assertEquals(expectedM.replace('\t', ' '), actualM.replace('\t', ' '))
}
protected def testFormatting((FormattingConfiguration)=>void configurator) {

View file

@ -845,7 +845,9 @@ public abstract class AbstractLanguageServerTest implements Endpoint {
}
public void assertEquals(final String expected, final String actual) {
Assert.assertEquals(expected.replace("\t", " "), actual.replace("\t", " "));
final String expectedM = expected.replace(System.lineSeparator(), "\n");
final String actualM = actual.replace(System.lineSeparator(), "\n");
Assert.assertEquals(expectedM.replace("\t", " "), actualM.replace("\t", " "));
}
protected void testFormatting(final Procedure1<? super FormattingConfiguration> configurator) {

View file

@ -667,8 +667,17 @@ class RegionAccessBuilderTest {
val access2 = obj.serializeToRegions
assertToStringDoesNotCrash(access1)
assertToStringDoesNotCrash(access2)
Assert.assertEquals(exp, new TextRegionAccessToString().withRegionAccess(access1).cfg() + "\n")
Assert.assertEquals(exp, new TextRegionAccessToString().withRegionAccess(access2).cfg() + "\n")
val tra1 = new TextRegionAccessToString().withRegionAccess(access1).cfg() + "\n"
val tra2 = new TextRegionAccessToString().withRegionAccess(access2).cfg() + "\n"
val expM = exp.replaceAll(System.lineSeparator, "\n")
val tra1M = tra1.replaceAll(System.lineSeparator, "\n")
val tra2M = tra2.replaceAll(System.lineSeparator, "\n")
Assert.assertEquals(expM, tra1M)
Assert.assertEquals(expM, tra2M)
}
private def assertToStringDoesNotCrash(ITextRegionAccess access) {

View file

@ -67,7 +67,8 @@ public class AntlrLexerSplitterTest extends AbstractAntlrSplitterTest {
AntlrLexerSplitter splitter = new AntlrLexerSplitter(content);
String actual = splitter.transform();
assertNotNull(actual);
assertTrue(actual.equals(content));
assertEquals(content.replaceAll(System.lineSeparator(), "\n"),
actual.replaceAll(System.lineSeparator(), "\n"));
}
@Test public void testOuterBraceInIfCascadePattern() throws Exception {

View file

@ -31,12 +31,12 @@ class GeneratorNodeTest {
node.appendNewLine.append('dedented')
val processor = new GeneratorNodeProcessor
val result = processor.process(node)
Assert.assertEquals('''
assertEquals('''
notindented
indented1
indented2
dedented'''.toString, result.toString)
Assert.assertEquals('''
assertEquals('''
CompletableTraceRegion [myOffset=0, myLength=44] associations={
LocationData [TextRegionWithLineInformation [0:100][lineNumber=0, endLineNumber=0]][path=foo/mymodel.dsl]
} nestedRegions={
@ -55,7 +55,7 @@ class GeneratorNodeTest {
node.append('noindent').appendNewLine
val processor = new GeneratorNodeProcessor
Assert.assertEquals('''
assertEquals('''
Hallo
noindent
noindent
@ -71,8 +71,8 @@ class GeneratorNodeTest {
val processor = new GeneratorNodeProcessor
val result = processor.process(node)
Assert.assertEquals(someCodeGen_noTrace(2).toString, result.toString)
Assert.assertEquals('''
assertEquals(someCodeGen_noTrace(2).toString, result.toString)
assertEquals('''
CompletableTraceRegion [myOffset=0, myLength=80] associations={
LocationData [TextRegionWithLineInformation [0:100][lineNumber=0, endLineNumber=0]][path=foo/mymodel.dsl]
} nestedRegions={
@ -133,7 +133,7 @@ class GeneratorNodeTest {
node.append(nestedNode)
val processor = new GeneratorNodeProcessor
Assert.assertEquals('''
assertEquals('''
* a simple string
* a multi-line string concatenation embedding
* a simple string
@ -156,7 +156,7 @@ class GeneratorNodeTest {
node.doIndent(true, true)
val processor = new GeneratorNodeProcessor
Assert.assertEquals('''
assertEquals('''
// indentImmediately: false, indentEmptyLines: false
a
@ -193,4 +193,10 @@ class GeneratorNodeTest {
parent.append('d').append(new IndentNode(' ', indentImmediately, indentEmptyLines).appendNewLine)
}
private def void assertEquals(String expected, String actual) {
val expectedM = expected.toString.replaceAll(System.lineSeparator, "\n")
val actualM = actual.toString.replaceAll(System.lineSeparator, "\n")
Assert.assertEquals(expectedM, actualM)
}
}

View file

@ -129,6 +129,10 @@ class TemplateNodeTest {
val expected = new StringConcatenation()
expected.append(c)
Assert.assertEquals(expected.toString, result.toString)
val expectedM = expected.toString.replaceAll(System.lineSeparator, "\n")
val resultM = result.toString.replaceAll(System.lineSeparator, "\n")
Assert.assertEquals(expectedM, resultM)
}
}

View file

@ -63,14 +63,14 @@ class TracingSugarTest {
val generated = fsa.textFiles.get(IFileSystemAccess.DEFAULT_OUTPUT + 'foo/bar.txt')
// check the generated string is as expected
Assert.assertEquals('''
assertEquals('''
«FOR t : root.types»
«t.generateType»
«ENDFOR»
'''.toString, generated.toString)
val trace = (generated as ITraceRegionProvider).traceRegion
Assert.assertEquals('''
assertEquals('''
CompletableTraceRegion [myOffset=0, myLength=55] associations={
LocationData [TextRegionWithLineInformation [0:41][lineNumber=0, endLineNumber=3]][path=__synthetic0.lazylinkingtestlanguage]
} nestedRegions={
@ -125,4 +125,10 @@ class TracingSugarTest {
Property «name» : «type.head.name»
'''
def void assertEquals(String expected, String actual) {
val expectedM = expected.replace(System.lineSeparator, '\n')
val actualM = actual.replace(System.lineSeparator, '\n')
Assert.assertEquals(expectedM, actualM)
}
}

View file

@ -54,7 +54,8 @@ public class XtextFormatterTest extends AbstractXtextTests {
URI expectedURI = URI.createURI("classpath:/" + path + "/XtextFormatterExpected.xtext");
XtextResource expectedResource = (XtextResource) resourceSet.getResource(expectedURI, true);
String expected = expectedResource.getParseResult().getRootNode().getText();
assertEquals(expected, formatted.toString());
assertEquals(expected.replaceAll(System.lineSeparator(), "\n"),
formatted.toString().replaceAll(System.lineSeparator(), "\n"));
}
public void _testXtextXtext() {

View file

@ -40,7 +40,7 @@ class GrammarConstraintProviderFeatureTest {
val[1,1]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void optional() {
@ -52,7 +52,7 @@ class GrammarConstraintProviderFeatureTest {
val[0,1]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void multi() {
@ -64,7 +64,7 @@ class GrammarConstraintProviderFeatureTest {
val[1,*]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void optionalMulti() {
@ -76,7 +76,7 @@ class GrammarConstraintProviderFeatureTest {
val[0,*]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void twoToThree() {
@ -88,7 +88,7 @@ class GrammarConstraintProviderFeatureTest {
val[2,3]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void twoDoubleLoop() {
@ -101,7 +101,7 @@ class GrammarConstraintProviderFeatureTest {
val2[0,*]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void zeroToThree() {
@ -115,7 +115,7 @@ class GrammarConstraintProviderFeatureTest {
val3[0,1]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void unordered() {
@ -128,7 +128,7 @@ class GrammarConstraintProviderFeatureTest {
val2[0,*]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void complex1() {
@ -153,7 +153,7 @@ class GrammarConstraintProviderFeatureTest {
val6[0,*]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
@Test def void complex2() {
@ -168,7 +168,14 @@ class GrammarConstraintProviderFeatureTest {
val2[0,*]
}
'''
Assert.assertEquals(expected, actual)
assertEquals(expected, actual)
}
def assertEquals(String expected, String actual)
{
val expectedM = expected?.replaceAll(System.lineSeparator, "\n");
val actualM = expected?.replaceAll(System.lineSeparator, "\n");
Assert.assertEquals(expectedM, actualM)
}
def String toFeatureInfo(CharSequence grammarString) {

View file

@ -105,7 +105,10 @@ class SerializerValidationDiagnosticsTest {
obj.serialize
Assert.fail("Serialization should not succeed.")
} catch (Throwable t) {
Assert.assertEquals(expected.toString.trim, t.message)
val expectedM = expected.toString.trim.replaceAll(System.lineSeparator, "\n")
val messageM = t.message.replaceAll(System.lineSeparator, "\n")
Assert.assertEquals(expectedM, messageM)
}
}

View file

@ -94,7 +94,9 @@ class StringsDiffTest {
protected def assertDiff(String one, String two, CharSequence expected) {
assertEquals(expected?.toString()?.trim, DiffUtil.diff(one, two))
val expectedM = expected?.toString()?.trim?.replaceAll(System.lineSeparator, "\n")
val actualM = DiffUtil.diff(one, two)?.replaceAll(System.lineSeparator, "\n")
assertEquals(expectedM, actualM)
}
}

View file

@ -1439,11 +1439,14 @@ public class RegionAccessBuilderTest {
this.assertToStringDoesNotCrash(access1);
this.assertToStringDoesNotCrash(access2);
TextRegionAccessToString _cfg = this.cfg(new TextRegionAccessToString().withRegionAccess(access1));
String _plus = (_cfg + "\n");
Assert.assertEquals(exp, _plus);
final String tra1 = (_cfg + "\n");
TextRegionAccessToString _cfg_1 = this.cfg(new TextRegionAccessToString().withRegionAccess(access2));
String _plus_1 = (_cfg_1 + "\n");
Assert.assertEquals(exp, _plus_1);
final String tra2 = (_cfg_1 + "\n");
final String expM = exp.replaceAll(System.lineSeparator(), "\n");
final String tra1M = tra1.replaceAll(System.lineSeparator(), "\n");
final String tra2M = tra2.replaceAll(System.lineSeparator(), "\n");
Assert.assertEquals(expM, tra1M);
Assert.assertEquals(expM, tra2M);
} catch (Throwable _e) {
throw Exceptions.sneakyThrow(_e);
}

View file

@ -46,7 +46,7 @@ public class GeneratorNodeTest {
_builder.append("indented2");
_builder.newLine();
_builder.append("dedented");
Assert.assertEquals(_builder.toString(), result.toString());
this.assertEquals(_builder.toString(), result.toString());
StringConcatenation _builder_1 = new StringConcatenation();
_builder_1.append("CompletableTraceRegion [myOffset=0, myLength=44] associations={");
_builder_1.newLine();
@ -65,7 +65,7 @@ public class GeneratorNodeTest {
_builder_1.append("}");
_builder_1.newLine();
_builder_1.append("}");
Assert.assertEquals(_builder_1.toString(), result.getTraceRegion().toString());
this.assertEquals(_builder_1.toString(), result.getTraceRegion().toString());
}
@Test
@ -85,7 +85,7 @@ public class GeneratorNodeTest {
_builder.newLine();
_builder.append("noindent");
_builder.newLine();
Assert.assertEquals(_builder.toString(), processor.process(node).toString());
this.assertEquals(_builder.toString(), processor.process(node).toString());
}
@Test
@ -103,7 +103,7 @@ public class GeneratorNodeTest {
final CompositeGeneratorNode node = this.exts.appendTemplate(_trace, _client);
final GeneratorNodeProcessor processor = new GeneratorNodeProcessor();
final GeneratorNodeProcessor.Result result = processor.process(node);
Assert.assertEquals(this.someCodeGen_noTrace(2).toString(), result.toString());
this.assertEquals(this.someCodeGen_noTrace(2).toString(), result.toString());
StringConcatenation _builder = new StringConcatenation();
_builder.append("CompletableTraceRegion [myOffset=0, myLength=80] associations={");
_builder.newLine();
@ -149,7 +149,7 @@ public class GeneratorNodeTest {
_builder.append("}");
_builder.newLine();
_builder.append("}");
Assert.assertEquals(_builder.toString(), result.getTraceRegion().toString());
this.assertEquals(_builder.toString(), result.getTraceRegion().toString());
}
private StringConcatenationClient someCodeGen(final int n) {
@ -270,7 +270,7 @@ public class GeneratorNodeTest {
_builder_3.append(" ");
_builder_3.append("in a string concatenation");
_builder_3.newLine();
Assert.assertEquals(_builder_3.toString(), processor.process(node).toString());
this.assertEquals(_builder_3.toString(), processor.process(node).toString());
}
@Test
@ -334,7 +334,7 @@ public class GeneratorNodeTest {
_builder.newLine();
_builder.append("d ");
_builder.newLine();
Assert.assertEquals(_builder.toString(), processor.process(node).toString());
this.assertEquals(_builder.toString(), processor.process(node).toString());
}
private void doIndent(final CompositeGeneratorNode parent, final boolean indentImmediately, final boolean indentEmptyLines) {
@ -345,4 +345,10 @@ public class GeneratorNodeTest {
this.exts.append(parent, this.exts.appendNewLine(new IndentNode(" ", indentImmediately, indentEmptyLines)));
this.exts.append(this.exts.append(parent, "d"), this.exts.appendNewLine(new IndentNode(" ", indentImmediately, indentEmptyLines)));
}
private void assertEquals(final String expected, final String actual) {
final String expectedM = expected.toString().replaceAll(System.lineSeparator(), "\n");
final String actualM = actual.toString().replaceAll(System.lineSeparator(), "\n");
Assert.assertEquals(expectedM, actualM);
}
}

View file

@ -274,6 +274,8 @@ public class TemplateNodeTest {
final GeneratorNodeProcessor.Result result = processor.process(root);
final StringConcatenation expected = new StringConcatenation();
expected.append(c);
Assert.assertEquals(expected.toString(), result.toString());
final String expectedM = expected.toString().replaceAll(System.lineSeparator(), "\n");
final String resultM = result.toString().replaceAll(System.lineSeparator(), "\n");
Assert.assertEquals(expectedM, resultM);
}
}

View file

@ -202,7 +202,7 @@ public class TracingSugarTest {
_builder_1.newLineIfNotEmpty();
}
}
Assert.assertEquals(_builder_1.toString(), generated.toString());
this.assertEquals(_builder_1.toString(), generated.toString());
final AbstractTraceRegion trace = ((ITraceRegionProvider) generated).getTraceRegion();
StringConcatenation _builder_2 = new StringConcatenation();
_builder_2.append("CompletableTraceRegion [myOffset=0, myLength=55] associations={");
@ -285,7 +285,7 @@ public class TracingSugarTest {
_builder_2.append("}");
_builder_2.newLine();
_builder_2.append("}");
Assert.assertEquals(_builder_2.toString(), trace.toString());
this.assertEquals(_builder_2.toString(), trace.toString());
} catch (Throwable _e) {
throw Exceptions.sneakyThrow(_e);
}
@ -340,6 +340,12 @@ public class TracingSugarTest {
return _builder;
}
public void assertEquals(final String expected, final String actual) {
final String expectedM = expected.replace(System.lineSeparator(), "\n");
final String actualM = actual.replace(System.lineSeparator(), "\n");
Assert.assertEquals(expectedM, actualM);
}
public StringConcatenationClient __generateType(final Type it) {
StringConcatenationClient _client = new StringConcatenationClient() {
@Override

View file

@ -58,7 +58,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -76,7 +76,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -94,7 +94,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -112,7 +112,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -130,7 +130,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -151,7 +151,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -175,7 +175,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -196,7 +196,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -253,7 +253,7 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
@Test
@ -280,7 +280,21 @@ public class GrammarConstraintProviderFeatureTest {
_builder_1.append("}");
_builder_1.newLine();
final String expected = _builder_1.toString();
Assert.assertEquals(expected, actual);
this.assertEquals(expected, actual);
}
public void assertEquals(final String expected, final String actual) {
String _replaceAll = null;
if (expected!=null) {
_replaceAll=expected.replaceAll(System.lineSeparator(), "\n");
}
final String expectedM = _replaceAll;
String _replaceAll_1 = null;
if (expected!=null) {
_replaceAll_1=expected.replaceAll(System.lineSeparator(), "\n");
}
final String actualM = _replaceAll_1;
Assert.assertEquals(expectedM, actualM);
}
public String toFeatureInfo(final CharSequence grammarString) {

View file

@ -180,7 +180,9 @@ public class SerializerValidationDiagnosticsTest {
} catch (final Throwable _t) {
if (_t instanceof Throwable) {
final Throwable t = (Throwable)_t;
Assert.assertEquals(expected.toString().trim(), t.getMessage());
final String expectedM = expected.toString().trim().replaceAll(System.lineSeparator(), "\n");
final String messageM = t.getMessage().replaceAll(System.lineSeparator(), "\n");
Assert.assertEquals(expectedM, messageM);
} else {
throw Exceptions.sneakyThrow(_t);
}

View file

@ -139,6 +139,17 @@ public class StringsDiffTest {
if (_string!=null) {
_trim=_string.trim();
}
Assert.assertEquals(_trim, DiffUtil.diff(one, two));
String _replaceAll = null;
if (_trim!=null) {
_replaceAll=_trim.replaceAll(System.lineSeparator(), "\n");
}
final String expectedM = _replaceAll;
String _diff = DiffUtil.diff(one, two);
String _replaceAll_1 = null;
if (_diff!=null) {
_replaceAll_1=_diff.replaceAll(System.lineSeparator(), "\n");
}
final String actualM = _replaceAll_1;
Assert.assertEquals(expectedM, actualM);
}
}