Add Graphiti core test plugin
* Adapt update site for platform
* Rename test class to be executed automatically
Change-Id: I81e81e22ea75f4909ee73874f035e7988a9168dd
diff --git a/parent/pom.xml b/parent/pom.xml
index 79646a5..7021fdd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <platform-path>4.5milestones/S-4.5RC2a-201505222000/</platform-path>
+ <platform-path>4.5milestones/S-4.5RC4-201506032000/</platform-path>
<orbit-version>R20150519210750</orbit-version>
<gef-path>milestones/</gef-path>
<emf-path>2.11milestones/</emf-path>
@@ -104,6 +104,7 @@
<module>../features/org.eclipse.graphiti.export.feature</module>
<module>../features/org.eclipse.graphiti.sdk.plus.feature</module>
<module>../features/org.eclipse.graphiti.site</module>
+ <module>../tests/org.eclipse.graphiti.tests</module>
</modules>
<build>
diff --git a/tests/org.eclipse.graphiti.tests/.classpath b/tests/org.eclipse.graphiti.tests/.classpath
index ad32c83..c72d35a 100644
--- a/tests/org.eclipse.graphiti.tests/.classpath
+++ b/tests/org.eclipse.graphiti.tests/.classpath
@@ -3,5 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/tests/org.eclipse.graphiti.tests/.gitignore b/tests/org.eclipse.graphiti.tests/.gitignore
index 5e56e04..06ba672 100644
--- a/tests/org.eclipse.graphiti.tests/.gitignore
+++ b/tests/org.eclipse.graphiti.tests/.gitignore
@@ -1 +1,2 @@
/bin
+/target/
diff --git a/tests/org.eclipse.graphiti.tests/.project b/tests/org.eclipse.graphiti.tests/.project
index a921d53..584a406 100644
--- a/tests/org.eclipse.graphiti.tests/.project
+++ b/tests/org.eclipse.graphiti.tests/.project
@@ -25,8 +25,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
diff --git a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.m2e.core.prefs b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/tests/org.eclipse.graphiti.tests/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/tests/org.eclipse.graphiti.tests/pom.xml b/tests/org.eclipse.graphiti.tests/pom.xml
new file mode 100644
index 0000000..840a659
--- /dev/null
+++ b/tests/org.eclipse.graphiti.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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.graphiti</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.12.0-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <name>Unit Tests for Graphiti Core</name>
+ <artifactId>org.eclipse.graphiti.tests</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <excludes>
+ <!-- test mojo matches TestProject be default and treats it as PojoTest -->
+ <exclude>**/Test*.class</exclude>
+ </excludes>
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/AllTests.java b/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/AllTests.java
index 4b8c688..c4161ce 100644
--- a/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/AllTests.java
+++ b/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/AllTests.java
@@ -26,7 +26,7 @@
import org.eclipse.graphiti.tests.cases.LinkServiceTest;
import org.eclipse.graphiti.tests.cases.PeServiceTest;
import org.eclipse.graphiti.tests.cases.ReconnectionTest;
-import org.eclipse.graphiti.tests.tb.DefaultToolBehaviorProviderTests;
+import org.eclipse.graphiti.tests.tb.DefaultToolBehaviorProviderTest;
import org.eclipse.graphiti.tests.internal.services.impl.PeServiceImplTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -34,7 +34,7 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({ DefaultFeaturesTest.class, GaServiceTest.class, LinkServiceTest.class, PeServiceTest.class,
CreateServiceTest.class, ReconnectionTest.class, FeatureParametersTest.class,
- DefaultToolBehaviorProviderTests.class, PeServiceImplTest.class })
+ DefaultToolBehaviorProviderTest.class, PeServiceImplTest.class })
public class AllTests {
}
diff --git a/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/tb/DefaultToolBehaviorProviderTests.java b/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/tb/DefaultToolBehaviorProviderTest.java
similarity index 98%
rename from tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/tb/DefaultToolBehaviorProviderTests.java
rename to tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/tb/DefaultToolBehaviorProviderTest.java
index dadc3c7..919d829 100644
--- a/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/tb/DefaultToolBehaviorProviderTests.java
+++ b/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/tb/DefaultToolBehaviorProviderTest.java
@@ -29,7 +29,7 @@
import org.eclipse.graphiti.tb.DefaultToolBehaviorProvider;
import org.junit.Test;
-public class DefaultToolBehaviorProviderTests {
+public class DefaultToolBehaviorProviderTest {
private ICreateService createService = Graphiti.getCreateService();
private IGaService gaService = Graphiti.getGaService();
