diff options
| author | Laurent Delaigue | 2016-07-25 09:40:21 +0000 |
|---|---|---|
| committer | Laurent Delaigue | 2016-07-25 13:47:31 +0000 |
| commit | f7261635b096a84e39579a621970c03dbbc0467e (patch) | |
| tree | f95b71fbf98558fe14f6192a5ee46c197c9464a9 /plugins | |
| parent | 4afcf74e457f1609ce68e24e22c24091d1ee4b14 (diff) | |
| download | org.eclipse.emf.compare-f7261635b096a84e39579a621970c03dbbc0467e.tar.gz org.eclipse.emf.compare-f7261635b096a84e39579a621970c03dbbc0467e.tar.xz org.eclipse.emf.compare-f7261635b096a84e39579a621970c03dbbc0467e.zip | |
Split tests to isolate dependencies to papyrus
We want to isolate the dependencies to papyrus in dedicated
projects/plug-ins so that it's easier to move them to papyrus later on.
NOTE: This commit also fixes a test that had been broken by commit
38670759ff (automatic migration of UML profiles), which prevented the
suite AllTests from being called. Only AllUITests was actually called,
because the opm declared the surefire plugin twice, which is apparently
not supported...
Change-Id: I389cfb6114a789b7aa4419321a54503dafda0d1d
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins')
60 files changed, 266 insertions, 19 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.checkstyle b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.checkstyle new file mode 100644 index 000000000..995d6e28c --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.checkstyle @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false"> + <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle6Configuration.xml" type="project" description=""> + <additional-data name="protect-config-file" value="false"/> + </local-check-config> + <fileset name="all" enabled="true" check-config-name="EMF Compare" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="FilesFromPackage" enabled="true"> + <filter-data value="profile"/> + </filter> +</fileset-config> diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.classpath b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.classpath new file mode 100644 index 000000000..64c5e31b7 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.project b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.project new file mode 100644 index 000000000..863d73707 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.emf.compare.uml2.papyrus.tests</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..8000cd6ca --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/META-INF/MANIFEST.MF new file mode 100644 index 000000000..9d8c3d064 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/META-INF/MANIFEST.MF @@ -0,0 +1,31 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.emf.compare.uml2.papyrus.tests +Bundle-Version: 2.5.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.emf.ecore;visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="5.0.0";visibility:=reexport, + org.eclipse.uml2.types;visibility:=reexport, + org.eclipse.emf.edit;visibility:=reexport, + org.eclipse.emf.ecore.edit;visibility:=reexport, + org.eclipse.uml2.uml.resources;bundle-version="5.0.0", + org.junit, + org.eclipse.emf.compare, + org.eclipse.emf.compare.uml2, + org.eclipse.emf.compare.tests;bundle-version="2.0.1", + org.eclipse.uml2.uml.edit;bundle-version="5.0.0";visibility:=reexport, + org.eclipse.uml2.common.edit;visibility:=reexport, + org.eclipse.emf.compare.uml2.edit, + org.eclipse.emf.compare.edit, + org.eclipse.emf.compare.ide.ui.tests.framework, + org.eclipse.emf.compare.ide;bundle-version="3.3.0", + org.eclipse.papyrus.sysml;bundle-version="[1.0.2,2.0.0)", + org.eclipse.emf.compare.uml2.papyrus +Bundle-ActivationPolicy: lazy +Import-Package: com.google.common.base;version="[11.0.0,16.0.0)", + com.google.common.collect;version="[11.0.0,16.0.0)" diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/about.html b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/about.html new file mode 100644 index 000000000..670d10856 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/about.html @@ -0,0 +1,106 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> +<title>Eclipse Foundation Software User Agreement</title> +</head> + +<body lang="EN-US"> +<h2>Eclipse Foundation Software User Agreement</h2> +<p>April 14, 2010</p> + +<h3>Usage Of Content</h3> + +<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> + +<h3>Applicable Licenses</h3> + +<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. + For purposes of the EPL, "Program" will mean the Content.</p> + +<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> + +<ul> + <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li> + <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li> + <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins + and/or Fragments associated with that Feature.</li> + <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li> +</ul> + +<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:</p> + +<ul> + <li>The top-level (root) directory</li> + <li>Plug-in and Fragment directories</li> + <li>Inside Plug-ins and Fragments packaged as JARs</li> + <li>Sub-directories of the directory named "src" of certain Plug-ins</li> + <li>Feature directories</li> +</ul> + +<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.</p> + +<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> + +<ul> + <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> + <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> + <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> + <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li> + <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li> +</ul> + +<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p> + + +<h3>Use of Provisioning Technology</h3> + +<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a + href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> + ("Specification").</p> + +<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p> + +<ol> + <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based + product.</li> + <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine.</li> + <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern + the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such + indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li> +</ol> + +<h3>Cryptography</h3> + +<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.</p> + +<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p> +</body> +</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/build.properties b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/build.properties new file mode 100644 index 000000000..cf5269fb5 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/build.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2006, 2012 Obeo. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Obeo - initial API and implementation +############################################################################### +bin.includes = .,\ + META-INF/,\ + plugin.properties,\ + about.html,\ + icons/ +jars.compile.order = . +source.. = src/ +output.. = bin/ +src.includes = about.html diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/plugin.properties b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/plugin.properties new file mode 100644 index 000000000..75bcbeee1 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/plugin.properties @@ -0,0 +1,12 @@ +################################################################################ +# Copyright (c) 2011, 2012 Obeo. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Obeo - initial API and implementation +################################################################################ +pluginName = EMFCompare UML2 Papyrus-Specific Tests +providerName = Eclipse Modeling Project
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/pom.xml new file mode 100644 index 000000000..a7cba70e8 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/pom.xml @@ -0,0 +1,32 @@ +<?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> + <artifactId>emf.compare-test-parent</artifactId> + <groupId>org.eclipse.emf.compare</groupId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../org.eclipse.emf.compare-parent/test-parent</relativePath> + </parent> + <groupId>org.eclipse.emf.compare</groupId> + <artifactId>org.eclipse.emf.compare.uml2.papyrus.tests</artifactId> + <version>2.5.0-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/emf/compare/uml2/papyrus/tests/suite/AllUITests.class</include> + </includes> + <useUIHarness>true</useUIHarness> + <useUIThread>false</useUIThread> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/PapyrusMigrationUtil.java index a82b504ea..7217ca8e7 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/PapyrusMigrationUtil.java +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/PapyrusMigrationUtil.java @@ -8,7 +8,7 @@ * Contributors: * Martin Fleck - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2.tests.profiles.migration; +package org.eclipse.emf.compare.uml2.papyrus.tests.profiles.migration; import org.eclipse.core.runtime.Platform; import org.osgi.framework.Bundle; diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/ProfileMigrationTest.java index ac10d8818..56f997fae 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/ProfileMigrationTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/ProfileMigrationTest.java @@ -8,7 +8,7 @@ * Contributors: * Martin Fleck - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2.tests.profiles.migration; +package org.eclipse.emf.compare.uml2.papyrus.tests.profiles.migration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml index d3b677fd9..d3b677fd9 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aab/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml index d3b677fd9..d3b677fd9 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/aba/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml index d3b677fd9..d3b677fd9 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml index d3b677fd9..d3b677fd9 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abb/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml index d3b677fd9..d3b677fd9 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml index af07871dc..af07871dc 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/change/abc/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml index 9d4f3bdf2..9d4f3bdf2 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml index 9d4f3bdf2..9d4f3bdf2 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/defaultval/aba/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml index a620b8ccb..a620b8ccb 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml index a620b8ccb..a620b8ccb 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/attribute/unmigrated/aba/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/nodiff/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/left.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/nodiff/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/nodiff/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/origin.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/nodiff/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/nodiff/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/right.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/nodiff/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/nodiff/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml index 629044ab5..629044ab5 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml index 629044ab5..629044ab5 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/aab/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml index 629044ab5..629044ab5 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/notmigrated/abb/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml index 3a9ddfa36..3a9ddfa36 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongformat/abb/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml index c85ebca1c..c85ebca1c 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/uri/wrongmigrated/abb/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/aba/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/left.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/aba/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/aba/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/origin.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/aba/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/aba/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/right.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/aba/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/aba/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/abb/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/left.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/abb/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/abb/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/origin.uml index 4ae9f6d2b..4ae9f6d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/abb/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/abb/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/right.uml index 2bf5b73f8..2bf5b73f8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/sysml/version/abb/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/sysml/version/abb/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/aba/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/left.uml index 29899e32b..29899e32b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/aba/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/origin.uml index 2d844279f..2d844279f 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/aba/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/aba/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/right.uml index 2d844279f..2d844279f 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/aba/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/aba/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/abb/left.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/left.uml index 29899e32b..29899e32b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/abb/left.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/left.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/origin.uml index 2d844279f..2d844279f 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/abb/origin.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/origin.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/abb/right.uml b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/right.uml index 29899e32b..29899e32b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/migration/data/version/abb/right.uml +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/profiles/migration/data/version/abb/right.uml diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/suite/AllUITests.java b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/suite/AllUITests.java index 699b4be35..97b5f008d 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/suite/AllUITests.java +++ b/plugins/org.eclipse.emf.compare.uml2.papyrus.tests/src/org/eclipse/emf/compare/uml2/papyrus/tests/suite/AllUITests.java @@ -8,9 +8,9 @@ * Contributors: * Martin Fleck - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2.tests.suite; +package org.eclipse.emf.compare.uml2.papyrus.tests.suite; -import org.eclipse.emf.compare.uml2.tests.profiles.migration.ProfileMigrationTest; +import org.eclipse.emf.compare.uml2.papyrus.tests.profiles.migration.ProfileMigrationTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF index 097631aed..f4db51e5a 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF @@ -30,8 +30,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.compare.edit, org.eclipse.emf.compare.ide.ui.tests.framework, org.eclipse.emf.compare.ide;bundle-version="3.3.0", - org.eclipse.papyrus.sysml;bundle-version="[1.0.2,2.0.0)", - org.eclipse.emf.compare.uml2.papyrus + org.eclipse.papyrus.sysml;bundle-version="[1.0.2,2.0.0)" Bundle-ActivationPolicy: lazy Import-Package: com.google.common.base;version="[11.0.0,16.0.0)", com.google.common.collect;version="[11.0.0,16.0.0)" diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml index 2a7997715..01ef916f0 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml @@ -26,17 +26,6 @@ <useUIThread>false</useUIThread> </configuration> </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <configuration> - <includes> - <include>org/eclipse/emf/compare/uml2/tests/suite/AllUITests.class</include> - </includes> - <useUIHarness>true</useUIHarness> - <useUIThread>false</useUIThread> - </configuration> - </plugin> </plugins> </build> diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/nonreg/bug484576_pseudoconflicts/TestNonRegPseudoConflict_484576.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/nonreg/bug484576_pseudoconflicts/TestNonRegPseudoConflict_484576.java index b3e8bcbd2..605d1e2fc 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/nonreg/bug484576_pseudoconflicts/TestNonRegPseudoConflict_484576.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/nonreg/bug484576_pseudoconflicts/TestNonRegPseudoConflict_484576.java @@ -34,8 +34,8 @@ public class TestNonRegPseudoConflict_484576 extends AbstractUMLTest { final Comparison comparison = compare(left, right, ancestor); - assertEquals(3, comparison.getConflicts().size()); - assertEquals(2, filter(comparison.getConflicts(), new Predicate<Conflict>() { + assertEquals(7, comparison.getConflicts().size()); + assertEquals(6, filter(comparison.getConflicts(), new Predicate<Conflict>() { public boolean apply(Conflict conflict) { return conflict.getKind() == ConflictKind.PSEUDO; } |