aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Clement <aclement@pivotal.io>2019-02-01 12:02:06 -0800
committerAndy Clement <aclement@pivotal.io>2019-02-01 12:02:06 -0800
commit6311f723a282acee125eb467f55c1ba6cb10a04e (patch)
tree79915b14ff8446c9549ad38a64f62995221160d4
parent456c020a72ae6c83e84e5832210acb6d48eb7d3f (diff)
downloadaspectj-6311f723a282acee125eb467f55c1ba6cb10a04e.tar.gz
aspectj-6311f723a282acee125eb467f55c1ba6cb10a04e.zip
Add module tests back in - but streamlined
-rw-r--r--testing-drivers/pom.xml25
-rw-r--r--testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java35
-rw-r--r--testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java (renamed from testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java)15
3 files changed, 29 insertions, 46 deletions
diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml
index 13e83f066..b3d8c9926 100644
--- a/testing-drivers/pom.xml
+++ b/testing-drivers/pom.xml
@@ -64,4 +64,29 @@
<type>test-jar</type>
</dependency>
</dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+<excludes>
+<exclude>**/*AjcTestSpecAsTest*</exclude>
+</excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+</build>
</project>
diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java
deleted file mode 100644
index da277f135..000000000
--- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation,
- * 2002 Palo Alto Research Center, Incorporated (PARC)
- * 2003 Contributors.
- * 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:
- * Xerox/PARC initial implementation
- * Wes Isberg added JUnit harness adapters
- * ******************************************************************/
-
-
-package org.aspectj.testing.drivers;
-
-import junit.framework.*;
-
-public class DriversTests extends TestCase {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(DriversTests.class.getName());
- // AjcTestsUsingJUnit takes too long to include by default
- //$JUnit-BEGIN$
- suite.addTestSuite(HarnessSelectionTest.class);
- suite.addTest(AjcHarnessTestsUsingJUnit.suite());
- //$JUnit-END$
- return suite;
- }
-
- public DriversTests(String name) { super(name); }
-
-}
diff --git a/testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java
index 8cb8ddf30..d690a4b1f 100644
--- a/testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java
+++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java
@@ -1,4 +1,3 @@
-package org.aspectj.testing;
/* *******************************************************************
* Copyright (c) 1999-2001 Xerox Corporation,
* 2002 Palo Alto Research Center, Incorporated (PARC).
@@ -11,24 +10,18 @@ package org.aspectj.testing;
* Contributors:
* Xerox/PARC initial implementation
* ******************************************************************/
-
-
-// default package
-
-import org.aspectj.testing.drivers.DriversTests;
+package org.aspectj.testing.drivers;
import junit.framework.*;
import junit.framework.Test;
-/**
- * TODO weaver dumping ajcore files when using this interface
- */
public class TestingDriversModuleTests extends TestCase {
public static Test suite() {
TestSuite suite = new TestSuite(TestingDriversModuleTests.class.getName());
- suite.addTest(DriversTests.suite());
- return suite;
+ suite.addTestSuite(HarnessSelectionTest.class);
+ suite.addTest(AjcHarnessTestsUsingJUnit.suite());
+ return suite;
}
public TestingDriversModuleTests(String name) { super(name); }