@@ -51,7 +51,7 @@ class ModelImporter(private val root: INode) {
51
51
52
52
expectedNodes.forEachIndexed { index, expected ->
53
53
val nodeAtIndex = node.getChildren(role).toList().getOrNull(index)
54
- val expectedId = expected.originalId() ? : TODO ()
54
+ val expectedId = checkNotNull( expected.originalId()) { " Specified node ' $expected ' has no id " }
55
55
val expectedConcept = expected.concept?.let { s -> ConceptReference (s) }
56
56
val childNode = if (nodeAtIndex?.originalId() != expectedId) {
57
57
val existingNode = originalIdToExisting[expectedId]
@@ -68,7 +68,7 @@ class ModelImporter(private val root: INode) {
68
68
} else {
69
69
nodeAtIndex
70
70
}
71
- if (childNode.getConceptReference() != expectedConcept) TODO ()
71
+ check (childNode.getConceptReference() == expectedConcept) { " Unexpected concept change " }
72
72
73
73
syncNode(childNode, expected)
74
74
}
@@ -108,13 +108,13 @@ class ModelImporter(private val root: INode) {
108
108
val expectedTarget = originalIdToExisting[expectedTargetId]
109
109
if (expectedTarget == null ) {
110
110
postponedReferences + = {
111
- val expectedTarget = originalIdToExisting[expectedTargetId]
112
- if (expectedTarget == null ) {
111
+ val expectedRefTarget = originalIdToExisting[expectedTargetId]
112
+ if (expectedRefTarget == null ) {
113
113
// The target node is not part of the model. Assuming it exists in some other model we can
114
114
// store the reference and try to resolve it dynamically on access.
115
115
node.setReferenceTarget(it.key, SerializedNodeReference (expectedTargetId))
116
116
} else {
117
- node.setReferenceTarget(it.key, expectedTarget )
117
+ node.setReferenceTarget(it.key, expectedRefTarget )
118
118
}
119
119
}
120
120
} else {
0 commit comments