test from 119570

3 files changed, 60 insertions, 0 deletions

diff --git a/tests/bugs150/pr119570/INode.java b/tests/bugs150/pr119570/INode.java
new file mode 100644
index 000000000..2c94ebf60
--- /dev/null
+++ b/tests/bugs150/pr119570/INode.java
@@ -0,0 +1,6 @@
+package bugsOtherPackage;
+
+public interface INode<Parent, Child> {
+    boolean setParent(INode<Parent, Child> p);
+    INode<Parent, Child> getParent();
+}
\ No newline at end of file
diff --git a/tests/bugs150/pr119570/NodeImpl.java b/tests/bugs150/pr119570/NodeImpl.java
new file mode 100644
index 000000000..68c486058
--- /dev/null
+++ b/tests/bugs150/pr119570/NodeImpl.java
@@ -0,0 +1,21 @@
+package bugsOtherPackage;
+
+import java.util.ArrayList;
+
+public abstract aspect NodeImpl<Parent, Child> {
+
+    declare parents : Child implements INode<Parent, Child>;
+    declare parents : Parent implements INode<Parent, Child>;
+
+    private final ArrayList<INode> INode.fChildren = new ArrayList<INode>();
+
+    // are you not supposed to use type parameters here?
+    private INode<Parent, Child> INode.fParent;
+    public final INode<Parent, Child> INode.getParent() {
+        return fParent;
+    }
+    public final boolean INode.setParent(INode<Parent, Child> newParent) {
+        fParent = newParent;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/tests/bugs150/pr119570/ParameterizedDP.java b/tests/bugs150/pr119570/ParameterizedDP.java
new file mode 100644
index 000000000..1a9e015a4
--- /dev/null
+++ b/tests/bugs150/pr119570/ParameterizedDP.java
@@ -0,0 +1,33 @@
+package bugs;
+
+import bugsOtherPackage.INode;
+import bugsOtherPackage.NodeImpl;
+
+// comments in this bug relate to what happened on AspectJ5 M4
+public class ParameterizedDP {
+
+    public static void main(String[] args) {
+//        // 1) compile-time error here without 
+//        //    {unneeded} subaspect declare-parent
+//        // Tag as INode<Tag, Tag> from PC extends NodeImpl<Tag, Tag>
+//        ((TaggedTexts.Tag) null).getParent();    
+        TaggedTexts.Tag tag1 = new TaggedTexts.Tag();
+        TaggedTexts.Tag tag2 = new TaggedTexts.Tag();
+        tag1.getParent();
+        tag1.setParent(tag2);
+        if (!tag1.getParent().equals(tag2)) throw new RuntimeException("");
+    }
+
+}
+class TaggedTexts {
+
+    public static class Text {  }
+
+    public static class Tag {  }
+    static aspect PC extends NodeImpl<Tag, Tag> {
+//        // unneeded declare-parents duplicates one in NodeImpl
+//        // when here, get spurious error message
+//        // when commented out, d-p fails and get compiler error at 1) above
+//        declare parents : Tag implements INode<Tag,Tag>;
+    }
+}
\ No newline at end of file