Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2012-09-26 14:45:34 +0000
committerlgoubet2012-09-26 14:45:34 +0000
commit6feae2b46a2f2936a728754bec81c46ff8c7fb8e (patch)
tree0eef0a84f0fc54120a9f7faa504d4a016e831a21 /plugins/org.eclipse.emf.compare.tests/src/org
parent09d79cd1bfece484f9d1990f7c7d7f109b9402ef (diff)
downloadorg.eclipse.emf.compare-6feae2b46a2f2936a728754bec81c46ff8c7fb8e.tar.gz
org.eclipse.emf.compare-6feae2b46a2f2936a728754bec81c46ff8c7fb8e.tar.xz
org.eclipse.emf.compare-6feae2b46a2f2936a728754bec81c46ff8c7fb8e.zip
Renaming AbstractInputData#loadFromClassLoader (typo).
Drafting the fragmentation tests.
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java288
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/data/EquiInputData.java160
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java93
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/FragmentationInputData.java45
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/fragment.nodes2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/left.nodes4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/origin.nodes4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/right.nodes4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/left.nodes4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/origin.nodes5
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/right.nodes5
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/left.nodes5
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/origin.nodes7
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/right.nodes7
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/fragment.nodes2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/left.nodes4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/origin.nodes4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/right.nodes4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java55
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java14
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/IdentifierMatchInputData.java6
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java108
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/data/PostProcessInputData.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/data/ReqInputData.java200
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java3
25 files changed, 639 insertions, 398 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java
index 69ffc79ee..4abeceda7 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java
@@ -23,578 +23,578 @@ import org.eclipse.emf.ecore.resource.Resource;
@SuppressWarnings("nls")
public class ConflictInputData extends AbstractInputData {
public Resource getA1AttributeLeft() throws IOException {
- return loadFromClassloader("a1/conflict_a1_attribute_left.nodes");
+ return loadFromClassLoader("a1/conflict_a1_attribute_left.nodes");
}
public Resource getA1AttributeOrigin() throws IOException {
- return loadFromClassloader("a1/conflict_a1_attribute_origin.nodes");
+ return loadFromClassLoader("a1/conflict_a1_attribute_origin.nodes");
}
public Resource getA1AttributeRight() throws IOException {
- return loadFromClassloader("a1/conflict_a1_attribute_right.nodes");
+ return loadFromClassLoader("a1/conflict_a1_attribute_right.nodes");
}
public Resource getA1ReferenceLeft() throws IOException {
- return loadFromClassloader("a1/conflict_a1_reference_left.nodes");
+ return loadFromClassLoader("a1/conflict_a1_reference_left.nodes");
}
public Resource getA1ReferenceOrigin() throws IOException {
- return loadFromClassloader("a1/conflict_a1_reference_origin.nodes");
+ return loadFromClassLoader("a1/conflict_a1_reference_origin.nodes");
}
public Resource getA1ReferenceRight() throws IOException {
- return loadFromClassloader("a1/conflict_a1_reference_right.nodes");
+ return loadFromClassLoader("a1/conflict_a1_reference_right.nodes");
}
public Resource getA2AttributeLeft() throws IOException {
- return loadFromClassloader("a2/conflict_a2_attribute_left.nodes");
+ return loadFromClassLoader("a2/conflict_a2_attribute_left.nodes");
}
public Resource getA2AttributeOrigin() throws IOException {
- return loadFromClassloader("a2/conflict_a2_attribute_origin.nodes");
+ return loadFromClassLoader("a2/conflict_a2_attribute_origin.nodes");
}
public Resource getA2AttributeRight() throws IOException {
- return loadFromClassloader("a2/conflict_a2_attribute_right.nodes");
+ return loadFromClassLoader("a2/conflict_a2_attribute_right.nodes");
}
public Resource getA2ReferenceLeft() throws IOException {
- return loadFromClassloader("a2/conflict_a2_reference_left.nodes");
+ return loadFromClassLoader("a2/conflict_a2_reference_left.nodes");
}
public Resource getA2ReferenceOrigin() throws IOException {
- return loadFromClassloader("a2/conflict_a2_reference_origin.nodes");
+ return loadFromClassLoader("a2/conflict_a2_reference_origin.nodes");
}
public Resource getA2ReferenceRight() throws IOException {
- return loadFromClassloader("a2/conflict_a2_reference_right.nodes");
+ return loadFromClassLoader("a2/conflict_a2_reference_right.nodes");
}
public Resource getA3AttributeLeft() throws IOException {
- return loadFromClassloader("a3/conflict_a3_attribute_left.nodes");
+ return loadFromClassLoader("a3/conflict_a3_attribute_left.nodes");
}
public Resource getA3AttributeOrigin() throws IOException {
- return loadFromClassloader("a3/conflict_a3_attribute_origin.nodes");
+ return loadFromClassLoader("a3/conflict_a3_attribute_origin.nodes");
}
public Resource getA3AttributeRight() throws IOException {
- return loadFromClassloader("a3/conflict_a3_attribute_right.nodes");
+ return loadFromClassLoader("a3/conflict_a3_attribute_right.nodes");
}
public Resource getA3ReferenceLeft() throws IOException {
- return loadFromClassloader("a3/conflict_a3_reference_left.nodes");
+ return loadFromClassLoader("a3/conflict_a3_reference_left.nodes");
}
public Resource getA3ReferenceOrigin() throws IOException {
- return loadFromClassloader("a3/conflict_a3_reference_origin.nodes");
+ return loadFromClassLoader("a3/conflict_a3_reference_origin.nodes");
}
public Resource getA3ReferenceRight() throws IOException {
- return loadFromClassloader("a3/conflict_a3_reference_right.nodes");
+ return loadFromClassLoader("a3/conflict_a3_reference_right.nodes");
}
public Resource getB1AttributeLeft() throws IOException {
- return loadFromClassloader("b1/conflict_b1_attribute_left.nodes");
+ return loadFromClassLoader("b1/conflict_b1_attribute_left.nodes");
}
public Resource getB1AttributeOrigin() throws IOException {
- return loadFromClassloader("b1/conflict_b1_attribute_origin.nodes");
+ return loadFromClassLoader("b1/conflict_b1_attribute_origin.nodes");
}
public Resource getB1AttributeRight() throws IOException {
- return loadFromClassloader("b1/conflict_b1_attribute_right.nodes");
+ return loadFromClassLoader("b1/conflict_b1_attribute_right.nodes");
}
public Resource getB1ReferenceLeft() throws IOException {
- return loadFromClassloader("b1/conflict_b1_reference_left.nodes");
+ return loadFromClassLoader("b1/conflict_b1_reference_left.nodes");
}
public Resource getB1ReferenceOrigin() throws IOException {
- return loadFromClassloader("b1/conflict_b1_reference_origin.nodes");
+ return loadFromClassLoader("b1/conflict_b1_reference_origin.nodes");
}
public Resource getB1ReferenceRight() throws IOException {
- return loadFromClassloader("b1/conflict_b1_reference_right.nodes");
+ return loadFromClassLoader("b1/conflict_b1_reference_right.nodes");
}
public Resource getB2AttributeLeft() throws IOException {
- return loadFromClassloader("b2/conflict_b2_attribute_left.nodes");
+ return loadFromClassLoader("b2/conflict_b2_attribute_left.nodes");
}
public Resource getB2AttributeOrigin() throws IOException {
- return loadFromClassloader("b2/conflict_b2_attribute_origin.nodes");
+ return loadFromClassLoader("b2/conflict_b2_attribute_origin.nodes");
}
public Resource getB2AttributeRight() throws IOException {
- return loadFromClassloader("b2/conflict_b2_attribute_right.nodes");
+ return loadFromClassLoader("b2/conflict_b2_attribute_right.nodes");
}
public Resource getB2ReferenceLeft() throws IOException {
- return loadFromClassloader("b2/conflict_b2_reference_left.nodes");
+ return loadFromClassLoader("b2/conflict_b2_reference_left.nodes");
}
public Resource getB2ReferenceOrigin() throws IOException {
- return loadFromClassloader("b2/conflict_b2_reference_origin.nodes");
+ return loadFromClassLoader("b2/conflict_b2_reference_origin.nodes");
}
public Resource getB2ReferenceRight() throws IOException {
- return loadFromClassloader("b2/conflict_b2_reference_right.nodes");
+ return loadFromClassLoader("b2/conflict_b2_reference_right.nodes");
}
public Resource getB3AttributeLeft() throws IOException {
- return loadFromClassloader("b3/conflict_b3_attribute_left.nodes");
+ return loadFromClassLoader("b3/conflict_b3_attribute_left.nodes");
}
public Resource getB3AttributeOrigin() throws IOException {
- return loadFromClassloader("b3/conflict_b3_attribute_origin.nodes");
+ return loadFromClassLoader("b3/conflict_b3_attribute_origin.nodes");
}
public Resource getB3AttributeRight() throws IOException {
- return loadFromClassloader("b3/conflict_b3_attribute_right.nodes");
+ return loadFromClassLoader("b3/conflict_b3_attribute_right.nodes");
}
public Resource getB3ReferenceLeft() throws IOException {
- return loadFromClassloader("b3/conflict_b3_reference_left.nodes");
+ return loadFromClassLoader("b3/conflict_b3_reference_left.nodes");
}
public Resource getB3ReferenceOrigin() throws IOException {
- return loadFromClassloader("b3/conflict_b3_reference_origin.nodes");
+ return loadFromClassLoader("b3/conflict_b3_reference_origin.nodes");
}
public Resource getB3ReferenceRight() throws IOException {
- return loadFromClassloader("b3/conflict_b3_reference_right.nodes");
+ return loadFromClassLoader("b3/conflict_b3_reference_right.nodes");
}
public Resource getB4AttributeLeft() throws IOException {
- return loadFromClassloader("b4/conflict_b4_attribute_left.nodes");
+ return loadFromClassLoader("b4/conflict_b4_attribute_left.nodes");
}
public Resource getB4AttributeOrigin() throws IOException {
- return loadFromClassloader("b4/conflict_b4_attribute_origin.nodes");
+ return loadFromClassLoader("b4/conflict_b4_attribute_origin.nodes");
}
public Resource getB4AttributeRight() throws IOException {
- return loadFromClassloader("b4/conflict_b4_attribute_right.nodes");
+ return loadFromClassLoader("b4/conflict_b4_attribute_right.nodes");
}
public Resource getB4ReferenceLeft() throws IOException {
- return loadFromClassloader("b4/conflict_b4_reference_left.nodes");
+ return loadFromClassLoader("b4/conflict_b4_reference_left.nodes");
}
public Resource getB4ReferenceOrigin() throws IOException {
- return loadFromClassloader("b4/conflict_b4_reference_origin.nodes");
+ return loadFromClassLoader("b4/conflict_b4_reference_origin.nodes");
}
public Resource getB4ReferenceRight() throws IOException {
- return loadFromClassloader("b4/conflict_b4_reference_right.nodes");
+ return loadFromClassLoader("b4/conflict_b4_reference_right.nodes");
}
public Resource getB5AttributeLeft() throws IOException {
- return loadFromClassloader("b5/conflict_b5_attribute_left.nodes");
+ return loadFromClassLoader("b5/conflict_b5_attribute_left.nodes");
}
public Resource getB5AttributeOrigin() throws IOException {
- return loadFromClassloader("b5/conflict_b5_attribute_origin.nodes");
+ return loadFromClassLoader("b5/conflict_b5_attribute_origin.nodes");
}
public Resource getB5AttributeRight() throws IOException {
- return loadFromClassloader("b5/conflict_b5_attribute_right.nodes");
+ return loadFromClassLoader("b5/conflict_b5_attribute_right.nodes");
}
public Resource getB5ReferenceLeft() throws IOException {
- return loadFromClassloader("b5/conflict_b5_reference_left.nodes");
+ return loadFromClassLoader("b5/conflict_b5_reference_left.nodes");
}
public Resource getB5ReferenceOrigin() throws IOException {
- return loadFromClassloader("b5/conflict_b5_reference_origin.nodes");
+ return loadFromClassLoader("b5/conflict_b5_reference_origin.nodes");
}
public Resource getB5ReferenceRight() throws IOException {
- return loadFromClassloader("b5/conflict_b5_reference_right.nodes");
+ return loadFromClassLoader("b5/conflict_b5_reference_right.nodes");
}
public Resource getB6AttributeLeft() throws IOException {
- return loadFromClassloader("b6/conflict_b6_attribute_left.nodes");
+ return loadFromClassLoader("b6/conflict_b6_attribute_left.nodes");
}
public Resource getB6AttributeOrigin() throws IOException {
- return loadFromClassloader("b6/conflict_b6_attribute_origin.nodes");
+ return loadFromClassLoader("b6/conflict_b6_attribute_origin.nodes");
}
public Resource getB6AttributeRight() throws IOException {
- return loadFromClassloader("b6/conflict_b6_attribute_right.nodes");
+ return loadFromClassLoader("b6/conflict_b6_attribute_right.nodes");
}
public Resource getB6ReferenceLeft() throws IOException {
- return loadFromClassloader("b6/conflict_b6_reference_left.nodes");
+ return loadFromClassLoader("b6/conflict_b6_reference_left.nodes");
}
public Resource getB6ReferenceOrigin() throws IOException {
- return loadFromClassloader("b6/conflict_b6_reference_origin.nodes");
+ return loadFromClassLoader("b6/conflict_b6_reference_origin.nodes");
}
public Resource getB6ReferenceRight() throws IOException {
- return loadFromClassloader("b6/conflict_b6_reference_right.nodes");
+ return loadFromClassLoader("b6/conflict_b6_reference_right.nodes");
}
public Resource getC1AttributeLeft() throws IOException {
- return loadFromClassloader("c1/conflict_c1_attribute_left.nodes");
+ return loadFromClassLoader("c1/conflict_c1_attribute_left.nodes");
}
public Resource getC1AttributeOrigin() throws IOException {
- return loadFromClassloader("c1/conflict_c1_attribute_origin.nodes");
+ return loadFromClassLoader("c1/conflict_c1_attribute_origin.nodes");
}
public Resource getC1AttributeRight() throws IOException {
- return loadFromClassloader("c1/conflict_c1_attribute_right.nodes");
+ return loadFromClassLoader("c1/conflict_c1_attribute_right.nodes");
}
public Resource getC1ReferenceLeft() throws IOException {
- return loadFromClassloader("c1/conflict_c1_reference_left.nodes");
+ return loadFromClassLoader("c1/conflict_c1_reference_left.nodes");
}
public Resource getC1ReferenceOrigin() throws IOException {
- return loadFromClassloader("c1/conflict_c1_reference_origin.nodes");
+ return loadFromClassLoader("c1/conflict_c1_reference_origin.nodes");
}
public Resource getC1ReferenceRight() throws IOException {
- return loadFromClassloader("c1/conflict_c1_reference_right.nodes");
+ return loadFromClassLoader("c1/conflict_c1_reference_right.nodes");
}
public Resource getC2AttributeLeft() throws IOException {
- return loadFromClassloader("c2/conflict_c2_attribute_left.nodes");
+ return loadFromClassLoader("c2/conflict_c2_attribute_left.nodes");
}
public Resource getC2AttributeOrigin() throws IOException {
- return loadFromClassloader("c2/conflict_c2_attribute_origin.nodes");
+ return loadFromClassLoader("c2/conflict_c2_attribute_origin.nodes");
}
public Resource getC2AttributeRight() throws IOException {
- return loadFromClassloader("c2/conflict_c2_attribute_right.nodes");
+ return loadFromClassLoader("c2/conflict_c2_attribute_right.nodes");
}
public Resource getC2ReferenceLeft() throws IOException {
- return loadFromClassloader("c2/conflict_c2_reference_left.nodes");
+ return loadFromClassLoader("c2/conflict_c2_reference_left.nodes");
}
public Resource getC2ReferenceOrigin() throws IOException {
- return loadFromClassloader("c2/conflict_c2_reference_origin.nodes");
+ return loadFromClassLoader("c2/conflict_c2_reference_origin.nodes");
}
public Resource getC2ReferenceRight() throws IOException {
- return loadFromClassloader("c2/conflict_c2_reference_right.nodes");
+ return loadFromClassLoader("c2/conflict_c2_reference_right.nodes");
}
public Resource getC3AttributeLeft() throws IOException {
- return loadFromClassloader("c3/conflict_c3_attribute_left.nodes");
+ return loadFromClassLoader("c3/conflict_c3_attribute_left.nodes");
}
public Resource getC3AttributeOrigin() throws IOException {
- return loadFromClassloader("c3/conflict_c3_attribute_origin.nodes");
+ return loadFromClassLoader("c3/conflict_c3_attribute_origin.nodes");
}
public Resource getC3AttributeRight() throws IOException {
- return loadFromClassloader("c3/conflict_c3_attribute_right.nodes");
+ return loadFromClassLoader("c3/conflict_c3_attribute_right.nodes");
}
public Resource getC3ReferenceLeft() throws IOException {
- return loadFromClassloader("c3/conflict_c3_reference_left.nodes");
+ return loadFromClassLoader("c3/conflict_c3_reference_left.nodes");
}
public Resource getC3ReferenceOrigin() throws IOException {
- return loadFromClassloader("c3/conflict_c3_reference_origin.nodes");
+ return loadFromClassLoader("c3/conflict_c3_reference_origin.nodes");
}
public Resource getC3ReferenceRight() throws IOException {
- return loadFromClassloader("c3/conflict_c3_reference_right.nodes");
+ return loadFromClassLoader("c3/conflict_c3_reference_right.nodes");
}
public Resource getC4AttributeLeft() throws IOException {
- return loadFromClassloader("c4/conflict_c4_attribute_left.nodes");
+ return loadFromClassLoader("c4/conflict_c4_attribute_left.nodes");
}
public Resource getC4AttributeOrigin() throws IOException {
- return loadFromClassloader("c4/conflict_c4_attribute_origin.nodes");
+ return loadFromClassLoader("c4/conflict_c4_attribute_origin.nodes");
}
public Resource getC4AttributeRight() throws IOException {
- return loadFromClassloader("c4/conflict_c4_attribute_right.nodes");
+ return loadFromClassLoader("c4/conflict_c4_attribute_right.nodes");
}
public Resource getC4ReferenceLeft() throws IOException {
- return loadFromClassloader("c4/conflict_c4_reference_left.nodes");
+ return loadFromClassLoader("c4/conflict_c4_reference_left.nodes");
}
public Resource getC4ReferenceOrigin() throws IOException {
- return loadFromClassloader("c4/conflict_c4_reference_origin.nodes");
+ return loadFromClassLoader("c4/conflict_c4_reference_origin.nodes");
}
public Resource getC4ReferenceRight() throws IOException {
- return loadFromClassloader("c4/conflict_c4_reference_right.nodes");
+ return loadFromClassLoader("c4/conflict_c4_reference_right.nodes");
}
public Resource getC5AttributeLeft() throws IOException {
- return loadFromClassloader("c5/conflict_c5_attribute_left.nodes");
+ return loadFromClassLoader("c5/conflict_c5_attribute_left.nodes");
}
public Resource getC5AttributeOrigin() throws IOException {
- return loadFromClassloader("c5/conflict_c5_attribute_origin.nodes");
+ return loadFromClassLoader("c5/conflict_c5_attribute_origin.nodes");
}
public Resource getC5AttributeRight() throws IOException {
- return loadFromClassloader("c5/conflict_c5_attribute_right.nodes");
+ return loadFromClassLoader("c5/conflict_c5_attribute_right.nodes");
}
public Resource getC5ReferenceLeft() throws IOException {
- return loadFromClassloader("c5/conflict_c5_reference_left.nodes");
+ return loadFromClassLoader("c5/conflict_c5_reference_left.nodes");
}
public Resource getC5ReferenceOrigin() throws IOException {
- return loadFromClassloader("c5/conflict_c5_reference_origin.nodes");
+ return loadFromClassLoader("c5/conflict_c5_reference_origin.nodes");
}
public Resource getC5ReferenceRight() throws IOException {
- return loadFromClassloader("c5/conflict_c5_reference_right.nodes");
+ return loadFromClassLoader("c5/conflict_c5_reference_right.nodes");
}
public Resource getD1AttributeLeft() throws IOException {
- return loadFromClassloader("d1/conflict_d1_attribute_left.nodes");
+ return loadFromClassLoader("d1/conflict_d1_attribute_left.nodes");
}
public Resource getD1AttributeOrigin() throws IOException {
- return loadFromClassloader("d1/conflict_d1_attribute_origin.nodes");
+ return loadFromClassLoader("d1/conflict_d1_attribute_origin.nodes");
}
public Resource getD1AttributeRight() throws IOException {
- return loadFromClassloader("d1/conflict_d1_attribute_right.nodes");
+ return loadFromClassLoader("d1/conflict_d1_attribute_right.nodes");
}
public Resource getD1ReferenceLeft() throws IOException {
- return loadFromClassloader("d1/conflict_d1_reference_left.nodes");
+ return loadFromClassLoader("d1/conflict_d1_reference_left.nodes");
}
public Resource getD1ReferenceOrigin() throws IOException {
- return loadFromClassloader("d1/conflict_d1_reference_origin.nodes");
+ return loadFromClassLoader("d1/conflict_d1_reference_origin.nodes");
}
public Resource getD1ReferenceRight() throws IOException {
- return loadFromClassloader("d1/conflict_d1_reference_right.nodes");
+ return loadFromClassLoader("d1/conflict_d1_reference_right.nodes");
}
public Resource getD2AttributeLeft() throws IOException {
- return loadFromClassloader("d2/conflict_d2_attribute_left.nodes");
+ return loadFromClassLoader("d2/conflict_d2_attribute_left.nodes");
}
public Resource getD2AttributeOrigin() throws IOException {
- return loadFromClassloader("d2/conflict_d2_attribute_origin.nodes");
+ return loadFromClassLoader("d2/conflict_d2_attribute_origin.nodes");
}
public Resource getD2AttributeRight() throws IOException {
- return loadFromClassloader("d2/conflict_d2_attribute_right.nodes");
+ return loadFromClassLoader("d2/conflict_d2_attribute_right.nodes");
}
public Resource getD2ReferenceLeft() throws IOException {
- return loadFromClassloader("d2/conflict_d2_reference_left.nodes");
+ return loadFromClassLoader("d2/conflict_d2_reference_left.nodes");
}
public Resource getD2ReferenceOrigin() throws IOException {
- return loadFromClassloader("d2/conflict_d2_reference_origin.nodes");
+ return loadFromClassLoader("d2/conflict_d2_reference_origin.nodes");
}
public Resource getD2ReferenceRight() throws IOException {
- return loadFromClassloader("d2/conflict_d2_reference_right.nodes");
+ return loadFromClassLoader("d2/conflict_d2_reference_right.nodes");
}
public Resource getD3AttributeLeft() throws IOException {
- return loadFromClassloader("d3/conflict_d3_attribute_left.nodes");
+ return loadFromClassLoader("d3/conflict_d3_attribute_left.nodes");
}
public Resource getD3AttributeOrigin() throws IOException {
- return loadFromClassloader("d3/conflict_d3_attribute_origin.nodes");
+ return loadFromClassLoader("d3/conflict_d3_attribute_origin.nodes");
}
public Resource getD3AttributeRight() throws IOException {
- return loadFromClassloader("d3/conflict_d3_attribute_right.nodes");
+ return loadFromClassLoader("d3/conflict_d3_attribute_right.nodes");
}
public Resource getD3ReferenceLeft() throws IOException {
- return loadFromClassloader("d3/conflict_d3_reference_left.nodes");
+ return loadFromClassLoader("d3/conflict_d3_reference_left.nodes");
}
public Resource getD3ReferenceOrigin() throws IOException {
- return loadFromClassloader("d3/conflict_d3_reference_origin.nodes");
+ return loadFromClassLoader("d3/conflict_d3_reference_origin.nodes");
}
public Resource getD3ReferenceRight() throws IOException {
- return loadFromClassloader("d3/conflict_d3_reference_right.nodes");
+ return loadFromClassLoader("d3/conflict_d3_reference_right.nodes");
}
public Resource getD4AttributeLeft() throws IOException {
- return loadFromClassloader("d4/conflict_d4_attribute_left.nodes");
+ return loadFromClassLoader("d4/conflict_d4_attribute_left.nodes");
}
public Resource getD4AttributeOrigin() throws IOException {
- return loadFromClassloader("d4/conflict_d4_attribute_origin.nodes");
+ return loadFromClassLoader("d4/conflict_d4_attribute_origin.nodes");
}
public Resource getD4AttributeRight() throws IOException {
- return loadFromClassloader("d4/conflict_d4_attribute_right.nodes");
+ return loadFromClassLoader("d4/conflict_d4_attribute_right.nodes");
}
public Resource getD4ReferenceLeft() throws IOException {
- return loadFromClassloader("d4/conflict_d4_reference_left.nodes");
+ return loadFromClassLoader("d4/conflict_d4_reference_left.nodes");
}
public Resource getD4ReferenceOrigin() throws IOException {
- return loadFromClassloader("d4/conflict_d4_reference_origin.nodes");
+ return loadFromClassLoader("d4/conflict_d4_reference_origin.nodes");
}
public Resource getD4ReferenceRight() throws IOException {
- return loadFromClassloader("d4/conflict_d4_reference_right.nodes");
+ return loadFromClassLoader("d4/conflict_d4_reference_right.nodes");
}
public Resource getD5AttributeLeft() throws IOException {
- return loadFromClassloader("d5/conflict_d5_attribute_left.nodes");
+ return loadFromClassLoader("d5/conflict_d5_attribute_left.nodes");
}
public Resource getD5AttributeOrigin() throws IOException {
- return loadFromClassloader("d5/conflict_d5_attribute_origin.nodes");
+ return loadFromClassLoader("d5/conflict_d5_attribute_origin.nodes");
}
public Resource getD5AttributeRight() throws IOException {
- return loadFromClassloader("d5/conflict_d5_attribute_right.nodes");
+ return loadFromClassLoader("d5/conflict_d5_attribute_right.nodes");
}
public Resource getD5ReferenceLeft() throws IOException {
- return loadFromClassloader("d5/conflict_d5_reference_left.nodes");
+ return loadFromClassLoader("d5/conflict_d5_reference_left.nodes");
}
public Resource getD5ReferenceOrigin() throws IOException {
- return loadFromClassloader("d5/conflict_d5_reference_origin.nodes");
+ return loadFromClassLoader("d5/conflict_d5_reference_origin.nodes");
}
public Resource getD5ReferenceRight() throws IOException {
- return loadFromClassloader("d5/conflict_d5_reference_right.nodes");
+ return loadFromClassLoader("d5/conflict_d5_reference_right.nodes");
}
public Resource getD6AttributeLeft() throws IOException {
- return loadFromClassloader("d6/conflict_d6_attribute_left.nodes");
+ return loadFromClassLoader("d6/conflict_d6_attribute_left.nodes");
}
public Resource getD6AttributeOrigin() throws IOException {
- return loadFromClassloader("d6/conflict_d6_attribute_origin.nodes");
+ return loadFromClassLoader("d6/conflict_d6_attribute_origin.nodes");
}
public Resource getD6AttributeRight() throws IOException {
- return loadFromClassloader("d6/conflict_d6_attribute_right.nodes");
+ return loadFromClassLoader("d6/conflict_d6_attribute_right.nodes");
}
public Resource getD6ReferenceLeft() throws IOException {
- return loadFromClassloader("d6/conflict_d6_reference_left.nodes");
+ return loadFromClassLoader("d6/conflict_d6_reference_left.nodes");
}
public Resource getD6ReferenceOrigin() throws IOException {
- return loadFromClassloader("d6/conflict_d6_reference_origin.nodes");
+ return loadFromClassLoader("d6/conflict_d6_reference_origin.nodes");
}
public Resource getD6ReferenceRight() throws IOException {
- return loadFromClassloader("d6/conflict_d6_reference_right.nodes");
+ return loadFromClassLoader("d6/conflict_d6_reference_right.nodes");
}
public Resource getE1Left() throws IOException {
- return loadFromClassloader("e1/conflict_e1_left.nodes");
+ return loadFromClassLoader("e1/conflict_e1_left.nodes");
}
public Resource getE1Origin() throws IOException {
- return loadFromClassloader("e1/conflict_e1_origin.nodes");
+ return loadFromClassLoader("e1/conflict_e1_origin.nodes");
}
public Resource getE1Right() throws IOException {
- return loadFromClassloader("e1/conflict_e1_right.nodes");
+ return loadFromClassLoader("e1/conflict_e1_right.nodes");
}
public Resource getE2Left() throws IOException {
- return loadFromClassloader("e2/conflict_e2_left.nodes");
+ return loadFromClassLoader("e2/conflict_e2_left.nodes");
}
public Resource getE2Origin() throws IOException {
- return loadFromClassloader("e2/conflict_e2_origin.nodes");
+ return loadFromClassLoader("e2/conflict_e2_origin.nodes");
}
public Resource getE2Right() throws IOException {
- return loadFromClassloader("e2/conflict_e2_right.nodes");
+ return loadFromClassLoader("e2/conflict_e2_right.nodes");
}
public Resource getFLeft() throws IOException {
- return loadFromClassloader("f/conflict_f_left.nodes");
+ return loadFromClassLoader("f/conflict_f_left.nodes");
}
public Resource getFOrigin() throws IOException {
- return loadFromClassloader("f/conflict_f_origin.nodes");
+ return loadFromClassLoader("f/conflict_f_origin.nodes");
}
public Resource getFRight() throws IOException {
- return loadFromClassloader("f/conflict_f_right.nodes");
+ return loadFromClassLoader("f/conflict_f_right.nodes");
}
public Resource getGLeft() throws IOException {
- return loadFromClassloader("g/conflict_g_left.nodes");
+ return loadFromClassLoader("g/conflict_g_left.nodes");
}
public Resource getGOrigin() throws IOException {
- return loadFromClassloader("g/conflict_g_origin.nodes");
+ return loadFromClassLoader("g/conflict_g_origin.nodes");
}
public Resource getGRight() throws IOException {
- return loadFromClassloader("g/conflict_g_right.nodes");
+ return loadFromClassLoader("g/conflict_g_right.nodes");
}
public Resource getH1Left() throws IOException {
- return loadFromClassloader("h1/conflict_h1_left.nodes");
+ return loadFromClassLoader("h1/conflict_h1_left.nodes");
}
public Resource getH1Origin() throws IOException {
- return loadFromClassloader("h1/conflict_h1_origin.nodes");
+ return loadFromClassLoader("h1/conflict_h1_origin.nodes");
}
public Resource getH1Right() throws IOException {
- return loadFromClassloader("h1/conflict_h1_right.nodes");
+ return loadFromClassLoader("h1/conflict_h1_right.nodes");
}
public Resource getH2Left() throws IOException {
- return loadFromClassloader("h2/conflict_h2_left.nodes");
+ return loadFromClassLoader("h2/conflict_h2_left.nodes");
}
public Resource getH2Origin() throws IOException {
- return loadFromClassloader("h2/conflict_h2_origin.nodes");
+ return loadFromClassLoader("h2/conflict_h2_origin.nodes");
}
public Resource getH2Right() throws IOException {
- return loadFromClassloader("h2/conflict_h2_right.nodes");
+ return loadFromClassLoader("h2/conflict_h2_right.nodes");
}
public Resource getILeft() throws IOException {
- return loadFromClassloader("i/conflict_i_left.nodes");
+ return loadFromClassLoader("i/conflict_i_left.nodes");
}
public Resource getIOrigin() throws IOException {
- return loadFromClassloader("i/conflict_i_origin.nodes");
+ return loadFromClassLoader("i/conflict_i_origin.nodes");
}
public Resource getIRight() throws IOException {
- return loadFromClassloader("i/conflict_i_right.nodes");
+ return loadFromClassLoader("i/conflict_i_right.nodes");
}
public Resource getComplexLeft() throws IOException {
- return loadFromClassloader("complex/conflict_complex_left.nodes");
+ return loadFromClassLoader("complex/conflict_complex_left.nodes");
}
public Resource getComplexOrigin() throws IOException {
- return loadFromClassloader("complex/conflict_complex_origin.nodes");
+ return loadFromClassLoader("complex/conflict_complex_origin.nodes");
}
public Resource getComplexRight() throws IOException {
- return loadFromClassloader("complex/conflict_complex_right.nodes");
+ return loadFromClassLoader("complex/conflict_complex_right.nodes");
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/data/EquiInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/data/EquiInputData.java
index 068eca9c3..3a4887be9 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/data/EquiInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/data/EquiInputData.java
@@ -7,322 +7,322 @@ import org.eclipse.emf.ecore.resource.Resource;
public class EquiInputData extends AbstractInputData {
public Resource getA1Left() throws IOException {
- return loadFromClassloader("a1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a1/left.nodes"); //$NON-NLS-1$
}
public Resource getA1Right() throws IOException {
- return loadFromClassloader("a1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a1/right.nodes"); //$NON-NLS-1$
}
public Resource getA2Left() throws IOException {
- return loadFromClassloader("a2/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a2/left.nodes"); //$NON-NLS-1$
}
public Resource getA2Right() throws IOException {
- return loadFromClassloader("a2/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a2/right.nodes"); //$NON-NLS-1$
}
public Resource getA3Left() throws IOException {
- return loadFromClassloader("a3/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a3/left.nodes"); //$NON-NLS-1$
}
public Resource getA3Right() throws IOException {
- return loadFromClassloader("a3/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a3/right.nodes"); //$NON-NLS-1$
}
public Resource getA4Left() throws IOException {
- return loadFromClassloader("a4/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a4/left.nodes"); //$NON-NLS-1$
}
public Resource getA4Right() throws IOException {
- return loadFromClassloader("a4/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a4/right.nodes"); //$NON-NLS-1$
}
public Resource getA5Left() throws IOException {
- return loadFromClassloader("a5/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a5/left.nodes"); //$NON-NLS-1$
}
public Resource getA5Right() throws IOException {
- return loadFromClassloader("a5/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a5/right.nodes"); //$NON-NLS-1$
}
public Resource getC1Left() throws IOException {
- return loadFromClassloader("c1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c1/left.nodes"); //$NON-NLS-1$
}
public Resource getC1Right() throws IOException {
- return loadFromClassloader("c1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c1/right.nodes"); //$NON-NLS-1$
}
public Resource getC2Left() throws IOException {
- return loadFromClassloader("c2/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c2/left.nodes"); //$NON-NLS-1$
}
public Resource getC2Right() throws IOException {
- return loadFromClassloader("c2/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c2/right.nodes"); //$NON-NLS-1$
}
public Resource getC3Left() throws IOException {
- return loadFromClassloader("c3/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c3/left.nodes"); //$NON-NLS-1$
}
public Resource getC3Right() throws IOException {
- return loadFromClassloader("c3/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c3/right.nodes"); //$NON-NLS-1$
}
public Resource getC4Left() throws IOException {
- return loadFromClassloader("c4/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c4/left.nodes"); //$NON-NLS-1$
}
public Resource getC4Right() throws IOException {
- return loadFromClassloader("c4/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c4/right.nodes"); //$NON-NLS-1$
}
public Resource getD1Left() throws IOException {
- return loadFromClassloader("d1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("d1/left.nodes"); //$NON-NLS-1$
}
public Resource getD1Right() throws IOException {
- return loadFromClassloader("d1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("d1/right.nodes"); //$NON-NLS-1$
}
public Resource getE1Left() throws IOException {
- return loadFromClassloader("e1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e1/left.nodes"); //$NON-NLS-1$
}
public Resource getE1Right() throws IOException {
- return loadFromClassloader("e1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e1/right.nodes"); //$NON-NLS-1$
}
public Resource getE1Ancestor() throws IOException {
- return loadFromClassloader("e1/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e1/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE2Left() throws IOException {
- return loadFromClassloader("e2/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e2/left.nodes"); //$NON-NLS-1$
}
public Resource getE2Right() throws IOException {
- return loadFromClassloader("e2/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e2/right.nodes"); //$NON-NLS-1$
}
public Resource getE2Ancestor() throws IOException {
- return loadFromClassloader("e2/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e2/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE3Left() throws IOException {
- return loadFromClassloader("e3/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e3/left.nodes"); //$NON-NLS-1$
}
public Resource getE3Right() throws IOException {
- return loadFromClassloader("e3/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e3/right.nodes"); //$NON-NLS-1$
}
public Resource getE3Ancestor() throws IOException {
- return loadFromClassloader("e3/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e3/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE4Left() throws IOException {
- return loadFromClassloader("e4/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e4/left.nodes"); //$NON-NLS-1$
}
public Resource getE4Right() throws IOException {
- return loadFromClassloader("e4/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e4/right.nodes"); //$NON-NLS-1$
}
public Resource getE4Ancestor() throws IOException {
- return loadFromClassloader("e4/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e4/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE5Left() throws IOException {
- return loadFromClassloader("e5/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e5/left.nodes"); //$NON-NLS-1$
}
public Resource getE5Right() throws IOException {
- return loadFromClassloader("e5/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e5/right.nodes"); //$NON-NLS-1$
}
public Resource getE5Ancestor() throws IOException {
- return loadFromClassloader("e5/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e5/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE6Left() throws IOException {
- return loadFromClassloader("e6/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e6/left.nodes"); //$NON-NLS-1$
}
public Resource getE6Right() throws IOException {
- return loadFromClassloader("e6/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e6/right.nodes"); //$NON-NLS-1$
}
public Resource getE6Ancestor() throws IOException {
- return loadFromClassloader("e6/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e6/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE7Left() throws IOException {
- return loadFromClassloader("e7/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e7/left.nodes"); //$NON-NLS-1$
}
public Resource getE7Right() throws IOException {
- return loadFromClassloader("e7/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e7/right.nodes"); //$NON-NLS-1$
}
public Resource getE7Ancestor() throws IOException {
- return loadFromClassloader("e7/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e7/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE8Left() throws IOException {
- return loadFromClassloader("e8/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e8/left.nodes"); //$NON-NLS-1$
}
public Resource getE8Right() throws IOException {
- return loadFromClassloader("e8/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e8/right.nodes"); //$NON-NLS-1$
}
public Resource getE8Ancestor() throws IOException {
- return loadFromClassloader("e8/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e8/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE9Left() throws IOException {
- return loadFromClassloader("e9/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e9/left.nodes"); //$NON-NLS-1$
}
public Resource getE9Right() throws IOException {
- return loadFromClassloader("e9/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e9/right.nodes"); //$NON-NLS-1$
}
public Resource getE9Ancestor() throws IOException {
- return loadFromClassloader("e9/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e9/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE10Left() throws IOException {
- return loadFromClassloader("e10/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e10/left.nodes"); //$NON-NLS-1$
}
public Resource getE10Right() throws IOException {
- return loadFromClassloader("e10/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e10/right.nodes"); //$NON-NLS-1$
}
public Resource getE10Ancestor() throws IOException {
- return loadFromClassloader("e10/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e10/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF1Left() throws IOException {
- return loadFromClassloader("f1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f1/left.nodes"); //$NON-NLS-1$
}
public Resource getF1Right() throws IOException {
- return loadFromClassloader("f1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f1/right.nodes"); //$NON-NLS-1$
}
public Resource getF1Ancestor() throws IOException {
- return loadFromClassloader("f1/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f1/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF2Left() throws IOException {
- return loadFromClassloader("f2/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f2/left.nodes"); //$NON-NLS-1$
}
public Resource getF2Right() throws IOException {
- return loadFromClassloader("f2/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f2/right.nodes"); //$NON-NLS-1$
}
public Resource getF2Ancestor() throws IOException {
- return loadFromClassloader("f2/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f2/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF3Left() throws IOException {
- return loadFromClassloader("f3/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f3/left.nodes"); //$NON-NLS-1$
}
public Resource getF3Right() throws IOException {
- return loadFromClassloader("f3/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f3/right.nodes"); //$NON-NLS-1$
}
public Resource getF3Ancestor() throws IOException {
- return loadFromClassloader("f3/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f3/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF4Left() throws IOException {
- return loadFromClassloader("f4/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f4/left.nodes"); //$NON-NLS-1$
}
public Resource getF4Right() throws IOException {
- return loadFromClassloader("f4/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f4/right.nodes"); //$NON-NLS-1$
}
public Resource getF4Ancestor() throws IOException {
- return loadFromClassloader("f4/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f4/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF5Left() throws IOException {
- return loadFromClassloader("f5/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f5/left.nodes"); //$NON-NLS-1$
}
public Resource getF5Right() throws IOException {
- return loadFromClassloader("f5/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f5/right.nodes"); //$NON-NLS-1$
}
public Resource getF5Ancestor() throws IOException {
- return loadFromClassloader("f5/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f5/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF6Left() throws IOException {
- return loadFromClassloader("f6/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f6/left.nodes"); //$NON-NLS-1$
}
public Resource getF6Right() throws IOException {
- return loadFromClassloader("f6/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f6/right.nodes"); //$NON-NLS-1$
}
public Resource getF6Ancestor() throws IOException {
- return loadFromClassloader("f6/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f6/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF7Left() throws IOException {
- return loadFromClassloader("f7/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f7/left.nodes"); //$NON-NLS-1$
}
public Resource getF7Right() throws IOException {
- return loadFromClassloader("f7/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f7/right.nodes"); //$NON-NLS-1$
}
public Resource getF7Ancestor() throws IOException {
- return loadFromClassloader("f7/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f7/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF8Left() throws IOException {
- return loadFromClassloader("f8/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f8/left.nodes"); //$NON-NLS-1$
}
public Resource getF8Right() throws IOException {
- return loadFromClassloader("f8/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f8/right.nodes"); //$NON-NLS-1$
}
public Resource getF8Ancestor() throws IOException {
- return loadFromClassloader("f8/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f8/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF9Left() throws IOException {
- return loadFromClassloader("f9/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f9/left.nodes"); //$NON-NLS-1$
}
public Resource getF9Right() throws IOException {
- return loadFromClassloader("f9/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f9/right.nodes"); //$NON-NLS-1$
}
public Resource getF9Ancestor() throws IOException {
- return loadFromClassloader("f9/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f9/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF10Left() throws IOException {
- return loadFromClassloader("f10/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f10/left.nodes"); //$NON-NLS-1$
}
public Resource getF10Right() throws IOException {
- return loadFromClassloader("f10/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f10/right.nodes"); //$NON-NLS-1$
}
public Resource getF10Ancestor() throws IOException {
- return loadFromClassloader("f10/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f10/ancestor.nodes"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java
new file mode 100644
index 000000000..5ac5c87c5
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) 2012 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ */
+package org.eclipse.emf.compare.tests.fragmentation;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertSame;
+import static junit.framework.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.DifferenceKind;
+import org.eclipse.emf.compare.DifferenceSource;
+import org.eclipse.emf.compare.EMFCompare;
+import org.eclipse.emf.compare.ResourceAttachmentChange;
+import org.eclipse.emf.compare.scope.IComparisonScope;
+import org.eclipse.emf.compare.tests.fragmentation.data.FragmentationInputData;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.junit.Test;
+
+@SuppressWarnings("nls")
+public class FragmentationTest {
+ private final FragmentationInputData input = new FragmentationInputData();
+
+ @Test
+ public void testDeletedRootResourceSet() throws IOException {
+ final Resource left = input.getDeletedRootLeft();
+ final Resource origin = input.getDeletedRootOrigin();
+ final Resource right = input.getDeletedRootRight();
+
+ final ResourceSet leftSet = left.getResourceSet();
+ final ResourceSet originSet = origin.getResourceSet();
+ final ResourceSet rightSet = right.getResourceSet();
+
+ assertNotNull(leftSet);
+ assertNotNull(originSet);
+ assertNotNull(rightSet);
+
+ EcoreUtil.resolveAll(leftSet);
+ EcoreUtil.resolveAll(originSet);
+ EcoreUtil.resolveAll(rightSet);
+
+ assertSame(Integer.valueOf(1), Integer.valueOf(leftSet.getResources().size()));
+ assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size()));
+ assertSame(Integer.valueOf(1), Integer.valueOf(rightSet.getResources().size()));
+
+ final IComparisonScope scope = EMFCompare.createDefaultScope(leftSet, rightSet, originSet);
+ Comparison comparison = EMFCompare.newComparator(scope).compare();
+
+ final List<Diff> differences = comparison.getDifferences();
+ assertSame(Integer.valueOf(1), Integer.valueOf(differences.size()));
+
+ final Diff diff = differences.get(0);
+ assertTrue(diff instanceof ResourceAttachmentChange);
+ assertEquals(diff.getMatch().getRight(), getNodeNamed(right, "deletedRoot"));
+ assertEquals(diff.getMatch().getOrigin(), getNodeNamed(origin, "deletedRoot"));
+ assertNull(diff.getMatch().getLeft());
+ assertSame(diff.getSource(), DifferenceSource.LEFT);
+ assertSame(diff.getKind(), DifferenceKind.DELETE);
+
+ comparison = EMFCompare.newComparator(scope).compare();
+ assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));
+ }
+
+ private EObject getNodeNamed(Resource res, String name) {
+ final Iterator<EObject> iterator = EcoreUtil.getAllProperContents(res, false);
+ while (iterator.hasNext()) {
+ final EObject next = iterator.next();
+ final EStructuralFeature nameFeature = next.eClass().getEStructuralFeature("name");
+ if (nameFeature != null && name.equals(next.eGet(nameFeature))) {
+ return next;
+ }
+ }
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/FragmentationInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/FragmentationInputData.java
new file mode 100644
index 000000000..83b4c4dc0
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/FragmentationInputData.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2012 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ */
+package org.eclipse.emf.compare.tests.fragmentation.data;
+
+import java.io.IOException;
+
+import org.eclipse.emf.compare.tests.framework.AbstractInputData;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+// We'll use a resource set for these tests
+@SuppressWarnings("nls")
+public class FragmentationInputData extends AbstractInputData {
+ public Resource getControlLeft() throws IOException {
+ return loadFromClassLoader("control/left.nodes", new ResourceSetImpl());
+ }
+
+ public Resource getControlOrigin() throws IOException {
+ return loadFromClassLoader("control/origin.nodes", new ResourceSetImpl());
+ }
+
+ public Resource getControlRight() throws IOException {
+ return loadFromClassLoader("control/right.nodes", new ResourceSetImpl());
+ }
+
+ public Resource getDeletedRootLeft() throws IOException {
+ return loadFromClassLoader("deletedroot/left.nodes", new ResourceSetImpl());
+ }
+
+ public Resource getDeletedRootOrigin() throws IOException {
+ return loadFromClassLoader("deletedroot/origin.nodes", new ResourceSetImpl());
+ }
+
+ public Resource getDeletedRootRight() throws IOException {
+ return loadFromClassLoader("deletedroot/right.nodes", new ResourceSetImpl());
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/fragment.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/fragment.nodes
new file mode 100644
index 000000000..27bbfc1a5
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/fragment.nodes
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_QE6YYAcQEeKTxJtDIb3mMw" name="fragmented"/> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/left.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/left.nodes
new file mode 100644
index 000000000..b75ab1666
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/left.nodes
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root">
+ <containmentRef1 href="fragment.nodes#_QE6YYAcQEeKTxJtDIb3mMw"/>
+</nodes:Node>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/origin.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/origin.nodes
new file mode 100644
index 000000000..3a9424aa9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/origin.nodes
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root">
+ <containmentRef1 xmi:id="_QE6YYAcQEeKTxJtDIb3mMw" name="fragmented"/>
+</nodes:Node>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/right.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/right.nodes
new file mode 100644
index 000000000..3a9424aa9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/control/right.nodes
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root">
+ <containmentRef1 xmi:id="_QE6YYAcQEeKTxJtDIb3mMw" name="fragmented"/>
+</nodes:Node>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/left.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/left.nodes
new file mode 100644
index 000000000..dcc0c4a0b
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/left.nodes
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes">
+ <nodes:Node xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root"/>
+</xmi:XMI> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/origin.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/origin.nodes
new file mode 100644
index 000000000..bdd57d7dc
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/origin.nodes
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes">
+ <nodes:Node xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root"/>
+ <nodes:Node xmi:id="_ORexoLlNEeGmS9ESxeCLvz" name="deletedRoot"/>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/right.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/right.nodes
new file mode 100644
index 000000000..bdd57d7dc
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/deletedroot/right.nodes
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes">
+ <nodes:Node xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root"/>
+ <nodes:Node xmi:id="_ORexoLlNEeGmS9ESxeCLvz" name="deletedRoot"/>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/left.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/left.nodes
new file mode 100644
index 000000000..4299ba385
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/left.nodes
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes">
+ <nodes:Node xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root"/>
+ <nodes:Node xmi:id="_ORexoLlNEeGmS9ESxeCLvz" name="newRoot"/>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/origin.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/origin.nodes
new file mode 100644
index 000000000..6d8762bae
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/origin.nodes
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes"
+ xmi:id="_ORexoLlNEeGmS9ESxeCLvg"
+ name="root"/>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/right.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/right.nodes
new file mode 100644
index 000000000..6d8762bae
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/newroot/right.nodes
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes"
+ xmi:id="_ORexoLlNEeGmS9ESxeCLvg"
+ name="root"/>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/fragment.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/fragment.nodes
new file mode 100644
index 000000000..27bbfc1a5
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/fragment.nodes
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_QE6YYAcQEeKTxJtDIb3mMw" name="fragmented"/> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/left.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/left.nodes
new file mode 100644
index 000000000..3a9424aa9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/left.nodes
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root">
+ <containmentRef1 xmi:id="_QE6YYAcQEeKTxJtDIb3mMw" name="fragmented"/>
+</nodes:Node>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/origin.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/origin.nodes
new file mode 100644
index 000000000..b75ab1666
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/origin.nodes
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root">
+ <containmentRef1 href="fragment.nodes#_QE6YYAcQEeKTxJtDIb3mMw"/>
+</nodes:Node>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/right.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/right.nodes
new file mode 100644
index 000000000..b75ab1666
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/data/uncontrol/right.nodes
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_ORexoLlNEeGmS9ESxeCLvg" name="root">
+ <containmentRef1 href="fragment.nodes#_QE6YYAcQEeKTxJtDIb3mMw"/>
+</nodes:Node>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java
index 4ebbf1aa3..85cf3f750 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java
@@ -14,10 +14,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
@@ -28,10 +27,6 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
*/
public abstract class AbstractInputData {
-
- /** Store the set of the resource sets of the input data. */
- public Set<ResourceSet> sets = new LinkedHashSet<ResourceSet>();
-
/**
* Tries and locate a model in the current class' classpath.
*
@@ -42,7 +37,7 @@ public abstract class AbstractInputData {
* Thrown if we could not access either this class' resource, or the file towards which
* <code>string</code> points.
*/
- protected Resource loadFromClassloader(String string) throws IOException {
+ protected Resource loadFromClassLoader(String string) throws IOException {
final URL fileURL = getClass().getResource(string);
final InputStream str = fileURL.openStream();
final URI uri = URI.createURI(fileURL.toString());
@@ -59,4 +54,50 @@ public abstract class AbstractInputData {
str.close();
return res;
}
+
+ /**
+ * Tries and locate a model in the current class' classpath.
+ *
+ * @param string
+ * Relative path to the model we seek (relative to this class).
+ * @param resourceSet
+ * the resource set in which to load the resource.
+ * @return The loaded resource.
+ * @throws IOException
+ * Thrown if we could not access either this class' resource, or the file towards which
+ * <code>path</code> points.
+ */
+ // Suppressing the warning until bug 376938 is fixed
+ @SuppressWarnings("resource")
+ protected Resource loadFromClassLoader(String path, ResourceSet resourceSet) throws IOException {
+ final URL fileURL = getClass().getResource(path);
+ final URI uri = URI.createURI(fileURL.toString());
+
+ final Resource existing = resourceSet.getResource(uri, false);
+ if (existing != null) {
+ return existing;
+ }
+
+ InputStream stream = null;
+ Resource resource = null;
+ try {
+ resource = resourceSet.createResource(uri);
+ stream = fileURL.openStream();
+ resource.load(stream, Collections.emptyMap());
+ } catch (IOException e) {
+ // return null
+ } catch (WrappedException e) {
+ // return null
+ } finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException e) {
+ // Should have been caught by the outer try
+ }
+ }
+ }
+
+ return resource;
+ }
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java
index 87fd7adfe..1eb5686aa 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java
@@ -18,31 +18,31 @@ import org.eclipse.emf.ecore.resource.Resource;
public class DistanceMatchInputData extends AbstractInputData {
public Resource getCompareLeft() throws IOException {
- return loadFromClassloader("compareLeft.ecore");
+ return loadFromClassLoader("compareLeft.ecore");
}
public Resource getCompareRight() throws IOException {
- return loadFromClassloader("compareRight.ecore");
+ return loadFromClassLoader("compareRight.ecore");
}
public Resource getNominalUMLLeft() throws IOException {
- return loadFromClassloader("agencyLeft.uml");
+ return loadFromClassLoader("agencyLeft.uml");
}
public Resource getNominalUMLRight() throws IOException {
- return loadFromClassloader("agencyRight.uml");
+ return loadFromClassLoader("agencyRight.uml");
}
public Resource getNominalUMLOrigin() throws IOException {
- return loadFromClassloader("agencyOrigin.uml");
+ return loadFromClassLoader("agencyOrigin.uml");
}
public Resource getVerySmallLeft() throws IOException {
- return loadFromClassloader("verySmallLeft.ecore");
+ return loadFromClassLoader("verySmallLeft.ecore");
}
public Resource getVerySmallRight() throws IOException {
- return loadFromClassloader("verySmallRight.ecore");
+ return loadFromClassLoader("verySmallRight.ecore");
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/IdentifierMatchInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/IdentifierMatchInputData.java
index aaacc1438..4be9ed51e 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/IdentifierMatchInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/identifier/IdentifierMatchInputData.java
@@ -23,14 +23,14 @@ import org.eclipse.emf.ecore.resource.Resource;
@SuppressWarnings("nls")
public class IdentifierMatchInputData extends AbstractInputData {
public Resource getExtlibraryLeft() throws IOException {
- return loadFromClassloader("extlibraryLeft.ecore");
+ return loadFromClassLoader("extlibraryLeft.ecore");
}
public Resource getExtlibraryRight() throws IOException {
- return loadFromClassloader("extlibraryRight.ecore");
+ return loadFromClassLoader("extlibraryRight.ecore");
}
public Resource getExtlibraryOrigin() throws IOException {
- return loadFromClassloader("extlibraryOrigin.ecore");
+ return loadFromClassLoader("extlibraryOrigin.ecore");
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java
index 348447f44..05e0aa2ea 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java
@@ -23,218 +23,218 @@ import org.eclipse.emf.ecore.resource.Resource;
@SuppressWarnings("nls")
public class IndividualDiffInputData extends AbstractInputData {
public Resource getAttributeMonoChangeLeft() throws IOException {
- return loadFromClassloader("fullscope/attributemonochange/left.nodes");
+ return loadFromClassLoader("fullscope/attributemonochange/left.nodes");
}
public Resource getAttributeMonoChangeOrigin() throws IOException {
- return loadFromClassloader("fullscope/attributemonochange/origin.nodes");
+ return loadFromClassLoader("fullscope/attributemonochange/origin.nodes");
}
public Resource getAttributeMonoChangeRight() throws IOException {
- return loadFromClassloader("fullscope/attributemonochange/right.nodes");
+ return loadFromClassLoader("fullscope/attributemonochange/right.nodes");
}
public Resource getAttributeMonoSetLeft() throws IOException {
- return loadFromClassloader("fullscope/attributemonoset/left.nodes");
+ return loadFromClassLoader("fullscope/attributemonoset/left.nodes");
}
public Resource getAttributeMonoSetOrigin() throws IOException {
- return loadFromClassloader("fullscope/attributemonoset/origin.nodes");
+ return loadFromClassLoader("fullscope/attributemonoset/origin.nodes");
}
public Resource getAttributeMonoSetRight() throws IOException {
- return loadFromClassloader("fullscope/attributemonoset/right.nodes");
+ return loadFromClassLoader("fullscope/attributemonoset/right.nodes");
}
public Resource getAttributeMonoUnsetLeft() throws IOException {
- return loadFromClassloader("fullscope/attributemonounset/left.nodes");
+ return loadFromClassLoader("fullscope/attributemonounset/left.nodes");
}
public Resource getAttributeMonoUnsetOrigin() throws IOException {
- return loadFromClassloader("fullscope/attributemonounset/origin.nodes");
+ return loadFromClassLoader("fullscope/attributemonounset/origin.nodes");
}
public Resource getAttributeMonoUnsetRight() throws IOException {
- return loadFromClassloader("fullscope/attributemonounset/right.nodes");
+ return loadFromClassLoader("fullscope/attributemonounset/right.nodes");
}
public Resource getAttributeMultiAddLeft() throws IOException {
- return loadFromClassloader("fullscope/attributemultiadd/left.nodes");
+ return loadFromClassLoader("fullscope/attributemultiadd/left.nodes");
}
public Resource getAttributeMultiAddOrigin() throws IOException {
- return loadFromClassloader("fullscope/attributemultiadd/origin.nodes");
+ return loadFromClassLoader("fullscope/attributemultiadd/origin.nodes");
}
public Resource getAttributeMultiAddRight() throws IOException {
- return loadFromClassloader("fullscope/attributemultiadd/right.nodes");
+ return loadFromClassLoader("fullscope/attributemultiadd/right.nodes");
}
public Resource getAttributeMultiDelLeft() throws IOException {
- return loadFromClassloader("fullscope/attributemultidel/left.nodes");
+ return loadFromClassLoader("fullscope/attributemultidel/left.nodes");
}
public Resource getAttributeMultiDelOrigin() throws IOException {
- return loadFromClassloader("fullscope/attributemultidel/origin.nodes");
+ return loadFromClassLoader("fullscope/attributemultidel/origin.nodes");
}
public Resource getAttributeMultiDelRight() throws IOException {
- return loadFromClassloader("fullscope/attributemultidel/right.nodes");
+ return loadFromClassLoader("fullscope/attributemultidel/right.nodes");
}
public Resource getAttributeMultiMoveLeft() throws IOException {
- return loadFromClassloader("fullscope/attributemultimove/left.nodes");
+ return loadFromClassLoader("fullscope/attributemultimove/left.nodes");
}
public Resource getAttributeMultiMoveOrigin() throws IOException {
- return loadFromClassloader("fullscope/attributemultimove/origin.nodes");
+ return loadFromClassLoader("fullscope/attributemultimove/origin.nodes");
}
public Resource getAttributeMultiMoveRight() throws IOException {
- return loadFromClassloader("fullscope/attributemultimove/right.nodes");
+ return loadFromClassLoader("fullscope/attributemultimove/right.nodes");
}
public Resource getReferenceMonoChangeLeft() throws IOException {
- return loadFromClassloader("fullscope/referencemonochange/left.nodes");
+ return loadFromClassLoader("fullscope/referencemonochange/left.nodes");
}
public Resource getReferenceMonoChangeOrigin() throws IOException {
- return loadFromClassloader("fullscope/referencemonochange/origin.nodes");
+ return loadFromClassLoader("fullscope/referencemonochange/origin.nodes");
}
public Resource getReferenceMonoChangeRight() throws IOException {
- return loadFromClassloader("fullscope/referencemonochange/right.nodes");
+ return loadFromClassLoader("fullscope/referencemonochange/right.nodes");
}
public Resource getReferenceMonoSetLeft() throws IOException {
- return loadFromClassloader("fullscope/referencemonoset/left.nodes");
+ return loadFromClassLoader("fullscope/referencemonoset/left.nodes");
}
public Resource getReferenceMonoSetOrigin() throws IOException {
- return loadFromClassloader("fullscope/referencemonoset/origin.nodes");
+ return loadFromClassLoader("fullscope/referencemonoset/origin.nodes");
}
public Resource getReferenceMonoSetRight() throws IOException {
- return loadFromClassloader("fullscope/referencemonoset/right.nodes");
+ return loadFromClassLoader("fullscope/referencemonoset/right.nodes");
}
public Resource getReferenceMonoUnsetLeft() throws IOException {
- return loadFromClassloader("fullscope/referencemonounset/left.nodes");
+ return loadFromClassLoader("fullscope/referencemonounset/left.nodes");
}
public Resource getReferenceMonoUnsetOrigin() throws IOException {
- return loadFromClassloader("fullscope/referencemonounset/origin.nodes");
+ return loadFromClassLoader("fullscope/referencemonounset/origin.nodes");
}
public Resource getReferenceMonoUnsetRight() throws IOException {
- return loadFromClassloader("fullscope/referencemonounset/right.nodes");
+ return loadFromClassLoader("fullscope/referencemonounset/right.nodes");
}
public Resource getReferenceMultiAddLeft() throws IOException {
- return loadFromClassloader("fullscope/referencemultiadd/left.nodes");
+ return loadFromClassLoader("fullscope/referencemultiadd/left.nodes");
}
public Resource getReferenceMultiAddOrigin() throws IOException {
- return loadFromClassloader("fullscope/referencemultiadd/origin.nodes");
+ return loadFromClassLoader("fullscope/referencemultiadd/origin.nodes");
}
public Resource getReferenceMultiAddRight() throws IOException {
- return loadFromClassloader("fullscope/referencemultiadd/right.nodes");
+ return loadFromClassLoader("fullscope/referencemultiadd/right.nodes");
}
public Resource getReferenceMultiDelLeft() throws IOException {
- return loadFromClassloader("fullscope/referencemultidel/left.nodes");
+ return loadFromClassLoader("fullscope/referencemultidel/left.nodes");
}
public Resource getReferenceMultiDelOrigin() throws IOException {
- return loadFromClassloader("fullscope/referencemultidel/origin.nodes");
+ return loadFromClassLoader("fullscope/referencemultidel/origin.nodes");
}
public Resource getReferenceMultiDelRight() throws IOException {
- return loadFromClassloader("fullscope/referencemultidel/right.nodes");
+ return loadFromClassLoader("fullscope/referencemultidel/right.nodes");
}
public Resource getReferenceMultiMoveLeft() throws IOException {
- return loadFromClassloader("fullscope/referencemultimove/left.nodes");
+ return loadFromClassLoader("fullscope/referencemultimove/left.nodes");
}
public Resource getReferenceMultiMoveOrigin() throws IOException {
- return loadFromClassloader("fullscope/referencemultimove/origin.nodes");
+ return loadFromClassLoader("fullscope/referencemultimove/origin.nodes");
}
public Resource getReferenceMultiMoveRight() throws IOException {
- return loadFromClassloader("fullscope/referencemultimove/right.nodes");
+ return loadFromClassLoader("fullscope/referencemultimove/right.nodes");
}
public Resource getReferenceMonoChangeLeftOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonochange/left.nodes");
+ return loadFromClassLoader("outofscope/referencemonochange/left.nodes");
}
public Resource getReferenceMonoChangeOriginOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonochange/origin.nodes");
+ return loadFromClassLoader("outofscope/referencemonochange/origin.nodes");
}
public Resource getReferenceMonoChangeRightOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonochange/right.nodes");
+ return loadFromClassLoader("outofscope/referencemonochange/right.nodes");
}
public Resource getReferenceMonoSetLeftOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonoset/left.nodes");
+ return loadFromClassLoader("outofscope/referencemonoset/left.nodes");
}
public Resource getReferenceMonoSetOriginOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonoset/origin.nodes");
+ return loadFromClassLoader("outofscope/referencemonoset/origin.nodes");
}
public Resource getReferenceMonoSetRightOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonoset/right.nodes");
+ return loadFromClassLoader("outofscope/referencemonoset/right.nodes");
}
public Resource getReferenceMonoUnsetLeftOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonounset/left.nodes");
+ return loadFromClassLoader("outofscope/referencemonounset/left.nodes");
}
public Resource getReferenceMonoUnsetOriginOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonounset/origin.nodes");
+ return loadFromClassLoader("outofscope/referencemonounset/origin.nodes");
}
public Resource getReferenceMonoUnsetRightOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemonounset/right.nodes");
+ return loadFromClassLoader("outofscope/referencemonounset/right.nodes");
}
public Resource getReferenceMultiAddLeftOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultiadd/left.nodes");
+ return loadFromClassLoader("outofscope/referencemultiadd/left.nodes");
}
public Resource getReferenceMultiAddOriginOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultiadd/origin.nodes");
+ return loadFromClassLoader("outofscope/referencemultiadd/origin.nodes");
}
public Resource getReferenceMultiAddRightOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultiadd/right.nodes");
+ return loadFromClassLoader("outofscope/referencemultiadd/right.nodes");
}
public Resource getReferenceMultiDelLeftOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultidel/left.nodes");
+ return loadFromClassLoader("outofscope/referencemultidel/left.nodes");
}
public Resource getReferenceMultiDelOriginOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultidel/origin.nodes");
+ return loadFromClassLoader("outofscope/referencemultidel/origin.nodes");
}
public Resource getReferenceMultiDelRightOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultidel/right.nodes");
+ return loadFromClassLoader("outofscope/referencemultidel/right.nodes");
}
public Resource getReferenceMultiMoveLeftOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultimove/left.nodes");
+ return loadFromClassLoader("outofscope/referencemultimove/left.nodes");
}
public Resource getReferenceMultiMoveOriginOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultimove/origin.nodes");
+ return loadFromClassLoader("outofscope/referencemultimove/origin.nodes");
}
public Resource getReferenceMultiMoveRightOutOfScope() throws IOException {
- return loadFromClassloader("outofscope/referencemultimove/right.nodes");
+ return loadFromClassLoader("outofscope/referencemultimove/right.nodes");
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/data/PostProcessInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/data/PostProcessInputData.java
index ec1e5db07..9e86e6240 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/data/PostProcessInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/data/PostProcessInputData.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.resource.Resource;
public class PostProcessInputData extends AbstractInputData {
public Resource getLeft() throws IOException {
- return loadFromClassloader("left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("left.nodes"); //$NON-NLS-1$
}
public Resource getRight() throws IOException {
- return loadFromClassloader("right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("right.nodes"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/data/ReqInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/data/ReqInputData.java
index 09423094b..63a399703 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/data/ReqInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/data/ReqInputData.java
@@ -17,402 +17,402 @@ import org.eclipse.emf.ecore.resource.Resource;
public class ReqInputData extends AbstractInputData {
public Resource getA1Left() throws IOException {
- return loadFromClassloader("a1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a1/left.nodes"); //$NON-NLS-1$
}
public Resource getA1Right() throws IOException {
- return loadFromClassloader("a1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a1/right.nodes"); //$NON-NLS-1$
}
public Resource getA2Left() throws IOException {
- return loadFromClassloader("a2/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a2/left.nodes"); //$NON-NLS-1$
}
public Resource getA2Right() throws IOException {
- return loadFromClassloader("a2/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a2/right.nodes"); //$NON-NLS-1$
}
public Resource getA3Left() throws IOException {
- return loadFromClassloader("a3/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a3/left.nodes"); //$NON-NLS-1$
}
public Resource getA3Right() throws IOException {
- return loadFromClassloader("a3/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a3/right.nodes"); //$NON-NLS-1$
}
public Resource getA4Left() throws IOException {
- return loadFromClassloader("a4/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a4/left.nodes"); //$NON-NLS-1$
}
public Resource getA4Right() throws IOException {
- return loadFromClassloader("a4/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a4/right.nodes"); //$NON-NLS-1$
}
public Resource getA5Left() throws IOException {
- return loadFromClassloader("a5/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a5/left.nodes"); //$NON-NLS-1$
}
public Resource getA5Right() throws IOException {
- return loadFromClassloader("a5/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a5/right.nodes"); //$NON-NLS-1$
}
public Resource getA6Left() throws IOException {
- return loadFromClassloader("a6/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a6/left.nodes"); //$NON-NLS-1$
}
public Resource getA6Right() throws IOException {
- return loadFromClassloader("a6/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a6/right.nodes"); //$NON-NLS-1$
}
public Resource getA7Left() throws IOException {
- return loadFromClassloader("a7/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a7/left.nodes"); //$NON-NLS-1$
}
public Resource getA7Right() throws IOException {
- return loadFromClassloader("a7/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a7/right.nodes"); //$NON-NLS-1$
}
public Resource getA8Left() throws IOException {
- return loadFromClassloader("a8/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a8/left.nodes"); //$NON-NLS-1$
}
public Resource getA8Right() throws IOException {
- return loadFromClassloader("a8/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a8/right.nodes"); //$NON-NLS-1$
}
public Resource getA9Left() throws IOException {
- return loadFromClassloader("a9/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a9/left.nodes"); //$NON-NLS-1$
}
public Resource getA9Right() throws IOException {
- return loadFromClassloader("a9/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a9/right.nodes"); //$NON-NLS-1$
}
public Resource getA10Left() throws IOException {
- return loadFromClassloader("a10/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a10/left.nodes"); //$NON-NLS-1$
}
public Resource getA10Right() throws IOException {
- return loadFromClassloader("a10/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a10/right.nodes"); //$NON-NLS-1$
}
public Resource getA11Left() throws IOException {
- return loadFromClassloader("a11/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a11/left.nodes"); //$NON-NLS-1$
}
public Resource getA11Right() throws IOException {
- return loadFromClassloader("a11/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("a11/right.nodes"); //$NON-NLS-1$
}
public Resource getC1Left() throws IOException {
- return loadFromClassloader("c1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c1/left.nodes"); //$NON-NLS-1$
}
public Resource getC1Right() throws IOException {
- return loadFromClassloader("c1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c1/right.nodes"); //$NON-NLS-1$
}
public Resource getC2Left() throws IOException {
- return loadFromClassloader("c2/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c2/left.nodes"); //$NON-NLS-1$
}
public Resource getC2Right() throws IOException {
- return loadFromClassloader("c2/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c2/right.nodes"); //$NON-NLS-1$
}
public Resource getC3Left() throws IOException {
- return loadFromClassloader("c3/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c3/left.nodes"); //$NON-NLS-1$
}
public Resource getC3Right() throws IOException {
- return loadFromClassloader("c3/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c3/right.nodes"); //$NON-NLS-1$
}
public Resource getC4Left() throws IOException {
- return loadFromClassloader("c4/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c4/left.nodes"); //$NON-NLS-1$
}
public Resource getC4Right() throws IOException {
- return loadFromClassloader("c4/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c4/right.nodes"); //$NON-NLS-1$
}
public Resource getC5Left() throws IOException {
- return loadFromClassloader("c5/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c5/left.nodes"); //$NON-NLS-1$
}
public Resource getC5Right() throws IOException {
- return loadFromClassloader("c5/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("c5/right.nodes"); //$NON-NLS-1$
}
public Resource getE1Left() throws IOException {
- return loadFromClassloader("e1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e1/left.nodes"); //$NON-NLS-1$
}
public Resource getE1Right() throws IOException {
- return loadFromClassloader("e1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e1/right.nodes"); //$NON-NLS-1$
}
public Resource getE1Ancestor() throws IOException {
- return loadFromClassloader("e1/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e1/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE2Left() throws IOException {
- return loadFromClassloader("e2/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e2/left.nodes"); //$NON-NLS-1$
}
public Resource getE2Right() throws IOException {
- return loadFromClassloader("e2/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e2/right.nodes"); //$NON-NLS-1$
}
public Resource getE2Ancestor() throws IOException {
- return loadFromClassloader("e2/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e2/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE3Left() throws IOException {
- return loadFromClassloader("e3/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e3/left.nodes"); //$NON-NLS-1$
}
public Resource getE3Right() throws IOException {
- return loadFromClassloader("e3/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e3/right.nodes"); //$NON-NLS-1$
}
public Resource getE3Ancestor() throws IOException {
- return loadFromClassloader("e3/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e3/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE4Left() throws IOException {
- return loadFromClassloader("e4/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e4/left.nodes"); //$NON-NLS-1$
}
public Resource getE4Right() throws IOException {
- return loadFromClassloader("e4/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e4/right.nodes"); //$NON-NLS-1$
}
public Resource getE4Ancestor() throws IOException {
- return loadFromClassloader("e4/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e4/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE5Left() throws IOException {
- return loadFromClassloader("e5/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e5/left.nodes"); //$NON-NLS-1$
}
public Resource getE5Right() throws IOException {
- return loadFromClassloader("e5/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e5/right.nodes"); //$NON-NLS-1$
}
public Resource getE5Ancestor() throws IOException {
- return loadFromClassloader("e5/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e5/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE6Left() throws IOException {
- return loadFromClassloader("e6/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e6/left.nodes"); //$NON-NLS-1$
}
public Resource getE6Right() throws IOException {
- return loadFromClassloader("e6/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e6/right.nodes"); //$NON-NLS-1$
}
public Resource getE6Ancestor() throws IOException {
- return loadFromClassloader("e6/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e6/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE7Left() throws IOException {
- return loadFromClassloader("e7/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e7/left.nodes"); //$NON-NLS-1$
}
public Resource getE7Right() throws IOException {
- return loadFromClassloader("e7/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e7/right.nodes"); //$NON-NLS-1$
}
public Resource getE7Ancestor() throws IOException {
- return loadFromClassloader("e7/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e7/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE8Left() throws IOException {
- return loadFromClassloader("e8/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e8/left.nodes"); //$NON-NLS-1$
}
public Resource getE8Right() throws IOException {
- return loadFromClassloader("e8/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e8/right.nodes"); //$NON-NLS-1$
}
public Resource getE8Ancestor() throws IOException {
- return loadFromClassloader("e8/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e8/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE9Left() throws IOException {
- return loadFromClassloader("e9/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e9/left.nodes"); //$NON-NLS-1$
}
public Resource getE9Right() throws IOException {
- return loadFromClassloader("e9/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e9/right.nodes"); //$NON-NLS-1$
}
public Resource getE9Ancestor() throws IOException {
- return loadFromClassloader("e9/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e9/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE10Left() throws IOException {
- return loadFromClassloader("e10/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e10/left.nodes"); //$NON-NLS-1$
}
public Resource getE10Right() throws IOException {
- return loadFromClassloader("e10/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e10/right.nodes"); //$NON-NLS-1$
}
public Resource getE10Ancestor() throws IOException {
- return loadFromClassloader("e10/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e10/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getE11Left() throws IOException {
- return loadFromClassloader("e11/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e11/left.nodes"); //$NON-NLS-1$
}
public Resource getE11Right() throws IOException {
- return loadFromClassloader("e11/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e11/right.nodes"); //$NON-NLS-1$
}
public Resource getE11Ancestor() throws IOException {
- return loadFromClassloader("e11/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("e11/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF1Left() throws IOException {
- return loadFromClassloader("f1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f1/left.nodes"); //$NON-NLS-1$
}
public Resource getF1Right() throws IOException {
- return loadFromClassloader("f1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f1/right.nodes"); //$NON-NLS-1$
}
public Resource getF1Ancestor() throws IOException {
- return loadFromClassloader("f1/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f1/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF2Left() throws IOException {
- return loadFromClassloader("f2/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f2/left.nodes"); //$NON-NLS-1$
}
public Resource getF2Right() throws IOException {
- return loadFromClassloader("f2/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f2/right.nodes"); //$NON-NLS-1$
}
public Resource getF2Ancestor() throws IOException {
- return loadFromClassloader("f2/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f2/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF3Left() throws IOException {
- return loadFromClassloader("f3/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f3/left.nodes"); //$NON-NLS-1$
}
public Resource getF3Right() throws IOException {
- return loadFromClassloader("f3/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f3/right.nodes"); //$NON-NLS-1$
}
public Resource getF3Ancestor() throws IOException {
- return loadFromClassloader("f3/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f3/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF4Left() throws IOException {
- return loadFromClassloader("f4/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f4/left.nodes"); //$NON-NLS-1$
}
public Resource getF4Right() throws IOException {
- return loadFromClassloader("f4/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f4/right.nodes"); //$NON-NLS-1$
}
public Resource getF4Ancestor() throws IOException {
- return loadFromClassloader("f4/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f4/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF5Left() throws IOException {
- return loadFromClassloader("f5/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f5/left.nodes"); //$NON-NLS-1$
}
public Resource getF5Right() throws IOException {
- return loadFromClassloader("f5/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f5/right.nodes"); //$NON-NLS-1$
}
public Resource getF5Ancestor() throws IOException {
- return loadFromClassloader("f5/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f5/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF6Left() throws IOException {
- return loadFromClassloader("f6/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f6/left.nodes"); //$NON-NLS-1$
}
public Resource getF6Right() throws IOException {
- return loadFromClassloader("f6/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f6/right.nodes"); //$NON-NLS-1$
}
public Resource getF6Ancestor() throws IOException {
- return loadFromClassloader("f6/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f6/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF7Left() throws IOException {
- return loadFromClassloader("f7/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f7/left.nodes"); //$NON-NLS-1$
}
public Resource getF7Right() throws IOException {
- return loadFromClassloader("f7/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f7/right.nodes"); //$NON-NLS-1$
}
public Resource getF7Ancestor() throws IOException {
- return loadFromClassloader("f7/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f7/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF8Left() throws IOException {
- return loadFromClassloader("f8/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f8/left.nodes"); //$NON-NLS-1$
}
public Resource getF8Right() throws IOException {
- return loadFromClassloader("f8/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f8/right.nodes"); //$NON-NLS-1$
}
public Resource getF8Ancestor() throws IOException {
- return loadFromClassloader("f8/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f8/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF9Left() throws IOException {
- return loadFromClassloader("f9/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f9/left.nodes"); //$NON-NLS-1$
}
public Resource getF9Right() throws IOException {
- return loadFromClassloader("f9/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f9/right.nodes"); //$NON-NLS-1$
}
public Resource getF9Ancestor() throws IOException {
- return loadFromClassloader("f9/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f9/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF10Left() throws IOException {
- return loadFromClassloader("f10/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f10/left.nodes"); //$NON-NLS-1$
}
public Resource getF10Right() throws IOException {
- return loadFromClassloader("f10/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f10/right.nodes"); //$NON-NLS-1$
}
public Resource getF10Ancestor() throws IOException {
- return loadFromClassloader("f10/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f10/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getF11Left() throws IOException {
- return loadFromClassloader("f11/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f11/left.nodes"); //$NON-NLS-1$
}
public Resource getF11Right() throws IOException {
- return loadFromClassloader("f11/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f11/right.nodes"); //$NON-NLS-1$
}
public Resource getF11Ancestor() throws IOException {
- return loadFromClassloader("f11/ancestor.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("f11/ancestor.nodes"); //$NON-NLS-1$
}
public Resource getG1Left() throws IOException {
- return loadFromClassloader("g1/left.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("g1/left.nodes"); //$NON-NLS-1$
}
public Resource getG1Right() throws IOException {
- return loadFromClassloader("g1/right.nodes"); //$NON-NLS-1$
+ return loadFromClassLoader("g1/right.nodes"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
index 830ff3922..c478c6fc0 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.compare.tests.conflict.ConflictDetectionTest;
import org.eclipse.emf.compare.tests.diff.DiffUtilTest;
import org.eclipse.emf.compare.tests.diff.URIDistanceTest;
import org.eclipse.emf.compare.tests.equi.EquiComputingTest;
+import org.eclipse.emf.compare.tests.fragmentation.FragmentationTest;
import org.eclipse.emf.compare.tests.fullcomparison.DynamicInstanceComparisonTest;
import org.eclipse.emf.compare.tests.fullcomparison.IdentifierComparisonTest;
import org.eclipse.emf.compare.tests.fullcomparison.ProximityComparisonTest;
@@ -47,7 +48,7 @@ import org.junit.runners.Suite.SuiteClasses;
ConflictDetectionTest.class, ReqComputingTest.class, EquiComputingTest.class, DiffUtilTest.class,
MultipleMergeTest.class, PostProcessorTest.class, IndividualMergeTest.class,
IndividualMergeOutOfScopeValuesTest.class, ProximityComparisonTest.class,
- DynamicInstanceComparisonTest.class, URIDistanceTest.class })
+ DynamicInstanceComparisonTest.class, URIDistanceTest.class, FragmentationTest.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top