247742: anonymous handles: c6

2 files changed, 30 insertions, 16 deletions

diff --git a/tests/multiIncremental/AdviceHandles/base/src/Handles.aj b/tests/multiIncremental/AdviceHandles/base/src/Handles.aj
index f92a314be..195f59fb0 100644
--- a/tests/multiIncremental/AdviceHandles/base/src/Handles.aj
+++ b/tests/multiIncremental/AdviceHandles/base/src/Handles.aj
@@ -62,11 +62,15 @@ void b(String x) {
   new Condition() {}; // l62
   new Condition() {}; // l63
 }
+void c(String x) {
+  new Condition() {}; // l66
+  new Fondue() {}; // l67
+}
 
 
 }
 
-class Condition {}
+class Condition {} class Fondue {}
 
 aspect Foo { // Line 71: 247742: c4
  after(String x) returning(String y) : within(NotExisting*) {  } //src<p*Foo.aj[Foo*&afterReturning&QString;
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 193f696d1..c2b302c05 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -191,13 +191,23 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~foo[", findElementAtLine(root, 55).getHandleIdentifier());
 		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~foo[!2", findElementAtLine(root, 56).getHandleIdentifier());
 
-		// From 247742: comment 3
-		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~b~QString;[", findElementAtLine(root, 62).getHandleIdentifier());
-		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~b~QString;[!2", findElementAtLine(root, 63).getHandleIdentifier());
+		// From 247742: comment 3: two anon class declarations
+		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~b~QString;[", findElementAtLine(root, 62)
+				.getHandleIdentifier());
+		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~b~QString;[!2", findElementAtLine(root, 63)
+				.getHandleIdentifier());
 
-//		// From 247742: comment 4
-//		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Foo&afterReturning&QString;", findElementAtLine(root, 72).getHandleIdentifier());
-//		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Foo&afterReturning&QString;!2", findElementAtLine(root, 73).getHandleIdentifier());
+		// From 247742: comment 6: two diff anon class declarations
+		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~c~QString;[", findElementAtLine(root, 66)
+				.getHandleIdentifier());
+		assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~c~QString;[!2", findElementAtLine(root, 67)
+				.getHandleIdentifier());
+
+		// // From 247742: comment 4
+		// assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Foo&afterReturning&QString;", findElementAtLine(root,
+		// 72).getHandleIdentifier());
+		// assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Foo&afterReturning&QString;!2", findElementAtLine(root,
+		// 73).getHandleIdentifier());
 
 	}
 
@@ -308,15 +318,15 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 	}
 
 	// 
-//	public void testAspectPath_pr242797_c41() {
-//		String bug = "pr242797_3";
-//		String bug2 = "pr242797_4";
-//		initialiseProject(bug);
-//		initialiseProject(bug2);
-//		configureAspectPath(bug2, getProjectRelativePath(bug, "bin"));
-//		build(bug);
-//		build(bug2);
-//	}
+	// public void testAspectPath_pr242797_c41() {
+	// String bug = "pr242797_3";
+	// String bug2 = "pr242797_4";
+	// initialiseProject(bug);
+	// initialiseProject(bug2);
+	// configureAspectPath(bug2, getProjectRelativePath(bug, "bin"));
+	// build(bug);
+	// build(bug2);
+	// }
 
 	/**
 	 * Build a project containing a resource - then mark the resource readOnly(), then do an inc-compile, it will report an error