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

22 files changed, 42 insertions, 41 deletions

diff --git a/tests/java5/annotations/aspectMembers/a/AnnotatedAspect03.aj b/tests/java5/annotations/aspectMembers/a/AnnotatedAspect03.aj
index 939285816..c3c6312a8 100644
--- a/tests/java5/annotations/aspectMembers/a/AnnotatedAspect03.aj
+++ b/tests/java5/annotations/aspectMembers/a/AnnotatedAspect03.aj
@@ -9,7 +9,7 @@ public aspect AnnotatedAspect03 {
 	
 	@MethodAnnotation private int ITDMe.getGoo() { return goo; }
 	
-	@ConstructorAnnotation public ITDMe.new(int x) { goo = x; }
+	@ConstructorAnnotation public ITDMe.new(int x) { this(); goo = x; }
 	
 }
 
diff --git a/tests/java5/annotations/binding/BindingWithAnnotatedItds3.aj b/tests/java5/annotations/binding/BindingWithAnnotatedItds3.aj
index 8bee421ec..caeec3ba7 100644
--- a/tests/java5/annotations/binding/BindingWithAnnotatedItds3.aj
+++ b/tests/java5/annotations/binding/BindingWithAnnotatedItds3.aj
@@ -5,11 +5,11 @@ import java.lang.annotation.*;
 
 public aspect BindingWithAnnotatedItds3 {
 
-  @Fruit("pear") A.new(String s) { }
+  @Fruit("pear") A.new(String s) { this();  }
 
-  private @Fruit("orange") A.new(int i) { }
+  private @Fruit("orange") A.new(int i) {  this(); }
 
-  public @Fruit("tomato") A.new(boolean b) { }
+  public @Fruit("tomato") A.new(boolean b) {  this(); }
   
   public static void main(String[]argv) {
     A instance1 = new A("a");
diff --git a/tests/java5/annotations/binding/BindingWithDeclaredAnnotationItds4.aj b/tests/java5/annotations/binding/BindingWithDeclaredAnnotationItds4.aj
index 2ecc73c64..65b8d2802 100644
--- a/tests/java5/annotations/binding/BindingWithDeclaredAnnotationItds4.aj
+++ b/tests/java5/annotations/binding/BindingWithDeclaredAnnotationItds4.aj
@@ -5,11 +5,11 @@ import java.lang.annotation.*;
 
 public aspect BindingWithDeclaredAnnotationItds4 {
 
-  A.new(String s) { }
+  A.new(String s) { this(); }
 
-  private A.new(int i) { }
+  private A.new(int i) { this(); }
 
-  public A.new(boolean b) { }
+  public A.new(boolean b) { this(); }
   
   public static void main(String[]argv) {
     A instance1 = new A("a");
diff --git a/tests/java5/annotations/itds/AnnotationsAndITDs.aj b/tests/java5/annotations/itds/AnnotationsAndITDs.aj
index 104681419..c26d8474a 100644
--- a/tests/java5/annotations/itds/AnnotationsAndITDs.aj
+++ b/tests/java5/annotations/itds/AnnotationsAndITDs.aj
@@ -14,10 +14,10 @@ public aspect AnnotationsAndITDs {
 	// annotated ITD constructors
 	
 	@SomeAnnotation(s="hello",clazz=AnnotationsAndITDs.class)
-	public ITDMe.new(String s) {}
+	public ITDMe.new(String s) { this(); }
 	
 	@SomeAnnotation(s="goodbye",clazz=String.class)
-	private ITDMe.new(int x) {}
+	private ITDMe.new(int x) { this(); }
 
 	// annotated ITD methods
 	
@@ -42,8 +42,8 @@ public aspect AnnotationsAndITDs {
 	
 	declare @constructor : ITDMe2.new(..) : @SomeAnnotation(s="@cons",clazz=String.class);
 	
-	public ITDMe2.new(String s) {}	
-	private ITDMe2.new(int x) {}
+	public ITDMe2.new(String s) { this(); }	
+	private ITDMe2.new(int x) { this(); }
 
 	// annotated ITD methods
 	
diff --git a/tests/java5/ataspectj/annotationGen/ITDTest.aj b/tests/java5/ataspectj/annotationGen/ITDTest.aj
index bfa2e58bd..26cdc4c2f 100644
--- a/tests/java5/ataspectj/annotationGen/ITDTest.aj
+++ b/tests/java5/ataspectj/annotationGen/ITDTest.aj
@@ -12,11 +12,11 @@ public aspect ITDTest {
 
     int A.c(String s) { return 1; }
 
-    public A.new(String s) {}
+    public A.new(String s) { this(); }
 
-    private A.new(String s,String s2) {}
+    private A.new(String s,String s2) { this(); }
 	
-    A.new(String s, Object o) {}
+    A.new(String s, Object o) { this(); }
 
     public int A.f ;
 
diff --git a/tests/java5/generics/itds/GenericCtorITD1.aj b/tests/java5/generics/itds/GenericCtorITD1.aj
index 9d0650568..ca02f6bec 100644
--- a/tests/java5/generics/itds/GenericCtorITD1.aj
+++ b/tests/java5/generics/itds/GenericCtorITD1.aj
@@ -14,5 +14,5 @@ public class GenericCtorITD1 {
 
 
 aspect X {
-  <T> Base.new(List<T> elements) { }
+  <T> Base.new(List<T> elements) { this(); }
 }
diff --git a/tests/java5/generics/itds/GenericCtorITD2.aj b/tests/java5/generics/itds/GenericCtorITD2.aj
index 9fc96e624..461bb80d7 100644
--- a/tests/java5/generics/itds/GenericCtorITD2.aj
+++ b/tests/java5/generics/itds/GenericCtorITD2.aj
@@ -18,5 +18,5 @@ public class GenericCtorITD2 {
 
 aspect X {
   // wildcards, argh!
-  <T> Base.new(List<T> one,List<? extends T> two) { }
+  <T> Base.new(List<T> one,List<? extends T> two) { this(); }
 }
diff --git a/tests/java5/generics/itds/GenericCtorITD3.aj b/tests/java5/generics/itds/GenericCtorITD3.aj
index 03b558726..4e3a5d8a0 100644
--- a/tests/java5/generics/itds/GenericCtorITD3.aj
+++ b/tests/java5/generics/itds/GenericCtorITD3.aj
@@ -38,6 +38,7 @@ public class GenericCtorITD3 {
 
 aspect X {
   <T> Sorter.new(List<T> elements,Comparator<? super T> comparator) { 
+	this();
 	Collections.sort(elements,comparator);
 	l = elements;
   }
diff --git a/tests/java5/generics/itds/Parse3.java b/tests/java5/generics/itds/Parse3.java
index a6b7d1a1d..e2f7c2fbd 100644
--- a/tests/java5/generics/itds/Parse3.java
+++ b/tests/java5/generics/itds/Parse3.java
@@ -2,5 +2,5 @@
 public class Parse3 { }
 
 aspect X {
-  <T> Parse3.new(T cupOf) {} 
+  <T> Parse3.new(T cupOf) {this();} 
 }
diff --git a/tests/java5/generics/itds/Parse6.java b/tests/java5/generics/itds/Parse6.java
index 90e3b94f5..f64b32267 100644
--- a/tests/java5/generics/itds/Parse6.java
+++ b/tests/java5/generics/itds/Parse6.java
@@ -11,7 +11,7 @@ class Base<N> {
 aspect X {
 
   public Base<Z>.new(Z  aNumber) {
-	  ;
+	 this() ;
   }
 	
   public List<Z> Base<Z>.f2;
diff --git a/tests/java5/generics/itds/sharing/CtorA.aj b/tests/java5/generics/itds/sharing/CtorA.aj
index 3dc05b26e..d9c1498ec 100644
--- a/tests/java5/generics/itds/sharing/CtorA.aj
+++ b/tests/java5/generics/itds/sharing/CtorA.aj
@@ -8,10 +8,10 @@ public class CtorA {
 }
 
 class Base<N extends Number> { 
-  //public Base(List<N> sn) {}
+  public Base() {}
   <Y extends Number> Base(Set<N> sn, List<Y> ys) {}
 }
 
 aspect X {
-  public Base<Z>.new(List<Z> lz) {}; // OK, Z becomes N in parameter
+  public Base<Z>.new(List<Z> lz) { this(); } // OK, Z becomes N in parameter
 }
diff --git a/tests/java5/generics/itds/sharing/CtorC.aj b/tests/java5/generics/itds/sharing/CtorC.aj
index 967c38192..04fe1c854 100644
--- a/tests/java5/generics/itds/sharing/CtorC.aj
+++ b/tests/java5/generics/itds/sharing/CtorC.aj
@@ -11,5 +11,5 @@ class Base<N extends Number> {
 }
 
 aspect X {
-  public Base<Z>.new(List<List<Z>> llz) {}; // ok - nested but OK
+  public Base<Z>.new(List<List<Z>> llz) { this(); }; // ok - nested but OK
 }
diff --git a/tests/java5/generics/itds/sharing/CtorD.aj b/tests/java5/generics/itds/sharing/CtorD.aj
index f8115ce92..8931c1f8f 100644
--- a/tests/java5/generics/itds/sharing/CtorD.aj
+++ b/tests/java5/generics/itds/sharing/CtorD.aj
@@ -10,5 +10,5 @@ class Base<N extends Number,S> {
 }
 
 aspect X {
-  public Base<A,B>.new(Map<A,B> mabs) {};  // ok multiple
+  public Base<A,B>.new(Map<A,B> mabs) { this(); };  // ok multiple
 }
diff --git a/tests/java5/generics/itds/sharing/CtorE.aj b/tests/java5/generics/itds/sharing/CtorE.aj
index 20aaf57d6..3d45790eb 100644
--- a/tests/java5/generics/itds/sharing/CtorE.aj
+++ b/tests/java5/generics/itds/sharing/CtorE.aj
@@ -12,5 +12,5 @@ class Base<N extends Number> {
 }
 
 aspect X {
-  public Base<Z>.new(List<String> ls) {}; // ok - specified type variable but didnt use it (could put a lint warning on this case?)
+  public Base<Z>.new(List<String> ls) { this(); }; // ok - specified type variable but didnt use it (could put a lint warning on this case?)
 }
diff --git a/tests/java5/generics/itds/sharing/CtorF.aj b/tests/java5/generics/itds/sharing/CtorF.aj
index bb4204b5b..c06083d2c 100644
--- a/tests/java5/generics/itds/sharing/CtorF.aj
+++ b/tests/java5/generics/itds/sharing/CtorF.aj
@@ -11,5 +11,5 @@ class Base<P,N extends Number,S> {
 }
 
 aspect X {
-  public Base<A,B,C>.new(Map<C,A> lc,Map<B,A> lb) {}  // ok multiple in funny orders 
+  public Base<A,B,C>.new(Map<C,A> lc,Map<B,A> lb) { this(); }  // ok multiple in funny orders 
 }
diff --git a/tests/java5/generics/itds/sharing/CtorG.aj b/tests/java5/generics/itds/sharing/CtorG.aj
index d798f9c7f..150dea67b 100644
--- a/tests/java5/generics/itds/sharing/CtorG.aj
+++ b/tests/java5/generics/itds/sharing/CtorG.aj
@@ -3,9 +3,9 @@ import java.util.*;
 public aspect CtorG {
 
   // visibility options...
-  public  Base<Z>.new(List<Z> lz,int i) {}
-  private Base<Z>.new(List<Z> lz,String s) {}
-          Base<Z>.new(List<Z> lz,boolean b) {}
+  public  Base<Z>.new(List<Z> lz,int i) { this();}
+  private Base<Z>.new(List<Z> lz,String s) { this();}
+          Base<Z>.new(List<Z> lz,boolean b) {this();}
 
     public static void main(String []argv) {
 	    List<Integer> intList = new ArrayList<Integer>();
diff --git a/tests/java5/generics/itds/sharing/CtorH.aj b/tests/java5/generics/itds/sharing/CtorH.aj
index 8ce2d0ffe..c0f9d7873 100644
--- a/tests/java5/generics/itds/sharing/CtorH.aj
+++ b/tests/java5/generics/itds/sharing/CtorH.aj
@@ -15,5 +15,5 @@ public class CtorH {
 class Base<N> { }
 
 aspect X {
-  public Base<Z>.new(List<Z> lz) {} // OK, Z becomes N in first case, S in the second ;)
+  public Base<Z>.new(List<Z> lz) {this();} // OK, Z becomes N in first case, S in the second ;)
 }
diff --git a/tests/java5/generics/itds/sharing/CtorI.aj b/tests/java5/generics/itds/sharing/CtorI.aj
index bed64a85a..5fbbcd2e2 100644
--- a/tests/java5/generics/itds/sharing/CtorI.aj
+++ b/tests/java5/generics/itds/sharing/CtorI.aj
@@ -10,5 +10,5 @@ public class CtorI {
 class Base<N extends Number> { }
 
 aspect X {
-  public Base<Z>.new(List<Z> lz) {}
+  public Base<Z>.new(List<Z> lz) {this();}
 }
diff --git a/tests/java5/generics/itds/visibility/PackageITDs.aj b/tests/java5/generics/itds/visibility/PackageITDs.aj
index eaa7f3122..7c4ed0602 100644
--- a/tests/java5/generics/itds/visibility/PackageITDs.aj
+++ b/tests/java5/generics/itds/visibility/PackageITDs.aj
@@ -23,8 +23,8 @@ public aspect PackageITDs {
   <R extends Number> void Base.packageMethod2(List<R> lr1,List<R> lr2) {}
 
   // ctor
-  <P extends Number> Base.new(List<P> lr) {}
-  <P extends Number> Base.new(List<P> lr1,List<P> lr2) {}
-  <P,Q extends Number> Base.new(List<P> lp,Map<Q,P> m1) {}
+  <P extends Number> Base.new(List<P> lr) { this(); }
+  <P extends Number> Base.new(List<P> lr1,List<P> lr2) { this(); }
+  <P,Q extends Number> Base.new(List<P> lp,Map<Q,P> m1) { this(); }
 
 }
diff --git a/tests/java5/generics/itds/visibility/PrivateITDs.aj b/tests/java5/generics/itds/visibility/PrivateITDs.aj
index beaebb49d..758bc58d7 100644
--- a/tests/java5/generics/itds/visibility/PrivateITDs.aj
+++ b/tests/java5/generics/itds/visibility/PrivateITDs.aj
@@ -23,8 +23,8 @@ public aspect PrivateITDs {
   private <R extends Number> void Base.privateMethod2(List<R> lr1,List<R> lr2) {}
 
   // ctor
-  private <P extends Number> Base.new(List<P> lr) {}
-  private <P extends Number> Base.new(List<P> lr1,List<P> lr2) {}
-  private <P,Q extends Number> Base.new(List<P> lp,Map<Q,P> m1) {}
+  private <P extends Number> Base.new(List<P> lr) { this(); }
+  private <P extends Number> Base.new(List<P> lr1,List<P> lr2) { this(); }
+  private <P,Q extends Number> Base.new(List<P> lp,Map<Q,P> m1) { this(); }
 
 }
diff --git a/tests/java5/generics/itds/visibility/PublicITDs.aj b/tests/java5/generics/itds/visibility/PublicITDs.aj
index 25d58b4a3..e419a8a21 100644
--- a/tests/java5/generics/itds/visibility/PublicITDs.aj
+++ b/tests/java5/generics/itds/visibility/PublicITDs.aj
@@ -26,9 +26,9 @@ aspect X {
   public <R extends Number> void Base.publicMethod2(List<R> lr1,List<R> lr2) {}
 
   // ctor
-  public <P extends Number> Base.new(List<P> lr) {}
-  public <P extends Number> Base.new(List<P> lr1,List<P> lr2) {}
-  public <P,Q extends Number> Base.new(List<P> lp,Map<Q,P> m1) {}
+  public <P extends Number> Base.new(List<P> lr) { this(); }
+  public <P extends Number> Base.new(List<P> lr1,List<P> lr2) { this(); }
+  public <P,Q extends Number> Base.new(List<P> lp,Map<Q,P> m1) { this(); }
 
   // what use is this next one??
   // public <R extends Number>    R Base.publicMethod3() { return null;}
diff --git a/tests/java5/generics/itds/visibility/PublicITDsErrors.aj b/tests/java5/generics/itds/visibility/PublicITDsErrors.aj
index cc7bd81cf..89a173f6a 100644
--- a/tests/java5/generics/itds/visibility/PublicITDsErrors.aj
+++ b/tests/java5/generics/itds/visibility/PublicITDsErrors.aj
@@ -23,7 +23,7 @@ aspect X {
   public <R extends Number> void Base.publicMethod2(List<R> lr1,List<R> lr2) {}
 
   // ctor
-  public <P extends Number> Base.new(List<P> lr) {}
-  public <P extends Number> Base.new(List<P> lr1,List<P> lr2) {}
-  public <P,Q extends Number> Base.new(List<P> lp,Map<Q,P> m1) {}
+  public <P extends Number> Base.new(List<P> lr) { this(); }
+  public <P extends Number> Base.new(List<P> lr1,List<P> lr2) { this(); }
+  public <P,Q extends Number> Base.new(List<P> lp,Map<Q,P> m1) { this(); }
 }