Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2017-01-19 11:31:36 -0500
committerLaurent Delaigue2017-01-24 11:23:36 -0500
commitdf499162002802e32144dc401e8ae7de00d31dbf (patch)
tree4474a747a647254f938ef32c0e9c8ed8ad8d2fa9 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parentaa3679b630ac02757a6a3eb691525a38f55b21e5 (diff)
downloadorg.eclipse.emf.compare-df499162002802e32144dc401e8ae7de00d31dbf.tar.gz
org.eclipse.emf.compare-df499162002802e32144dc401e8ae7de00d31dbf.tar.xz
org.eclipse.emf.compare-df499162002802e32144dc401e8ae7de00d31dbf.zip
[510704] Add equivalent diffs in same conflict
Bug: 510704 Change-Id: Ib6496b5713c962bcfa34e74e8b526384aef54f77 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.java5
1 files changed, 3 insertions, 2 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 69b2cd077..a69af8112 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
@@ -17,6 +17,7 @@ package org.eclipse.emf.compare.tests.suite;
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.ConflictSearchTest;
import org.eclipse.emf.compare.tests.conflict.MultiLineAttributeConflictDetectionTest;
import org.eclipse.emf.compare.tests.conflict.PseudoConflictDetectionTest;
import org.eclipse.emf.compare.tests.conflict.data.bug484557.Bug484557ConflictTest;
@@ -106,8 +107,8 @@ import junit.textui.TestRunner;
Bug485266_MoveDeleteConflict_Test.class, ResourceAttachmentChangeBug492261.class,
RankedAdapterFactoryRegistryTest.class, ComparisonScopeAdapterTest.class,
EMFComparePredicatesTest.class, ImplicationsMergeTest.class, GraphTest.class,
- ConflictImplicationsTest_Bug484579.class, PseudoConflictDetectionTest.class,
- ComplexMergeTest.class, })
+ ConflictImplicationsTest_Bug484579.class, PseudoConflictDetectionTest.class, ComplexMergeTest.class,
+ ConflictSearchTest.class, })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top