From 69ba51113aff39f33a487006036de80474f42cb2 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 24 Feb 2009 22:36:37 +0000
Subject: [PATCH] 265729: get return type and param types correct for ITDs

---
 .../base/src/be/cronos/aop/App.java           |  2 +-
 .../base/src/be/cronos/aop/App.java           |  2 +-
 .../be/cronos/aop/aspects/InterTypeAspect.aj  |  6 +--
 .../tools/MultiProjectIncrementalTests.java   | 40 ++++++++++++++-----
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/tests/multiIncremental/pr265729_client/base/src/be/cronos/aop/App.java b/tests/multiIncremental/pr265729_client/base/src/be/cronos/aop/App.java
index 3e6566992..d2de59344 100644
--- a/tests/multiIncremental/pr265729_client/base/src/be/cronos/aop/App.java
+++ b/tests/multiIncremental/pr265729_client/base/src/be/cronos/aop/App.java
@@ -7,7 +7,7 @@ public class App {
 		// System.out.println( "Hello World!" ); //should throw compiler error,
 		// OK
 		App app = new App();
-		app.foo(42);
+		app.foo(42,null,null);
 
 	}
 }
diff --git a/tests/multiIncremental/pr265729_lib/base/src/be/cronos/aop/App.java b/tests/multiIncremental/pr265729_lib/base/src/be/cronos/aop/App.java
index a49827673..b9829afaa 100644
--- a/tests/multiIncremental/pr265729_lib/base/src/be/cronos/aop/App.java
+++ b/tests/multiIncremental/pr265729_lib/base/src/be/cronos/aop/App.java
@@ -9,7 +9,7 @@ public class App
     {
         //System.out.println( "Hello World!" ); //should throw compiler error, OK
 	App app = new App();
-	app.foo(42);
+	app.foo(42,null,null);
 
 	
     }
diff --git a/tests/multiIncremental/pr265729_lib/base/src/be/cronos/aop/aspects/InterTypeAspect.aj b/tests/multiIncremental/pr265729_lib/base/src/be/cronos/aop/aspects/InterTypeAspect.aj
index 39c3ae769..dfcb52ba7 100644
--- a/tests/multiIncremental/pr265729_lib/base/src/be/cronos/aop/aspects/InterTypeAspect.aj
+++ b/tests/multiIncremental/pr265729_lib/base/src/be/cronos/aop/aspects/InterTypeAspect.aj
@@ -1,7 +1,7 @@
 package be.cronos.aop.aspects;
-
+import java.io.*;
 import be.cronos.aop.InterTypeAspectSupport;
-
+import java.util.List;
 public aspect InterTypeAspect {
 
     public interface InterTypeAspectInterface {
@@ -9,7 +9,7 @@ public aspect InterTypeAspect {
     
     declare parents : (@InterTypeAspectSupport *) implements InterTypeAspectInterface;
     
-    public String InterTypeAspectInterface.foo(int i) {
+    public String InterTypeAspectInterface.foo(int i,List list,Serializable a) {
     	return "bar";
     }
 
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 677b6ad6b..0a45de9d2 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -66,7 +66,7 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 		String cli = "pr265729_client";
 		initialiseProject(cli);
 
-		addClasspathEntry(cli, new File("../lib/junit/junit.jar"));
+		// addClasspathEntry(cli, new File("../lib/junit/junit.jar"));
 		configureAspectPath(cli, getProjectRelativePath(lib, "bin"));
 		build(cli);
 		checkWasFullBuild();
@@ -91,17 +91,35 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 		// Node in tree: I.g(java.lang.String) [inter-type method]
 		// Handle: =pr265729_client<be.cronos.aop{App.java}X)I.g)QString;
 
-		if (h1.endsWith("parents")) {
-			assertEquals("=pr265729_client/binaries<be.cronos.aop.aspects*InterTypeAspect.aj}InterTypeAspect`declare parents", h1);
-			assertEquals(
-					"=pr265729_client/binaries<be.cronos.aop.aspects*InterTypeAspect.aj}InterTypeAspect)InterTypeAspectInterface.foo)I",
-					h2);
-		} else {
-			assertEquals("=pr265729_client/binaries<be.cronos.aop.aspects*InterTypeAspect.aj}InterTypeAspect`declare parents", h2);
-			assertEquals(
-					"=pr265729_client/binaries<be.cronos.aop.aspects*InterTypeAspect.aj}InterTypeAspect)InterTypeAspectInterface.foo)I",
-					h1);
+		if (!h1.endsWith("parents")) {
+			String h3 = h1;
+			h1 = h2;
+			h2 = h3;
 		}
+		// ITD from the test program:
+		// public String InterTypeAspectInterface.foo(int i,List list,App a) {
+		assertEquals("=pr265729_client/binaries<be.cronos.aop.aspects*InterTypeAspect.aj}InterTypeAspect`declare parents", h1);
+		assertEquals(
+				"=pr265729_client/binaries<be.cronos.aop.aspects*InterTypeAspect.aj}InterTypeAspect)InterTypeAspectInterface.foo)I)QList;)QSerializable;",
+				h2);
+		IProgramElement binaryDecp = getModelFor(cli).getHierarchy().getElement(h1);
+		assertNotNull(binaryDecp);
+		IProgramElement binaryITDM = getModelFor(cli).getHierarchy().getElement(h2);
+		assertNotNull(binaryITDM);
+
+		// @see AsmRelationshipProvider.createIntertypeDeclaredChild()
+		List ptypes = binaryITDM.getParameterTypes();
+		assertEquals("int", new String((char[]) ptypes.get(0)));
+		assertEquals("java.util.List", new String((char[]) ptypes.get(1)));
+		assertEquals("java.io.Serializable", new String((char[]) ptypes.get(2)));
+
+		// param names not set
+		// List pnames = binaryITDM.getParameterNames();
+		// assertEquals("i", new String((char[]) pnames.get(0)));
+		// assertEquals("list", new String((char[]) pnames.get(1)));
+		// assertEquals("b", new String((char[]) pnames.get(2)));
+
+		assertEquals("java.lang.String", binaryITDM.getCorrespondingType(true));
 	}
 
 	public void testXmlConfiguredProject() {
-- 
2.39.5