Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Constant2017-03-21 09:56:25 +0000
committerOlivier Constant2017-03-21 09:56:25 +0000
commitbc236c770c3f92f91850e6487ba3735c682560cf (patch)
tree36421b3c6a5e1e800b248b3a66d94117bd81d64f /tests
parent20493da51b8567d2f7a9243172da30ebcfab3cd5 (diff)
downloadorg.eclipse.emf.diffmerge.core-bc236c770c3f92f91850e6487ba3735c682560cf.tar.gz
org.eclipse.emf.diffmerge.core-bc236c770c3f92f91850e6487ba3735c682560cf.tar.xz
org.eclipse.emf.diffmerge.core-bc236c770c3f92f91850e6487ba3735c682560cf.zip
Added test examples for containment cycles
Change-Id: I60bca4e2ee3cefce8c141c36991f170e45113220 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/a-SimpleSwap/Ex1.elements15
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/a-SimpleSwap/Ex2.elements6
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/b-PathSwap/Ex1.elements27
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/b-PathSwap/Ex2.elements12
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/c-InvertedPathSwap/Ex1.elements27
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/c-InvertedPathSwap/Ex2.elements12
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/d-Shuffle/Ex1.elements18
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/d-Shuffle/Ex2.elements18
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/e-CrossedSwaps/Ex1.elements36
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/e-CrossedSwaps/Ex2.elements36
10 files changed, 207 insertions, 0 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/a-SimpleSwap/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/a-SimpleSwap/Ex1.elements
new file mode 100644
index 00000000..47ca643b
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/a-SimpleSwap/Ex1.elements
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0"
+ id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element"
+ id="_Lzbr8P_vEeCtcfaFoBQ8TQ"
+ name="A">
+ <singleContent
+ id="_6oY0kgD5EeerqbMb09V_mQ"
+ name="B"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/a-SimpleSwap/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/a-SimpleSwap/Ex2.elements
new file mode 100644
index 00000000..febe5708
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/a-SimpleSwap/Ex2.elements
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_6oY0kgD5EeerqbMb09V_mQ" name="B">
+ <manyContent id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/b-PathSwap/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/b-PathSwap/Ex1.elements
new file mode 100644
index 00000000..b1d56002
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/b-PathSwap/Ex1.elements
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0"
+ id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element"
+ id="_Lzbr8P_vEeCtcfaFoBQ8TQ"
+ name="A">
+ <singleContent
+ id="_6oY0kgD5EeerqbMb09V_mQ"
+ name="B">
+ <manyContent
+ id="_rZaMsAPdEeemhvs0MXzgKA"
+ name="C">
+ <singleContent
+ id="_swUVQgPdEeemhvs0MXzgKA"
+ name="D">
+ <singleContent
+ id="_tqW7ogPdEeemhvs0MXzgKA"
+ name="E"/>
+ </singleContent>
+ </manyContent>
+ </singleContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/b-PathSwap/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/b-PathSwap/Ex2.elements
new file mode 100644
index 00000000..bddaed12
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/b-PathSwap/Ex2.elements
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_swUVQgPdEeemhvs0MXzgKA" name="D">
+ <singleContent id="_tqW7ogPdEeemhvs0MXzgKA" name="E">
+ <manyContent id="_rZaMsAPdEeemhvs0MXzgKA" name="C">
+ <manyContent id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
+ <singleContent id="_6oY0kgD5EeerqbMb09V_mQ" name="B"/>
+ </manyContent>
+ </manyContent>
+ </singleContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/c-InvertedPathSwap/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/c-InvertedPathSwap/Ex1.elements
new file mode 100644
index 00000000..b1d56002
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/c-InvertedPathSwap/Ex1.elements
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0"
+ id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element"
+ id="_Lzbr8P_vEeCtcfaFoBQ8TQ"
+ name="A">
+ <singleContent
+ id="_6oY0kgD5EeerqbMb09V_mQ"
+ name="B">
+ <manyContent
+ id="_rZaMsAPdEeemhvs0MXzgKA"
+ name="C">
+ <singleContent
+ id="_swUVQgPdEeemhvs0MXzgKA"
+ name="D">
+ <singleContent
+ id="_tqW7ogPdEeemhvs0MXzgKA"
+ name="E"/>
+ </singleContent>
+ </manyContent>
+ </singleContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/c-InvertedPathSwap/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/c-InvertedPathSwap/Ex2.elements
new file mode 100644
index 00000000..68ca77ee
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/c-InvertedPathSwap/Ex2.elements
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_6oY0kgD5EeerqbMb09V_mQ" name="B">
+ <manyContent id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
+ <manyContent id="_rZaMsAPdEeemhvs0MXzgKA" name="C">
+ <manyContent id="_tqW7ogPdEeemhvs0MXzgKA" name="E">
+ <manyContent id="_swUVQgPdEeemhvs0MXzgKA" name="D"/>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/d-Shuffle/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/d-Shuffle/Ex1.elements
new file mode 100644
index 00000000..1cab4f3d
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/d-Shuffle/Ex1.elements
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
+ <singleContent id="_6oY0kgD5EeerqbMb09V_mQ" name="B">
+ <manyContent id="_rZaMsAPdEeemhvs0MXzgKA" name="C">
+ <singleContent id="_swUVQgPdEeemhvs0MXzgKA" name="D">
+ <singleContent id="_tqW7ogPdEeemhvs0MXzgKA" name="E">
+ <manyContent id="_bzDbkAWNEeeLHd7ApWHAOw" name="F">
+ <manyContent id="_fI_coAWNEeeLHd7ApWHAOw" name="G">
+ <manyContent id="_icspEAWNEeeLHd7ApWHAOw" name="H"/>
+ </manyContent>
+ </manyContent>
+ </singleContent>
+ </singleContent>
+ </manyContent>
+ </singleContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/d-Shuffle/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/d-Shuffle/Ex2.elements
new file mode 100644
index 00000000..cf64f203
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/d-Shuffle/Ex2.elements
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_tqW7ogPdEeemhvs0MXzgKA" name="E">
+ <manyContent id="_6oY0kgD5EeerqbMb09V_mQ" name="B">
+ <manyContent id="_fI_coAWNEeeLHd7ApWHAOw" name="G">
+ <manyContent id="_swUVQgPdEeemhvs0MXzgKA" name="D">
+ <manyContent id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
+ <manyContent id="_bzDbkAWNEeeLHd7ApWHAOw" name="F">
+ <manyContent id="_rZaMsAPdEeemhvs0MXzgKA" name="C">
+ <manyContent id="_icspEAWNEeeLHd7ApWHAOw" name="H"/>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/e-CrossedSwaps/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/e-CrossedSwaps/Ex1.elements
new file mode 100644
index 00000000..e35dc613
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/e-CrossedSwaps/Ex1.elements
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="1">
+ <singleContent id="_6oY0kgD5EeerqbMb09V_mQ" name="2">
+ <manyContent id="_rZaMsAPdEeemhvs0MXzgKA" name="A">
+ <singleContent id="_swUVQgPdEeemhvs0MXzgKA" name="3">
+ <singleContent id="_tqW7ogPdEeemhvs0MXzgKA" name="4">
+ <manyContent id="_fI_coAWNEeeLHd7ApWHAOw" name="5">
+ <manyContent id="_bzDbkAWNEeeLHd7ApWHAOw" name="B">
+ <manyContent id="_icspEAWNEeeLHd7ApWHAOw" name="6">
+ <manyContent id="_9sDEYAWPEeeLHd7ApWHAOw" name="7">
+ <manyContent id="_-wVL4AWPEeeLHd7ApWHAOw" name="8">
+ <manyContent id="_8wFycAWPEeeLHd7ApWHAOw" name="C">
+ <manyContent id="_J1zrgAWQEeeLHd7ApWHAOw" name="9">
+ <manyContent id="_MafOwAWQEeeLHd7ApWHAOw" name="10">
+ <manyContent id="_NUqYAAWQEeeLHd7ApWHAOw" name="11">
+ <manyContent id="_EQK4sAWQEeeLHd7ApWHAOw" name="D">
+ <manyContent id="_OtxgAAWQEeeLHd7ApWHAOw" name="12">
+ <manyContent id="_RBf2IAWQEeeLHd7ApWHAOw" name="13"/>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </singleContent>
+ </singleContent>
+ </manyContent>
+ </singleContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/e-CrossedSwaps/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/e-CrossedSwaps/Ex2.elements
new file mode 100644
index 00000000..1e530a3d
--- /dev/null
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Cycles/e-CrossedSwaps/Ex2.elements
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="1">
+ <singleContent id="_6oY0kgD5EeerqbMb09V_mQ" name="2">
+ <manyContent id="_8wFycAWPEeeLHd7ApWHAOw" name="C">
+ <manyContent id="_swUVQgPdEeemhvs0MXzgKA" name="3">
+ <singleContent id="_tqW7ogPdEeemhvs0MXzgKA" name="4">
+ <manyContent id="_fI_coAWNEeeLHd7ApWHAOw" name="5">
+ <manyContent id="_EQK4sAWQEeeLHd7ApWHAOw" name="D">
+ <manyContent id="_icspEAWNEeeLHd7ApWHAOw" name="6">
+ <manyContent id="_9sDEYAWPEeeLHd7ApWHAOw" name="7">
+ <manyContent id="_-wVL4AWPEeeLHd7ApWHAOw" name="8">
+ <manyContent id="_rZaMsAPdEeemhvs0MXzgKA" name="A">
+ <manyContent id="_J1zrgAWQEeeLHd7ApWHAOw" name="9">
+ <manyContent id="_MafOwAWQEeeLHd7ApWHAOw" name="10">
+ <manyContent id="_NUqYAAWQEeeLHd7ApWHAOw" name="11">
+ <manyContent id="_bzDbkAWNEeeLHd7ApWHAOw" name="B">
+ <manyContent id="_OtxgAAWQEeeLHd7ApWHAOw" name="12">
+ <manyContent id="_RBf2IAWQEeeLHd7ApWHAOw" name="13"/>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </manyContent>
+ </singleContent>
+ </manyContent>
+ </manyContent>
+ </singleContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>

Back to the top