Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.emf.compare-parent/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/.classpath7
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/.project28
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/build.properties3
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/pom.xml31
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/ItemRegistryTest.java (renamed from plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/ItemRegistryTest.java)2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/MatchEngineFactoryRegistryWrapperTest.java (renamed from plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/MatchEngineFactoryRegistryWrapperTest.java)4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/EcoreInputData.java (renamed from plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/EcoreInputData.java)2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryLeft.ecore (renamed from plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryLeft.ecore)0
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryOrigin.ecore (renamed from plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryOrigin.ecore)0
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryRight.ecore (renamed from plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryRight.ecore)0
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/suite/AllRCPTests.java (renamed from plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/AllRCPTests.java)4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java5
16 files changed, 104 insertions, 9 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index fcd4c00dc..5dc6e9da4 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -89,6 +89,7 @@
<module>../packaging/org.eclipse.emf.compare.rcp.ui-feature</module>
<module>../plugins/org.eclipse.emf.compare.rcp</module>
+ <module>../plugins/org.eclipse.emf.compare.rcp.tests</module>
<module>../plugins/org.eclipse.emf.compare.rcp.ui</module>
<module>../plugins/org.eclipse.emf.compare.rcp.ui.tests</module>
</modules>
diff --git a/plugins/org.eclipse.emf.compare.rcp.tests/.classpath b/plugins/org.eclipse.emf.compare.rcp.tests/.classpath
new file mode 100644
index 000000000..64c5e31b7
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.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.rcp.tests/.project b/plugins/org.eclipse.emf.compare.rcp.tests/.project
new file mode 100644
index 000000000..ccb350d54
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare.rcp.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.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.compare.rcp.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.compare.rcp.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..eb1cb4cf9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+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.5
diff --git a/plugins/org.eclipse.emf.compare.rcp.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.tests/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..75505288b
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.emf.compare.rcp.tests
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;bundle-version="4.8.2",
+ org.eclipse.emf.compare;bundle-version="3.3.0",
+ org.eclipse.emf.compare.rcp;bundle-version="2.4.0",
+ org.eclipse.emf.compare.tests;bundle-version="3.3.0"
+Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
+ com.google.common.collect;version="[11.0.0,16.0.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.compare.rcp.tests/build.properties b/plugins/org.eclipse.emf.compare.rcp.tests/build.properties
new file mode 100644
index 000000000..b107977f4
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/build.properties
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+ .
diff --git a/plugins/org.eclipse.emf.compare.rcp.tests/pom.xml b/plugins/org.eclipse.emf.compare.rcp.tests/pom.xml
new file mode 100644
index 000000000..e4de7fea5
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/pom.xml
@@ -0,0 +1,31 @@
+<?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.rcp.tests</artifactId>
+ <version>1.0.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/rcp/tests/suite/AllRCPTests.class</include>
+ </includes>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>false</useUIThread>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/ItemRegistryTest.java b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/ItemRegistryTest.java
index 6ea934c2a..0b27c9325 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/ItemRegistryTest.java
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/ItemRegistryTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.tests.rcp;
+package org.eclipse.emf.compare.rcp.tests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/MatchEngineFactoryRegistryWrapperTest.java b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/MatchEngineFactoryRegistryWrapperTest.java
index cb356f409..5f262cd84 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/MatchEngineFactoryRegistryWrapperTest.java
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/MatchEngineFactoryRegistryWrapperTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.tests.rcp;
+package org.eclipse.emf.compare.rcp.tests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
@@ -34,9 +34,9 @@ import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemRegistry;
import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemUtil;
import org.eclipse.emf.compare.rcp.internal.match.MatchEngineFactoryRegistryWrapper;
import org.eclipse.emf.compare.rcp.internal.preferences.EMFComparePreferences;
+import org.eclipse.emf.compare.rcp.tests.data.EcoreInputData;
import org.eclipse.emf.compare.scope.DefaultComparisonScope;
import org.eclipse.emf.compare.scope.IComparisonScope;
-import org.eclipse.emf.compare.tests.rcp.data.EcoreInputData;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/EcoreInputData.java b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/EcoreInputData.java
index 30e6c2431..978052811 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/EcoreInputData.java
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/EcoreInputData.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.tests.rcp.data;
+package org.eclipse.emf.compare.rcp.tests.data;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryLeft.ecore b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryLeft.ecore
index b26cef279..b26cef279 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryLeft.ecore
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryLeft.ecore
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryOrigin.ecore b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryOrigin.ecore
index c891aa81b..c891aa81b 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryOrigin.ecore
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryOrigin.ecore
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryRight.ecore b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryRight.ecore
index 09d5b0720..09d5b0720 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/data/extlibraryRight.ecore
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/data/extlibraryRight.ecore
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/AllRCPTests.java b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/suite/AllRCPTests.java
index 320e9d5c5..882acfd84 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/rcp/AllRCPTests.java
+++ b/plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/suite/AllRCPTests.java
@@ -8,8 +8,10 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.tests.rcp;
+package org.eclipse.emf.compare.rcp.tests.suite;
+import org.eclipse.emf.compare.rcp.tests.ItemRegistryTest;
+import org.eclipse.emf.compare.rcp.tests.MatchEngineFactoryRegistryWrapperTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
index cfc063f4c..aca9bd2f7 100644
--- a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore.change,
org.eclipse.uml2.uml;bundle-version="3.1.2",
org.eclipse.emf.compare.edit,
- org.eclipse.emf.compare.rcp;bundle-version="2.2.0",
org.eclipse.emf.transaction;bundle-version="1.3.0",
org.mockito;bundle-version="1.8.0",
org.hamcrest;bundle-version="1.1.0"
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
index 98df55f9e..af90f241b 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
@@ -59,7 +59,6 @@ import org.eclipse.emf.compare.tests.monitor.MonitorCancelTest;
import org.eclipse.emf.compare.tests.nodes.NodesPackage;
import org.eclipse.emf.compare.tests.nodes.util.NodesResourceFactoryImpl;
import org.eclipse.emf.compare.tests.postprocess.PostProcessorTest;
-import org.eclipse.emf.compare.tests.rcp.AllRCPTests;
import org.eclipse.emf.compare.tests.req.ReqComputingTest;
import org.eclipse.emf.compare.tests.scope.DefaultComparisonScopeTest;
import org.eclipse.emf.compare.tests.utils.EqualityHelperTest;
@@ -85,8 +84,8 @@ import org.junit.runners.Suite.SuiteClasses;
DynamicInstanceComparisonTest.class, URIDistanceTest.class, FragmentationTest.class,
AllEditTests.class, CommandStackTestSuite.class, MatchEngineFactoryRegistryTest.class,
RootIDMatchingTest.class, XMIMatchingTest.class, ProxyMatchingTest.class, ConflictMergeTest.class,
- PseudoConflictMergeTest.class, ProximityIndexTest.class, AllRCPTests.class,
- FeatureMaps2wayMergeTest.class, FeatureMaps3wayMergeTest.class, FeatureMapsConflictsMergeTest.class,
+ PseudoConflictMergeTest.class, ProximityIndexTest.class, FeatureMaps2wayMergeTest.class,
+ FeatureMaps3wayMergeTest.class, FeatureMapsConflictsMergeTest.class,
FeatureMapsPseudoConflictsMergeTest.class, TwoWayBatchMergingTest.class, EqualityHelperTest.class,
FeatureFilterTest.class, ThreeWayBatchMergingTest.class,
MultiLineAttributeConflictDetectionTest.class, ThreeWayTextDiffTest.class,

Back to the top