From 576db589a6aa911df6ce8a9cd608baacdfe631d7 Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 19 Mar 2010 15:42:02 +0000 Subject: 44365: is() support in type patterns --- tests/bugs169/pr44365/Errors1.java | 3 +++ tests/bugs169/pr44365/Errors5.java | 11 +++++++++++ tests/bugs169/pr44365/SimpleAnnotation.java | 18 ++++++++++++++++++ tests/bugs169/pr44365/SimpleAnonymous.java | 21 +++++++++++++++++++++ tests/bugs169/pr44365/SimpleAspect.java | 21 +++++++++++++++++++++ tests/bugs169/pr44365/SimpleClass.java | 12 ++++++++++++ tests/bugs169/pr44365/SimpleEnum.java | 15 +++++++++++++++ tests/bugs169/pr44365/SimpleInner.java | 22 ++++++++++++++++++++++ tests/bugs169/pr44365/SimpleInner2.java | 22 ++++++++++++++++++++++ tests/bugs169/pr44365/SimpleInner3.java | 24 ++++++++++++++++++++++++ tests/bugs169/pr44365/SimpleInterface.java | 12 ++++++++++++ 11 files changed, 181 insertions(+) create mode 100644 tests/bugs169/pr44365/Errors1.java create mode 100644 tests/bugs169/pr44365/Errors5.java create mode 100644 tests/bugs169/pr44365/SimpleAnnotation.java create mode 100644 tests/bugs169/pr44365/SimpleAnonymous.java create mode 100644 tests/bugs169/pr44365/SimpleAspect.java create mode 100644 tests/bugs169/pr44365/SimpleClass.java create mode 100644 tests/bugs169/pr44365/SimpleEnum.java create mode 100644 tests/bugs169/pr44365/SimpleInner.java create mode 100644 tests/bugs169/pr44365/SimpleInner2.java create mode 100644 tests/bugs169/pr44365/SimpleInner3.java create mode 100644 tests/bugs169/pr44365/SimpleInterface.java (limited to 'tests/bugs169') diff --git a/tests/bugs169/pr44365/Errors1.java b/tests/bugs169/pr44365/Errors1.java new file mode 100644 index 000000000..33e3bda48 --- /dev/null +++ b/tests/bugs169/pr44365/Errors1.java @@ -0,0 +1,3 @@ +public aspect Errors1 { + before(): within(is( && !is(AnonymousType)) && staticinitialization(*) {} +} diff --git a/tests/bugs169/pr44365/Errors5.java b/tests/bugs169/pr44365/Errors5.java new file mode 100644 index 000000000..e14c2decc --- /dev/null +++ b/tests/bugs169/pr44365/Errors5.java @@ -0,0 +1,11 @@ +public aspect Errors5 { + before(): execution(* (is(InnerType) && *).*(..)) {} + before(): execution(* (is)) && *).*(..)) {} +} + +class C { + class Foo { + public void m() {} + } + public void m() {} +} diff --git a/tests/bugs169/pr44365/SimpleAnnotation.java b/tests/bugs169/pr44365/SimpleAnnotation.java new file mode 100644 index 000000000..69a77853d --- /dev/null +++ b/tests/bugs169/pr44365/SimpleAnnotation.java @@ -0,0 +1,18 @@ +public class SimpleAnnotation { +} + +enum Foo { +} + +@interface WibbleAnno { +} + +class Bar { +} + +interface I { +} + +aspect X { + before(): within(is(AnnotationType)) && staticinitialization(*) {} +} diff --git a/tests/bugs169/pr44365/SimpleAnonymous.java b/tests/bugs169/pr44365/SimpleAnonymous.java new file mode 100644 index 000000000..33b3cda46 --- /dev/null +++ b/tests/bugs169/pr44365/SimpleAnonymous.java @@ -0,0 +1,21 @@ +public class SimpleAnonymous { +} + +enum Foo { +} + +@interface WibbleAnno { +} + +class Bar { + Runnable r = new Runnable() { + public void run() {} + }; +} + +interface I { +} + +aspect X { + before(): within(is(AnonymousType)) && staticinitialization(*) {} +} diff --git a/tests/bugs169/pr44365/SimpleAspect.java b/tests/bugs169/pr44365/SimpleAspect.java new file mode 100644 index 000000000..69bb8485f --- /dev/null +++ b/tests/bugs169/pr44365/SimpleAspect.java @@ -0,0 +1,21 @@ +public class SimpleAspect { +} + +enum Foo { +} + +@interface WibbleAnno { +} + +class Bar { + Runnable r = new Runnable() { + public void run() {} + }; +} + +interface I { +} + +aspect X { + before(): within(is(AspectType)) && staticinitialization(*) {} +} diff --git a/tests/bugs169/pr44365/SimpleClass.java b/tests/bugs169/pr44365/SimpleClass.java new file mode 100644 index 000000000..ed97b7013 --- /dev/null +++ b/tests/bugs169/pr44365/SimpleClass.java @@ -0,0 +1,12 @@ +public class SimpleClass { +} + +interface Foo { +} + +class Bar { +} + +aspect X { + before(): within(is(ClassType)) && staticinitialization(*) {} +} diff --git a/tests/bugs169/pr44365/SimpleEnum.java b/tests/bugs169/pr44365/SimpleEnum.java new file mode 100644 index 000000000..6f1ecbee7 --- /dev/null +++ b/tests/bugs169/pr44365/SimpleEnum.java @@ -0,0 +1,15 @@ +public class SimpleEnum { +} + +enum Foo { +} + +class Bar { +} + +interface I { +} + +aspect X { + before(): within(is(EnumType)) && staticinitialization(*) {} +} diff --git a/tests/bugs169/pr44365/SimpleInner.java b/tests/bugs169/pr44365/SimpleInner.java new file mode 100644 index 000000000..60a30e7e1 --- /dev/null +++ b/tests/bugs169/pr44365/SimpleInner.java @@ -0,0 +1,22 @@ +public class SimpleInner { +} + +enum Foo { +} + +@interface WibbleAnno { +} + +class Bar { + public class Inner {} + Runnable r = new Runnable() { + public void run() {} + }; +} + +interface I { +} + +aspect X { + before(): within(is(InnerType)) && staticinitialization(*) {} +} diff --git a/tests/bugs169/pr44365/SimpleInner2.java b/tests/bugs169/pr44365/SimpleInner2.java new file mode 100644 index 000000000..7f6819b3f --- /dev/null +++ b/tests/bugs169/pr44365/SimpleInner2.java @@ -0,0 +1,22 @@ +public class SimpleInner2 { +} + +enum Foo { +} + +@interface WibbleAnno { +} + +class Bar { + public class Inner {} + Runnable r = new Runnable() { + public void run() {} + }; +} + +interface I { +} + +aspect X { + before(): within(is(InnerType) && !is(AnonymousType)) && staticinitialization(*) {} +} diff --git a/tests/bugs169/pr44365/SimpleInner3.java b/tests/bugs169/pr44365/SimpleInner3.java new file mode 100644 index 000000000..5fa28f7c3 --- /dev/null +++ b/tests/bugs169/pr44365/SimpleInner3.java @@ -0,0 +1,24 @@ +public class SimpleInner3 { +} + +enum Foo { +} + +@interface WibbleAnno { +} + +class Bar { + public class Inner { + public void foo() {} + } + Runnable r = new Runnable() { + public void run() {} + }; +} + +interface I { +} + +aspect X { + before(): execution(* (is(InnerType) && !is(AnonymousType) && *).*(..)) {} +} diff --git a/tests/bugs169/pr44365/SimpleInterface.java b/tests/bugs169/pr44365/SimpleInterface.java new file mode 100644 index 000000000..95dc1e26c --- /dev/null +++ b/tests/bugs169/pr44365/SimpleInterface.java @@ -0,0 +1,12 @@ +public class SimpleInterface { +} + +interface Foo { +} + +class Bar { +} + +aspect X { + before(): within(is(InterfaceType)) && staticinitialization(*) {} +} -- cgit v1.2.3