aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/multiIncremental/PR124399/base/edu/ucsd/aosd/MyApplication.aj27
-rw-r--r--tests/multiIncremental/PR124399/inc1/edu/ucsd/aosd/MyApplication.aj27
-rw-r--r--tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java12
3 files changed, 66 insertions, 0 deletions
diff --git a/tests/multiIncremental/PR124399/base/edu/ucsd/aosd/MyApplication.aj b/tests/multiIncremental/PR124399/base/edu/ucsd/aosd/MyApplication.aj
new file mode 100644
index 000000000..0ee8a869f
--- /dev/null
+++ b/tests/multiIncremental/PR124399/base/edu/ucsd/aosd/MyApplication.aj
@@ -0,0 +1,27 @@
+package edu.ucsd.aosd;
+
+import java.io.PrintStream;
+
+public class MyApplication
+{
+ // main
+ public static void main(String[] args) {
+ for (String arg : args) {
+ System.out.println("got: " + arg);
+// System.out.printf("got: %s\n", arg);
+ }
+ }
+}
+
+aspect Printing {
+ pointcut printlnCalls(PrintStream ps, String out):
+ call(* PrintStream+.println(String)) && target(ps) && args(out);
+ Object around(PrintStream ps, String out):
+ printlnCalls(ps, out) && !adviceexecution() {
+ return proceed(ps, out);
+ }
+
+// pointcut printfCalls(PrintStream ps, String fmt, Object[] objs):
+// call(* PrintStream+.printf(String, Object...#####))
+// && target(ps) && args(fmt, objs);
+}
diff --git a/tests/multiIncremental/PR124399/inc1/edu/ucsd/aosd/MyApplication.aj b/tests/multiIncremental/PR124399/inc1/edu/ucsd/aosd/MyApplication.aj
new file mode 100644
index 000000000..32aa992fa
--- /dev/null
+++ b/tests/multiIncremental/PR124399/inc1/edu/ucsd/aosd/MyApplication.aj
@@ -0,0 +1,27 @@
+package edu.ucsd.aosd;
+
+import java.io.PrintStream;
+
+public class MyApplication
+{
+ // main
+ public static void main(String[] args) {
+ for (String arg : args) {
+ System.out.println("got: " + arg);
+ System.out.printf("got: %s\n", arg);
+ }
+ }
+}
+
+aspect Printing {
+ pointcut printlnCalls(PrintStream ps, String out):
+ call(* PrintStream+.println(String)) && target(ps) && args(out);
+ Object around(PrintStream ps, String out):
+ printlnCalls(ps, out) && !adviceexecution() {
+ return proceed(ps, out);
+ }
+
+ pointcut printfCalls(PrintStream ps, String fmt, Object[] objs):
+ call(* PrintStream+.printf(String, Object...))
+ && target(ps) && args(fmt, objs);
+}
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index ca4dc81b0..a17a57a8d 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -365,6 +365,18 @@ public class MultiProjectIncrementalTests extends AjdeInteractionTestbed {
checkWasntFullBuild();
}
+
+// public void testPr124399() {
+// AjdeInteractionTestbed.VERBOSE=true;
+// configureBuildStructureModel(true);
+// initialiseProject("PR124399");
+// build("PR124399");
+// checkWasFullBuild();
+// alter("PR124399","inc1");
+// build("PR124399");
+// checkWasntFullBuild();
+// }
+
public void testPr121384() {
// AjdeInteractionTestbed.VERBOSE=true;
// AsmManager.setReporting("c:/foo.txt",true,true,true,false);