diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bugs183/443477/Coo.java | 12 | ||||
| -rw-r--r-- | tests/bugs183/444398/Bottom.java | 5 | ||||
| -rw-r--r-- | tests/bugs183/444398/Middle.java | 6 | ||||
| -rw-r--r-- | tests/bugs183/444398/Top.java | 2 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/AllTests18.java | 4 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc183/Ajc183Tests.java | 12 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc183/ajc183.xml | 10 |
7 files changed, 48 insertions, 3 deletions
diff --git a/tests/bugs183/443477/Coo.java b/tests/bugs183/443477/Coo.java new file mode 100644 index 000000000..7b514f3ba --- /dev/null +++ b/tests/bugs183/443477/Coo.java @@ -0,0 +1,12 @@ +public class Coo { + Coo() { + } + + public static void main(String[] args) { + } +} + +aspect Azpect { + before(): !cflow(preinitialization(Coo.new(..))) && execution(* main(..)) { } +} + diff --git a/tests/bugs183/444398/Bottom.java b/tests/bugs183/444398/Bottom.java new file mode 100644 index 000000000..b3d366adf --- /dev/null +++ b/tests/bugs183/444398/Bottom.java @@ -0,0 +1,5 @@ +import org.aspectj.lang.annotation.*; + +@Aspect +public abstract class Bottom extends Middle { +} diff --git a/tests/bugs183/444398/Middle.java b/tests/bugs183/444398/Middle.java new file mode 100644 index 000000000..37c3e82ba --- /dev/null +++ b/tests/bugs183/444398/Middle.java @@ -0,0 +1,6 @@ +import org.aspectj.lang.annotation.*; + +@Aspect + +public abstract class Middle extends Top { +} diff --git a/tests/bugs183/444398/Top.java b/tests/bugs183/444398/Top.java new file mode 100644 index 000000000..a013d980e --- /dev/null +++ b/tests/bugs183/444398/Top.java @@ -0,0 +1,2 @@ +public abstract class Top { +} diff --git a/tests/src/org/aspectj/systemtest/AllTests18.java b/tests/src/org/aspectj/systemtest/AllTests18.java index 5001f9a37..547a17817 100644 --- a/tests/src/org/aspectj/systemtest/AllTests18.java +++ b/tests/src/org/aspectj/systemtest/AllTests18.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Contributors + * Copyright (c) 2013, 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 @@ -16,12 +16,14 @@ import junit.framework.TestSuite; import org.aspectj.systemtest.ajc180.AllTestsAspectJ180; import org.aspectj.systemtest.ajc181.AllTestsAspectJ181; import org.aspectj.systemtest.ajc182.AllTestsAspectJ182; +import org.aspectj.systemtest.ajc183.AllTestsAspectJ183; public class AllTests18 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ System Test Suite - 1.8"); // $JUnit-BEGIN$ + suite.addTest(AllTestsAspectJ183.suite()); suite.addTest(AllTestsAspectJ182.suite()); suite.addTest(AllTestsAspectJ181.suite()); suite.addTest(AllTestsAspectJ180.suite()); diff --git a/tests/src/org/aspectj/systemtest/ajc183/Ajc183Tests.java b/tests/src/org/aspectj/systemtest/ajc183/Ajc183Tests.java index 80541fc0f..3c0257115 100644 --- a/tests/src/org/aspectj/systemtest/ajc183/Ajc183Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc183/Ajc183Tests.java @@ -21,9 +21,17 @@ import org.aspectj.testing.XMLBasedAjcTestCase; */ public class Ajc183Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - public void testAnnoStyleDecp_442425() { - runTest("anno style decp"); + public void testAbstractAspectNPE_444398() { + runTest("abstract aspect npe"); } + +// public void testVerifyError_443447() { +// runTest("verifyerror"); +// } +// +// public void testAnnoStyleDecp_442425() { +// runTest("anno style decp"); +// } // --- diff --git a/tests/src/org/aspectj/systemtest/ajc183/ajc183.xml b/tests/src/org/aspectj/systemtest/ajc183/ajc183.xml index 5a77148b7..35bdca396 100644 --- a/tests/src/org/aspectj/systemtest/ajc183/ajc183.xml +++ b/tests/src/org/aspectj/systemtest/ajc183/ajc183.xml @@ -2,6 +2,11 @@ <suite> + <ajc-test dir="bugs183/444398" title="abstract aspect npe"> + <compile options="-1.8" files="Bottom.java Middle.java Top.java"> + </compile> + </ajc-test> + <ajc-test dir="bugs183/442425" title="anno style decp"> <compile options="-1.8" files="EntityController.java IEntityController.java MyAnnotatedController.java EntityControllerAspect.java EntityMongoController.java"> <message kind="error" line="23" text="Type mismatch: cannot convert from MyAnnotatedController<String> to IEntityController<String>"/> @@ -22,4 +27,9 @@ --> </ajc-test> + <ajc-test dir="bugs183/443477" title="verifyerror"> + <compile options="-1.7" files="Coo.java"/> + <run class="Coo"/> + </ajc-test> + </suite> |