Skip to content
Snippets Groups Projects
Commit db9b919c authored by René Schöne's avatar René Schöne
Browse files

2.0.3

- fix tests after adding empty nodes
parent d3778ce0
Branches
No related tags found
1 merge request!133.0.1
Pipeline #14783 passed
......@@ -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));
}
......
......@@ -28,7 +28,7 @@ public class TestSimple {
assertThat(nodes).flatExtracting(NAME_EXTRACTOR).containsExactly(ROOT_NAME);
DumpNode actualRoot = TestUtils.findByName(nodes, ROOT_NAME);
assertEquals(1, actualRoot.getNumDumpToken());
assertEquals(0, actualRoot.getNumDumpChildNode());
assertEmpty(actualRoot.getDumpChildNode(0));
assertEquals(0, actualRoot.getNumDumpRelation());
}
......@@ -64,7 +64,8 @@ public class TestSimple {
assertThat(nodes).flatExtracting(NAME_EXTRACTOR).containsExactlyInAnyOrder(ROOT_NAME, A_NAME);
DumpNode actualRoot = TestUtils.findByName(nodes, ROOT_NAME);
assertEquals(1, actualRoot.getNumDumpToken());
assertEquals(1, actualRoot.getNumDumpChildNode());
assertEquals(2, actualRoot.getNumDumpChildNode());
assertEmpty(actualRoot.getDumpChildNode(1));
assertEquals(0, actualRoot.getNumDumpRelation());
assertThatMapOf(normalChildren(actualRoot)).containsExactlyInAnyOrder(tuple("A", A_NAME));
}
......@@ -86,7 +87,8 @@ public class TestSimple {
);
DumpNode actualRoot = TestUtils.findByName(nodes, ROOT_NAME);
assertEquals(1, actualRoot.getNumDumpToken());
assertEquals(2, actualRoot.getNumDumpChildNode());
assertEquals(3, actualRoot.getNumDumpChildNode());
assertEmpty(actualRoot.getDumpChildNode(1));
assertEquals(0, actualRoot.getNumDumpRelation());
DumpNode actualA = TestUtils.findByName(nodes, A_NAME);
......@@ -152,7 +154,7 @@ public class TestSimple {
assertThat(nodes).flatExtracting(NAME_EXTRACTOR).containsExactlyInAnyOrder(ROOT_NAME);
DumpNode actualRoot = TestUtils.findByName(nodes, ROOT_NAME);
assertEquals(1, actualRoot.getNumDumpToken());
assertEquals(0, actualRoot.getNumDumpChildNode());
assertEmpty(actualRoot.getDumpChildNode(0));
assertEquals(0, actualRoot.getNumDumpRelation());
assertThatMapOf(normalChildren(actualRoot)).isEmpty();
}
......@@ -165,9 +167,10 @@ public class TestSimple {
assertThat(nodes).flatExtracting(NAME_EXTRACTOR).containsExactlyInAnyOrder(ROOT_NAME, C_NAME);
DumpNode actualRoot = TestUtils.findByName(nodes, ROOT_NAME);
assertEquals(1, actualRoot.getNumDumpToken());
assertEquals(1, actualRoot.getNumDumpChildNode());
assertEquals(2, actualRoot.getNumDumpChildNode());
assertEmpty(actualRoot.getDumpChildNode(0));
assertEquals(0, actualRoot.getNumDumpRelation());
assertThatMapOf(normalChildren(actualRoot)).containsExactlyInAnyOrder(tuple("C", C_NAME));
assertThatMapOf(normalChildren(actualRoot)).containsExactlyInAnyOrder(tuple("C?", C_NAME));
}
@Test
......@@ -203,7 +206,7 @@ public class TestSimple {
List<DumpNode> nodes = TestUtils.dumpModel(root);
assertThat(nodes).flatExtracting(NAME_EXTRACTOR).containsExactlyInAnyOrder(ROOT_NAME, A_NAME, B_NAME, C_NAME);
DumpNode actualB = TestUtils.findByName(nodes, B_NAME);
assertThatMapOf(normalRelationChildren(actualB)).containsExactlyInAnyOrder(tuple("MaybeC", C_NAME));
assertThatMapOf(normalRelationChildren(actualB)).containsExactlyInAnyOrder(tuple("MaybeC?", C_NAME));
}
@Test
......@@ -245,7 +248,7 @@ public class TestSimple {
DumpNode actualA = TestUtils.findByName(nodes, A_NAME);
assertThatMapOf(normalRelationChildren(actualA)).containsExactlyInAnyOrder(tuple("BiC3", C_NAME));
DumpNode actualC = TestUtils.findByName(nodes, C_NAME);
assertThatMapOf(normalRelationChildren(actualC)).containsExactlyInAnyOrder(tuple("BiA3", A_NAME));
assertThatMapOf(normalRelationChildren(actualC)).containsExactlyInAnyOrder(tuple("BiA3?", A_NAME));
}
@Test
......
......@@ -107,7 +107,7 @@ public class TestTypeLevel3 {
dp -> dp.excludeChildren("Bee"));
assertThat(nodes).flatExtracting(NAME_EXTRACTOR).containsExactlyInAnyOrder(ROOT_NAME, A_NAME, T1_NAME, T2_NAME, T3_NAME);
for (String name : Tx_NAMES) {
assertThat(listChildren(TestUtils.findByName(nodes, name))).isEmpty();
assertEmpty(findByName(nodes, name).getDumpChildNode(0));
}
}
......@@ -121,10 +121,10 @@ public class TestTypeLevel3 {
dp -> dp.excludeChildren("Bee")
.includeChildrenFor("T2", "Bee"));
assertThat(nodes).flatExtracting(NAME_EXTRACTOR).containsExactlyInAnyOrder(ROOT_NAME, A_NAME, T1_NAME, T2_NAME, T3_NAME, T2_NAME + B_NAME);
assertThat(listChildren(TestUtils.findByName(nodes, T1_NAME))).isEmpty();
assertEmpty(findByName(nodes, T1_NAME).getDumpChildNode(0));
assertThatMapOf(listChildren(TestUtils.findByName(nodes, T2_NAME)), "Bee").containsOnly(
T2_NAME + B_NAME);
assertThat(listChildren(TestUtils.findByName(nodes, T3_NAME))).isEmpty();
assertEmpty(TestUtils.findByName(nodes, T3_NAME).getDumpChildNode(0));
}
@Test
......
......@@ -146,7 +146,7 @@ public class TestTypeLevel4 {
T1_NAME + B_NAME);
assertThatMapOf(listChildren(findByName(nodes, T2_NAME)), "Bee").containsOnly(
T2_NAME + B_NAME);
assertThat(listChildren(findByName(nodes, T3_NAME))).isEmpty();
assertEmpty(findByName(nodes, T3_NAME).getDumpChildNode(0));
}
@Test
......
......@@ -11,7 +11,7 @@ import java.util.*;
import java.util.function.Consumer;
import java.util.function.Function;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.*;
public class TestUtils {
public static final Random rand = new Random();
......@@ -150,6 +150,16 @@ public class TestUtils {
return Assertions.assertThat(map.get(key)).flatExtracting(NAME_EXTRACTOR);
}
public static void assertEmpty(DumpChildNode node) {
assertEquals(1, node.asDumpListChildNode().getNumInnerDumpNode());
assertTrue(node.asDumpListChildNode().getInnerDumpNode(0).getDumpNode().isEmpty());
}
public static void assertEmpty(DumpRelation node) {
assertEquals(1, node.asDumpListRelation().getNumInnerRelationDumpNode());
assertTrue(node.asDumpListRelation().getInnerRelationDumpNode(0).getDumpNode().isEmpty());
}
public static List<DumpNode> dumpModel(Object target) throws TransformationException {
return dumpModel(target, db -> {});
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment