test and fix for @DeclareParents problem where the target was "@Coloured *" - fix was to resolve the typepattern

2 files changed, 90 insertions, 0 deletions

diff --git a/tests/bugs151/atDecp/case1/MainClass.java b/tests/bugs151/atDecp/case1/MainClass.java
new file mode 100644
index 000000000..ab58d8c8a
--- /dev/null
+++ b/tests/bugs151/atDecp/case1/MainClass.java
@@ -0,0 +1,44 @@
+package moody;
+
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.DeclareParents;
+
+enum Mood { HAPPY, SAD, JOLLY, GRUMPY }
+
+class AnnotationMoodImplementor { }
+
+
+
+@Aspect
+class AnnotationMoodIndicator {
+
+   public interface Moody {
+      Mood getMood();
+      void setMood(Mood mood);
+   }
+
+   public static class MoodyImpl implements Moody {
+      private Mood mood = Mood.HAPPY;
+
+      public Mood getMood() { return mood; }
+      public void setMood(Mood mood) { this.mood = mood; }
+   }
+
+   @DeclareParents(value="moody.AnnotationMoodImplementor",defaultImpl=MoodyImpl.class)
+   private Moody implementedInterface;
+}
+
+
+
+public class MainClass {
+  public static void main(String[] args) {
+    AnnotationMoodImplementor ami0 = new AnnotationMoodImplementor();
+    AnnotationMoodImplementor ami1 = new AnnotationMoodImplementor();
+
+    System.err.println("ami0's mood is " + ((AnnotationMoodIndicator.Moody) ami0).getMood());
+    ((AnnotationMoodIndicator.Moody) ami1).setMood(Mood.JOLLY);
+    System.err.println("ami1's mood is now " + ((AnnotationMoodIndicator.Moody) ami1).getMood());
+    System.err.println("ami0's mood is still " + ((AnnotationMoodIndicator.Moody) ami0).getMood());
+  }
+}
+
diff --git a/tests/bugs151/atDecp/case2/MainClass.java b/tests/bugs151/atDecp/case2/MainClass.java
new file mode 100644
index 000000000..7f33bbfae
--- /dev/null
+++ b/tests/bugs151/atDecp/case2/MainClass.java
@@ -0,0 +1,46 @@
+package moody;
+
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.DeclareParents;
+import java.lang.annotation.*;
+
+enum Mood { HAPPY, SAD, JOLLY, GRUMPY }
+
+@Retention(RetentionPolicy.RUNTIME) @interface Coloured {}
+
+@Coloured
+class AnnotationMoodImplementor { }
+
+@Aspect
+class AnnotationMoodIndicator {
+
+   public interface Moody {
+      Mood getMood();
+      void setMood(Mood mood);
+   }
+
+   public static class MoodyImpl implements Moody {
+      private Mood mood = Mood.HAPPY;
+
+      public Mood getMood() { return mood; }
+      public void setMood(Mood mood) { this.mood = mood; }
+   }
+
+   @DeclareParents(value="@Coloured *",defaultImpl=MoodyImpl.class) // Choosing types by annotation
+   private Moody implementedInterface;
+}
+
+
+
+public class MainClass {
+  public static void main(String[] args) {
+    AnnotationMoodImplementor ami0 = new AnnotationMoodImplementor();
+    AnnotationMoodImplementor ami1 = new AnnotationMoodImplementor();
+
+    System.err.println("ami0's mood is " + ((AnnotationMoodIndicator.Moody) ami0).getMood());
+    ((AnnotationMoodIndicator.Moody) ami1).setMood(Mood.JOLLY);
+    System.err.println("ami1's mood is now " + ((AnnotationMoodIndicator.Moody) ami1).getMood());
+    System.err.println("ami0's mood is still " + ((AnnotationMoodIndicator.Moody) ami0).getMood());
+  }
+}
+