Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Cartaud2016-04-25 08:42:37 -0400
committerLaurent Delaigue2016-05-10 02:38:04 -0400
commit118b62be3c4744c47df68aedfb3bc29696c92f78 (patch)
tree85f4ba5db5367fe1e2c115660428397d2fb76f85 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parentad2007e30c3bb99a07803c666c0326286970ad26 (diff)
downloadorg.eclipse.emf.compare-118b62be3c4744c47df68aedfb3bc29696c92f78.tar.gz
org.eclipse.emf.compare-118b62be3c4744c47df68aedfb3bc29696c92f78.tar.xz
org.eclipse.emf.compare-118b62be3c4744c47df68aedfb3bc29696c92f78.zip
[492261] Merge ResourceAttChange in the right resource
Add test to make sure that diffs linked to a merged RAC are now created in the right resource Bug: 492261 Change-Id: I4de6c63d16add447241c891a22e46c224f819cd3 Signed-off-by: Mathieu Cartaud <mathieu.cartaud@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 11b6cad45..749e98933 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
@@ -32,6 +32,7 @@ import org.eclipse.emf.compare.tests.diff.URIDistanceTest;
import org.eclipse.emf.compare.tests.edit.AllEditTests;
import org.eclipse.emf.compare.tests.equi.EquiComputingTest;
import org.eclipse.emf.compare.tests.fragmentation.FragmentationTest;
+import org.eclipse.emf.compare.tests.fragmentation.ResourceAttachmentChangeBug492261;
import org.eclipse.emf.compare.tests.fullcomparison.DynamicInstanceComparisonTest;
import org.eclipse.emf.compare.tests.fullcomparison.ExtLibraryTest;
import org.eclipse.emf.compare.tests.fullcomparison.IdentifierComparisonTest;
@@ -93,7 +94,7 @@ import org.junit.runners.Suite.SuiteClasses;
MultiLineAttributeConflictDetectionTest.class, ThreeWayTextDiffTest.class,
MultiLineAttributeMergeTest.class, MonitorCancelTest.class, IdentifierEObjectMatcherTest.class,
MatchUtilFeatureContainsTest.class, RefineMergeTest.class, Bug484557ConflictTest.class,
- Bug485266_MoveDeleteConflict_Test.class })
+ Bug485266_MoveDeleteConflict_Test.class, ResourceAttachmentChangeBug492261.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top