aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authoracolyer <acolyer>2004-08-11 16:51:24 +0000
committeracolyer <acolyer>2004-08-11 16:51:24 +0000
commit8c5d743c848479b07f3d35479292002aa01b4f70 (patch)
treed45d6cb11784370946a95dd77c9b50b7e2c89ae0 /tests/src
parentd43a39103f476d95cade6b87b604ee4578de25b3 (diff)
downloadaspectj-8c5d743c848479b07f3d35479292002aa01b4f70.tar.gz
aspectj-8c5d743c848479b07f3d35479292002aa01b4f70.zip
fix for Bugzilla Bug 61768
scope for intertype methods
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java15
-rw-r--r--tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml19
2 files changed, 23 insertions, 11 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
index 805397df1..0e5654ec6 100644
--- a/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
@@ -10,7 +10,9 @@
package org.aspectj.systemtest.ajc121;
import java.io.File;
+
import junit.framework.Test;
+
import org.aspectj.testing.XMLBasedAjcTestCase;
public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
@@ -148,15 +150,15 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("ITDs on inner classes should be static context");
}
-// public void test028_itdsAndInitializers() {
-// runTest("resolution of IT field inits");
-// }
+ public void test028_itdsAndInitializers() {
+ runTest("resolution of IT field inits");
+ }
public void test029_falseInvalidAbsoluteTypeName() {
runTest("Valid but inaccessible type names should not be flagged by XLint:invalidAbsoluteTypeName");
}
- public void test030_privateITDinitialisersBeingMatched() {
+ public void test030_privateITDinitialisersBeingMatched() {
runTest("intertype initialisers should match field set pointcuts");
}
@@ -175,5 +177,10 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
public void test033_stringConcatForDEOWErrorCase() {
runTest("Compile time declarations (warning and error) do not accept string concatenation (with +) (2)");
}
+
+ public void test034_scopeForITDS_pr61768() {
+ runTest("scope for inter-type methods");
+ }
+
}
diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
index e1c6c5481..c11ce0228 100644
--- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
@@ -224,14 +224,13 @@
</compile>
</ajc-test>
-<!--
- <ajc-test dir="bugs/oxford" pr="62475"
+<!-- should NOT raise error, despite Oxford expectations to the contrary -->
+ <ajc-test dir="bugs/oxford" pr="62475"
title="resolution of IT field inits">
<compile files="PR62475.java">
- <message kind="error" line="14" />
</compile>
</ajc-test>
--->
+
<ajc-test
dir="bugs/invalidAbsoluteTypeName"
@@ -242,8 +241,8 @@
</compile>
<run class="False_InvalidAbsoluteTypeName"/>
</ajc-test>
-
- <ajc-test dir="bugs/PR68991" pr="68991"
+
+ <ajc-test dir="bugs/PR68991" pr="68991"
title="intertype initialisers should match field set pointcuts">
<compile files="Simple.java"/>
<run class="Simple"/>
@@ -274,4 +273,10 @@
<message kind="error" line="22"/>
</compile>
</ajc-test>
-
+
+ <ajc-test dir="bugs/oxford" pr="61768"
+ title="scope for inter-type methods">
+ <compile files="PR61768.java">
+ <message kind="error" line="37" text="No enclosing instance of type Aspect is accessible"/>
+ </compile>
+ </ajc-test> \ No newline at end of file