From 33ca000880bf7c71b8ca5c2af9ec12cbc0b8b4b1 Mon Sep 17 00:00:00 2001 From: Mikhail Mukhin Date: Fri, 19 May 2017 12:31:36 +0300 Subject: [PATCH] test fix fix Signed-off-by: Mikhail Muhin --- .../serializer/GrammarConstraintProviderFeatureTest.xtend | 2 +- .../serializer/GrammarConstraintProviderFeatureTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.xtend index 0639c1245..0c2a66bcb 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.xtend +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.xtend @@ -174,7 +174,7 @@ class GrammarConstraintProviderFeatureTest { def assertEquals(String expected, String actual) { val expectedM = expected?.replaceAll(System.lineSeparator, "\n"); - val actualM = expected?.replaceAll(System.lineSeparator, "\n"); + val actualM = actual?.replaceAll(System.lineSeparator, "\n"); Assert.assertEquals(expectedM, actualM) } diff --git a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.java b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.java index 67d6e278c..11ec59b0d 100644 --- a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.java +++ b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/serializer/GrammarConstraintProviderFeatureTest.java @@ -290,8 +290,8 @@ public class GrammarConstraintProviderFeatureTest { } final String expectedM = _replaceAll; String _replaceAll_1 = null; - if (expected!=null) { - _replaceAll_1=expected.replaceAll(System.lineSeparator(), "\n"); + if (actual!=null) { + _replaceAll_1=actual.replaceAll(System.lineSeparator(), "\n"); } final String actualM = _replaceAll_1; Assert.assertEquals(expectedM, actualM);