Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2015-12-17 02:19:16 -0500
committerLaurent Delaigue2016-01-05 10:45:06 -0500
commit619673c9a2ab9a605dcee71c71d54a04c56b630a (patch)
tree328f70475220030820d372decb3a8de0df5be514 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parent72f4e844338af831fca31ec7e807681fe32dcf9e (diff)
downloadorg.eclipse.emf.compare-619673c9a2ab9a605dcee71c71d54a04c56b630a.tar.gz
org.eclipse.emf.compare-619673c9a2ab9a605dcee71c71d54a04c56b630a.tar.xz
org.eclipse.emf.compare-619673c9a2ab9a605dcee71c71d54a04c56b630a.zip
[484557] ResourceAttachment vs Attribute conflicts
Conflicts between ResourceAttachmentChanges and Attribute or FeatureMap changes were not properly detected. Bug: 484557 Change-Id: I06afb3f4141f9194b1314f423282b7df51e66d2e Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java3
1 files changed, 2 insertions, 1 deletions
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 af90f241b..0e7647aea 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
@@ -21,6 +21,7 @@ import org.eclipse.emf.compare.ComparePackage;
import org.eclipse.emf.compare.tests.command.CommandStackTestSuite;
import org.eclipse.emf.compare.tests.conflict.ConflictDetectionTest;
import org.eclipse.emf.compare.tests.conflict.MultiLineAttributeConflictDetectionTest;
+import org.eclipse.emf.compare.tests.conflict.data.bug484557.Bug484557ConflictTest;
import org.eclipse.emf.compare.tests.diff.ComparisonUtilTest;
import org.eclipse.emf.compare.tests.diff.DiffUtilTest;
import org.eclipse.emf.compare.tests.diff.FeatureFilterTest;
@@ -90,7 +91,7 @@ import org.junit.runners.Suite.SuiteClasses;
FeatureFilterTest.class, ThreeWayBatchMergingTest.class,
MultiLineAttributeConflictDetectionTest.class, ThreeWayTextDiffTest.class,
MultiLineAttributeMergeTest.class, MonitorCancelTest.class, IdentifierEObjectMatcherTest.class,
- MatchUtilFeatureContainsTest.class, RefineMergeTest.class })
+ MatchUtilFeatureContainsTest.class, RefineMergeTest.class, Bug484557ConflictTest.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top