integration.test: fix tree-xres resources with consistent xmi:id-based cross-resource refs
diff --git a/core/tests/org.hawk.integration.tests/resources/models/tree-xres/child.model b/core/tests/org.hawk.integration.tests/resources/models/tree-xres/child.model
index 2f67566..dbcc161 100644
--- a/core/tests/org.hawk.integration.tests/resources/models/tree-xres/child.model
+++ b/core/tests/org.hawk.integration.tests/resources/models/tree-xres/child.model
@@ -1,2 +1,4 @@
<?xml version="1.0" encoding="ASCII"?>
-<Tree:Tree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:Tree="Tree" xmi:id="_9rSZ0GjAEee8-on3BEZ1LQ" label="xyz"/>
+<Tree:Tree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:Tree="Tree" xmi:id="_9rSZ0GjAEee8-on3BEZ1LQ" label="xyz">
+ <parent href="root.model#_81n9IGjAEee8-on3BEZ1LQ"/>
+</Tree:Tree>
diff --git a/core/tests/org.hawk.integration.tests/resources/models/tree-xres/root.model b/core/tests/org.hawk.integration.tests/resources/models/tree-xres/root.model
index 426aa16..513b1d0 100644
--- a/core/tests/org.hawk.integration.tests/resources/models/tree-xres/root.model
+++ b/core/tests/org.hawk.integration.tests/resources/models/tree-xres/root.model
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
<Tree:Tree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:Tree="Tree" xmi:id="_81n9IGjAEee8-on3BEZ1LQ" label="root">
- <children href="child.model#/" />
- <children label="abc"/>
+ <children href="child.model#_9rSZ0GjAEee8-on3BEZ1LQ"/>
+ <children xmi:id="_OokPIWU-Eeq_BJPojDjafQ" label="abc"/>
</Tree:Tree>
diff --git a/core/tests/org.hawk.integration.tests/src/org/hawk/integration/tests/emf/CountInstancesTest.java b/core/tests/org.hawk.integration.tests/src/org/hawk/integration/tests/emf/CountInstancesTest.java
index e16d851..4e3ca05 100644
--- a/core/tests/org.hawk.integration.tests/src/org/hawk/integration/tests/emf/CountInstancesTest.java
+++ b/core/tests/org.hawk.integration.tests/src/org/hawk/integration/tests/emf/CountInstancesTest.java
@@ -77,7 +77,7 @@
scheduleAndWait(() -> {
assertNoErrors(syncValidation.getListener());
-
+
// Test for bug #56: select(t:Type|xyz) does not work
assertEquals(3, eol("return Model.allContents.select(t:Tree|true).size;"));
@@ -86,7 +86,7 @@
for (String e : Arrays.asList("xyz", "root", "abc")) {
assertTrue(labels.contains(e));
}
-
+
assertEquals(3, eol("return Tree.all.size;"));
assertEquals(2, eol("return Tree.all.selectOne(t|t.label='root').children.size;"));
assertEquals("root", eol("return Tree.all.selectOne(t|t.label='xyz').eContainer.label;"));
