diff options
author | Philip Langer | 2016-05-12 16:34:41 +0000 |
---|---|---|
committer | Laurent Delaigue | 2016-06-03 08:55:48 +0000 |
commit | 7ad78fe00cb8ee8108228dd30d53a9ead06a3ca3 (patch) | |
tree | 6ab1b77d75659bb5546ac7d27b8f67af322720a4 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite | |
parent | ea6b5f3db821d3c3cdff84a6f269ee989facadd6 (diff) | |
download | org.eclipse.emf.compare-7ad78fe00cb8ee8108228dd30d53a9ead06a3ca3.tar.gz org.eclipse.emf.compare-7ad78fe00cb8ee8108228dd30d53a9ead06a3ca3.tar.xz org.eclipse.emf.compare-7ad78fe00cb8ee8108228dd30d53a9ead06a3ca3.zip |
Store all file URIs that have initially been in scope
With this change, we provide access to the originally selected resources
in the synchronization model and the comparison scope. This information
will allow us to better identify the context of a comparison or merge.
Change-Id: I344ed455e77df171143ceb089c6269d207046e31
Signed-off-by: Philip Langer <planger@eclipsesource.com>
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.java | 4 |
1 files changed, 3 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 749e98933..c8bb708cb 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 @@ -63,6 +63,7 @@ import org.eclipse.emf.compare.tests.nodes.NodesPackage; import org.eclipse.emf.compare.tests.nodes.util.NodesResourceFactoryImpl; import org.eclipse.emf.compare.tests.postprocess.PostProcessorTest; import org.eclipse.emf.compare.tests.req.ReqComputingTest; +import org.eclipse.emf.compare.tests.scope.ComparisonScopeAdapterTest; import org.eclipse.emf.compare.tests.scope.DefaultComparisonScopeTest; import org.eclipse.emf.compare.tests.utils.EqualityHelperTest; import org.eclipse.emf.compare.tests.utils.MatchUtilFeatureContainsTest; @@ -94,7 +95,8 @@ 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, ResourceAttachmentChangeBug492261.class }) + Bug485266_MoveDeleteConflict_Test.class, ResourceAttachmentChangeBug492261.class, + ComparisonScopeAdapterTest.class, }) public class AllTests { /** * Standalone launcher for all of compare's tests. |