tests for pr62606 - itdcs don't run field initialisers in target type. Largely updates to existing tests to cope with new Lint warning.

4 files changed, 9 insertions, 8 deletions

diff --git a/tests/base/test103/Driver.java b/tests/base/test103/Driver.java
index 68961d801..cdb42e809 100644
--- a/tests/base/test103/Driver.java
+++ b/tests/base/test103/Driver.java
@@ -46,7 +46,8 @@ aspect Foo {
         return other;
     }
         
-    Pos.new(MagicKey key) {
+    Pos.new(MagicKey key) { 
+    		   this();
             other = id;
             id = getOther();
         }
diff --git a/tests/base/test115/Driver.java b/tests/base/test115/Driver.java
index a15967fc0..16fb5b13e 100644
--- a/tests/base/test115/Driver.java
+++ b/tests/base/test115/Driver.java
@@ -19,7 +19,7 @@ class SubClass extends Class {}
 aspect Aspect {
   static int count = 0;
   //introduction subtypes(Class) {
-  Class.new(int i) {count++;}
+  Class.new(int i) {this(); count++;}
   SubClass.new(int i) {super(2); count++;}
       //}
 }
diff --git a/tests/base/test118/Driver.java b/tests/base/test118/Driver.java
index 5d0db8c15..813a395a6 100644
--- a/tests/base/test118/Driver.java
+++ b/tests/base/test118/Driver.java
@@ -53,11 +53,11 @@ aspect A1 {
 
   C1.new() {
           c1Count++;
-      }
-      C1.new(int x) {
-              c1IntCount++;
-          }
-      }
+  }
+  C1.new(int x) {
+          c1IntCount++;
+  }
+}
 
 aspect Verify {
 
diff --git a/tests/base/test121/Driver.java b/tests/base/test121/Driver.java
index ff9fffb28..c363fbd3e 100644
--- a/tests/base/test121/Driver.java
+++ b/tests/base/test121/Driver.java
@@ -74,7 +74,7 @@ aspect A pertarget(target(Foo)){
         // System.out.println(thisJoinPoint.className +"."+ 
         // thisJoinPoint.methodName);
     }
-    Foo.new(int n) { ranIntroducedConstructor = true; }
+    Foo.new(int n) { this(); ranIntroducedConstructor = true; }
 
 	// make sure advice doesn't go on the toString() method
 	// this would result in an infinite recursion