diff options
Diffstat (limited to 'tests/src/org')
9 files changed, 96 insertions, 9 deletions
diff --git a/tests/src/org/aspectj/systemtest/AllTests18.java b/tests/src/org/aspectj/systemtest/AllTests18.java index ae57ece04..cbef2eb66 100644 --- a/tests/src/org/aspectj/systemtest/AllTests18.java +++ b/tests/src/org/aspectj/systemtest/AllTests18.java @@ -20,12 +20,14 @@ import org.aspectj.systemtest.ajc183.AllTestsAspectJ183; import org.aspectj.systemtest.ajc184.AllTestsAspectJ184; import org.aspectj.systemtest.ajc185.AllTestsAspectJ185; import org.aspectj.systemtest.ajc186.AllTestsAspectJ186; +import org.aspectj.systemtest.ajc187.AllTestsAspectJ187; public class AllTests18 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ System Test Suite - 1.8"); // $JUnit-BEGIN$ + suite.addTest(AllTestsAspectJ187.suite()); suite.addTest(AllTestsAspectJ186.suite()); suite.addTest(AllTestsAspectJ185.suite()); suite.addTest(AllTestsAspectJ184.suite()); diff --git a/tests/src/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java b/tests/src/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java index 4adbdfb76..10551687d 100644 --- a/tests/src/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java +++ b/tests/src/org/aspectj/systemtest/ajc182/AllTestsAspectJ182.java @@ -20,7 +20,6 @@ public class AllTestsAspectJ182 { TestSuite suite = new TestSuite("AspectJ 1.8.2 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc182Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/tests/src/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java b/tests/src/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java index 6caef2609..8b68b8e40 100644 --- a/tests/src/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java +++ b/tests/src/org/aspectj/systemtest/ajc183/AllTestsAspectJ183.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.ajc183; import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ183 { @@ -20,7 +19,6 @@ public class AllTestsAspectJ183 { TestSuite suite = new TestSuite("AspectJ 1.8.3 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc183Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/tests/src/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java b/tests/src/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java index 1c1c61a98..be0b12112 100644 --- a/tests/src/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java +++ b/tests/src/org/aspectj/systemtest/ajc184/AllTestsAspectJ184.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.ajc184; import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ184 { @@ -20,7 +19,6 @@ public class AllTestsAspectJ184 { TestSuite suite = new TestSuite("AspectJ 1.8.4 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc184Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/tests/src/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java b/tests/src/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java index a286daf0c..0cd580fce 100644 --- a/tests/src/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java +++ b/tests/src/org/aspectj/systemtest/ajc185/AllTestsAspectJ185.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.ajc185; import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ185 { @@ -20,7 +19,6 @@ public class AllTestsAspectJ185 { TestSuite suite = new TestSuite("AspectJ 1.8.5 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc185Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/tests/src/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java b/tests/src/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java index 4e533d0d5..ff67705de 100644 --- a/tests/src/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java +++ b/tests/src/org/aspectj/systemtest/ajc186/AllTestsAspectJ186.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.ajc186; import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ186 { @@ -20,7 +19,6 @@ public class AllTestsAspectJ186 { TestSuite suite = new TestSuite("AspectJ 1.8.6 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc186Tests.suite()); - suite.addTest(AptTests.suite()); // $JUnit-END$ return suite; } diff --git a/tests/src/org/aspectj/systemtest/ajc187/Ajc187Tests.java b/tests/src/org/aspectj/systemtest/ajc187/Ajc187Tests.java new file mode 100644 index 000000000..148317933 --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc187/Ajc187Tests.java @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Andy Clement - initial API and implementation + *******************************************************************************/ +package org.aspectj.systemtest.ajc187; + +import java.io.File; +import java.lang.reflect.Method; +import java.net.URL; +import java.net.URLClassLoader; + +import junit.framework.Test; + +import org.aspectj.testing.XMLBasedAjcTestCase; + +/** + * @author Andy Clement + */ +public class Ajc187Tests extends org.aspectj.testing.XMLBasedAjcTestCase { + + public void testLambda_470633() throws Exception { + runTest("lambda"); + } + +// public void testBrokenJava_469889() throws Exception { +// runTest("broken java"); +// } + + // --- + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Ajc187Tests.class); + } + + @Override + protected File getSpecFile() { + return getClassResource("ajc187.xml"); + } + +} diff --git a/tests/src/org/aspectj/systemtest/ajc187/AllTestsAspectJ187.java b/tests/src/org/aspectj/systemtest/ajc187/AllTestsAspectJ187.java new file mode 100644 index 000000000..79634df8c --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc187/AllTestsAspectJ187.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Andy Clement - initial API and implementation + *******************************************************************************/ +package org.aspectj.systemtest.ajc187; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.aspectj.systemtest.apt.AptTests; + +public class AllTestsAspectJ187 { + + public static Test suite() { + TestSuite suite = new TestSuite("AspectJ 1.8.7 tests"); + // $JUnit-BEGIN$ + suite.addTest(Ajc187Tests.suite()); + // $JUnit-END$ + return suite; + } +} diff --git a/tests/src/org/aspectj/systemtest/ajc187/ajc187.xml b/tests/src/org/aspectj/systemtest/ajc187/ajc187.xml new file mode 100644 index 000000000..0413c55ef --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc187/ajc187.xml @@ -0,0 +1,22 @@ +<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]> + +<suite> + +<ajc-test dir="bugs187/469889" title="broken java"> +<!-- +<compile files="A.java B.java AbstractA.java BImpl.java Main.java" options="-1.8"/> +--> +<compile files="Code.java" options="-1.8"/> +<run class="Code"> +<stdout> +<line text="B"/> +</stdout> +</run> +</ajc-test> + + +<ajc-test dir="bugs187/470633" title="lambda"> +<compile files="Maps.java" options="-1.8"/> +</ajc-test> + +</suite> |