240360 - test and fix for -proceedOnError and weaving in the face of broken source

7 files changed, 106 insertions, 0 deletions

diff --git a/tests/multiIncremental/pr240360/base/test/Base.java b/tests/multiIncremental/pr240360/base/test/Base.java
new file mode 100644
index 000000000..fe9a5e681
--- /dev/null
+++ b/tests/multiIncremental/pr240360/base/test/Base.java
@@ -0,0 +1,28 @@
+package test;
+
+public class Base {
+	private int id;
+	private String value;
+
+	public Base(int id, String value) {
+		super();
+		this.id = id;
+		this.value = value;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}
diff --git a/tests/multiIncremental/pr240360/base/test/Error.java b/tests/multiIncremental/pr240360/base/test/Error.java
new file mode 100644
index 000000000..0e01e5e30
--- /dev/null
+++ b/tests/multiIncremental/pr240360/base/test/Error.java
@@ -0,0 +1,5 @@
+package test;
+
+public class Error {
+asdf
+}
diff --git a/tests/multiIncremental/pr240360/base/test/Sub.java b/tests/multiIncremental/pr240360/base/test/Sub.java
new file mode 100644
index 000000000..342d06e03
--- /dev/null
+++ b/tests/multiIncremental/pr240360/base/test/Sub.java
@@ -0,0 +1,33 @@
+package test;
+
+public class Sub extends Base {
+	private int numValue;
+
+	private String description;
+
+	public Sub(int id, String value, String description, int numValue) {
+		super(id, value);
+		this.description = description;
+		this.numValue = numValue;
+	}
+	
+	public int getNumValue() {
+		return numValue;
+	}
+
+	public void setNumValue(int numValue) {
+		this.numValue = numValue;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	public void other() {
+//		blah;
+	}
+}
diff --git a/tests/multiIncremental/pr240360/base/test/TestIt.java b/tests/multiIncremental/pr240360/base/test/TestIt.java
new file mode 100644
index 000000000..28d4dc71a
--- /dev/null
+++ b/tests/multiIncremental/pr240360/base/test/TestIt.java
@@ -0,0 +1,10 @@
+package test;
+
+public class TestIt {
+	public static void main(String[] args) {
+		Sub s = new Sub(3, "testValue", "Desc", 17);
+		s.setValue("another value");
+		s.setDescription("blue");
+		System.out.println("done.");
+	}
+}
diff --git a/tests/multiIncremental/pr240360/base/test/aj/ModelAspect.aj b/tests/multiIncremental/pr240360/base/test/aj/ModelAspect.aj
new file mode 100644
index 000000000..f71995b77
--- /dev/null
+++ b/tests/multiIncremental/pr240360/base/test/aj/ModelAspect.aj
@@ -0,0 +1,12 @@
+package test.aj;
+
+import test.Base;
+
+
+public aspect ModelAspect {
+	  pointcut setter(Base o, Object v): set(* Base+.*) && target(o) && args(v);
+
+	  void around(Base o, Object v) : setter(o, v) {
+		  System.out.println(o + ": " +thisJoinPoint.getSignature().getName()+", "+v);
+	  }
+}
diff --git a/tests/multiIncremental/pr240360/inc1/test/Error.java b/tests/multiIncremental/pr240360/inc1/test/Error.java
new file mode 100644
index 000000000..0e01e5e30
--- /dev/null
+++ b/tests/multiIncremental/pr240360/inc1/test/Error.java
@@ -0,0 +1,5 @@
+package test;
+
+public class Error {
+asdf
+}
diff --git a/tests/multiIncremental/pr240360/inc2/test/aj/ModelAspect.aj b/tests/multiIncremental/pr240360/inc2/test/aj/ModelAspect.aj
new file mode 100644
index 000000000..130089e3e
--- /dev/null
+++ b/tests/multiIncremental/pr240360/inc2/test/aj/ModelAspect.aj
@@ -0,0 +1,13 @@
+package test.aj;
+
+import test.Base;
+
+
+public aspect ModelAspect {
+	  pointcut setter(Base o, Object v): set(* Base+.*) && target(o) && args(v);
+
+	  void around(Base o, Object v) : setter(o, v) {
+System.out.println("Advice changed");
+		  System.out.println(o + ": " +thisJoinPoint.getSignature().getName()+", "+v);
+	  }
+}