diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java')
-rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java | 3 |
1 files changed, 3 insertions, 0 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 e852f4f04..1ce88a85d 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,6 +643,7 @@ 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(); @@ -955,6 +956,7 @@ 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(); @@ -1099,6 +1101,7 @@ 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(); |