Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2015-09-18 10:04:21 -0400
committerAxel Richard2015-09-29 09:10:59 -0400
commit66a2f57d87adfddaadfed7c968a40c491980aced (patch)
tree794cf2d09fb4ebccd4bcbe562e273186ce5901ef /plugins/org.eclipse.emf.compare.tests/src/org/eclipse
parent04facfead9e64a9bd38f734273c927a74de67a54 (diff)
downloadorg.eclipse.emf.compare-66a2f57d87adfddaadfed7c968a40c491980aced.tar.gz
org.eclipse.emf.compare-66a2f57d87adfddaadfed7c968a40c491980aced.tar.xz
org.eclipse.emf.compare-66a2f57d87adfddaadfed7c968a40c491980aced.zip
[477767] Introduce new MatchingStrategy for models shared with git3.2.0M2
When a comparison invloves models shared with git, the NameMatchingStrategy is not effective. The strategy should use the entire location for matching instead of name. This strategy must be active only when comparison invloves models shared with git. Change-Id: I27a4b03871845ed1f1e54de4659ebad844dc8e72 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java3
1 files changed, 0 insertions, 3 deletions
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
index 1ce88a85d..e852f4f04 100644
--- 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
@@ -643,7 +643,6 @@ public class FragmentationTest {
}
// This only tests the merge. Will fail if testControledObjectFolderResourceSet does.
- @Ignore("To ignore while an Egit merge strategy hasn't be provided.")
@Test
public void testMergeControledObjectFolderResourceSetLtR() throws IOException {
final Resource left = input.getControlLeftFolder();
@@ -956,7 +955,6 @@ public class FragmentationTest {
}
// This only tests the merge. Will fail if testDeletedRootResourceSet does.
- @Ignore("To ignore while an Egit merge strategy hasn't be provided.")
@Test
public void testMergeDeletedRootResourceSetRtL() throws IOException {
final Resource left = input.getDeletedRootLeft();
@@ -1101,7 +1099,6 @@ public class FragmentationTest {
}
// This only tests the merge. Will fail if testNewRootResourceSet does.
- @Ignore("To ignore while an Egit merge strategy hasn't be provided.")
@Test
public void testMergeNewRootResourceSetLtR() throws IOException {
final Resource left = input.getNewRootLeft();

Back to the top