summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authoracolyer <acolyer>2005-12-13 22:19:08 +0000
committeracolyer <acolyer>2005-12-13 22:19:08 +0000
commitb7929e91659708dc27141f587ad236af7bfa8287 (patch)
tree4ab9a88305479e154a499077ef4978fe7d33242d /tests/src
parente50bf403b26657b4b39a6be0e34b7170dbc788a9 (diff)
downloadaspectj-b7929e91659708dc27141f587ad236af7bfa8287.tar.gz
aspectj-b7929e91659708dc27141f587ad236af7bfa8287.zip
tests and fix for pr119749
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ajc150.xml21
2 files changed, 24 insertions, 1 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index d5c3c2bdc..bc7d7e683 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -847,6 +847,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("reflection on @DeclareParents");
}
+ public void testModifierOverrides() {
+ runTest("modifier overrides");
+ }
+
// helper methods.....
public SyntheticRepository createRepos(File cpentry) {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 19bcb55a9..d6814e28e 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -6,6 +6,25 @@
<compile files="pr118698.aj"/>
<run class="pr118698"/>
</ajc-test>
+
+ <ajc-test dir="bugs150" title="modifier overrides">
+ <compile files="pr119749.aj" options="-1.5">
+ <message kind="warning" line="26" text="C E.*()"/>
+ <message kind="warning" line="25" text="D E.*()"/>
+ <message kind="warning" line="17" text="aa @Me void m()"/>
+ <message kind="warning" line="17" text="aa void m() throws Exception"/>
+ <message kind="warning" line="17" text="aa * *(..) throws Exception"/>
+ <message kind="warning" line="37" text="aa call void m() throws Exception"/>
+ <message kind="warning" line="38" text="aa call void m() throws Exception"/>
+ </compile>
+ <run class="pr119749">
+ <stdout>
+ <line text="execution(void pr119749.C.m()): execMe[@pr119749$Me()]"/>
+ <line text="execution(void pr119749.C.m()): execEx"/>
+ </stdout>
+ </run>
+ </ajc-test>
+
<ajc-test dir="bugs150/pr112476/case1" title="binary weaving decp broken">
<compile files="lib/A.java,lib/B.java,lib/C.java" outjar="library.jar" options="-1.5"/>
@@ -2683,7 +2702,7 @@
<ajc-test dir="java5/annotations/ajdkExamples" title="ajdk: @inherited">
<compile files="AnnotationInheritance.aj" options="-1.5">
<message kind="warning" line="16" text="annotatedMethodCall()"/>
- <message kind="warning" line="17" text="annotatedMethodCall()"/>
+ <!-- <message kind="warning" line="17" text="annotatedMethodCall()"/> -->
</compile>
</ajc-test>