From 99eff05ed4e0fd8b5324e035ecad48cd006930a0 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 20 Aug 2008 17:25:25 +0000
Subject: [PATCH] 119570:212783: testcases relating to not up collecting
 declare parents

---
 .../pr119570_3/base/Complete.java             | 29 +++++++++++++++++++
 .../tools/MultiProjectIncrementalTests.java   | 22 ++++++++++----
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 tests/multiIncremental/pr119570_3/base/Complete.java

diff --git a/tests/multiIncremental/pr119570_3/base/Complete.java b/tests/multiIncremental/pr119570_3/base/Complete.java
new file mode 100644
index 000000000..fb34e53eb
--- /dev/null
+++ b/tests/multiIncremental/pr119570_3/base/Complete.java
@@ -0,0 +1,29 @@
+
+import java.util.ArrayList;
+
+interface INode<Parent, Child> {
+    INode<Parent, Child> getParent();
+}
+
+abstract aspect NodeImpl<Parent, Child> {
+    declare parents : Child implements INode<Parent, Child>;
+    declare parents : Parent implements INode<Parent, Child>;
+
+    private INode<Parent, Child> INode.fParent;
+    public final INode<Parent, Child> INode.getParent() {
+        return fParent;
+    }
+}
+
+aspect PC extends NodeImpl<Tag, Tag> {
+//  declare parents : Tag implements INode<Tag,Tag>;
+}
+
+class Text {}
+class Tag {}
+
+public class Complete {
+    public static void main(String[] args) {
+        ((Tag) null).getParent();       
+    }
+}
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index aaf74b812..f04d349da 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -658,12 +658,22 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 //		assertNoErrors("PR119570");
 //	}
 	
-	public void testPr119570_2() {
-		initialiseProject("PR119570_2");
-		build("PR119570_2");
-		List l = getWarningMessages("PR119570_2");
-		assertTrue("Should be no warnings, but got "+l,l.size()==0);
-	}
+//	public void testPr119570_212783_2() {
+//		initialiseProject("PR119570_2");
+//		build("PR119570_2");
+//		List l = getWarningMessages("PR119570_2");
+//		assertTrue("Should be no warnings, but got "+l,l.size()==0);
+//		assertNoErrors("PR119570_2");
+//	}
+//
+//	public void testPr119570_212783_3() {
+//		initialiseProject("pr119570_3");
+//		build("pr119570_3");
+//		List l = getWarningMessages("pr119570_3");
+//		assertTrue("Should be no warnings, but got "+l,l.size()==0);
+//		assertNoErrors("pr119570_3");
+//	}
+
 	
 	// If you fiddle with the compiler options - you must manually reset the options at the end of the test
 	public void testPr117209() {
-- 
2.39.5