further tests in AbstractXbaseEvaluationTest

eclipse-xtext · Apr 29, 2024 · d7c67a3 · d7c67a3
1 parent 45500f7
commit d7c67a3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/...end.core.tests/src/org/eclipse/xtend/core/tests/compiler/AbstractXbaseEvaluationTest.java b/...end.core.tests/src/org/eclipse/xtend/core/tests/compiler/AbstractXbaseEvaluationTest.java
@@ -911,7 +911,15 @@ public abstract class AbstractXbaseEvaluationTest extends Assert {
 	@Test public void testStringLiteral_03() throws Exception {
 		assertEvaluatesTo("lite\nr\\al", "'lite\r\nr\\\\al'");
 	}
-
+
+	@Test public void testStringLiteral_03_Issue_2293_01() throws Exception {
+		assertEvaluatesTo("lite\nr\\al", "'lite\\nr\\\\al'");
+	}
+
+	@Test public void testStringLiteral_03_Issue_2293_02() throws Exception {
+		assertEvaluatesTo("lite\r\nr\\al", "'lite\\r\\nr\\\\al'");
+	}
+
 	@Test public void testStringLiteral_04() throws Exception {
 		assertEvaluatesTo('\n', "{ val char x = '\n' x}");
 	}

diff --git a/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.xtext.xbase.testing;version="2.35.0",
  org.eclipse.xtext.xbase.testing.evaluation;version="2.35.0";x-friends:="org.eclipse.xtext.xbase.tests,org.eclipse.xtext.purexbase.tests",
  org.eclipse.xtext.xbase.testing.typesystem;version="2.35.0";x-internal:=true,
- testdata;version="2.35.0";x-friends:="org.eclipse.xtext.xbase.tests",
+ testdata;version="2.35.0";x-friends:="org.eclipse.xtext.xbase.tests,org.eclipse.xtend.core.tests",
  testdata.a;version="2.35.0";x-internal:=true,
  testdata.b;version="2.35.0";x-internal:=true
 Import-Package: org.apache.log4j;version="1.2.24"

diff --git a/...e.testing/src/org/eclipse/xtext/xbase/testing/evaluation/AbstractXbaseEvaluationTest.java b/...e.testing/src/org/eclipse/xtext/xbase/testing/evaluation/AbstractXbaseEvaluationTest.java
@@ -914,7 +914,15 @@ public abstract class AbstractXbaseEvaluationTest extends Assert {
 	@Test public void testStringLiteral_03() throws Exception {
 		assertEvaluatesTo("lite\nr\\al", "'lite\r\nr\\\\al'");
 	}
-
+
+	@Test public void testStringLiteral_03_Issue_2293_01() throws Exception {
+		assertEvaluatesTo("lite\nr\\al", "'lite\\nr\\\\al'");
+	}
+
+	@Test public void testStringLiteral_03_Issue_2293_02() throws Exception {
+		assertEvaluatesTo("lite\r\nr\\al", "'lite\\r\\nr\\\\al'");
+	}
+
 	@Test public void testStringLiteral_04() throws Exception {
 		assertEvaluatesTo('\n', "{ val char x = '\n' x}");
 	}