test data upgrades for adding new command-line error tests

3 files changed, 33 insertions, 13 deletions

diff --git a/tests/new/binaryWarnings/src/app/Main.java b/tests/new/binaryWarnings/src/app/Main.java
index a118555d4..293e506ce 100644
--- a/tests/new/binaryWarnings/src/app/Main.java
+++ b/tests/new/binaryWarnings/src/app/Main.java
@@ -5,7 +5,7 @@ public class Main {
 
     static String staticString = "hello";
     
-    String s = "me";
+    String s = "me";     // bug 8 initializer picked out as execution
     
     public static void main(String[] args) {
 
@@ -20,7 +20,7 @@ public class Main {
         }
     }
 
-    Main() {                // 23
+    Main() {  s += "pick me, not initializer";   // 23
     }
 
     void go(String s) {  String t = "..".substring(0);   // 26
@@ -29,7 +29,7 @@ public class Main {
             String temp = this.s;  // 29
 
             this.s = temp + ", " + s;  // 31
-
+            D.go();                      // 32 
         } catch (RuntimeException e) {   String u = "..".substring(0);  // 33
             
             stop();                      // 35 
@@ -39,7 +39,7 @@ public class Main {
 
     void stop() {                        // 40
 
-        new Main();                      // 42
+        D.go();                      // 42
 
     }
 }
@@ -53,3 +53,10 @@ class C {
 
 }
 
+class D {
+    
+    static void go() {
+        
+    }
+
+}
diff --git a/tests/new/binaryWarnings/src/aspects/ConstructorExecutionWarning.java b/tests/new/binaryWarnings/src/aspects/ConstructorExecutionWarning.java
new file mode 100644
index 000000000..fa55066d4
--- /dev/null
+++ b/tests/new/binaryWarnings/src/aspects/ConstructorExecutionWarning.java
@@ -0,0 +1,12 @@
+
+package aspects;
+
+import app.Main;
+
+// WARNING: do not change message text without changing test specification
+public privileged aspect ConstructorExecutionWarning {
+
+    declare warning : execution(Main.new()) // 23 (bug: 8)
+        : "execution(Main.new())";
+
+}
\ No newline at end of file
diff --git a/tests/new/binaryWarnings/src/aspects/MainWarnings.java b/tests/new/binaryWarnings/src/aspects/MainWarnings.java
index 4debf1f3b..218968f94 100644
--- a/tests/new/binaryWarnings/src/aspects/MainWarnings.java
+++ b/tests/new/binaryWarnings/src/aspects/MainWarnings.java
@@ -7,14 +7,11 @@ import app.Main;
 public privileged aspect MainWarnings {
 
     declare warning : staticinitialization(Main)
-        : "staticinitializtion(Main)";
+        : "staticinitialization(Main)";
         
-    declare warning : initialization(Main.new())
+    declare warning : initialization(Main.new()) // 23
         : "initialization(Main.new())";
 
-    declare warning : execution(Main.new())
-        : "execution(Main.new())";
-
     declare warning : execution(void Main.go(String))
         : "execution(void Main.go(String))";
 
@@ -24,13 +21,17 @@ public privileged aspect MainWarnings {
     declare warning : call(void Main.go(String))
         : "call(void Main.go(String))";
 
-    declare warning : call(Main.new())
+    declare warning : call(void app.D.go())  // 42 (bug missing)
         && withincode(void Main.stop())
-        : "call(Main.new()) && withincode(void Main.stop())";
+        : "withincode(void Main.stop())";
+
+    declare warning : call(void app.D.go()) // 32
+    && withincode(void Main.go(String))
+        : "D.go withincode(void Main.go(String))";
 
-    declare warning : call(void Main.stop())
+    declare warning : call(void Main.stop()) // 35
     && withincode(void Main.go(String))
-        : "call(void Main.stop()) && withincode(void Main.go(String))";
+        : "Main.stop withincode(void Main.go(String))";
 
     declare warning : get(String Main.s)
         : "get(String Main.s)";