aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2006-01-17 13:36:37 +0000
committeraclement <aclement>2006-01-17 13:36:37 +0000
commit51855f9c7de66c19c5db21cb416bfb5ec52de30b (patch)
tree74b43e8e7acab95664e9ebb7811be9b0e6edb663
parent3a315d0a21d3c4b57436a8d77ab980f910ac17e5 (diff)
downloadaspectj-51855f9c7de66c19c5db21cb416bfb5ec52de30b.tar.gz
aspectj-51855f9c7de66c19c5db21cb416bfb5ec52de30b.zip
tests for 123695 and 124105
-rw-r--r--tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java3
-rw-r--r--tests/src/org/aspectj/systemtest/ajc151/ajc151.xml11
2 files changed, 13 insertions, 1 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
index 92c4705b5..6bf01d7f3 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
@@ -20,7 +20,8 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
public void testMemberTypesInGenericTypes_pr122458() { runTest("member types in generic types");}
public void testMemberTypesInGenericTypes_pr122458_2() { runTest("member types in generic types - 2");}
-
+ public void testNPEOnDeclareAnnotation_pr123695() { runTest("Internal nullptr exception with complex declare annotation");}
+ public void testHasMemberPackageProblem_pr124105() { runTest("hasMember problems with packages");}
/////////////////////////////////////////
public static Test suite() {
diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
index 9a8b081a1..4fb00ce91 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
+++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
@@ -11,5 +11,16 @@
<compile files="pr122458_2.aj" options="-1.5 -emacssym"/>
<run class="pr122458_2"/>
</ajc-test>
+
+ <ajc-test dir="bugs151/pr123695" title="Internal nullptr exception with complex declare annotation">
+ <compile files="InjectName.java,Main.java,MarkMyMethods.java,MarkMyMethodsAspect.java,NameAspect.java,Named.java,Read.java,Write.java" options="-1.5"/>
+ </ajc-test>
+
+ <ajc-test dir="bugs151/pr124105" title="hasMember problems with packages">
+ <compile files="com/test/IOption.java,com/test/IXOption.java,com/test/IYOption.java,com/test/IZOption.java,com/test/MyBrokenXOption.java,com/test/MyXOption.java,com/test/OptionAspect.aj,com/test/OptionType.java" options="-1.5 -XhasMember">
+ <message kind="error" line="4" text="IOption implementations must provide a constructor which accepts an OptionType"/>
+ </compile>
+ </ajc-test>
+
</suite> \ No newline at end of file