diff options
| author | Lars Grefer <eclipse@larsgrefer.de> | 2020-08-15 00:59:58 +0200 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2020-08-15 09:27:26 -0700 |
| commit | 48522f987fb2247a190c842e871edd70ff63df2b (patch) | |
| tree | 87ddba53990457ac658892587d9a38aaec04e85d /testing/src/test | |
| parent | dfa04a0104f7b0d7e59c7fb3ba5f43b06e49e29f (diff) | |
| download | aspectj-48522f987fb2247a190c842e871edd70ff63df2b.tar.gz aspectj-48522f987fb2247a190c842e871edd70ff63df2b.zip | |
Update to JUnit 4.13
Signed-off-by: Lars Grefer <eclipse@larsgrefer.de>
Diffstat (limited to 'testing/src/test')
3 files changed, 3 insertions, 6 deletions
diff --git a/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java index 2b7e4942f..f36959c7e 100644 --- a/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java @@ -48,7 +48,7 @@ public abstract class AutowiredXMLBasedAjcTestCase extends XMLBasedAjcTestCase { return testMap; } - public static Test loadSuite(Class<?> testCaseClass) { + public static Test loadSuite(Class<? extends TestCase> testCaseClass) { TestSuite suite = new TestSuite(testCaseClass.getName()); //suite.addTestSuite(testCaseClass); diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java index e5e2fcdb9..e3d29e966 100644 --- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Stack; +import junit.framework.TestCase; import org.apache.commons.digester.Digester; import org.aspectj.apache.bcel.classfile.Attribute; import org.aspectj.apache.bcel.classfile.JavaClass; @@ -81,7 +82,7 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase { * @param testCaseClass * @return */ - public static Test loadSuite(Class<?> testCaseClass) { + public static Test loadSuite(Class<? extends TestCase> testCaseClass) { TestSuite suite = new TestSuite(testCaseClass.getName()); suite.addTestSuite(testCaseClass); TestSetup wrapper = new TestSetup(suite) { diff --git a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java index 11b9ea2b4..0b9d7ef41 100644 --- a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java +++ b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java @@ -34,10 +34,6 @@ public class StructureModelUtilTest extends AjdeCoreTestCase { "figures" + File.separator + "primitives" + File.separator + "planar" + File.separator + "Point.java", "figures" + File.separator + "primitives" + File.separator + "solid" + File.separator + "SolidPoint.java" }; - public static void main(String[] args) { - junit.swingui.TestRunner.run(StructureModelUtilTest.class); - } - public static TestSuite suite() { TestSuite result = new TestSuite(); result.addTestSuite(StructureModelUtilTest.class); |