Refactor Papyrus Compare build
Change-Id: Iad5e31d6d646f402782461bb61cd1eaa2c1b55d0
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.classpath b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.classpath
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.classpath
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.classpath
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.project b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.project
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.resources.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.resources.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.runtime.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.runtime.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.pde.api.tools.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..ae909a8
--- /dev/null
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,46 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.compare.diagram.ide.ui;singleton:=true
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Version: 2.8.1.qualifier
+Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.compare.diagram.ide.ui.internal.CompareDiagramIDEUIPapyrusPlugin
+Require-Bundle: org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.emf.compare;bundle-version="3.0.0",
+ org.eclipse.emf.compare.rcp;bundle-version="2.5.0",
+ org.eclipse.emf.compare.ide;bundle-version="3.1.0",
+ org.eclipse.emf.compare.ide.ui;bundle-version="4.1.0",
+ org.eclipse.emf.compare.diagram.ide.ui;bundle-version="3.0.0",
+ org.eclipse.emf.compare.rcp.ui;bundle-version="4.2.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="0.9.1",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.1",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.9.1",
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.1",
+ org.eclipse.papyrus.infra.onefile;bundle-version="0.9.1",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf,
+ org.eclipse.compare,
+ org.eclipse.emf.compare.rcp.ui,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.papyrus.emf.facet.custom.metamodel,
+ org.eclipse.papyrus.emf.facet.custom.ui,
+ org.eclipse.uml2.uml.edit,
+ org.eclipse.papyrus.infra.services.labelprovider,
+ org.eclipse.ui.navigator,
+ org.eclipse.emf.compare.edit,
+ org.eclipse.papyrus.compare.diagram;bundle-version="1.2.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.google.common.base;version="[15.0.0,22.0.0)",
+ com.google.common.collect;version="[15.0.0,22.0.0)",
+ com.google.common.io;version="[15.0.0,22.0.0)",
+ org.apache.log4j;version="1.2.15"
+Export-Package: org.eclipse.papyrus.compare.diagram.ide.ui.comparesource,
+ org.eclipse.papyrus.compare.diagram.ide.ui.dependency,
+ org.eclipse.papyrus.compare.diagram.ide.ui.internal,
+ org.eclipse.papyrus.compare.diagram.ide.ui.internal.context,
+ org.eclipse.papyrus.compare.diagram.ide.ui.internal.logical.view,
+ org.eclipse.papyrus.compare.diagram.ide.ui.internal.structuremergeviewer.filters;x-internal:=true,
+ org.eclipse.papyrus.compare.diagram.ide.ui.util
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/about.html b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/about.html
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.html
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/about.ini b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.ini
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/about.ini
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.ini
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/about.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/about.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/about.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/build.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/build.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/build.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/build.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/modeling32.png b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/modeling32.png
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/modeling32.png
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/modeling32.png
Binary files differ
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.properties
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml
new file mode 100644
index 0000000..a5d151a
--- /dev/null
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+
+<!--
+ Copyright (c) 2013, 2017 Obeo, EclipseSource and others.
+ 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
+ Stefan Dirix - Bugs 456699, 474723
+ Camille Letavernier - Bug 515373
+-->
+
+<plugin>
+ <extension
+ point="org.eclipse.core.contenttype.contentTypes">
+ <file-association
+ content-type="org.eclipse.emf.compare.content.type"
+ file-extensions="di,notation"/>
+ </extension>
+ <extension
+ point="org.eclipse.emf.compare.ide.resourceSetHook">
+ <resourceSetHook
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.internal.CssInstallationHook">
+ </resourceSetHook>
+ <resourceSetHook
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.internal.SaveParameterHook">
+ </resourceSetHook>
+ <resourceSetHook
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.internal.ElementTypeSetConfigurationRegistryInitializingHook">
+ </resourceSetHook>
+ <resourceSetHook
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.internal.ServicesRegistryInitializingHook">
+ </resourceSetHook>
+ </extension>
+ <extension
+ point="org.eclipse.emf.compare.ide.ui.logicalModelViewHandlers">
+ <handler
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.internal.logical.view.PapyrusLMVHandler"
+ ranking="20">
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.emf.compare.ide.ui.modelDependencyProvider">
+ <dependency
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.dependency.PapyrusDependencyProvider">
+ </dependency>
+ </extension>
+ <extension
+ point="org.eclipse.core.runtime.adapters">
+ <factory
+ adaptableType="org.eclipse.papyrus.infra.onefile.model.IPapyrusFile"
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.comparesource.EMFCompareSourceAdapterFactory">
+ <adapter
+ type="org.eclipse.emf.compare.ide.ui.source.IEMFComparisonSource">
+ </adapter>
+ </factory>
+ </extension>
+ <extension
+ point="org.eclipse.compare.contentMergeViewers">
+ <viewer
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.contentmergeviewer.PapyrusTreeContentMergeViewerCreator"
+ id="org.eclipse.papyrus.compare.ide.ui.PapyrusTreeContentMergeViewer"
+ label="Model Compare (Papyrus)"
+ extensions=
+ "papyrus-org.eclipse.emf.compare.rcp.ui.eTreeDiff,
+ papyrus-org.eclipse.emf.compare.rcp.ui.eMatch,
+ papyrus-org.eclipse.emf.compare.rcp.ui.eResourceDiff,
+ papyrus-NODE_TYPE__EMF_EOBJECT,
+ papyrus-NODE_TYPE__EMF_RESOURCE,
+ papyrus-NODE_TYPE__EMF_RESOURCESET,
+ papyrus-NODE_TYPE__EMF_COMPARISON">
+ </viewer>
+ <viewer
+ class="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.TextFallbackCompareViewerCreator"
+ extensions=
+ "papyrus-org.eclipse.emf.compare.rcp.ui.eTreeDiff,
+ papyrus-org.eclipse.emf.compare.rcp.ui.eMatch,
+ papyrus-org.eclipse.emf.compare.rcp.ui.eResourceDiff,
+ papyrus-NODE_TYPE__EMF_EOBJECT,
+ papyrus-NODE_TYPE__EMF_RESOURCE,
+ papyrus-NODE_TYPE__EMF_RESOURCESET,
+ papyrus-NODE_TYPE__EMF_COMPARISON"
+ id="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.TextFallbackCompareViewer"
+ label="%emf.compare.fallback.textcompare">
+ </viewer>
+ </extension>
+ <extension
+ point="org.eclipse.emf.compare.rcp.ui.accessorFactory">
+ <factory
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.internal.accessorfactory.PapyrusAccessorFactoryWrapper"
+ ranking="1000">
+ </factory>
+ </extension>
+ <extension
+ point="org.eclipse.emf.compare.rcp.ui.contentMergeViewerCustomization">
+ <treeContentCustomization
+ contentProvider="org.eclipse.papyrus.compare.diagram.ide.ui.contentmergeviewer.provider.PapyrusMergeViewerItemContentProvider"
+ context="org.eclipse.papyrus.compare.diagram.ide.ui.contentmergeviewer.provider.PapyrusContextTester"
+ ranking="20">
+ </treeContentCustomization>
+ <contentCustomization
+ context="org.eclipse.papyrus.compare.diagram.ide.ui.contentmergeviewer.provider.PapyrusContextTester"
+ mergeViewerItemProvider="org.eclipse.papyrus.compare.diagram.ide.ui.contentmergeviewer.provider.PapyrusCompareAccessorMergeViewerItemProvider"
+ ranking="10">
+ </contentCustomization>
+ </extension>
+ <extension
+ point="org.eclipse.emf.compare.rcp.ui.filters">
+ <filter
+ activeByDefault="true"
+ class="org.eclipse.papyrus.compare.diagram.ide.ui.internal.structuremergeviewer.filters.PapyrusDiagramTechnicalElementsFilter"
+ description="Technical elements of Papyrus diagrams such as hidden applied stereotype comments shapes and links."
+ label="Papyrus diagram technical elements">
+ </filter>
+ </extension>
+</plugin>
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml
new file mode 100644
index 0000000..b01e4c6
--- /dev/null
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <version>0.7.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.bundles.parent</artifactId>
+ </parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.compare.diagram.ide.ui</artifactId>
+ <version>2.8.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <dependency-resolution>
+ <optionalDependencies>ignore</optionalDependencies>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/EMFCompareSourceAdapterFactory.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/EMFCompareSourceAdapterFactory.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/EMFCompareSourceAdapterFactory.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/EMFCompareSourceAdapterFactory.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/PapyrusFileEMFCompareSourceAdapter.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/PapyrusFileEMFCompareSourceAdapter.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/PapyrusFileEMFCompareSourceAdapter.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/comparesource/PapyrusFileEMFCompareSourceAdapter.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewerCreator.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/FacetUtil.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/FacetUtil.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/FacetUtil.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/FacetUtil.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusCompareAccessorMergeViewerItemProvider.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusContextTester.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusContextTester.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusContextTester.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusContextTester.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItem.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItem.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItem.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItem.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusMergeViewerItemContentProvider.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/provider/PapyrusTreeContentMergeViewerItemLabelProvider.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/dependency/PapyrusDependencyProvider.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/dependency/PapyrusDependencyProvider.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/dependency/PapyrusDependencyProvider.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/dependency/PapyrusDependencyProvider.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/AbstractPapyrusResourceSetHook.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/AbstractPapyrusResourceSetHook.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/AbstractPapyrusResourceSetHook.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/AbstractPapyrusResourceSetHook.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPapyrusPlugin.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPapyrusPlugin.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPapyrusPlugin.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPapyrusPlugin.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareUIPapyrusMessages.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareUIPapyrusMessages.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareUIPapyrusMessages.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CompareUIPapyrusMessages.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CssInstallationHook.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CssInstallationHook.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CssInstallationHook.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/CssInstallationHook.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ElementTypeSetConfigurationRegistryInitializingHook.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ElementTypeSetConfigurationRegistryInitializingHook.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ElementTypeSetConfigurationRegistryInitializingHook.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ElementTypeSetConfigurationRegistryInitializingHook.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/SaveParameterHook.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/SaveParameterHook.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/SaveParameterHook.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/SaveParameterHook.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ServicesRegistryInitializingHook.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ServicesRegistryInitializingHook.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ServicesRegistryInitializingHook.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/ServicesRegistryInitializingHook.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorWrapper.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorWrapper.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorWrapper.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorWrapper.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/compare_ui_papyrus_messages.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/compare_ui_papyrus_messages.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/compare_ui_papyrus_messages.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/compare_ui_papyrus_messages.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/context/PapyrusContextUtil.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/context/PapyrusContextUtil.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/context/PapyrusContextUtil.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/context/PapyrusContextUtil.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/view/PapyrusLMVHandler.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/view/PapyrusLMVHandler.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/view/PapyrusLMVHandler.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/logical/view/PapyrusLMVHandler.java
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/filters/PapyrusDiagramTechnicalElementsFilter.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/filters/PapyrusDiagramTechnicalElementsFilter.java
new file mode 100644
index 0000000..027eafe
--- /dev/null
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/structuremergeviewer/filters/PapyrusDiagramTechnicalElementsFilter.java
@@ -0,0 +1,170 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Christian W. Damus and others.
+ *
+ * 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:
+ * Christian W. Damus - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.papyrus.compare.diagram.ide.ui.internal.structuremergeviewer.filters;
+
+import static com.google.common.base.Predicates.notNull;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+
+import java.util.Arrays;
+
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.Match;
+import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.filters.AbstractDifferenceFilter;
+import org.eclipse.emf.compare.scope.IComparisonScope;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.tree.TreeNode;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.ForceValueHelper;
+
+/**
+ * <p>
+ * A filter that excludes technical elements peculiar to Papyrus diagrams. These are, at least
+ * </p>
+ * <ul>
+ * <li>addition of, deletion of, and changes in the applied stereotype comment shapes and links for
+ * stereotypes that do not use them (in which case those views exist but are hidden from view)</li>
+ * </ul>
+ *
+ * @author Christian W. Damus
+ */
+public class PapyrusDiagramTechnicalElementsFilter extends AbstractDifferenceFilter {
+
+ /**
+ * A predicate matching a hidden applied-stereotype comment shape or the link tethering such shape to the
+ * base element shape.
+ */
+ private static final Predicate<EObject> IS_HIDDEN_STEREOTYPE_COMMENT_VIEW = new Predicate<EObject>() {
+ public boolean apply(EObject input) {
+ if (!(input instanceof View)) {
+ return false;
+ }
+
+ View view = (View)input;
+ if (view.getType() == null) {
+ return false;
+ }
+
+ boolean result;
+
+ switch (view.getType()) {
+ case "StereotypeCommentLink": //$NON-NLS-1$
+ Edge edge = (Edge)view;
+ View source = edge.getSource();
+ View target = edge.getTarget();
+
+ // Visibility is always implied by the connected nodes
+ result = (source == null) || !isCSSVisible(source) //
+ || (target == null) || !isCSSVisible(target);
+ break;
+ case "StereotypeComment": //$NON-NLS-1$
+ result = !isCSSVisible(view);
+ break;
+ default:
+ result = false;
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * Determines a {@code view}'s visibility according to Papyrus's CSS-based scheme and the assumption
+ * that the default CSS styles for these applied-stereotype views are active that override the GMF
+ * default visibility from {@code true} to {@code false}.
+ *
+ * @param view
+ * a CSS-managed applied-stereotype view
+ * @return whether the {@code view} is CSSly visible
+ */
+ private boolean isCSSVisible(View view) {
+ // The view appears to be visible
+ return view.isVisible()
+ // and not by accident
+ && ForceValueHelper.isSet(view, NotationPackage.Literals.VIEW__VISIBLE, Boolean.TRUE);
+ }
+ };
+
+ /**
+ * The predicate provided by this filter when it is selected.
+ */
+ private static final Predicate<EObject> SELECTED_PREDICATE = new Predicate<EObject>() {
+ public boolean apply(EObject input) {
+ EObject data = input;
+ if (input instanceof TreeNode) {
+ data = ((TreeNode)input).getData();
+ }
+
+ Match match = null;
+ if (data instanceof Match) {
+ match = (Match)data;
+ } else if (data instanceof Diff) {
+ match = ((Diff)data).getMatch();
+ }
+
+ if (match != null) {
+ // We don't show diffs where the view is hidden on all sides
+ // where it exists
+ return Iterables.all(getMatchedObjects(match), IS_HIDDEN_STEREOTYPE_COMMENT_VIEW);
+ }
+
+ return false;
+ }
+ };
+
+ /**
+ * A predicate matching namespace URIs of Papyrus that we key on for the likely presence of
+ * applied-stereotype comments.
+ */
+ private static final Predicate<String> IS_PAPYRUS_NAMESPACE = new Predicate<String>() {
+ public boolean apply(String input) {
+ // For example, the http://www.eclipse.org/papyrus/infra/gmfdiag/style namespace
+ // for styles that always are instantiated in the applied-stereotype comments
+ return input.startsWith("http://www.eclipse.org/papyrus/infra/gmfdiag/"); //$NON-NLS-1$
+ }
+ };
+
+ /**
+ * Initializes me.
+ */
+ public PapyrusDiagramTechnicalElementsFilter() {
+ super();
+ }
+
+ @Override
+ public boolean isEnabled(IComparisonScope scope, Comparison comparison) {
+ return (scope != null) && Iterables.any(scope.getNsURIs(), IS_PAPYRUS_NAMESPACE);
+ }
+
+ @Override
+ public Predicate<? super EObject> getPredicateWhenSelected() {
+ return SELECTED_PREDICATE;
+ }
+
+ /**
+ * Obtains an iterable over all of the objects matched by a {@code match}.
+ *
+ * @param match
+ * a match
+ * @return the one to three objects that it matches, in order the left (if any), then the right (if any),
+ * and finally the ancestor (if any)
+ */
+ static Iterable<EObject> getMatchedObjects(Match match) {
+ return Iterables.filter(Arrays.asList(match.getLeft(), match.getRight(), match.getOrigin()),
+ notNull());
+ }
+
+}
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/util/ModelExtensionUtil.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/util/ModelExtensionUtil.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/util/ModelExtensionUtil.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/util/ModelExtensionUtil.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/.classpath b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.classpath
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/.classpath
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.classpath
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/.project b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/.project
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.resources.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.resources.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.runtime.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.runtime.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.core.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.core.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.ui.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/about.html b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/about.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/about.html
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/about.html
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/build.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/build.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/build.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/build.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/plugin.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/plugin.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/plugin.xml
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/plugin.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/pom.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/pom.xml
new file mode 100644
index 0000000..ad97875
--- /dev/null
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <version>0.7.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.bundles.parent</artifactId>
+ </parent>
+ <artifactId>org.eclipse.papyrus.compare.diagram</artifactId>
+ <version>2.6.2-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/ComparePapyrusMessages.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/ComparePapyrusMessages.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/ComparePapyrusMessages.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/ComparePapyrusMessages.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/compare_papyrus_messages.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/compare_papyrus_messages.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/compare_papyrus_messages.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/compare_papyrus_messages.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/AbstractPapyrusDiagramDiffHandler.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/AbstractPapyrusDiagramDiffHandler.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/AbstractPapyrusDiagramDiffHandler.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/AbstractPapyrusDiagramDiffHandler.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/CompareDiagramPapyrusPlugin.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/CompareDiagramPapyrusPlugin.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/CompareDiagramPapyrusPlugin.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/CompareDiagramPapyrusPlugin.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/DiffIndexer.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/DiffIndexer.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/DiffIndexer.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/DiffIndexer.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/FeatureInstance.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/FeatureInstance.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/FeatureInstance.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/FeatureInstance.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IDiffHandler.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IDiffHandler.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IDiffHandler.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IDiffHandler.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IgnoreDiFilePostProcessor.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IgnoreDiFilePostProcessor.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IgnoreDiFilePostProcessor.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/IgnoreDiFilePostProcessor.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram2WayDiffHandler.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram2WayDiffHandler.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram2WayDiffHandler.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram2WayDiffHandler.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram3WayDiffHandler.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram3WayDiffHandler.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram3WayDiffHandler.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagram3WayDiffHandler.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostComparison.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostComparison.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostComparison.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostComparison.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostProcessor.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostProcessor.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostProcessor.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusDiagramPostProcessor.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusResourceChangeParticipant.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusResourceChangeParticipant.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusResourceChangeParticipant.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/PapyrusResourceChangeParticipant.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedEObject.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedEObject.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedEObject.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedEObject.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedFeatureInstance.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedFeatureInstance.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedFeatureInstance.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/internal/SidedFeatureInstance.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/util/ModelExtensionUtil.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/util/ModelExtensionUtil.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/util/ModelExtensionUtil.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.diagram/src/org/eclipse/papyrus/compare/diagram/util/ModelExtensionUtil.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.feature/.project b/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.feature/.project
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.feature/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.feature/build.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/build.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.feature/build.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.feature/build.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.feature/epl-v10.html b/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/epl-v10.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.feature/epl-v10.html
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.feature/epl-v10.html
diff --git a/plugins/compare/org.eclipse.papyrus.compare.feature/feature.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/feature.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.feature/feature.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.feature/feature.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.feature/feature.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/feature.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.feature/feature.xml
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.feature/feature.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.feature/license.html b/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/license.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.feature/license.html
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.feature/license.html
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/pom.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/pom.xml
new file mode 100755
index 0000000..2c92aef
--- /dev/null
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.feature/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2017 EclipseSource Services GmbH and others. 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: Philip Langer - Initial API and implementation -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Parent of this POM -->
+ <parent>
+ <version>0.7.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.bundles.parent</artifactId>
+ </parent>
+
+ <!-- Project POM (aggregator) -->
+ <artifactId>org.eclipse.papyrus.compare.feature</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+ <groupId>org.eclipse.papyrus</groupId>
+</project>
\ No newline at end of file
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.classpath b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.classpath
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.classpath
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.classpath
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.project b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.project
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.pde.api.tools.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/about.html b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/about.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/about.html
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/about.html
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/build.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/build.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/build.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/build.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/plugin.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/plugin.xml
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/plugin.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/pom.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/pom.xml
new file mode 100644
index 0000000..77d1ddc
--- /dev/null
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <version>0.7.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.bundles.parent</artifactId>
+ </parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.compare.uml2.edit</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/Activator.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/Activator.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/Activator.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/Activator.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderAdapterFactoryDecorator.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderContextTester.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderContextTester.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderContextTester.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderContextTester.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderDecorator.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderDecorator.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderDecorator.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/src/org/eclipse/papyrus/compare/uml2/edit/internal/decorator/PapyrusItemProviderDecorator.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/.classpath b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.classpath
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/.classpath
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.classpath
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/.project b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/.project
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.resources.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.resources.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.runtime.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.runtime.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.core.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.core.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.ui.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.pde.api.tools.prefs b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.pde.api.tools.prefs
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/about.html b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/about.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/about.html
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/about.html
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/build.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/build.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/build.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/build.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/plugin.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/plugin.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/plugin.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/plugin.xml
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/plugin.xml
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/pom.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/pom.xml
new file mode 100644
index 0000000..4d5a29a
--- /dev/null
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <version>0.7.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.bundles.parent</artifactId>
+ </parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.compare.uml2</artifactId>
+ <version>2.5.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusCompareMessages.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusCompareMessages.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusCompareMessages.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusCompareMessages.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusComparePlugin.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusComparePlugin.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusComparePlugin.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/UMLPapyrusComparePlugin.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/ProfileMigrationHook.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/ProfileMigrationHook.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/ProfileMigrationHook.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/ProfileMigrationHook.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/DelegatingInvocationHandler.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/DelegatingInvocationHandler.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/DelegatingInvocationHandler.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/DelegatingInvocationHandler.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/MissingProfileSupplier.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/MissingProfileSupplier.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/MissingProfileSupplier.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/MissingProfileSupplier.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ModelSetWrapper.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ModelSetWrapper.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ModelSetWrapper.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ModelSetWrapper.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileMigrationDiagnostic.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileMigrationDiagnostic.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileMigrationDiagnostic.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileMigrationDiagnostic.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileNamespaceURIPatternAPI.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileNamespaceURIPatternAPI.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileNamespaceURIPatternAPI.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/ProfileNamespaceURIPatternAPI.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/StereotypeApplicationRepair.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/StereotypeApplicationRepair.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/StereotypeApplicationRepair.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/StereotypeApplicationRepair.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/UMLLabelProviderService.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/UMLLabelProviderService.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/UMLLabelProviderService.java
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/hook/migration/UMLLabelProviderService.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/messages.properties b/plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/messages.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/messages.properties
rename to plugins/compare/bundles/org.eclipse.papyrus.compare.uml2/src/org/eclipse/papyrus/compare/uml2/internal/messages.properties
diff --git a/plugins/compare/bundles/pom.xml b/plugins/compare/bundles/pom.xml
new file mode 100644
index 0000000..5f1ccda
--- /dev/null
+++ b/plugins/compare/bundles/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.releng</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <target.file>${target.folder}/compare-release</target.file>
+ </properties>
+
+ <artifactId>org.eclipse.papyrus.compare.bundles.parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.papyrus.compare.diagram</module>
+ <module>org.eclipse.papyrus.compare.diagram.ide.ui</module>
+ <module>org.eclipse.papyrus.compare.feature</module>
+ <module>org.eclipse.papyrus.compare.uml2</module>
+ <module>org.eclipse.papyrus.compare.uml2.edit</module>
+ </modules>
+</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml
deleted file mode 100644
index af763d2..0000000
--- a/plugins/compare/org.eclipse.papyrus.compare.diagram.ide.ui/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.compare.diagram.ide.ui</artifactId>
- <version>2.8.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <dependency-resolution>
- <optionalDependencies>ignore</optionalDependencies>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml
deleted file mode 100644
index f55aae9..0000000
--- a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.compare.diagram.tests.git</artifactId>
- <version>2.6.2-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.class</include>
- </includes>
- <useUIHarness>true</useUIHarness>
- <argLine>-Xmx2048m ${os-jvm-flags}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/pom.xml
deleted file mode 100644
index ac69622..0000000
--- a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.compare.diagram.tests</artifactId>
- <version>2.6.2-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.class</include>
- </includes>
- <useUIHarness>true</useUIHarness>
- <showEclipseLog>true</showEclipseLog>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.diagram/pom.xml
deleted file mode 100644
index 0cfb869..0000000
--- a/plugins/compare/org.eclipse.papyrus.compare.diagram/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.compare.diagram</artifactId>
- <version>2.6.2-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.feature/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.feature/pom.xml
deleted file mode 100755
index 4dc3331..0000000
--- a/plugins/compare/org.eclipse.papyrus.compare.feature/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017 EclipseSource Services GmbH and others.
-
- 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:
- Philip Langer - Initial API and implementation
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent of this POM -->
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
- </parent>
-
- <!-- Project POM (aggregator) -->
- <artifactId>org.eclipse.papyrus.compare.feature</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
- <groupId>org.eclipse.papyrus</groupId>
-</project>
\ No newline at end of file
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/pom.xml
deleted file mode 100644
index d87a401..0000000
--- a/plugins/compare/org.eclipse.papyrus.compare.uml2.edit/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.compare.uml2.edit</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/pom.xml
deleted file mode 100644
index 211ee2f..0000000
--- a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.compare.uml2.tests</artifactId>
- <version>2.5.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.class</include>
- </includes>
- <useUIHarness>true</useUIHarness>
- <showEclipseLog>true</showEclipseLog>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.uml2/pom.xml
deleted file mode 100644
index 84cd952..0000000
--- a/plugins/compare/org.eclipse.papyrus.compare.uml2/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.compare.uml2</artifactId>
- <version>2.5.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/compare/pom.xml b/plugins/compare/pom.xml
index 3f19305..d2fe69c 100755
--- a/plugins/compare/pom.xml
+++ b/plugins/compare/pom.xml
@@ -1,70 +1,256 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017 EclipseSource Services GmbH.
+<!-- Copyright (c) 2017 EclipseSource Services GmbH. 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:
+ Philip Langer - Initial API and implementation -->
- 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:
- Philip Langer - Initial API and implementation
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- Parent of this POM -->
- <parent>
- <version>0.7.0-SNAPSHOT</version>
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins</artifactId>
- </parent>
-
<!-- Project POM (aggregator) -->
- <groupId>org.eclipse.papyrus.collaborativemodeling</groupId>
- <artifactId>org.eclipse.papyrus.collaborativemodeling.plugins.compare</artifactId>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.releng</artifactId>
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Collaborative Modeling -- Papyrus Compare</name>
<description>Papyrus Compare allows to diff/merge Papyrus models with EGit.</description>
- <!-- Children modules to build -->
- <modules>
- <module>org.eclipse.papyrus.compare.diagram.ide.ui</module>
- <module>org.eclipse.papyrus.compare.diagram</module>
- <module>org.eclipse.papyrus.compare.uml2</module>
- <module>org.eclipse.papyrus.compare.uml2.edit</module>
- <module>org.eclipse.papyrus.compare.feature</module>
- </modules>
+ <properties>
+ <!-- plugins versions -->
+ <!-- use 'mvn versions:display-plugin-updates' to check for the latest -->
+ <tycho-version>1.0.0</tycho-version>
+ <tychoExtrasVersion>1.0.0</tychoExtrasVersion>
+ <maven-checkstyle-version>2.12.1</maven-checkstyle-version>
+ <maven-findbugs-version>3.0.0</maven-findbugs-version>
+ <maven-pmd-version>3.1</maven-pmd-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <profiles>
- <profile>
- <id>papyrusCompareTests</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <testFailureIgnore>true</testFailureIgnore>
- <product>org.eclipse.sdk.ide</product>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <modules>
- <module>org.eclipse.papyrus.compare.uml2.tests</module>
- <module>org.eclipse.papyrus.compare.diagram.tests</module>
- <module>org.eclipse.papyrus.compare.diagram.tests.git</module>
- </modules>
- </profile>
- </profiles>
+ <!-- Eclipse properties -->
+
+ <!-- default environment overridden by profile, tycho preempts profile -->
+ <java.source>1.8</java.source>
+ <java.target>1.8</java.target>
+ <target.folder>targetplatforms</target.folder>
+ <target.stream>release</target.stream> <!-- release | nightly -->
+ <target.file>${target.folder}/compare-${target.stream}</target.file>
+
+ <!-- Platform properties -->
+ <env.ui.test>-Xms256m -Xmx1024m</env.ui.test>
+ </properties>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>eclipse-maven-releases</id>
+ <url>https://repo.eclipse.org/content/repositories/releases/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <!-- enable tycho build extension -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin><!-- enable source bundle generation -->
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-director-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>1.1.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <configuration>
+ <source>${java.source}</source>
+ <target>${java.target}</target>
+ <optimize>true</optimize>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ <!-- enable tycho build extension -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ </plugin>
+ <plugin><!-- enable source bundle generation -->
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>plugin-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+<!-- <configuration> -->
+<!-- <excludes> -->
+<!-- <plugin id="org.eclipse.papyrus.common.information.modeling.rcp" /> -->
+<!-- <plugin id="org.apache.batik.pdf" /> -->
+<!-- <plugin id="org.eclipse.wst.common.project.facet.core" /> -->
+<!-- <plugin id="org.eclipse.emf.compare.rcp" /> -->
+<!-- <plugin id="org.eclipse.emf.compare.rcp.ui" /> -->
+<!-- <plugin -->
+<!-- id="org.eclipse.papyrus.common.information.modeling.examples" /> -->
+<!-- </excludes> -->
+<!-- </configuration> -->
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ <targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
+ <environments>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <!-- <environment> <os>macosx</os> <ws>cocoa</ws> <arch>x86_64</arch>
+ </environment> -->
+ </environments>
+ <target>
+ <artifact>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.releng</artifactId>
+ <classifier>${target.file}</classifier>
+ <version>0.7.0-SNAPSHOT</version>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>bundles</module>
+ <module>tests</module>
+ </modules>
</project>
diff --git a/plugins/compare/targetplatforms/.project b/plugins/compare/targetplatforms/.project
new file mode 100644
index 0000000..e55bff7
--- /dev/null
+++ b/plugins/compare/targetplatforms/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>targetplatforms</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/plugins/compare/targetplatforms/compare-nightly.target b/plugins/compare/targetplatforms/compare-nightly.target
new file mode 100644
index 0000000..4cb89ac
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-nightly.target
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Compare Target Platform - Nightly" sequenceNumber="1508837327">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.draw2d" version="0.0.0"/>
+ <unit id="org.eclipse.gef" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
+ <repository id="eclipse-oxygen" location="http://download.eclipse.org/staging/oxygen/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.egit.feature.group" version="4.9.0.201710071750-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="4.9.0.201710071750-r"/>
+ <repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="0.0.0"/>
+ <repository id="papyrusNightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
+ <repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.commons.io" version="0.0.0"/>
+ <unit id="org.apache.commons.io.source" version="0.0.0"/>
+ <unit id="com.google.inject" version="0.0.0"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <unit id="javaewah" version="0.0.0"/>
+ <unit id="org.apache.commons.compress" version="0.0.0"/>
+ <unit id="org.apache.commons.lang" version="0.0.0"/>
+ <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="0.0.0"/>
+ <unit id="org.hamcrest.library" version="0.0.0"/>
+ <unit id="org.hamcrest.integration" version="0.0.0"/>
+ <unit id="org.hamcrest.text" version="0.0.0"/>
+ <unit id="org.objenesis" version="1.0.0.v201505121915"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ </locations>
+</target>
diff --git a/plugins/compare/targetplatforms/compare-nightly.tpd b/plugins/compare/targetplatforms/compare-nightly.tpd
new file mode 100755
index 0000000..429db8a
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-nightly.tpd
@@ -0,0 +1,58 @@
+target "Compare Target Platform - Nightly" with requirements
+
+location "http://download.eclipse.org/staging/oxygen/" eclipse-oxygen {
+ org.eclipse.platform.feature.group lazy
+ org.eclipse.sdk.feature.group lazy
+ org.eclipse.rcp.feature.group lazy
+ org.eclipse.jdt.feature.group lazy
+ org.eclipse.equinox.p2.discovery.feature.feature.group lazy
+ org.eclipse.equinox.executable.feature.group lazy
+ org.eclipse.draw2d lazy
+ org.eclipse.gef lazy
+ org.eclipse.ocl.core.sdk.feature.group lazy
+ org.eclipse.ocl.examples.classic.feature.group lazy
+ org.eclipse.ocl.examples.feature.group lazy
+ org.eclipse.emf.sdk.feature.group lazy
+ org.eclipse.xsd.sdk.feature.group lazy
+}
+
+location "http://download.eclipse.org/egit/updates" EGit {
+ org.eclipse.egit.feature.group [4.9.0,5.0.0)
+ org.eclipse.jgit.feature.group [4.9.0,5.0.0)
+}
+
+location papyrusNightly "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen" {
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.papyrus.views.properties.toolsmiths lazy
+}
+
+location xwt "http://download.eclipse.org/xwt/updates" {
+ org.eclipse.xwt.feature.feature.group [1.3.1,2.0.0)
+}
+
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest" {
+ org.eclipse.emf.compare.feature.group lazy
+ org.eclipse.emf.compare.diagram.gmf.feature.group lazy
+ org.eclipse.emf.compare.uml2.feature.group lazy
+ org.eclipse.emf.compare.egit.feature.group lazy
+ org.eclipse.emf.compare.ide.ui.feature.group lazy
+}
+
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
+ org.apache.commons.io lazy
+ org.apache.commons.io.source lazy
+ com.google.inject lazy
+ com.google.guava [21.0.0,22.0.0)
+ com.google.guava.source [21.0.0,22.0.0)
+ /* Egit/Jgit */
+ javaewah lazy
+ org.apache.commons.compress lazy
+ org.apache.commons.lang lazy
+ org.kohsuke.args4j lazy
+ org.mockito [1.9.0,2.0.0)
+ org.hamcrest lazy
+ org.hamcrest.library lazy
+ org.hamcrest.integration lazy
+ org.hamcrest.text lazy
+ org.objenesis [1.0.0,2.0.0)
+}
diff --git a/plugins/compare/targetplatforms/compare-release-base.target b/plugins/compare/targetplatforms/compare-release-base.target
new file mode 100644
index 0000000..7c2eb49
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-release-base.target
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Compare Target Platform - Base for Release" sequenceNumber="1508836529">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="4.7.1.v20171009-0410"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.7.1.v20171009-0537"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.7.1.v20171009-0410"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.13.1.v20171009-0410"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.1.v20170906-1259"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.1.v20170928-1359"/>
+ <unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
+ <unit id="org.eclipse.gef" version="3.11.0.201606061308"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170604-1316"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="2.13.0.v20170609-0928"/>
+ <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.11.0.201706061352"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.11.0.201706061339"/>
+ <unit id="org.eclipse.emf.workspace.feature.group" version="1.11.0.201706061339"/>
+ <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.11.0.201706061354"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.11.0.201706061437"/>
+ <unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="4.8.0.201706111038-r"/>
+ <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.commons.io" version="0.0.0"/>
+ <unit id="org.apache.commons.io.source" version="0.0.0"/>
+ <unit id="com.google.inject" version="0.0.0"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <unit id="javaewah" version="0.0.0"/>
+ <unit id="org.apache.commons.compress" version="0.0.0"/>
+ <unit id="org.apache.commons.lang" version="0.0.0"/>
+ <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="0.0.0"/>
+ <unit id="org.hamcrest.library" version="0.0.0"/>
+ <unit id="org.hamcrest.integration" version="0.0.0"/>
+ <unit id="org.hamcrest.text" version="0.0.0"/>
+ <unit id="org.objenesis" version="1.0.0.v201505121915"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ </locations>
+</target>
diff --git a/plugins/compare/targetplatforms/compare-release-base.tpd b/plugins/compare/targetplatforms/compare-release-base.tpd
new file mode 100755
index 0000000..40f5447
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-release-base.tpd
@@ -0,0 +1,52 @@
+//This target platform is not used as-is, but we need it to get a mix of Nightlies and Release artifacts for Papyrus
+//Papyrus tests need the Nightlies, whereas we want to build against the Release. We can't mix both in a single TP.
+//So we need a generic base TP that excludes Papyrus, then Main and Tests will add the version of Papyrus they need
+
+target "Compare Target Platform - Base for Release" with requirements
+
+location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
+ org.eclipse.platform.feature.group
+ org.eclipse.sdk.feature.group
+ org.eclipse.rcp.feature.group
+ org.eclipse.jdt.feature.group
+ org.eclipse.equinox.p2.discovery.feature.feature.group
+ org.eclipse.equinox.executable.feature.group
+ org.eclipse.draw2d
+ org.eclipse.gef
+ org.eclipse.m2m.qvt.oml.sdk.feature.group
+ org.eclipse.emf.sdk.feature.group
+ org.eclipse.xsd.sdk.feature.group
+ org.eclipse.emf.validation.sdk.feature.group
+ org.eclipse.emf.transaction.sdk.feature.group
+ org.eclipse.emf.workspace.feature.group
+ org.eclipse.gmf.runtime.notation.sdk.feature.group
+ org.eclipse.gmf.runtime.sdk.feature.group
+ org.eclipse.uml2.sdk.feature.group
+ org.eclipse.emf.compare.source.feature.group
+ org.eclipse.emf.compare.diagram.gmf.source.feature.group
+ org.eclipse.emf.compare.uml2.feature.group
+ org.eclipse.emf.compare.egit.feature.group
+ org.eclipse.emf.compare.ide.ui.feature.group
+ org.eclipse.egit.feature.group
+ org.eclipse.jgit.feature.group
+}
+
+//manualUpdate
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
+ org.apache.commons.io
+ org.apache.commons.io.source
+ com.google.inject
+ com.google.guava [21.0.0,22.0.0)
+ com.google.guava.source [21.0.0,22.0.0)
+ /* Egit/Jgit */
+ javaewah
+ org.apache.commons.compress
+ org.apache.commons.lang
+ org.kohsuke.args4j
+ org.mockito [1.9.0,2.0.0)
+ org.hamcrest
+ org.hamcrest.library
+ org.hamcrest.integration
+ org.hamcrest.text
+ org.objenesis [1.0.0,2.0.0)
+}
diff --git a/plugins/compare/targetplatforms/compare-release.target b/plugins/compare/targetplatforms/compare-release.target
new file mode 100644
index 0000000..abc4e16
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-release.target
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Compare Target Platform - Release" sequenceNumber="1508836529">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="4.7.1.v20171009-0410"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.7.1.v20171009-0537"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.7.1.v20171009-0410"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.13.1.v20171009-0410"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.1.v20170906-1259"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.1.v20170928-1359"/>
+ <unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
+ <unit id="org.eclipse.gef" version="3.11.0.201606061308"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170604-1316"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="2.13.0.v20170609-0928"/>
+ <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.11.0.201706061352"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.11.0.201706061339"/>
+ <unit id="org.eclipse.emf.workspace.feature.group" version="1.11.0.201706061339"/>
+ <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.11.0.201706061354"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.11.0.201706061437"/>
+ <unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="4.8.0.201706111038-r"/>
+ <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.commons.io" version="0.0.0"/>
+ <unit id="org.apache.commons.io.source" version="0.0.0"/>
+ <unit id="com.google.inject" version="0.0.0"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <unit id="javaewah" version="0.0.0"/>
+ <unit id="org.apache.commons.compress" version="0.0.0"/>
+ <unit id="org.apache.commons.lang" version="0.0.0"/>
+ <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="0.0.0"/>
+ <unit id="org.hamcrest.library" version="0.0.0"/>
+ <unit id="org.hamcrest.integration" version="0.0.0"/>
+ <unit id="org.hamcrest.text" version="0.0.0"/>
+ <unit id="org.objenesis" version="1.0.0.v201505121915"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.1.0.201709130748"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201709130748"/>
+ <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201709130748"/>
+ <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.0.0.201709130748"/>
+ <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen"/>
+ </location>
+ </locations>
+</target>
diff --git a/plugins/compare/targetplatforms/compare-release.tpd b/plugins/compare/targetplatforms/compare-release.tpd
new file mode 100755
index 0000000..1489bb1
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare-release.tpd
@@ -0,0 +1,10 @@
+target "Compare Target Platform - Release" with requirements
+
+include "compare-release-base.tpd"
+
+location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen" {
+ org.eclipse.papyrus.sdk.feature.feature.group
+ org.eclipse.papyrus.infra.gmfdiag.feature.feature.group
+ org.eclipse.papyrus.infra.services.feature.feature.group
+ org.eclipse.papyrus.views.properties.toolsmiths
+}
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.target b/plugins/compare/targetplatforms/compare.tests-nightly.target
new file mode 100644
index 0000000..5f1be1c
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare.tests-nightly.target
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1508837327">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.draw2d" version="0.0.0"/>
+ <unit id="org.eclipse.gef" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
+ <repository id="eclipse-oxygen" location="http://download.eclipse.org/staging/oxygen/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.egit.feature.group" version="4.9.0.201710071750-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="4.9.0.201710071750-r"/>
+ <repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="0.0.0"/>
+ <repository id="papyrusNightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
+ <repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.commons.io" version="0.0.0"/>
+ <unit id="org.apache.commons.io.source" version="0.0.0"/>
+ <unit id="com.google.inject" version="0.0.0"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <unit id="javaewah" version="0.0.0"/>
+ <unit id="org.apache.commons.compress" version="0.0.0"/>
+ <unit id="org.apache.commons.lang" version="0.0.0"/>
+ <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="0.0.0"/>
+ <unit id="org.hamcrest.library" version="0.0.0"/>
+ <unit id="org.hamcrest.integration" version="0.0.0"/>
+ <unit id="org.hamcrest.text" version="0.0.0"/>
+ <unit id="org.objenesis" version="1.0.0.v201505121915"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
+ <repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sysml14" version="0.0.0"/>
+ <repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest"/>
+ </location>
+ </locations>
+</target>
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.tpd b/plugins/compare/targetplatforms/compare.tests-nightly.tpd
new file mode 100755
index 0000000..c8af4b1
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare.tests-nightly.tpd
@@ -0,0 +1,19 @@
+target "Compare Target Platform - Nightly, Tests" with requirements
+
+include "compare-nightly.tpd"
+
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/" {
+ org.eclipse.papyrus.junit.utils lazy
+ org.eclipse.papyrus.junit.framework lazy
+}
+
+//required for Compare test ProfileMigrationTest
+
+location sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen" {
+ org.eclipse.papyrus.sysml14 lazy
+}
+
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/nightly/latest" {
+ org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
+ org.eclipse.emf.compare.tests.source.feature.group lazy
+}
\ No newline at end of file
diff --git a/plugins/compare/targetplatforms/compare.tests-release.target b/plugins/compare/targetplatforms/compare.tests-release.target
new file mode 100644
index 0000000..b583f41
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare.tests-release.target
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Compare Target Platform - Release, Tests" sequenceNumber="1508836529">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="4.7.1.v20171009-0410"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.7.1.v20171009-0537"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.7.1.v20171009-0410"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.13.1.v20171009-0410"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.1.v20170906-1259"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.7.1.v20170928-1359"/>
+ <unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
+ <unit id="org.eclipse.gef" version="3.11.0.201606061308"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170604-1316"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="2.13.0.v20170609-0928"/>
+ <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.11.0.201706061352"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.11.0.201706061339"/>
+ <unit id="org.eclipse.emf.workspace.feature.group" version="1.11.0.201706061339"/>
+ <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.11.0.201706061354"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.11.0.201706061437"/>
+ <unit id="org.eclipse.uml2.sdk.feature.group" version="5.3.0.v20170605-1616"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.egit.feature.group" version="1.2.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.egit.feature.group" version="4.8.0.201706111038-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="4.8.0.201706111038-r"/>
+ <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.apache.commons.io" version="0.0.0"/>
+ <unit id="org.apache.commons.io.source" version="0.0.0"/>
+ <unit id="com.google.inject" version="0.0.0"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <unit id="javaewah" version="0.0.0"/>
+ <unit id="org.apache.commons.compress" version="0.0.0"/>
+ <unit id="org.apache.commons.lang" version="0.0.0"/>
+ <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="0.0.0"/>
+ <unit id="org.hamcrest.library" version="0.0.0"/>
+ <unit id="org.hamcrest.integration" version="0.0.0"/>
+ <unit id="org.hamcrest.text" version="0.0.0"/>
+ <unit id="org.objenesis" version="1.0.0.v201505121915"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.junit.utils" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.junit.framework" version="0.0.0"/>
+ <repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.nattable.feature.feature.group" version="0.0.0"/>
+ <repository id="papyrusNightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
+ <repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sysml14" version="0.0.0"/>
+ <repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="3.5.0.201709090201"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.2.201709090201"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.2.201709090201"/>
+ <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3"/>
+ </location>
+ </locations>
+</target>
diff --git a/plugins/compare/targetplatforms/compare.tests-release.tpd b/plugins/compare/targetplatforms/compare.tests-release.tpd
new file mode 100755
index 0000000..082bfb1
--- /dev/null
+++ b/plugins/compare/targetplatforms/compare.tests-release.tpd
@@ -0,0 +1,36 @@
+target "Compare Target Platform - Release, Tests" with requirements
+
+include "compare-release-base.tpd"
+
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/" {
+ org.eclipse.papyrus.junit.utils lazy
+ org.eclipse.papyrus.junit.framework lazy
+}
+
+//For the tests, we need a nightly version of some Papyrus plugins, as breaking changes have been
+//introduced between Oxygen.1 (Release) and Oxygen.2 (Nightly)
+//Papyrus test framework is only available as a Nightly, and depends on these breaking changes
+location papyrusNightly "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen" {
+ //Override Papyrus units from compare-release.tpd, to make sure we pull the nightly
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+
+ //That's the feature we explicitly need, for the Papyrus junit.utils to work
+ org.eclipse.papyrus.infra.nattable.feature.feature.group lazy
+}
+
+//Transitive dependency for Papyrus Nightly (Will be released in Oxygen.2 but is not yet present in Oxygen.1)
+location xwt "http://download.eclipse.org/xwt/updates" {
+ org.eclipse.xwt.feature.feature.group [1.3.1,2.0.0)
+}
+
+
+//required for Compare test ProfileMigrationTest
+location sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/oxygen" {
+ org.eclipse.papyrus.sysml14
+}
+
+location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3" {
+ org.eclipse.emf.compare.tests.source.feature.group
+ org.eclipse.emf.compare.uml2.source.feature.group
+ org.eclipse.emf.compare.rcp.ui.feature.group
+}
\ No newline at end of file
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/.classpath b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/.project b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/.project
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.ui.prefs b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/about.html b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/about.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/about.html
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/about.html
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/build.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/build.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/build.properties
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/build.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/plugin.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml
new file mode 100644
index 0000000..7ea9138
--- /dev/null
+++ b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <version>0.7.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.tests.releng</artifactId>
+ </parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.compare.diagram.tests.git</artifactId>
+ <version>2.6.2-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <targetType>.tests-release</targetType>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.class</include>
+ </includes>
+ <useUIHarness>true</useUIHarness>
+ <argLine>-Xmx2048m</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/AbstractGitTestCase.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/AbstractGitTestCase.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/AbstractGitTestCase.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/AbstractGitTestCase.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/MoveOfDiagramConflictDetectionTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/MoveOfDiagramConflictDetectionTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/MoveOfDiagramConflictDetectionTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/MoveOfDiagramConflictDetectionTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case001.zip b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case001.zip
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case001.zip
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case001.zip
Binary files differ
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case002.zip b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case002.zip
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case002.zip
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/conflicts/data/case002.zip
Binary files differ
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/IgnoreDiFileChangesInGitMergeTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/IgnoreDiFileChangesInGitMergeTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/IgnoreDiFileChangesInGitMergeTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/IgnoreDiFileChangesInGitMergeTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeConflictTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeConflictTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeConflictTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/StereotypeConflictTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/ignore-di-file-changes.zip b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/ignore-di-file-changes.zip
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/ignore-di-file-changes.zip
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/data/ignore-di-file-changes.zip
Binary files differ
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/mergeresolution/MergeResolutionManagerTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/AdditiveMergeDiagramTests.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/AdditiveMergeDiagramTests.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/AdditiveMergeDiagramTests.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/AdditiveMergeDiagramTests.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/AdditiveMergeDiagramInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/AdditiveMergeDiagramInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/AdditiveMergeDiagramInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/AdditiveMergeDiagramInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/commit3/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test1/result2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit3/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/result/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wave.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit1/wired.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit2/wave.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/commit3/wired.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wave.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/control/result/wired.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit3/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/result/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/rac.zip b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/rac.zip
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/rac.zip
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/rac.zip
Binary files differ
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/solvable.zip b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/solvable.zip
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/solvable.zip
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/solvable.zip
Binary files differ
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/unsolvable.zip b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/unsolvable.zip
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/unsolvable.zip
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/unsolvable.zip
Binary files differ
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/fragment.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case001/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/fragment.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/implication/data/case002/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/fragment.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case001/commit3/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/fragment.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case002/commit3/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/fragment.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/control.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/case003/commit3/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model2.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/ancestor/model3.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model2.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/left/model3.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/caseBug488089/right/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/resourceattachmentchange/move/data/resourceAttachmentChangeMoveNoConflict.zip
Binary files differ
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/suite/PapyrusGitTests.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/SomePackage.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/left/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/origin/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add1/right/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/SomePackage.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/left/unrelated-file.txt
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/origin/unrelated-file.txt
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/add2/right/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/Package1.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/left/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/Package1.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/origin/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete1/right/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/Package1.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/left/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/Package1.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/origin/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/resourceattachmentchange/delete2/right/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/left/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/origin/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/testmodels/stereotype-changes/conflict/right/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.classpath b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.classpath
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.classpath
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.classpath
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.project b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.project
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.resources.prefs b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.resources.prefs
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.runtime.prefs b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.runtime.prefs
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.core.prefs
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/build.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/build.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/build.properties
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/build.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/expectedResultWithUMLRefineElement.nodes b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/expectedResultWithUMLRefineElement.nodes
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/expectedResultWithUMLRefineElement.nodes
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/expectedResultWithUMLRefineElement.nodes
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/plugin.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/plugin.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/pom.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/pom.xml
new file mode 100644
index 0000000..2dca1de
--- /dev/null
+++ b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <version>0.7.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.tests.releng</artifactId>
+ </parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.compare.diagram.tests</artifactId>
+ <version>2.6.2-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <targetType>.tests-release</targetType>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.class</include>
+ </includes>
+ <useUIHarness>true</useUIHarness>
+ <showEclipseLog>true</showEclipseLog>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/AbstractTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/AbstractTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/AbstractTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/AbstractTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/DiagramInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/DiagramTooltipProviderTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/DiagramTooltipProviderTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/DiagramTooltipProviderTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/DiagramTooltipProviderTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/DiagramTooltipProviderInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/DiagramTooltipProviderInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/DiagramTooltipProviderInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/DiagramTooltipProviderInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/ancestor.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/comparison/data/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/PapyrusContextUtilTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/left.ecore b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/left.ecore
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/left.ecore
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/left.ecore
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/right.ecore b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/right.ecore
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/right.ecore
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/ecore/right.ecore
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/context/data/papyrus/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/IgnoreDiFilePostProcessorTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/IgnoreDiFilePostProcessorTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/IgnoreDiFilePostProcessorTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/IgnoreDiFilePostProcessorTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/origin/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/origin/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/origin/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/origin/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/difile/data/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusConflictsGroupProviderTests.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusConflictsGroupProviderTests.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusConflictsGroupProviderTests.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusConflictsGroupProviderTests.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusDifferencesOrderTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusDifferencesOrderTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusDifferencesOrderTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/PapyrusDifferencesOrderTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOff.nodes
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/expectedResult_DiagRefineOn.nodes
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/a1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/ConflictsGroupInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/left/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/origin/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/groups/data/conflictsgroup/bug478539/right/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/AssocMergeTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/AssocMergeTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/AssocMergeTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/AssocMergeTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/EdgeMergeTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/EdgeMergeTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/EdgeMergeTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/EdgeMergeTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/NodeMergeTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/NodeMergeTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/NodeMergeTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/NodeMergeTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/AssocMergeInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/AssocMergeInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/AssocMergeInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/AssocMergeInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/EdgeMergeInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/EdgeMergeInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/EdgeMergeInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/EdgeMergeInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/NodeMergeInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/NodeMergeInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/NodeMergeInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/NodeMergeInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/ancestor.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/ancestor.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/package-info.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/package-info.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/package-info.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/package-info.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/t1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/ancestor.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/package-info.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/package-info.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/package-info.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/package-info.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/c1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/ancestor.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/package-info.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/package-info.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/package-info.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/package-info.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/threeway/t1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/package-info.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/package-info.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/package-info.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/package-info.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/package-info.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/package-info.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/package-info.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/package-info.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/a2/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/package-info.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/package-info.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/package-info.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/package-info.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/twoway/t1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a2/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a3/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a4/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a5/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a6/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/edges/a7/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a1/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a2/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a3/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/ancestor.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a4/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/nodes/a5/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/sysml/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/ModelExtensionUtilTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/ModelExtensionUtilTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/ModelExtensionUtilTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/ModelExtensionUtilTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/CustomParameterModel.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/CustomParameterModel.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/CustomParameterModel.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/CustomParameterModel.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/customparametermodel.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/customparametermodel.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/customparametermodel.xml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/customparametermodel/customparametermodel.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/fileextension/fileextension.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/fileextension/fileextension.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/fileextension/fileextension.xml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/fileextension/fileextension.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/NoParameterModel.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/NoParameterModel.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/NoParameterModel.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/NoParameterModel.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/noparametermodel.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/noparametermodel.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/noparametermodel.xml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/noparametermodel/noparametermodel.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nulldata/nullextension.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nulldata/nullextension.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nulldata/nullextension.xml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nulldata/nullextension.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullmodel/nullmodel.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullmodel/nullmodel.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullmodel/nullmodel.xml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullmodel/nullmodel.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/NullParameterModel.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/NullParameterModel.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/NullParameterModel.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/NullParameterModel.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/nullparametermodel.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/nullparametermodel.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/nullparametermodel.xml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/nullparametermodel/nullparametermodel.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/RuntimeExceptionModel.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/modelextension/data/runtimeexceptionmodel/runtimeexceptionmodel.xml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookIntegrationTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookIntegrationTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookIntegrationTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookIntegrationTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/SaveParameterHookTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a1/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/saveparameter/data/a2/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/MergeNonConflictingCascadingFilterTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/left/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/origin/ancestor.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/classes/right/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/left/left.ecore
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/origin/ancestor.ecore
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/structuremergeviewer/actions/data/bug487151/ecore/right/right.ecore
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/suite/AllTests.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/URIAttachmentTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/URIAttachmentTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/URIAttachmentTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/URIAttachmentTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/URIAttachmentData.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/URIAttachmentData.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/URIAttachmentData.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/URIAttachmentData.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/left/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/origin/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.di b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.di
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.di
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.di
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.notation b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.notation
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.notation
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.notation
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/uriattachment/data/a1/right/model.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/util/PapyrusSaveParameterUtil.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/util/PapyrusSaveParameterUtil.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/util/PapyrusSaveParameterUtil.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/util/PapyrusSaveParameterUtil.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/.checkstyle b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.checkstyle
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/.checkstyle
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.checkstyle
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/.classpath b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.classpath
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/.classpath
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.classpath
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/.project b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.project
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/.project
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.project
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/about.html b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/about.html
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/about.html
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/about.html
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/build.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/build.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/build.properties
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/build.properties
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/plugin.properties b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/plugin.properties
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/pom.xml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/pom.xml
new file mode 100644
index 0000000..a67a528
--- /dev/null
+++ b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <version>0.7.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.tests.releng</artifactId>
+ </parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.compare.uml2.tests</artifactId>
+ <version>2.5.1-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <targetType>.tests-release</targetType>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.class</include>
+ </includes>
+ <useUIHarness>true</useUIHarness>
+ <showEclipseLog>true</showEclipseLog>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/nodiff/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/aba/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/sysml/version/abb/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/aba/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/left.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/left.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/left.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/left.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/right.uml b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/right.uml
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/right.uml
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/profiles/migration/data/version/abb/right.uml
diff --git a/plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java b/plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
similarity index 100%
rename from plugins/compare/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
rename to plugins/compare/tests/org.eclipse.papyrus.compare.uml2.tests/src/org/eclipse/papyrus/compare/uml2/tests/suite/AllUITests.java
diff --git a/plugins/compare/tests/pom.xml b/plugins/compare/tests/pom.xml
new file mode 100644
index 0000000..fd0c9eb
--- /dev/null
+++ b/plugins/compare/tests/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus.compare</groupId>
+ <artifactId>org.eclipse.papyrus.compare.releng</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.compare.tests.releng</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <target.file>${target.folder}/compare.tests-release</target.file>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIHarness>true</useUIHarness>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+ <modules>
+ <module>org.eclipse.papyrus.compare.uml2.tests</module>
+ <module>org.eclipse.papyrus.compare.diagram.tests</module>
+ <module>org.eclipse.papyrus.compare.diagram.tests.git</module>
+ </modules>
+</project>
diff --git a/releng/org.eclipse.papyrus.collaborativemodeling.configuration/pom.xml b/releng/org.eclipse.papyrus.collaborativemodeling.configuration/pom.xml
index ee028c0..ff085b9 100755
--- a/releng/org.eclipse.papyrus.collaborativemodeling.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.collaborativemodeling.configuration/pom.xml
@@ -31,6 +31,7 @@
<eclipse.targetrelease>oxygen</eclipse.targetrelease>
<target.version>0.7.0-SNAPSHOT</target.version>
<os-jvm-flags/>
+ <tycho-version>1.0.0</tycho-version>
</properties>
<!-- Collaborative Modeling CI system-->
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
index fd6ce55..b742077 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1508337493">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1508838287">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -12,7 +12,6 @@
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d" version="0.0.0"/>
<unit id="org.eclipse.gef" version="0.0.0"/>
- <unit id="org.eclipse.xwt" version="0.0.0"/>
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
@@ -26,6 +25,10 @@
<repository location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.xwt" version="1.3.1.I20171018-2059"/>
+ <repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.2/I1/main/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
index 78dc6fa..f41df4c 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
@@ -10,7 +10,6 @@
org.eclipse.draw2d lazy
org.eclipse.gef lazy
- org.eclipse.xwt lazy
}
location "http://download.eclipse.org/egit/updates" EGit {
@@ -35,6 +34,10 @@
org.eclipse.papyrus.junit.framework lazy
}
+location xwt "http://download.eclipse.org/xwt/updates" {
+ org.eclipse.xwt [1.3.1,2.0.0)
+}
+
// Temporary fix as the latest Milestone sdk does not
//updateFrom ("Papyrus",0)
location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/3.2/I1/main/" {
