Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2015-09-18 10:12:49 -0400
committerLaurent Delaigue2015-09-18 10:35:22 -0400
commit906d0cc7d2eb527b375c26c3654d3e030c482cc3 (patch)
tree3c8d909f243fbcec0d046c8a883e23f30b3a50f1 /plugins/org.eclipse.emf.compare.tests
parent92e3df0cb5f57f5c81f324ee599834cc31deb047 (diff)
downloadorg.eclipse.emf.compare-906d0cc7d2eb527b375c26c3654d3e030c482cc3.tar.gz
org.eclipse.emf.compare-906d0cc7d2eb527b375c26c3654d3e030c482cc3.tar.xz
org.eclipse.emf.compare-906d0cc7d2eb527b375c26c3654d3e030c482cc3.zip
Remove dependency to rcp in emf.compare.tests
Introduce new test project to do so. Change-Id: I6d487446bd7b78110ab6b742c57496d56d81ca14 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/AllRCPTests.java24
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/ItemRegistryTest.java176
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/MatchEngineFactoryRegistryWrapperTest.java399
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/EcoreInputData.java33
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryLeft.ecore109
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryOrigin.ecore111
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryRight.ecore112
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java5
9 files changed, 2 insertions, 968 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
index cfc063f4c..aca9bd2f7 100644
--- a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore.change,
org.eclipse.uml2.uml;bundle-version="3.1.2",
org.eclipse.emf.compare.edit,
- org.eclipse.emf.compare.rcp;bundle-version="2.2.0",
org.eclipse.emf.transaction;bundle-version="1.3.0",
org.mockito;bundle-version="1.8.0",
org.hamcrest;bundle-version="1.1.0"
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/AllRCPTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/AllRCPTests.java
deleted file mode 100644
index 320e9d5c5..000000000
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/AllRCPTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.emf.compare.tests.rcp;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
-@RunWith(Suite.class)
-@SuiteClasses({ItemRegistryTest.class, MatchEngineFactoryRegistryWrapperTest.class })
-public class AllRCPTests {
-
-}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/ItemRegistryTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/ItemRegistryTest.java
deleted file mode 100644
index 6ea934c2a..000000000
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/ItemRegistryTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.emf.compare.tests.rcp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import org.eclipse.emf.compare.match.IMatchEngine;
-import org.eclipse.emf.compare.match.IMatchEngine.Factory;
-import org.eclipse.emf.compare.match.impl.MatchEngineFactoryImpl;
-import org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor;
-import org.eclipse.emf.compare.rcp.internal.extension.IItemRegistry;
-import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemRegistry;
-import org.eclipse.emf.compare.rcp.internal.extension.impl.WrapperItemDescriptor;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test class for {@link ItemRegistry}.
- *
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
-@SuppressWarnings({"restriction", "nls" })
-public class ItemRegistryTest {
-
- /** Registry to test. */
- private IItemRegistry<IMatchEngine.Factory> registry;
-
- @Before
- public void setUp() {
- registry = new ItemRegistry<IMatchEngine.Factory>();
- }
-
- /**
- * Create a {@link IMatchEngine.Factory} descriptor.
- *
- * @param id
- * Id of the descriptor.
- * @param rank
- * Rank of the descriptor.
- * @param instance
- * Instance that the descriptor describes.
- * @return {@link IItemDescriptor} of {@link IMatchEngine.Factory}.
- */
- private IItemDescriptor<IMatchEngine.Factory> createDescriptor(String id, int rank,
- IMatchEngine.Factory instance) {
- return new WrapperItemDescriptor<IMatchEngine.Factory>("Fake label " + id, "Fake description " + id,
- rank, id, instance);
- }
-
- /**
- * Nominal use case: Add an element in the registry.
- */
- @Test
- public void testAdd() {
- String id = "fakeID";
- IItemDescriptor<Factory> instance = createDescriptor(id, 1, new MatchEngineFactoryImpl());
- IItemDescriptor<Factory> oldValue = registry.add(instance);
- assertEquals(registry.getItemDescriptors().size(), 1);
- assertSame(registry.getItemDescriptor(id), instance);
- assertSame(registry.getHighestRankingDescriptor(), instance);
- assertNull(oldValue);
- }
-
- /**
- * Adds a null to the registry.
- */
- @Test(expected = NullPointerException.class)
- public void testAddNull() {
- registry.add(null);
- }
-
- /**
- * Adds two elements with the same id in the registry.
- */
- @Test
- public void testSameID() {
- String id = "fakeID";
- IItemDescriptor<Factory> instance1 = createDescriptor(id, 1, new MatchEngineFactoryImpl());
- registry.add(instance1);
- IItemDescriptor<Factory> instance2 = createDescriptor(id, 2, new MatchEngineFactoryImpl());
- IItemDescriptor<Factory> oldValue = registry.add(instance2);
- assertTrue(oldValue == instance1);
- assertTrue(registry.getItemDescriptor(id) == instance2);
- assertTrue(registry.getItemDescriptors().size() == 1);
- }
-
- /**
- * Nominal use case: Checks that the registry returns the item with the highest rank.
- */
- @Test
- public void testGetHighestRankingItem() {
- registry.add(createDescriptor("Id-10", -10, new MatchEngineFactoryImpl()));
- registry.add(createDescriptor("Id0", 0, new MatchEngineFactoryImpl()));
- registry.add(createDescriptor("Id10", 10, new MatchEngineFactoryImpl()));
- IItemDescriptor<Factory> higherRankedInstance = createDescriptor("Id100", 100,
- new MatchEngineFactoryImpl());
- registry.add(higherRankedInstance);
- assertTrue(registry.getHighestRankingDescriptor() == higherRankedInstance);
- }
-
- /**
- * Gets the highest ranking item from an empty registry.
- */
- @Test
- public void testGetHighestRankingItemEmptyRegistry() {
- assertTrue(registry.getHighestRankingDescriptor() == null);
- }
-
- /**
- * Checks that the registry handles correctly items with equal rank.
- */
- @Test
- public void testHighestRankingItemEqualRank() {
- IItemDescriptor<Factory> instance1 = createDescriptor("Id1", 10, new MatchEngineFactoryImpl());
- registry.add(instance1);
- IItemDescriptor<Factory> instance2 = createDescriptor("Id2", 10, new MatchEngineFactoryImpl());
- registry.add(instance2);
- IItemDescriptor<Factory> highestRankedElement = registry.getHighestRankingDescriptor();
- assertTrue(highestRankedElement == instance2 || highestRankedElement == instance1);
- }
-
- /**
- * Nominal use case: Remove an item from the registry.
- */
- @Test
- public void testRemove() {
- String id = "fakeID";
- IItemDescriptor<Factory> instance = createDescriptor(id, 1, new MatchEngineFactoryImpl());
- registry.add(instance);
- IItemDescriptor<Factory> oldValue = registry.remove(id);
-
- assertTrue(oldValue == instance);
- assertTrue(registry.getItemDescriptors().isEmpty());
- }
-
- /**
- * Tries to remove null from the registry.
- */
- @Test(expected = NullPointerException.class)
- public void testRemoveNull() {
- registry.remove(null);
- }
-
- /**
- * Tries to remove an element with an id that is not in the registry.
- */
- @Test
- public void testRemoveWrongElementId() {
- String id = "fakeID";
- IItemDescriptor<Factory> oldValue = registry.remove(id);
- assertTrue(oldValue == null);
- }
-
- /**
- * Nominal use case: Clear the registry.
- */
- @Test
- public void testClearRegistry() {
- registry.add(createDescriptor("Id-10", -10, new MatchEngineFactoryImpl()));
- registry.add(createDescriptor("Id0", 0, new MatchEngineFactoryImpl()));
- registry.add(createDescriptor("Id10", 10, new MatchEngineFactoryImpl()));
- registry.clear();
- assertTrue(registry.getItemDescriptors().isEmpty());
- }
-}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/MatchEngineFactoryRegistryWrapperTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/MatchEngineFactoryRegistryWrapperTest.java
deleted file mode 100644
index cb356f409..000000000
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/MatchEngineFactoryRegistryWrapperTest.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014, 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.emf.compare.tests.rcp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.emf.compare.EMFCompare;
-import org.eclipse.emf.compare.match.IMatchEngine;
-import org.eclipse.emf.compare.match.IMatchEngine.Factory;
-import org.eclipse.emf.compare.match.impl.MatchEngineFactoryImpl;
-import org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor;
-import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemRegistry;
-import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemUtil;
-import org.eclipse.emf.compare.rcp.internal.match.MatchEngineFactoryRegistryWrapper;
-import org.eclipse.emf.compare.rcp.internal.preferences.EMFComparePreferences;
-import org.eclipse.emf.compare.scope.DefaultComparisonScope;
-import org.eclipse.emf.compare.scope.IComparisonScope;
-import org.eclipse.emf.compare.tests.rcp.data.EcoreInputData;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * Test class for {@link MatchEngineFactoryRegistryWrapper}.
- *
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
-@SuppressWarnings({"restriction", "nls" })
-public class MatchEngineFactoryRegistryWrapperTest {
-
- private MatchEngineFactoryRegistryWrapper registryWrapper;
-
- private IEclipsePreferences preferences;
-
- /**
- * Creates a comparison scope from Ecore model.
- *
- * @return {@link IComparisonScope}
- * @throws IOException
- */
- private IComparisonScope createComparisonScope() throws IOException {
- EcoreInputData ecoreData = new EcoreInputData();
- return new DefaultComparisonScope(ecoreData.getLeft(), ecoreData.getRight(), ecoreData.getOrigin());
- }
-
- // For Helios compatibility.
- @SuppressWarnings("deprecation")
- @Before
- public void setUp() throws BackingStoreException {
- ItemRegistry<Factory> registry = new ItemRegistry<IMatchEngine.Factory>();
- // Mock preference node.
- preferences = new InstanceScope()
- .getNode("org.eclipse.emf.compare.tests.rcp.MatchEngineFactoryRegistryWrapperTest");
- preferences.clear();
- registryWrapper = new MatchEngineFactoryRegistryWrapper(registry, preferences);
- }
-
- @After
- public void tearDown() throws BackingStoreException {
- preferences.clear();
- }
-
- /**
- * Nominal use case: Adds {@link IMatchEngine.Factory} in the registry.
- *
- * @throws IOException
- */
- @Test
- public void testAdd() throws IOException {
- IMatchEngine.Factory factory = new MockMatchEngineFactory1();
- factory.setRanking(10);
- registryWrapper.add(factory);
- IComparisonScope createComparisonScope = createComparisonScope();
- assertSame(registryWrapper.getHighestRankingMatchEngineFactory(createComparisonScope), factory);
- assertEquals(registryWrapper.getMatchEngineFactories(createComparisonScope).size(), 1);
- }
-
- /**
- * Adds a factory with no ranking set into the registry.
- *
- * @throws IOException
- */
- @Test
- public void testAddFactoryWithNoRanking() throws IOException {
- IMatchEngine.Factory factory = new MockMatchEngineFactory1();
- registryWrapper.add(factory);
- IMatchEngine.Factory factory2 = new MockMatchEngineFactory2();
- factory2.setRanking(10);
- registryWrapper.add(factory2);
- IComparisonScope createComparisonScope = createComparisonScope();
- assertSame(registryWrapper.getHighestRankingMatchEngineFactory(createComparisonScope), factory2);
- }
-
- /**
- * Adds null to the registry.
- */
- @Test(expected = NullPointerException.class)
- public void testAddNull() {
- registryWrapper.add(null);
- }
-
- /**
- * Adds two factories with identical id in the registry.
- *
- * @throws IOException
- */
- @Test
- public void testAddSameID() throws IOException {
- MockMatchEngineFactory1 factory1 = new MockMatchEngineFactory1();
- factory1.setRanking(10);
- registryWrapper.add(factory1);
- MockMatchEngineFactory1 factory2 = new MockMatchEngineFactory1();
- Factory oldValue = registryWrapper.add(factory2);
- assertTrue(oldValue == factory1);
- IComparisonScope createComparisonScope = createComparisonScope();
- assertSame(registryWrapper.getHighestRankingMatchEngineFactory(createComparisonScope), factory2);
- }
-
- /**
- * Nominal use case: Gets the highest ranking match engine factory.
- *
- * @throws IOException
- */
- @Test
- public void testHighestRankingMatchEngineFactory() throws IOException {
- IMatchEngine.Factory factory = new MockMatchEngineFactory1();
- factory.setRanking(10);
- registryWrapper.add(factory);
- IMatchEngine.Factory factory2 = new MockMatchEngineFactory2();
- factory2.setRanking(20);
- registryWrapper.add(factory2);
- IMatchEngine.Factory factory3 = new MockMatchEngineFactory3();
- factory3.setRanking(30);
- registryWrapper.add(factory3);
-
- IComparisonScope scope = createComparisonScope();
- assertSame(registryWrapper.getHighestRankingMatchEngineFactory(scope), factory3);
- assertTrue(registryWrapper.getMatchEngineFactories(scope).containsAll(
- Lists.newArrayList(factory, factory2, factory3)));
- }
-
- /**
- * Tries to get the highest ranking match engine factory from an empty registry.
- *
- * @throws IOException
- */
- @Test
- public void testHighestRankingMatchEngineFactoryEmpty() throws IOException {
- IComparisonScope scope = createComparisonScope();
- assertEquals(registryWrapper.getHighestRankingMatchEngineFactory(scope), null);
- assertTrue(registryWrapper.getMatchEngineFactories(scope).isEmpty());
- }
-
- /**
- * Nominal use case: Gets the highest ranking match engine factory with more complex registry.
- *
- * @throws IOException
- */
- @Test
- public void testHighestRankingMatchEngineFactoryWithDisabledFactories() throws IOException {
- IMatchEngine.Factory factory = new MockMatchEngineFactory1();
- factory.setRanking(10);
- registryWrapper.add(factory);
-
- IMatchEngine.Factory factory2 = new MockMatchEngineFactory2();
- factory2.setRanking(20);
- registryWrapper.add(factory2);
-
- IMatchEngine.Factory factory3 = new MockMatchEngineFactory3();
- factory3.setRanking(30);
- registryWrapper.add(factory3);
-
- IMatchEngine.Factory disabledFactory1 = new MockDisabledMatchEngineFactory1();
- disabledFactory1.setRanking(40);
- registryWrapper.add(disabledFactory1);
-
- IMatchEngine.Factory disabledFactory2 = new MockDisabledMatchEngineFactory2();
- disabledFactory2.setRanking(50);
- registryWrapper.add(disabledFactory2);
-
- IMatchEngine.Factory disabledFactory3 = new MockDisabledMatchEngineFactory3();
- disabledFactory2.setRanking(60);
- registryWrapper.add(disabledFactory3);
-
- IComparisonScope scope = createComparisonScope();
- assertSame(registryWrapper.getHighestRankingMatchEngineFactory(scope), factory3);
- assertTrue(registryWrapper.getMatchEngineFactories(scope).containsAll(
- Lists.newArrayList(factory, factory2, factory3)));
-
- }
-
- /**
- * Nominal use case: Removes a factory from the registry.
- *
- * @throws IOException
- */
- @Test
- public void testRemove() throws IOException {
- IMatchEngine.Factory factory = new MockMatchEngineFactory1();
- factory.setRanking(10);
- registryWrapper.add(factory);
-
- Factory oldValue = registryWrapper.remove(MockMatchEngineFactory1.class.getName());
- assertSame(oldValue, factory);
- assertTrue(registryWrapper.getMatchEngineFactories(createComparisonScope()).isEmpty());
- }
-
- /**
- * Tries to remove null from the registry.
- */
- @Test(expected = NullPointerException.class)
- public void testRemoveNull() {
- registryWrapper.remove(null);
- }
-
- /**
- * Tries to remove a factory from the registry with an incoherent id.
- *
- * @throws IOException
- */
- @Test
- public void testRemoveWrongID() throws IOException {
- IMatchEngine.Factory factory = new MockMatchEngineFactory1();
- factory.setRanking(10);
- registryWrapper.add(factory);
-
- Factory oldValue = registryWrapper.remove("IncohereId");
- assertNull(oldValue);
- assertTrue(!registryWrapper.getMatchEngineFactories(createComparisonScope()).isEmpty());
- }
-
- /**
- * Nominal use case: Disables Match Engine factory from preferences. Checks that the registry to do use
- * them anymore.
- *
- * @throws IOException
- */
- @Test
- public void testDisablingMatchEngine() throws IOException {
- IMatchEngine.Factory factory = new MockMatchEngineFactory1();
- factory.setRanking(10);
- registryWrapper.add(factory);
-
- IMatchEngine.Factory factory2 = new MockMatchEngineFactory2();
- factory2.setRanking(20);
- registryWrapper.add(factory2);
-
- IMatchEngine.Factory factory3 = new MockMatchEngineFactory3();
- factory3.setRanking(30);
- registryWrapper.add(factory3);
-
- IComparisonScope scope = createComparisonScope();
- assertSame(registryWrapper.getHighestRankingMatchEngineFactory(scope), factory3);
-
- disableEngine(preferences, EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES, Collections
- .singleton(factory3.getClass().getName()));
- assertSame(registryWrapper.getHighestRankingMatchEngineFactory(scope), factory2);
- assertTrue(!registryWrapper.getMatchEngineFactories(scope).contains(factory3));
-
- disableEngine(preferences, EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES, Lists.newArrayList(
- factory3.getClass().getName(), factory2.getClass().getName()));
- assertSame(registryWrapper.getHighestRankingMatchEngineFactory(scope), factory);
- assertTrue(!registryWrapper.getMatchEngineFactories(scope).contains(factory2));
-
- }
-
- @Test
- public void testEMFCompareBuilder() throws IOException {
- IMatchEngine.Factory factory = new MockMatchEngineFactory1();
- factory.setRanking(10);
- registryWrapper.add(factory);
-
- IMatchEngine.Factory factory2 = new MockMatchEngineFactory2();
- factory2.setRanking(20);
- registryWrapper.add(factory2);
-
- IMatchEngine.Factory factory3 = new MockMatchEngineFactory3();
- factory3.setRanking(30);
- registryWrapper.add(factory3);
-
- MockBuilder mockBuilder = new MockBuilder();
- mockBuilder.build();
-
- IMatchEngine.Factory.Registry builderMatchEngineFactoryRegistry = mockBuilder
- .getMatchEngineFactoryRegistry();
-
- assertNotSame(registryWrapper, builderMatchEngineFactoryRegistry);
-
- mockBuilder.setMatchEngineFactoryRegistry(registryWrapper);
- mockBuilder.build();
- builderMatchEngineFactoryRegistry = mockBuilder.getMatchEngineFactoryRegistry();
-
- assertSame(registryWrapper, builderMatchEngineFactoryRegistry);
-
- }
-
- /**
- * Disables engine in preferences.
- *
- * @param preference
- * {@link IEclipsePreferences}
- * @param key
- * @param toDisable
- * {@link Collection} of {@link IItemDescriptor} to disable.
- */
- private void disableEngine(IEclipsePreferences preference, String key, Collection<String> toDisable) {
- if (toDisable != null && !toDisable.isEmpty()) {
- String newPreferenceValue = Joiner.on(ItemUtil.PREFERENCE_DELIMITER).join(toDisable);
- preference.put(key, newPreferenceValue);
- } else {
- preference.remove(key);
- }
- }
-
- /**
- * Mock {@link IMatchEngine.Factory} that does not handle any {@link IComparisonScope}.
- *
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
- private static class MockDisabledMatchEngineFactory1 extends MatchEngineFactoryImpl {
- @Override
- public boolean isMatchEngineFactoryFor(IComparisonScope scope) {
- return false;
- }
- }
-
- /**
- * Mock {@link IMatchEngine.Factory} that does not handle any {@link IComparisonScope}.
- *
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
- private static class MockDisabledMatchEngineFactory2 extends MockDisabledMatchEngineFactory1 {
- }
-
- /**
- * Mock {@link IMatchEngine.Factory} that does not handle any {@link IComparisonScope}.
- *
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
- private static class MockDisabledMatchEngineFactory3 extends MockDisabledMatchEngineFactory1 {
- }
-
- /**
- * Mock {@link IMatchEngine.Factory} that can handle any {@link IComparisonScope}.
- *
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
- private static class MockMatchEngineFactory1 extends MatchEngineFactoryImpl {
- }
-
- /**
- * Mock {@link IMatchEngine.Factory} that can handle any {@link IComparisonScope}.
- *
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
- private static class MockMatchEngineFactory2 extends MatchEngineFactoryImpl {
- }
-
- /**
- * Mock {@link IMatchEngine.Factory} that can handle any {@link IComparisonScope}.
- *
- * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- */
- private static class MockMatchEngineFactory3 extends MatchEngineFactoryImpl {
- }
-
- /**
- * Mock {@link EMFCompare.Builder} in order to access matchEngineFactoryRegistry field.
- *
- * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- */
- private static class MockBuilder extends EMFCompare.Builder {
- public IMatchEngine.Factory.Registry getMatchEngineFactoryRegistry() {
- return this.matchEngineFactoryRegistry;
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/EcoreInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/EcoreInputData.java
deleted file mode 100644
index 30e6c2431..000000000
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/EcoreInputData.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.emf.compare.tests.rcp.data;
-
-import java.io.IOException;
-
-import org.eclipse.emf.compare.tests.edit.data.ResourceScopeProvider;
-import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.ecore.resource.Resource;
-
-@SuppressWarnings("nls")
-public class EcoreInputData extends AbstractInputData implements ResourceScopeProvider {
-
- public Resource getLeft() throws IOException {
- return loadFromClassLoader("extlibraryLeft.ecore");
- }
-
- public Resource getRight() throws IOException {
- return loadFromClassLoader("extlibraryRight.ecore");
- }
-
- public Resource getOrigin() throws IOException {
- return loadFromClassLoader("extlibraryOrigin.ecore");
- }
-}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryLeft.ecore b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryLeft.ecore
deleted file mode 100644
index b26cef279..000000000
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryLeft.ecore
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="_14sTEG60EeGkd4g88tZXfA" name="extlibrary" nsURI="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0" nsPrefix="extlib">
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_146VgG60EeGkd4g88tZXfA" name="Book" eSuperTypes="_15LbQG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_146VgW60EeGkd4g88tZXfA" name="title">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_146Vg260EeGkd4g88tZXfA" name="pages" defaultValueLiteral="100">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_1468kW60EeGkd4g88tZXfA" name="category" eType="_15F7sG60EeGkd4g88tZXfA" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_148KsG60EeGkd4g88tZXfA" name="author" lowerBound="1" eType="_15CRUW60EeGkd4g88tZXfA" eOpposite="_15EGgG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_148KsW60EeGkd4g88tZXfA" name="Library" eSuperTypes="_15OelG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_148Ksm60EeGkd4g88tZXfA" name="name">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_148xwW60EeGkd4g88tZXfA" name="writers" upperBound="-1" eType="_15CRUW60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_148xwm60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_148xw260EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_149Y0G60EeGkd4g88tZXfA" name="employees" upperBound="-1" eType="_15OekG60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_149Y0W60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_149Y0m60EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15AcIG60EeGkd4g88tZXfA" name="borrowers" upperBound="-1" eType="_15NQcW60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_15AcIW60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_15BDMG60EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BDMW60EeGkd4g88tZXfA" name="stock" ordered="false" upperBound="-1" eType="_15Hw4m60EeGkd4g88tZXfA" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BDMm60EeGkd4g88tZXfA" name="books" ordered="false" upperBound="-1" eType="_146VgG60EeGkd4g88tZXfA" transient="true" derived="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BqQG60EeGkd4g88tZXfA" name="branches" upperBound="-1" eType="_148KsW60EeGkd4g88tZXfA" containment="true" eOpposite="_15BqQm60EeGkd4g88tZXfA"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BqQm60EeGkd4g88tZXfA" name="parentBranch" eType="_148KsW60EeGkd4g88tZXfA" eOpposite="_15BqQG60EeGkd4g88tZXfA"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15BqRG60EeGkd4g88tZXfA" name="people" upperBound="-1">
- <eAnnotations xmi:id="_15BqRW60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_15BqRm60EeGkd4g88tZXfA" key="kind" value="group"/>
- </eAnnotations>
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15CRUW60EeGkd4g88tZXfA" name="Writer" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15CRUm60EeGkd4g88tZXfA" name="name" volatile="true" transient="true">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15EGgG60EeGkd4g88tZXfA" name="books" upperBound="-1" eType="_146VgG60EeGkd4g88tZXfA" eOpposite="_148KsG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" xmi:id="_15F7sG60EeGkd4g88tZXfA" name="BookCategory">
- <eLiterals xmi:id="_15HJ0G60EeGkd4g88tZXfA" name="Mystery"/>
- <eLiterals xmi:id="_15Hw4G60EeGkd4g88tZXfA" name="ScienceFiction" value="1"/>
- <eLiterals xmi:id="_15Hw4W60EeGkd4g88tZXfA" name="Biography" value="2"/>
- <eLiterals xmi:id="_XID4MG9IEeG7V_vNzpYwOw" name="Encyclopedia" value="3" literal="Encyclopedia"/>
- <eLiterals xmi:id="_XIEfQG9IEeG7V_vNzpYwOw" name="Dictionary" value="4"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15Hw4m60EeGkd4g88tZXfA" name="Item" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15Hw4260EeGkd4g88tZXfA" name="publicationDate">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15IX8G60EeGkd4g88tZXfA" name="Borrowable" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15JmEG60EeGkd4g88tZXfA" name="copies" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15JmEm60EeGkd4g88tZXfA" name="borrowers" ordered="false" upperBound="-1" eType="_15NQcW60EeGkd4g88tZXfA" eOpposite="_15N3gG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15LbQG60EeGkd4g88tZXfA" name="CirculatingItem" abstract="true" eSuperTypes="_15Hw4m60EeGkd4g88tZXfA _15IX8G60EeGkd4g88tZXfA"/>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MCUG60EeGkd4g88tZXfA" name="AudioVisualItem" abstract="true" eSuperTypes="_15LbQG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15MCUm60EeGkd4g88tZXfA" name="title">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15MCVG60EeGkd4g88tZXfA" name="length" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15MCVm60EeGkd4g88tZXfA" name="damaged">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MpYW60EeGkd4g88tZXfA" name="BookOnTape" eSuperTypes="_15MCUG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15MpZG60EeGkd4g88tZXfA" name="author" eType="_15CRUW60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MpZm60EeGkd4g88tZXfA" name="VideoCassette" eSuperTypes="_15MCUG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15NQcG60EeGkd4g88tZXfA" name="cast" upperBound="-1" eType="_15N3gm60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15NQcW60EeGkd4g88tZXfA" name="Borrower" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15N3gG60EeGkd4g88tZXfA" name="borrowed" upperBound="-1" eType="_15IX8G60EeGkd4g88tZXfA" eOpposite="_15JmEm60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15N3gm60EeGkd4g88tZXfA" name="Person" eSuperTypes="_15OelG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_XIJ-0G9IEeG7V_vNzpYwOw" name="fullName">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15OekG60EeGkd4g88tZXfA" name="Employee" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15Oekm60EeGkd4g88tZXfA" name="manager" eType="_15OekG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15OelG60EeGkd4g88tZXfA" name="Addressable" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15OelW60EeGkd4g88tZXfA" name="address">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_XIKl4W9IEeG7V_vNzpYwOw" name="Magazine" eSuperTypes="_15LbQG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_XIKl429IEeG7V_vNzpYwOw" name="title">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_XIKl5W9IEeG7V_vNzpYwOw" name="pages">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryOrigin.ecore b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryOrigin.ecore
deleted file mode 100644
index c891aa81b..000000000
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryOrigin.ecore
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="_14sTEG60EeGkd4g88tZXfA" name="extlibrary" nsURI="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0" nsPrefix="extlib">
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_146VgG60EeGkd4g88tZXfA" name="Book" eSuperTypes="_15LbQG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_146VgW60EeGkd4g88tZXfA" name="title">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_146Vg260EeGkd4g88tZXfA" name="pages" defaultValueLiteral="100">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_1468kW60EeGkd4g88tZXfA" name="category" eType="_15F7sG60EeGkd4g88tZXfA" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_148KsG60EeGkd4g88tZXfA" name="author" lowerBound="1" eType="_15CRUW60EeGkd4g88tZXfA" eOpposite="_15EGgG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_148KsW60EeGkd4g88tZXfA" name="Library" eSuperTypes="_15OelG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_148Ksm60EeGkd4g88tZXfA" name="name">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_148xwW60EeGkd4g88tZXfA" name="writers" upperBound="-1" eType="_15CRUW60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_148xwm60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_148xw260EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_149Y0G60EeGkd4g88tZXfA" name="employees" upperBound="-1" eType="_15OekG60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_149Y0W60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_149Y0m60EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15AcIG60EeGkd4g88tZXfA" name="borrowers" upperBound="-1" eType="_15NQcW60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_15AcIW60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_15BDMG60EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BDMW60EeGkd4g88tZXfA" name="stock" ordered="false" upperBound="-1" eType="_15Hw4m60EeGkd4g88tZXfA" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BDMm60EeGkd4g88tZXfA" name="books" ordered="false" upperBound="-1" eType="_146VgG60EeGkd4g88tZXfA" transient="true" derived="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BqQG60EeGkd4g88tZXfA" name="branches" upperBound="-1" eType="_148KsW60EeGkd4g88tZXfA" containment="true" eOpposite="_15BqQm60EeGkd4g88tZXfA"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BqQm60EeGkd4g88tZXfA" name="parentBranch" eType="_148KsW60EeGkd4g88tZXfA" eOpposite="_15BqQG60EeGkd4g88tZXfA"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15BqRG60EeGkd4g88tZXfA" name="people" upperBound="-1">
- <eAnnotations xmi:id="_15BqRW60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_15BqRm60EeGkd4g88tZXfA" key="kind" value="group"/>
- </eAnnotations>
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15CRUW60EeGkd4g88tZXfA" name="Writer" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15CRUm60EeGkd4g88tZXfA" name="name" volatile="true" transient="true">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15EGgG60EeGkd4g88tZXfA" name="books" upperBound="-1" eType="_146VgG60EeGkd4g88tZXfA" eOpposite="_148KsG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" xmi:id="_15F7sG60EeGkd4g88tZXfA" name="BookCategory">
- <eLiterals xmi:id="_15HJ0G60EeGkd4g88tZXfA" name="Mystery"/>
- <eLiterals xmi:id="_15Hw4G60EeGkd4g88tZXfA" name="ScienceFiction" value="1"/>
- <eLiterals xmi:id="_15Hw4W60EeGkd4g88tZXfA" name="Biography" value="2"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15Hw4m60EeGkd4g88tZXfA" name="Item" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15Hw4260EeGkd4g88tZXfA" name="publicationDate">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15IX8G60EeGkd4g88tZXfA" name="Lendable" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15JmEG60EeGkd4g88tZXfA" name="copies" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15JmEm60EeGkd4g88tZXfA" name="borrowers" ordered="false" upperBound="-1" eType="_15NQcW60EeGkd4g88tZXfA" eOpposite="_15N3gG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15LbQG60EeGkd4g88tZXfA" name="CirculatingItem" abstract="true" eSuperTypes="_15Hw4m60EeGkd4g88tZXfA _15IX8G60EeGkd4g88tZXfA"/>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15LbQ260EeGkd4g88tZXfA" name="Periodical" abstract="true" eSuperTypes="_15Hw4m60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15LbRW60EeGkd4g88tZXfA" name="title">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15LbR260EeGkd4g88tZXfA" name="issuesPerYear" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MCUG60EeGkd4g88tZXfA" name="AudioVisualItem" abstract="true" eSuperTypes="_15LbQG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15MCUm60EeGkd4g88tZXfA" name="title">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15MCVG60EeGkd4g88tZXfA" name="minutesLength" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15MCVm60EeGkd4g88tZXfA" name="damaged">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MpYW60EeGkd4g88tZXfA" name="BookOnTape" eSuperTypes="_15MCUG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15MpY260EeGkd4g88tZXfA" name="reader" eType="_15N3gm60EeGkd4g88tZXfA"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15MpZG60EeGkd4g88tZXfA" name="author" eType="_15CRUW60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MpZm60EeGkd4g88tZXfA" name="VideoCassette" eSuperTypes="_15MCUG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15NQcG60EeGkd4g88tZXfA" name="cast" upperBound="-1" eType="_15N3gm60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15NQcW60EeGkd4g88tZXfA" name="Borrower" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15N3gG60EeGkd4g88tZXfA" name="borrowed" upperBound="-1" eType="_15IX8G60EeGkd4g88tZXfA" eOpposite="_15JmEm60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15N3gm60EeGkd4g88tZXfA" name="Person" eSuperTypes="_15OelG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15N3g260EeGkd4g88tZXfA" name="firstName" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15N3hW60EeGkd4g88tZXfA" name="lastName" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15OekG60EeGkd4g88tZXfA" name="Employee" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15Oekm60EeGkd4g88tZXfA" name="manager" eType="_15OekG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15OelG60EeGkd4g88tZXfA" name="Addressable" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15OelW60EeGkd4g88tZXfA" name="address">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryRight.ecore b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryRight.ecore
deleted file mode 100644
index 09d5b0720..000000000
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryRight.ecore
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:id="_14sTEG60EeGkd4g88tZXfA" name="extlibrary" nsURI="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0" nsPrefix="extlib">
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_146VgG60EeGkd4g88tZXfA" name="Book" eSuperTypes="_15LbQG60EeGkd4g88tZXfA _9M9ys29IEeGekPcBm25hwQ">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_146Vg260EeGkd4g88tZXfA" name="pages" defaultValueLiteral="100">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_1468kW60EeGkd4g88tZXfA" name="category" eType="_15F7sG60EeGkd4g88tZXfA" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_148KsG60EeGkd4g88tZXfA" name="author" lowerBound="1" eType="_15CRUW60EeGkd4g88tZXfA" eOpposite="_15EGgG60EeGkd4g88tZXfA"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_9MlYMG9IEeGekPcBm25hwQ" name="subtitle">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_148KsW60EeGkd4g88tZXfA" name="Library" eSuperTypes="_15OelG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_148Ksm60EeGkd4g88tZXfA" name="name">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_148xwW60EeGkd4g88tZXfA" name="writers" upperBound="-1" eType="_15CRUW60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_148xwm60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_148xw260EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_149Y0G60EeGkd4g88tZXfA" name="employees" upperBound="-1" eType="_15OekG60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_149Y0W60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_149Y0m60EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15AcIG60EeGkd4g88tZXfA" name="borrowers" upperBound="-1" eType="_15NQcW60EeGkd4g88tZXfA" volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations xmi:id="_15AcIW60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_15BDMG60EeGkd4g88tZXfA" key="group" value="#people"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BDMW60EeGkd4g88tZXfA" name="stock" ordered="false" upperBound="-1" eType="_15Hw4m60EeGkd4g88tZXfA" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BDMm60EeGkd4g88tZXfA" name="books" ordered="false" upperBound="-1" eType="_146VgG60EeGkd4g88tZXfA" transient="true" derived="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BqQG60EeGkd4g88tZXfA" name="branches" upperBound="-1" eType="_148KsW60EeGkd4g88tZXfA" containment="true" eOpposite="_15BqQm60EeGkd4g88tZXfA"/>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15BqQm60EeGkd4g88tZXfA" name="parentBranch" eType="_148KsW60EeGkd4g88tZXfA" eOpposite="_15BqQG60EeGkd4g88tZXfA"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15BqRG60EeGkd4g88tZXfA" name="people" upperBound="-1">
- <eAnnotations xmi:id="_15BqRW60EeGkd4g88tZXfA" source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details xmi:id="_15BqRm60EeGkd4g88tZXfA" key="kind" value="group"/>
- </eAnnotations>
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15CRUW60EeGkd4g88tZXfA" name="Writer" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15CRUm60EeGkd4g88tZXfA" name="name" volatile="true" transient="true">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15EGgG60EeGkd4g88tZXfA" name="books" upperBound="-1" eType="_146VgG60EeGkd4g88tZXfA" eOpposite="_148KsG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" xmi:id="_15F7sG60EeGkd4g88tZXfA" name="BookCategory">
- <eLiterals xmi:id="_15HJ0G60EeGkd4g88tZXfA" name="Mystery"/>
- <eLiterals xmi:id="_15Hw4G60EeGkd4g88tZXfA" name="ScienceFiction" value="1"/>
- <eLiterals xmi:id="_15Hw4W60EeGkd4g88tZXfA" name="Biography" value="2"/>
- <eLiterals xmi:id="_9Mw-YG9IEeGekPcBm25hwQ" name="Manga" value="3" literal="Manga"/>
- <eLiterals xmi:id="_9Mw-YW9IEeGekPcBm25hwQ" name="Manhwa" value="5"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15Hw4m60EeGkd4g88tZXfA" name="Item" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15Hw4260EeGkd4g88tZXfA" name="publicationDate">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15IX8G60EeGkd4g88tZXfA" name="Lendable" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15JmEG60EeGkd4g88tZXfA" name="copies" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15JmEm60EeGkd4g88tZXfA" name="borrowers" ordered="false" upperBound="-1" eType="_15NQcW60EeGkd4g88tZXfA" eOpposite="_15N3gG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15LbQG60EeGkd4g88tZXfA" name="CirculatingItem" abstract="true" eSuperTypes="_15Hw4m60EeGkd4g88tZXfA _15IX8G60EeGkd4g88tZXfA"/>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15LbQ260EeGkd4g88tZXfA" name="Periodical" abstract="true" eSuperTypes="_15Hw4m60EeGkd4g88tZXfA _9M9ys29IEeGekPcBm25hwQ">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15LbR260EeGkd4g88tZXfA" name="issuesPerYear" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MCUG60EeGkd4g88tZXfA" name="AudioVisualItem" abstract="true" eSuperTypes="_15LbQG60EeGkd4g88tZXfA _9M9ys29IEeGekPcBm25hwQ">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15MCVG60EeGkd4g88tZXfA" name="minutes" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15MCVm60EeGkd4g88tZXfA" name="damaged">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MpYW60EeGkd4g88tZXfA" name="BookOnTape" eSuperTypes="_15MCUG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15MpZG60EeGkd4g88tZXfA" name="author" eType="_15CRUW60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15MpZm60EeGkd4g88tZXfA" name="VideoCassette" eSuperTypes="_15MCUG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15NQcG60EeGkd4g88tZXfA" name="cast" upperBound="-1" eType="_15N3gm60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15NQcW60EeGkd4g88tZXfA" name="Borrower" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15N3gG60EeGkd4g88tZXfA" name="borrowed" upperBound="-1" eType="_15IX8G60EeGkd4g88tZXfA" eOpposite="_15JmEm60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15N3gm60EeGkd4g88tZXfA" name="Person" eSuperTypes="_15OelG60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15N3g260EeGkd4g88tZXfA" name="firstName" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15N3hW60EeGkd4g88tZXfA" name="familyName" lowerBound="1">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15OekG60EeGkd4g88tZXfA" name="Employee" eSuperTypes="_15N3gm60EeGkd4g88tZXfA">
- <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="_15Oekm60EeGkd4g88tZXfA" name="manager" eType="_15OekG60EeGkd4g88tZXfA"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_15OelG60EeGkd4g88tZXfA" name="Addressable" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_15OelW60EeGkd4g88tZXfA" name="address">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_9M9ysW9IEeGekPcBm25hwQ" name="Magazine" eSuperTypes="_15LbQ260EeGkd4g88tZXfA"/>
- <eClassifiers xsi:type="ecore:EClass" xmi:id="_9M9ys29IEeGekPcBm25hwQ" name="TitledItem">
- <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="_9M9ytG9IEeGekPcBm25hwQ" name="title">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
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 98df55f9e..af90f241b 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
@@ -59,7 +59,6 @@ import org.eclipse.emf.compare.tests.monitor.MonitorCancelTest;
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.rcp.AllRCPTests;
import org.eclipse.emf.compare.tests.req.ReqComputingTest;
import org.eclipse.emf.compare.tests.scope.DefaultComparisonScopeTest;
import org.eclipse.emf.compare.tests.utils.EqualityHelperTest;
@@ -85,8 +84,8 @@ import org.junit.runners.Suite.SuiteClasses;
DynamicInstanceComparisonTest.class, URIDistanceTest.class, FragmentationTest.class,
AllEditTests.class, CommandStackTestSuite.class, MatchEngineFactoryRegistryTest.class,
RootIDMatchingTest.class, XMIMatchingTest.class, ProxyMatchingTest.class, ConflictMergeTest.class,
- PseudoConflictMergeTest.class, ProximityIndexTest.class, AllRCPTests.class,
- FeatureMaps2wayMergeTest.class, FeatureMaps3wayMergeTest.class, FeatureMapsConflictsMergeTest.class,
+ PseudoConflictMergeTest.class, ProximityIndexTest.class, FeatureMaps2wayMergeTest.class,
+ FeatureMaps3wayMergeTest.class, FeatureMapsConflictsMergeTest.class,
FeatureMapsPseudoConflictsMergeTest.class, TwoWayBatchMergingTest.class, EqualityHelperTest.class,
FeatureFilterTest.class, ThreeWayBatchMergingTest.class,
MultiLineAttributeConflictDetectionTest.class, ThreeWayTextDiffTest.class,

Back to the top