kext.text: Fixed KExpression tests

kieler · Jul 25, 2024 · 6bdc662 · 6bdc662
1 parent 646be7e
commit 6bdc662
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/....kieler.kexpressions.text.test/src/de/cau/cs/kieler/kexpressions/text/test/KExtTest.xtend b/....kieler.kexpressions.text.test/src/de/cau/cs/kieler/kexpressions/text/test/KExtTest.xtend
@@ -113,6 +113,9 @@ public class KExtTest {
             }
         }
 
+        // Serializer does not escape keywords
+        expected = expected.replaceAll("\\^global", "global")
+
         if (!serialized.equals(expected)) {
             val StringAnnotation checkAnnotation = getAnnotation(entity, KExtTestRunner.KEXT_CHECK_ANNOTATION);
         	failedAssertion("Serialization of " + checkAnnotation.getValues().get(0) + 
@@ -145,7 +148,7 @@ public class KExtTest {
         val entity = eObject as TestEntity;
         var expected = expectedLine
         if (entity.getExpression() !== null && expected.startsWith(KEXT_EXPRESSION_KEYWORD)) {
-                expected = expected.substring(11); 
+            expected = expected.substring(11);
         }
 
         val serialized = SE.serializeHR(entity).toString();
@@ -155,6 +158,9 @@ public class KExtTest {
             expected = humanReadableAnnotation.getValues().get(0);
         }
 
+        // Serializer does not escape keywords
+        expected = expected.replaceAll("\\^global", "global")
+
         if (!serialized.equals(expected)) {
                 val checkAnnotation = getAnnotation(entity, KExtTestRunner.KEXT_CHECK_ANNOTATION);
                 failedAssertion("Human readable serialization of " + checkAnnotation.getValues().get(0) + 

diff --git a/test/de.cau.cs.kieler.kexpressions.text.test/tests/080_scoping_simple.kext b/test/de.cau.cs.kieler.kexpressions.text.test/tests/080_scoping_simple.kext
@@ -35,6 +35,8 @@ B = false
 A = B
 
 @check "scoping.global.reference.operator#001"
+@strict "global = (A & B)"
+@readable "global = A & B"
 @aliasCheck A, globalA
 @aliasCheck B, globalB
 ^global = A & B
@@ -45,6 +47,8 @@ A = B
 ^global = pre(A)
 
 @check "scoping.global.reference.operator#003"
+@strict "global = (A & B & C)"
+@readable "global = A & B & C"
 @aliasCheck A, globalA
 @aliasCheck B, globalB
 @aliasCheck C, globalC