Revert "greycat.tests: use surefire with fork-per-test for the non-integration tests"
This reverts commit 2f5ff16a4ccdf13e6af484218d73bd845a817a3f.
diff --git a/greycat/org.eclipse.hawk.greycat.tests/pom.xml b/greycat/org.eclipse.hawk.greycat.tests/pom.xml
index 70c6be6..8bd4995 100644
--- a/greycat/org.eclipse.hawk.greycat.tests/pom.xml
+++ b/greycat/org.eclipse.hawk.greycat.tests/pom.xml
@@ -1,7 +1,7 @@
<?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">
+ 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>org.eclipse.hawk.greycat.parent</artifactId>
@@ -14,42 +14,8 @@
<version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
- <testSourceDirectory>${project.basedir}/src</testSourceDirectory>
- <testOutputDirectory>${project.basedir}/target/classes</testOutputDirectory>
-
<plugins>
- <!-- Run everything we can with test-by-test forking -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M4</version>
- <configuration>
- <includes>
- <include>**/*SurefireTestSuite.java</include>
- </includes>
- <reuseForks>false</reuseForks>
- <forkCount>1</forkCount>
- <useSystemClassLoader>false</useSystemClassLoader>
- <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
- </configuration>
- <executions>
- <execution>
- <id>surefire-test</id>
- <goals><goal>test</goal></goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
@@ -57,9 +23,6 @@
<includes>
<include>**/*TestSuite.java</include>
</includes>
- <excludes>
- <exclude>**/*SurefireTestSuite.java</exclude>
- </excludes>
</configuration>
</plugin>
</plugins>
diff --git a/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatBackendSurefireTestSuite.java b/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatBackendTestSuite.java
similarity index 93%
rename from greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatBackendSurefireTestSuite.java
rename to greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatBackendTestSuite.java
index 78a8610..af19bde 100644
--- a/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatBackendSurefireTestSuite.java
+++ b/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatBackendTestSuite.java
@@ -19,7 +19,7 @@
import org.eclipse.hawk.backend.tests.BackendTestSuite;
import org.junit.runners.Parameterized.Parameters;
-public class GreycatBackendSurefireTestSuite extends BackendTestSuite {
+public class GreycatBackendTestSuite extends BackendTestSuite {
@Parameters(name="{0}")
public static Object[][] params() {
diff --git a/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatLuceneSurefireTestSuite.java b/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatLuceneTestSuite.java
similarity index 93%
rename from greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatLuceneSurefireTestSuite.java
rename to greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatLuceneTestSuite.java
index 0f5fb12..cde7e6d 100644
--- a/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatLuceneSurefireTestSuite.java
+++ b/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatLuceneTestSuite.java
@@ -17,7 +17,7 @@
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
-public class GreycatLuceneSurefireTestSuite extends TemporaryDatabaseTest {
+public class GreycatLuceneTestSuite extends TemporaryDatabaseTest {
@Parameters(name="{0}")
public static Object[][] params() {
@@ -29,7 +29,7 @@
private ITimeAwareGraphDatabase tadb;
private ITimeAwareGraphNode n;
- public GreycatLuceneSurefireTestSuite(IGraphDatabaseFactory dbf) {
+ public GreycatLuceneTestSuite(IGraphDatabaseFactory dbf) {
super(dbf);
}
diff --git a/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatTimeAwareSurefireTestSuite.java b/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatTimeAwareTestSuite.java
similarity index 94%
rename from greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatTimeAwareSurefireTestSuite.java
rename to greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatTimeAwareTestSuite.java
index 1953dc6..91de5e1 100644
--- a/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatTimeAwareSurefireTestSuite.java
+++ b/greycat/org.eclipse.hawk.greycat.tests/src/org/eclipse/hawk/greycat/tests/GreycatTimeAwareTestSuite.java
@@ -21,7 +21,7 @@
import org.eclipse.hawk.timeaware.tests.TimeAwareTestSuite;
import org.junit.runners.Parameterized.Parameters;
-public class GreycatTimeAwareSurefireTestSuite extends TimeAwareTestSuite {
+public class GreycatTimeAwareTestSuite extends TimeAwareTestSuite {
private static final String TIMEAWARE_TESTS_PATH = "../../core/tests/org.eclipse.hawk.integration.tests";
