test(model-sync-lib): check for operation overlap in random testcase

Author: mhuster23

model-sync-lib/src/test/kotlin/org/modelix/model/sync/ModelImporterTest.kt

@@ -101,14 +101,7 @@ class ModelImporterTest {
 
     @Test
     fun `operations do not overlap`() {
-        val stats = importer.stats ?: fail("No import stats found.")
-        val additionsSet = stats.additions.toSet()
-        val deletionsSet = stats.deletions.toSet()
-        val movesSet = stats.moves.toSet()
-
-        assert(additionsSet.intersect(deletionsSet).isEmpty())
-        assert(deletionsSet.intersect(movesSet).isEmpty())
-        assert(movesSet.intersect(additionsSet).isEmpty())
+        assertNoOverlappingOperations(importer.stats)
     }
 
     @Test
@@ -168,7 +161,10 @@ class ModelImporterTest {
 //            println(branch1.getRootNode().toJson())
 
             assertAllNodesConformToSpec(specification, branch1.getRootNode())
-            assert(importer.stats!!.getTotal() <= numChanges)
+            assertNoOverlappingOperations(importer.stats)
+            assert(importer.stats!!.getTotal() <= numChanges) {
+                "expected operations: <= $numChanges, actual: ${importer.stats!!.getTotal()}"
+            }
         }
     }
 }

model-sync-lib/src/test/kotlin/org/modelix/model/sync/SyncTestUtil.kt

@@ -56,4 +56,15 @@ internal fun assertNodeChildOrderConformsToSpec(expected: NodeData, actual: INod
     val specifiedOrder = expected.children.groupBy {it.role}.mapValues { (_, children) -> children.map { it.originalId() }}
     val actualOrder = actual.allChildren.groupBy { it.roleInParent }.mapValues {  (_, children) -> children.map { it.originalId() }}
     assertEquals(specifiedOrder, actualOrder)
+}
+
+internal fun assertNoOverlappingOperations(stats: ImportStats?) {
+    stats ?: fail("No import stats found.")
+    val additionsSet = stats.additions.toSet()
+    val deletionsSet = stats.deletions.toSet()
+    val movesSet = stats.moves.toSet()
+
+    assert(additionsSet.intersect(deletionsSet).isEmpty())
+    assert(deletionsSet.intersect(movesSet).isEmpty())
+    assert(movesSet.intersect(additionsSet).isEmpty())
 }