diff options
| author | aclement <aclement> | 2009-09-04 20:51:51 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2009-09-04 20:51:51 +0000 |
| commit | f1b0ee3c34a90a0db0feb812139684b5fd132a1a (patch) | |
| tree | 431f7cdbc23035c5191e2e5d903de98b661fd904 | |
| parent | 0fb61a07291261d7ae0760a38b32d5e46be63aa8 (diff) | |
| download | aspectj-f1b0ee3c34a90a0db0feb812139684b5fd132a1a.tar.gz aspectj-f1b0ee3c34a90a0db0feb812139684b5fd132a1a.zip | |
286375: test and fix: recursive decl npe
| -rw-r--r-- | tests/bugs166/pr286375/DatabaseOperationMonitor.java | 5 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java | 11 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc166/ajc166.xml | 5 |
3 files changed, 17 insertions, 4 deletions
diff --git a/tests/bugs166/pr286375/DatabaseOperationMonitor.java b/tests/bugs166/pr286375/DatabaseOperationMonitor.java new file mode 100644 index 000000000..22ef1a247 --- /dev/null +++ b/tests/bugs166/pr286375/DatabaseOperationMonitor.java @@ -0,0 +1,5 @@ +privileged public abstract aspect DatabaseOperationMonitor<T extends AggregatedDatabaseStats<T>> extends BaseOperationMonitor<T> {} +class BaseOperationMonitor<P> {} +class AggregatedDatabaseStats<Q> {} +class Wibble extends AggregatedDatabaseStats<Wibble> {} +aspect Foo extends DatabaseOperationMonitor<Wibble> {} diff --git a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java index 62355aa4b..e906be45c 100644 --- a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java @@ -18,13 +18,18 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase { +// public void testITDannos_288049() { +// runTest("itd decanno"); +// } + public void testMungerCCE_288635() { runTest("munger cce"); } - // public void testNPEonBadAspectDecl_286375() { - // runTest("npe on bad aspect decl"); - // } + public void testNPEonBadAspectDecl_286375() { + runTest("npe on bad aspect decl"); + } + // // public void testAnnoModifierOrdering_287597_1() { // runTest("anno modifier ordering - 1"); diff --git a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml index bb873164e..f6ac19c62 100644 --- a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml +++ b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml @@ -2,11 +2,14 @@ <suite> + <ajc-test dir="bugs166/pr288049" title="itd decanno"> + <compile files="org/tests/AClass.java org/tests/ASubClass.java org/tests/DeclareAnns.aj" options="-1.5"/> + </ajc-test> + <ajc-test dir="bugs166/pr288635" title="munger cce"> <compile files="org/tests/atann/AddAnnotations.aj org/tests/atann/AddITDDoMethod.aj org/tests/atann/InterceptTraceds.aj org/tests/atann/TestClass.java org/tests/atann/Traced.java" options="-1.5"/> <run class="org.tests.atann.TestClass"/> </ajc-test> - <ajc-test dir="bugs166/pr286375" title="npe on bad aspect decl"> <compile files="DatabaseOperationMonitor.java" options="-1.5" outjar="wibble.jar"/> |