aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjhugunin <jhugunin>2003-03-12 19:51:43 +0000
committerjhugunin <jhugunin>2003-03-12 19:51:43 +0000
commita57ec8d9cff0ca35ce9efb59c79a5f1ec90c13cb (patch)
tree68b31b1937984f97c0603f8ae82a77d1aaaba416 /tests
parentf76921c5e0053c472abf8ccd3979116f180aae0a (diff)
downloadaspectj-a57ec8d9cff0ca35ce9efb59c79a5f1ec90c13cb.tar.gz
aspectj-a57ec8d9cff0ca35ce9efb59c79a5f1ec90c13cb.zip
fix and tests for checked exception on advice being checked at
woven join points
Diffstat (limited to 'tests')
-rw-r--r--tests/ajcTests.xml19
-rw-r--r--tests/ajcTestsFailing.xml12
-rw-r--r--tests/jimTests.xml15
-rw-r--r--tests/new/AdviceThrowsCf.java13
4 files changed, 40 insertions, 19 deletions
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 31f5a7607..b8486e3b5 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -5666,4 +5666,23 @@
<compile files="CflowCycles.java"/>
<run class="CflowCycles"/>
</ajc-test>
+
+ <ajc-test dir="new"
+ title="incompatible advice throws clause are a compile-time error"
+ keywords="from-resolved_10x">
+ <compile files="AdviceThrowsCf.java">
+ <message kind="error" line="13"/>
+ <message kind="error" line="28"/>
+ <message kind="error" line="47"/>
+ <message kind="error" line="48"/>
+ <message kind="error" line="50"/>
+
+ <message kind="error" line="70"/>
+ <message kind="error" line="74"/>
+ <message kind="error" line="76"/>
+ <message kind="error" line="78"/>
+
+ <message kind="error" line="85"/>
+ </compile>
+ </ajc-test>
</suite>
diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index 5964c4aee..578f0aa75 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -2,18 +2,6 @@
<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
<suite>
-
- <ajc-test dir="new"
- title="incompatible advice throws clause are a compile-time error"
- keywords="from-resolved_10x">
- <compile files="AdviceThrowsCf.java">
- <message kind="error" line="70"/>
- <message kind="error" line="74"/>
- <message kind="error" line="76"/>
- <message kind="error" line="78"/>
- </compile>
- </ajc-test>
-
<ajc-test dir="new" pr="660" title="illegal name binding in around cflow"
keywords="from-resolved_104">
<compile files="ArgsInCflowCf.java">
diff --git a/tests/jimTests.xml b/tests/jimTests.xml
index e55e54ff7..f4adb0f97 100644
--- a/tests/jimTests.xml
+++ b/tests/jimTests.xml
@@ -1,14 +1,15 @@
<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
<suite>
- <ajc-test dir="new" pr="29934"
- title="can't apply around advice to the execution of around advice"
- keywords="from-resolved_10x">
- <compile files="CflowCycles.java"/>
- <run class="CflowCycles"/>
- </ajc-test>
+
+
+
<!--
-
+ <ajc-test dir="new" pr="885"
+ title="source locations within expressions">
+ <compile files="SourceLocationWithinExpr.java" options="-1.4"/>
+ <run class="SourceLocationWithinExpr"/>
+ </ajc-test>
-->
</suite> \ No newline at end of file
diff --git a/tests/new/AdviceThrowsCf.java b/tests/new/AdviceThrowsCf.java
index f8564d979..279bd2d55 100644
--- a/tests/new/AdviceThrowsCf.java
+++ b/tests/new/AdviceThrowsCf.java
@@ -77,4 +77,17 @@ aspect A {
}
before() throws CheckedExc: staticinitialization(C) { //ERR: can't throw
}
+
+ void around() throws CheckedExc: canThrowChecked() {
+ proceed();
+ }
+
+ void around() throws CheckedExc: canThrowUnchecked() { // ERR: can't throw
+ proceed();
+ }
+
+ void around() throws UncheckedExc: canThrowUnchecked() || set(int C.x) {
+ proceed();
+ }
+
}