From 41af7600c8661ff5b7a66a1e97fb865b562bc296 Mon Sep 17 00:00:00 2001 From: aclement Date: Tue, 22 Aug 2006 10:34:01 +0000 Subject: [PATCH] code has moved into model area...154552, comment 3 --- tests/bugs150/pr115607.java | 7 ------ tests/bugs150/pr77269/pack/pr77269.aj | 24 ------------------ tests/bugs150/pr77269/pack/pr77269c.aj | 19 -------------- tests/bugs150/pr77269b.aj | 23 ----------------- tests/bugs151/pr120356/A.java | 15 ----------- tests/bugs151/pr120356/C.java | 11 -------- tests/bugs151/pr131932.aj | 21 ---------------- tests/bugs151/pr132130.aj | 17 ------------- tests/bugs152/pr141730/aspectpath/MyBar.aj | 9 ------- tests/bugs152/pr141730/aspectpath/MyFoo.java | 11 -------- .../bugs152/pr141730/inpath/MyAnnotation.java | 5 ---- tests/bugs152/pr141730/inpath/MyBar.aj | 18 ------------- tests/bugs152/pr141730/inpath/MyFoo.java | 25 ------------------- tests/bugs152/pr141730/inpath/NewClass.java | 5 ---- tests/bugs152/pr143924.aj | 13 ---------- tests/bugs152/pr148027/A.aj | 15 ----------- tests/bugs152/pr148027/C.aj | 10 -------- .../systemtest/ajc151/Ajc151Tests.java | 4 --- .../org/aspectj/systemtest/ajc151/ajc151.xml | 7 ------ 19 files changed, 259 deletions(-) delete mode 100644 tests/bugs150/pr115607.java delete mode 100644 tests/bugs150/pr77269/pack/pr77269.aj delete mode 100644 tests/bugs150/pr77269/pack/pr77269c.aj delete mode 100644 tests/bugs150/pr77269b.aj delete mode 100644 tests/bugs151/pr120356/A.java delete mode 100644 tests/bugs151/pr120356/C.java delete mode 100644 tests/bugs151/pr131932.aj delete mode 100644 tests/bugs151/pr132130.aj delete mode 100644 tests/bugs152/pr141730/aspectpath/MyBar.aj delete mode 100644 tests/bugs152/pr141730/aspectpath/MyFoo.java delete mode 100644 tests/bugs152/pr141730/inpath/MyAnnotation.java delete mode 100644 tests/bugs152/pr141730/inpath/MyBar.aj delete mode 100644 tests/bugs152/pr141730/inpath/MyFoo.java delete mode 100644 tests/bugs152/pr141730/inpath/NewClass.java delete mode 100644 tests/bugs152/pr143924.aj delete mode 100644 tests/bugs152/pr148027/A.aj delete mode 100644 tests/bugs152/pr148027/C.aj diff --git a/tests/bugs150/pr115607.java b/tests/bugs150/pr115607.java deleted file mode 100644 index dfbcd28b7..000000000 --- a/tests/bugs150/pr115607.java +++ /dev/null @@ -1,7 +0,0 @@ -@interface I {} - -class Simple {} - -public aspect pr115607 { - declare @type: Simple : @I; -} \ No newline at end of file diff --git a/tests/bugs150/pr77269/pack/pr77269.aj b/tests/bugs150/pr77269/pack/pr77269.aj deleted file mode 100644 index 014c1bed8..000000000 --- a/tests/bugs150/pr77269/pack/pr77269.aj +++ /dev/null @@ -1,24 +0,0 @@ -package pack; -class Test { - - public void testMethod() { - new Runnable() { - public void run() { - } - }; - class C { - public void m(){ - } - } - } - -} - -aspect A { - - pointcut p() : execution(* run(..)); - - before() : p() { - } - -} diff --git a/tests/bugs150/pr77269/pack/pr77269c.aj b/tests/bugs150/pr77269/pack/pr77269c.aj deleted file mode 100644 index 948902347..000000000 --- a/tests/bugs150/pr77269/pack/pr77269c.aj +++ /dev/null @@ -1,19 +0,0 @@ -package pack; - -class Test { - - public void testMethod() { - new Runnable() { - public void run() { - someMethod(); - } - }; - } - - public void someMethod() { - } -} - -aspect A { - declare warning : call(void someMethod(..)) : "blah blah blah"; -} diff --git a/tests/bugs150/pr77269b.aj b/tests/bugs150/pr77269b.aj deleted file mode 100644 index 4f95dbb2c..000000000 --- a/tests/bugs150/pr77269b.aj +++ /dev/null @@ -1,23 +0,0 @@ -class Test { - - public void testMethod() { - new Runnable() { - public void run() { - } - }; - class C { - public void m(){ - } - } - } - -} - -aspect A { - - pointcut p() : execution(* m(..)); - - before() : p() { - } - -} diff --git a/tests/bugs151/pr120356/A.java b/tests/bugs151/pr120356/A.java deleted file mode 100644 index 628205610..000000000 --- a/tests/bugs151/pr120356/A.java +++ /dev/null @@ -1,15 +0,0 @@ - -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.DeclareWarning; -import org.aspectj.lang.annotation.DeclareError; - -@Aspect -public class A { - - @DeclareWarning("execution(* C.warningMethod())") - static final String warning = "warning"; - - @DeclareError("execution(* C.badMethod())") - static final String error = "error"; - -} diff --git a/tests/bugs151/pr120356/C.java b/tests/bugs151/pr120356/C.java deleted file mode 100644 index 91ef6ab6c..000000000 --- a/tests/bugs151/pr120356/C.java +++ /dev/null @@ -1,11 +0,0 @@ - - -public class C { - - public void warningMethod() { - } - - public void badMethod() { - } - -} diff --git a/tests/bugs151/pr131932.aj b/tests/bugs151/pr131932.aj deleted file mode 100644 index 648f9ed34..000000000 --- a/tests/bugs151/pr131932.aj +++ /dev/null @@ -1,21 +0,0 @@ -import java.util.List; - -aspect Slide74 { - - public X Bar.getFirst() { - return lts.get(0); - } - - Foo.new(List elements) { this(); } - - private List Bar.children;// = new ArrayList(); - - static class Bar { - List lts; - } - -} - -class Foo { - -} diff --git a/tests/bugs151/pr132130.aj b/tests/bugs151/pr132130.aj deleted file mode 100644 index 3259d7232..000000000 --- a/tests/bugs151/pr132130.aj +++ /dev/null @@ -1,17 +0,0 @@ - aspect basic { - - declare @method : * debit(..) : @Secured(role="supervisor"); - declare @constructor : BankAccount+.new(..) : @Secured(role="supervisor"); -} - -class BankAccount { - - public BankAccount(String s, int i) { - } - public void debit(long accId,long amount) { - } -} - -@interface Secured { - String role(); -} diff --git a/tests/bugs152/pr141730/aspectpath/MyBar.aj b/tests/bugs152/pr141730/aspectpath/MyBar.aj deleted file mode 100644 index 3a38885ce..000000000 --- a/tests/bugs152/pr141730/aspectpath/MyBar.aj +++ /dev/null @@ -1,9 +0,0 @@ -package bar; - -public aspect MyBar { - - before() : call(* main(..)) { - System.out.println("about to call a main method"); - } - -} diff --git a/tests/bugs152/pr141730/aspectpath/MyFoo.java b/tests/bugs152/pr141730/aspectpath/MyFoo.java deleted file mode 100644 index d733097cf..000000000 --- a/tests/bugs152/pr141730/aspectpath/MyFoo.java +++ /dev/null @@ -1,11 +0,0 @@ -package foo; - -public class MyFoo { - - public void callMain() { - new MyFoo().main(); - } - - public void main() { - } -} diff --git a/tests/bugs152/pr141730/inpath/MyAnnotation.java b/tests/bugs152/pr141730/inpath/MyAnnotation.java deleted file mode 100644 index 16a690ce2..000000000 --- a/tests/bugs152/pr141730/inpath/MyAnnotation.java +++ /dev/null @@ -1,5 +0,0 @@ -package bar; - -public @interface MyAnnotation { - -} diff --git a/tests/bugs152/pr141730/inpath/MyBar.aj b/tests/bugs152/pr141730/inpath/MyBar.aj deleted file mode 100644 index 50ea6efd0..000000000 --- a/tests/bugs152/pr141730/inpath/MyBar.aj +++ /dev/null @@ -1,18 +0,0 @@ -package bar; - -import foo.*; - -public aspect MyBar { - - before() : call(* main(..)) {} - - declare warning: get( * System.out ) : "System.out should not be called"; - - declare parents : *Foo extends NewClass; - - declare @type : *Foo* : @MyAnnotation; - declare @method : public * *Foo.anotMethod(..) : @MyAnnotation; - declare @constructor : *Foo.new(String) : @MyAnnotation; - declare @field : int *Foo.* : @MyAnnotation ; - -} diff --git a/tests/bugs152/pr141730/inpath/MyFoo.java b/tests/bugs152/pr141730/inpath/MyFoo.java deleted file mode 100644 index d9aba23f4..000000000 --- a/tests/bugs152/pr141730/inpath/MyFoo.java +++ /dev/null @@ -1,25 +0,0 @@ -package foo; - -public class MyFoo { - - public int i; - - public MyFoo() { - super(); - } - - public MyFoo(String s) { - super(); - } - - public void callMain() { - new MyFoo().main(); - } - - public void main() { - System.out.println("blah"); - } - - public void anotMethod() { - } -} diff --git a/tests/bugs152/pr141730/inpath/NewClass.java b/tests/bugs152/pr141730/inpath/NewClass.java deleted file mode 100644 index cdbce29e5..000000000 --- a/tests/bugs152/pr141730/inpath/NewClass.java +++ /dev/null @@ -1,5 +0,0 @@ -package bar; - -public class NewClass { - -} diff --git a/tests/bugs152/pr143924.aj b/tests/bugs152/pr143924.aj deleted file mode 100644 index 7ea1e8d24..000000000 --- a/tests/bugs152/pr143924.aj +++ /dev/null @@ -1,13 +0,0 @@ -aspect DeclareAnnotation { - declare @method : * debit(..) : @Secured(role="supervisor"); -} - -class BankAccount { - - public void debit(String accId,long amount) { - } -} - -@interface Secured { - String role(); -} diff --git a/tests/bugs152/pr148027/A.aj b/tests/bugs152/pr148027/A.aj deleted file mode 100644 index 306f14b68..000000000 --- a/tests/bugs152/pr148027/A.aj +++ /dev/null @@ -1,15 +0,0 @@ -package pkg; - -public aspect A { - - before() : C.pointcutInClass() { - } - - pointcut pointcutInAspect() : execution(void aMethod()); - - before() : pointcutInAspect() { - } - - public void aMethod() { - } -} diff --git a/tests/bugs152/pr148027/C.aj b/tests/bugs152/pr148027/C.aj deleted file mode 100644 index 63b4e6cb6..000000000 --- a/tests/bugs152/pr148027/C.aj +++ /dev/null @@ -1,10 +0,0 @@ -package pkg; - -public class C { - - pointcut pointcutInClass() : execution(void cMethod()); - - public void cMethod() { - - } -} diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java index 79461c477..cdf61225f 100644 --- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java @@ -143,10 +143,6 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testAtAspectInheritsAbstractPointcut_pr125810 () { runTest("warning when inherited pointcut not made concrete"); } - - public void testAtAspectNoNPEWithDEOWWithoutStructureModel_pr120356() { - runTest("@AJ no NPE with deow when structure model isn't generated"); - } public void testAtAspectWithoutJoinPointImport_pr121616() { runTest("@AJ without JoinPoint import"); diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml index 088cd8399..eaf65a95a 100644 --- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml +++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml @@ -343,13 +343,6 @@ - - - - - - - -- 2.39.5