From a57ec8d9cff0ca35ce9efb59c79a5f1ec90c13cb Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Wed, 12 Mar 2003 19:51:43 +0000
Subject: fix and tests for checked exception on advice being checked at woven
 join points

---
 tests/ajcTests.xml            | 19 +++++++++++++++++++
 tests/ajcTestsFailing.xml     | 12 ------------
 tests/jimTests.xml            | 15 ++++++++-------
 tests/new/AdviceThrowsCf.java | 13 +++++++++++++
 4 files changed, 40 insertions(+), 19 deletions(-)

(limited to 'tests')

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();
+    }
+
 }
-- 
cgit v1.2.3