diff options
author | acolyer <acolyer> | 2004-08-19 12:29:04 +0000 |
---|---|---|
committer | acolyer <acolyer> | 2004-08-19 12:29:04 +0000 |
commit | 65c67a4e848311efb7402f5d06bd1a833720b94b (patch) | |
tree | fdb6a106aa7059922e42adb079516a04c4093514 /tests/new | |
parent | 2834a7c26b42b8d98af57ef9733ae94fa4aa4a5b (diff) | |
download | aspectj-65c67a4e848311efb7402f5d06bd1a833720b94b.tar.gz aspectj-65c67a4e848311efb7402f5d06bd1a833720b94b.zip |
fix for Bugzilla Bug 37020
wrong line for method execution join point
Diffstat (limited to 'tests/new')
-rw-r--r-- | tests/new/DeclareWarningMain.java | 4 | ||||
-rw-r--r-- | tests/new/declare/DeclareWarning.java | 4 | ||||
-rw-r--r-- | tests/new/options11/aspectlib1.jar | bin | 1209 -> 1547 bytes | |||
-rw-r--r-- | tests/new/options11/aspectlib2.jar | bin | 974 -> 1223 bytes | |||
-rw-r--r-- | tests/new/options11/injar.jar | bin | 363 -> 597 bytes |
5 files changed, 4 insertions, 4 deletions
diff --git a/tests/new/DeclareWarningMain.java b/tests/new/DeclareWarningMain.java index 243a4668b..add8ff01e 100644 --- a/tests/new/DeclareWarningMain.java +++ b/tests/new/DeclareWarningMain.java @@ -1,7 +1,7 @@ import org.aspectj.testing.*; public class DeclareWarningMain { - public static void main (String[] args) { // DW 5 main + public static void main (String[] args) { // DW 4 main Tester.checkAllEvents(); } static { @@ -10,7 +10,7 @@ public class DeclareWarningMain { } aspect Warnings { - declare warning : execution(static void main(String[])) : "main"; // for DW 5 main + declare warning : execution(static void main(String[])) : "main"; // for DW 4 main // just to show that pointcut is valid - works if warning removed before() : execution(static void main(String[])) { diff --git a/tests/new/declare/DeclareWarning.java b/tests/new/declare/DeclareWarning.java index 1ea56b2b8..9f7efccf5 100644 --- a/tests/new/declare/DeclareWarning.java +++ b/tests/new/declare/DeclareWarning.java @@ -69,8 +69,8 @@ aspect A { declare warning: adviceexecution() && within(A) : "adviceExecution() && within(A)"; - before() : initialization(DeclareWarning.new(..)) { - // CW 74 + before() : initialization(DeclareWarning.new(..)) { // CW 72 + long l = System.currentTimeMillis(); if (0l == l) { throw new Error("never thrown"); diff --git a/tests/new/options11/aspectlib1.jar b/tests/new/options11/aspectlib1.jar Binary files differindex fbe0d3610..722c97ff3 100644 --- a/tests/new/options11/aspectlib1.jar +++ b/tests/new/options11/aspectlib1.jar diff --git a/tests/new/options11/aspectlib2.jar b/tests/new/options11/aspectlib2.jar Binary files differindex 05e82c363..22647696d 100644 --- a/tests/new/options11/aspectlib2.jar +++ b/tests/new/options11/aspectlib2.jar diff --git a/tests/new/options11/injar.jar b/tests/new/options11/injar.jar Binary files differindex d4ac54e79..7acf3a083 100644 --- a/tests/new/options11/injar.jar +++ b/tests/new/options11/injar.jar |