3.0.1

dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestExcluded.java

@@ -81,10 +81,10 @@ public class TestExcluded {
         tuple("BiC1", C_NAME), tuple("BiC2", C_NAME), tuple("BiC3", C_NAME));
     // B
     assertThatMapOf(normalRelationChildren(findByName(nodes, B_NAME))).containsExactlyInAnyOrder(
-        tuple("OneA", A_NAME), tuple("MaybeC", C_NAME));
+        tuple("OneA", A_NAME), tuple("MaybeC?", C_NAME));
     // C
     assertThatMapOf(normalRelationChildren(findByName(nodes, C_NAME))).containsExactlyInAnyOrder(
-        tuple("BiA1", A_NAME), tuple("BiA3", A_NAME));
+        tuple("BiA1", A_NAME), tuple("BiA3?", A_NAME));
     assertThatMapOf(listRelationChildren(findByName(nodes, C_NAME)), "BiA2").containsExactlyInAnyOrder(A_NAME);
     assertThatMapOf(referenceTokens(findByName(nodes, C_NAME))).containsExactlyInAnyOrder(
         tuple(TOKEN_LABEL_RAW_REFERENCE, A_NAME));
@@ -116,7 +116,7 @@ public class TestExcluded {
     assertThat(nodes).flatExtracting(NAME_EXTRACTOR).containsExactlyInAnyOrder(ROOT_NAME, B_NAME, C_NAME);
     // B
     assertThatMapOf(normalRelationChildren(findByName(nodes, B_NAME))).containsExactlyInAnyOrder(
-        tuple("MaybeC", (C_NAME)));
+        tuple("MaybeC?", (C_NAME)));
     // C
     assertThat(normalRelationChildren(findByName(nodes, C_NAME))).isEmpty();
     assertThat(listRelationChildren(findByName(nodes, C_NAME))).isEmpty();
@@ -339,10 +339,10 @@ public class TestExcluded {
         tuple("BiC2", C_NAME), tuple("BiC3", C_NAME));
     // B
     assertThatMapOf(normalRelationChildren(findByName(nodes, B_NAME))).containsExactlyInAnyOrder(
-        tuple("OneA", A_NAME), tuple("MaybeC", C_NAME));
+        tuple("OneA", A_NAME), tuple("MaybeC?", C_NAME));
     // C
     assertThatMapOf(normalRelationChildren(findByName(nodes, C_NAME))).containsExactlyInAnyOrder(
-        tuple("BiA1", A_NAME), tuple("BiA3", A_NAME));
+        tuple("BiA1", A_NAME), tuple("BiA3?", A_NAME));
     assertThatMapOf(listRelationChildren(findByName(nodes, C_NAME)), "BiA2").containsExactlyInAnyOrder(A_NAME);
     assertThatMapOf(referenceTokens(findByName(nodes, C_NAME))).containsExactlyInAnyOrder(
         tuple(TOKEN_LABEL_RAW_REFERENCE, A_NAME));
@@ -357,10 +357,10 @@ public class TestExcluded {
     assertThat(normalRelationChildren(findByName(nodes, A_NAME))).isEmpty();
     // B
     assertThatMapOf(normalRelationChildren(findByName(nodes, B_NAME))).containsExactlyInAnyOrder(
-        tuple("OneA", A_NAME), tuple("MaybeC", C_NAME));
+        tuple("OneA", A_NAME), tuple("MaybeC?", C_NAME));
     // C
     assertThat(normalRelationChildren(findByName(nodes, C_NAME))).isEmpty();
-    assertThat(listRelationChildren(findByName(nodes, C_NAME))).isEmpty();
+    assertEmpty(TestUtils.findByName(nodes, C_NAME).getDumpRelation(0));
     assertThatMapOf(referenceTokens(findByName(nodes, C_NAME))).containsExactlyInAnyOrder(
         tuple(TOKEN_LABEL_RAW_REFERENCE, A_NAME));
   }
@@ -375,10 +375,10 @@ public class TestExcluded {
         tuple("BiC1", C_NAME), tuple("BiC2", C_NAME), tuple("BiC3", C_NAME));
     // B
     assertThatMapOf(normalRelationChildren(findByName(nodes, B_NAME))).containsExactlyInAnyOrder(
-        tuple("MaybeC", C_NAME));
+        tuple("MaybeC?", C_NAME));
     // C
     assertThat(normalRelationChildren(findByName(nodes, C_NAME))).isEmpty();
-    assertThat(listRelationChildren(findByName(nodes, C_NAME))).isEmpty();
+    assertEmpty(TestUtils.findByName(nodes, C_NAME).getDumpRelation(0));
     assertThatMapOf(referenceTokens(findByName(nodes, C_NAME))).containsExactlyInAnyOrder(
         tuple(TOKEN_LABEL_RAW_REFERENCE, A_NAME));
   }