ITD inner type tests: replace '_' by '__'

Classes and methods named '_' are no longer allowed in ECJ, obviously
also not for old target versions like 1.5. This probably is due to
the added support for unnamed patterns and classes in the latest
upstream JDT Core merge. Therefore, we simply rename '_' to '__'.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/tests/features169/itdInnerTypes/Construction.java b/tests/features169/itdInnerTypes/Construction.java
index 40f965b3dbe58e69255c2697f0c9317ed602b573..f86e14e2a72a4c1351aac8746c94a18701562c2c 100644 (file)
--- a/tests/features169/itdInnerTypes/Construction.java
+++ b/tests/features169/itdInnerTypes/Construction.java
@@ -1,11 +1,11 @@
 public class Construction {
   public static void main(String []argv) {
-    new _();
+    new __();
     System.out.println("done");
   }
 }
 
 aspect XX {
-  public static class Construction._ {
+  public static class Construction.__ {
   }
 }

diff --git a/tests/features169/itdInnerTypes/Construction3.java b/tests/features169/itdInnerTypes/Construction3.java
index b4f1973529965a110a07cc7ba1c40eac53bf9346..e37fd9ab1a8b56b13c1fec2798347b2f0becf6a8 100644 (file)
--- a/tests/features169/itdInnerTypes/Construction3.java
+++ b/tests/features169/itdInnerTypes/Construction3.java
@@ -1,17 +1,17 @@
 aspect Aspect2 {
-  public static class Construction3._ {
+  public static class Construction3.__ {
     String string;
-    public _(String string) { this.string = string;}
+    public __(String string) { this.string = string;}
     public String toString() {
       return string;
     }
   }
-  public static Construction3._ Construction3._() { return new _("abc"); }
+  public static Construction3.__ Construction3.__() { return new __("abc"); }
   public static String Construction3.foo() { return "abc"; }
 }
 public class Construction3 {
   public static void main(String []argv) {
-    Object o = _();
+    Object o = __();
     o = foo();
     System.out.println(o);
   }

diff --git a/tests/features169/itdInnerTypes/Construction4.java b/tests/features169/itdInnerTypes/Construction4.java
index 5c97371b8e317451f3aba03529820f54ec9b51ce..7505be1e72db4a32282b729ebf5192469f6aff9c 100644 (file)
--- a/tests/features169/itdInnerTypes/Construction4.java
+++ b/tests/features169/itdInnerTypes/Construction4.java
@@ -1,11 +1,11 @@
 aspect Aspect1 {
-  public static Construction4._ Construction4._() { return new _("abc"); }
+  public static Construction4.__ Construction4.__() { return new __("abc"); }
   public static String Construction4.foo() { return "abc"; }
 }
 aspect Aspect2 {
-  public static class Construction4._ {
+  public static class Construction4.__ {
     String string;
-    public _(String string) { this.string = string;}
+    public __(String string) { this.string = string;}
     public String toString() {
       return string;
     }
@@ -13,7 +13,7 @@ aspect Aspect2 {
 } 
 public class Construction4 {
   public static void main(String []argv) {
-    Object o = _();
+    Object o = __();
     o = foo();
     System.out.println(o);
   }

diff --git a/tests/features169/itdInnerTypes/eight/Runner.java b/tests/features169/itdInnerTypes/eight/Runner.java
index f9bd75421127f31ec6ac08439439d5b19b4f19e0..14dcfcae7b4e71ac2470f8beb9f9e9a4c2481c91 100644 (file)
--- a/tests/features169/itdInnerTypes/eight/Runner.java
+++ b/tests/features169/itdInnerTypes/eight/Runner.java
@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

diff --git a/tests/features169/itdInnerTypes/eight/Underscorer.aj b/tests/features169/itdInnerTypes/eight/Underscorer.aj
index 93ca709d6732c82304299bef9344348e3c529b01..03ec84b5388c4d47598ea2ef4be903f6987f5ba6 100644 (file)
--- a/tests/features169/itdInnerTypes/eight/Underscorer.aj
+++ b/tests/features169/itdInnerTypes/eight/Underscorer.aj
@@ -3,11 +3,11 @@ package a.b.c;
 public aspect Underscorer {
   public int Vote.i = 5;
   public String Vote.zzz() { return "abc"; }
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

diff --git a/tests/features169/itdInnerTypes/eight/Vote.java b/tests/features169/itdInnerTypes/eight/Vote.java
index 8d22bdc7ac2bcf0476f338cf0c0c3404564720b5..65b20f93db69ce006e1aef236df833e302fb53ff 100644 (file)
--- a/tests/features169/itdInnerTypes/eight/Vote.java
+++ b/tests/features169/itdInnerTypes/eight/Vote.java
@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Vote {
 
-  public static Vote._ _() { return new Vote._(null); }
+  public static Vote.__ __() { return new Vote.__(null); }
 
   static class RealInner {}
 

diff --git a/tests/features169/itdInnerTypes/five/Runner.java b/tests/features169/itdInnerTypes/five/Runner.java
index f9bd75421127f31ec6ac08439439d5b19b4f19e0..14dcfcae7b4e71ac2470f8beb9f9e9a4c2481c91 100644 (file)
--- a/tests/features169/itdInnerTypes/five/Runner.java
+++ b/tests/features169/itdInnerTypes/five/Runner.java
@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

diff --git a/tests/features169/itdInnerTypes/five/Vote_Amender.aj b/tests/features169/itdInnerTypes/five/Vote_Amender.aj
index ec80d28dfc184c230b7f21aa5eeb86869450d41a..0e9ce5cf6f12f824b0a3c1464b7df93f4448b98d 100644 (file)
--- a/tests/features169/itdInnerTypes/five/Vote_Amender.aj
+++ b/tests/features169/itdInnerTypes/five/Vote_Amender.aj
@@ -1,11 +1,11 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

diff --git a/tests/features169/itdInnerTypes/four/Runner.java b/tests/features169/itdInnerTypes/four/Runner.java
index f9bd75421127f31ec6ac08439439d5b19b4f19e0..14dcfcae7b4e71ac2470f8beb9f9e9a4c2481c91 100644 (file)
--- a/tests/features169/itdInnerTypes/four/Runner.java
+++ b/tests/features169/itdInnerTypes/four/Runner.java
@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

diff --git a/tests/features169/itdInnerTypes/four/Vote_Amender.aj b/tests/features169/itdInnerTypes/four/Vote_Amender.aj
index 44a4ff750fbaecc5e049408150e800882f0d4019..3b8220e965941b6b7be77e352f22cc2f6b20f88b 100644 (file)
--- a/tests/features169/itdInnerTypes/four/Vote_Amender.aj
+++ b/tests/features169/itdInnerTypes/four/Vote_Amender.aj
@@ -1,10 +1,10 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
   }
 }

diff --git a/tests/features169/itdInnerTypes/nine/Runner.java b/tests/features169/itdInnerTypes/nine/Runner.java
index f9bd75421127f31ec6ac08439439d5b19b4f19e0..14dcfcae7b4e71ac2470f8beb9f9e9a4c2481c91 100644 (file)
--- a/tests/features169/itdInnerTypes/nine/Runner.java
+++ b/tests/features169/itdInnerTypes/nine/Runner.java
@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

diff --git a/tests/features169/itdInnerTypes/nine/Underscorer.aj b/tests/features169/itdInnerTypes/nine/Underscorer.aj
index 2d633bfc7e3e5d6542f56f145db2f286017e75f1..7068d473b7469363a9b50b07ce90dd28c1abcf99 100644 (file)
--- a/tests/features169/itdInnerTypes/nine/Underscorer.aj
+++ b/tests/features169/itdInnerTypes/nine/Underscorer.aj
@@ -1,13 +1,13 @@
 package a.b.c;
 
 public aspect Underscorer {
-  public Vote._ Vote._()  { return new Vote._(null); }
+  public Vote.__ Vote.__()  { return new Vote.__(null); }
 
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

diff --git a/tests/features169/itdInnerTypes/nine/Vote.java b/tests/features169/itdInnerTypes/nine/Vote.java
index 956c7e1bbb6e64572017d0f93466a56d7fc7a9c0..5dc9828cd17b762473e9a48858e5483856e31a46 100644 (file)
--- a/tests/features169/itdInnerTypes/nine/Vote.java
+++ b/tests/features169/itdInnerTypes/nine/Vote.java
@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Vote {
 
-//  public static Vote._ _() { return new Vote._(null); }
+//  public static Vote.__ __() { return new Vote.__(null); }
 
   static class RealInner {}
 

diff --git a/tests/features169/itdInnerTypes/one/Vote_Amender.aj b/tests/features169/itdInnerTypes/one/Vote_Amender.aj
index 4c8c7ee2deb00a840891fe9c8a7ef8885c6e2559..043b38fe59c8a693b96e2b6df03a7234be641df9 100644 (file)
--- a/tests/features169/itdInnerTypes/one/Vote_Amender.aj
+++ b/tests/features169/itdInnerTypes/one/Vote_Amender.aj
@@ -1,6 +1,6 @@
 package a.b.c;
 
 aspect Vote_Amender {
-  static class Vote._ {
+  static class Vote.__ {
   }
 }

diff --git a/tests/features169/itdInnerTypes/separate/Basic.java b/tests/features169/itdInnerTypes/separate/Basic.java
index b76e6a43f9cddb8dbd9c81f631a76f20f1b12fba..332f2f47688d8ec902bd27e2014c4a8bf91ea473 100644 (file)
--- a/tests/features169/itdInnerTypes/separate/Basic.java
+++ b/tests/features169/itdInnerTypes/separate/Basic.java
@@ -1,11 +1,11 @@
 public class Basic {
   public static void main(String []argv) {
-    new _();
+    new __();
     System.out.println("done");
   }
 }
 
 aspect XX {
-  public static class Basic._ {
+  public static class Basic.__ {
   }
 }

diff --git a/tests/features169/itdInnerTypes/separate/Basic2.java b/tests/features169/itdInnerTypes/separate/Basic2.java
index f44b45b3df4eb188e66b97f17af8a2787bdfc195..b569e5dc72d388404a3eb2e4d30ebcd9708d70a5 100644 (file)
--- a/tests/features169/itdInnerTypes/separate/Basic2.java
+++ b/tests/features169/itdInnerTypes/separate/Basic2.java
@@ -1,6 +1,6 @@
 public class Basic2 {
   public static void main(String []argv) {
-    new Basic._();
+    new Basic.__();
     System.out.println("done");
   }
 }

diff --git a/tests/features169/itdInnerTypes/separate2/Basic.java b/tests/features169/itdInnerTypes/separate2/Basic.java
index 44aed7c7c3f7833e4a3e43486016cc78e7f624e9..5f7d8bd48d4eb7b1528fee18bd61c33de672f3ae 100644 (file)
--- a/tests/features169/itdInnerTypes/separate2/Basic.java
+++ b/tests/features169/itdInnerTypes/separate2/Basic.java
@@ -1,11 +1,11 @@
 public class Basic {
   public static void main(String []argv) {
-    // new _();
+    // new __();
     System.out.println("done");
   }
 }
 
 aspect XX {
-  public static class Basic._ {
+  public static class Basic.__ {
   }
 }

diff --git a/tests/features169/itdInnerTypes/separate2/Basic2.java b/tests/features169/itdInnerTypes/separate2/Basic2.java
index f44b45b3df4eb188e66b97f17af8a2787bdfc195..b569e5dc72d388404a3eb2e4d30ebcd9708d70a5 100644 (file)
--- a/tests/features169/itdInnerTypes/separate2/Basic2.java
+++ b/tests/features169/itdInnerTypes/separate2/Basic2.java
@@ -1,6 +1,6 @@
 public class Basic2 {
   public static void main(String []argv) {
-    new Basic._();
+    new Basic.__();
     System.out.println("done");
   }
 }

diff --git a/tests/features169/itdInnerTypes/seven/Runner.java b/tests/features169/itdInnerTypes/seven/Runner.java
index f9bd75421127f31ec6ac08439439d5b19b4f19e0..14dcfcae7b4e71ac2470f8beb9f9e9a4c2481c91 100644 (file)
--- a/tests/features169/itdInnerTypes/seven/Runner.java
+++ b/tests/features169/itdInnerTypes/seven/Runner.java
@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

diff --git a/tests/features169/itdInnerTypes/seven/Underscorer.aj b/tests/features169/itdInnerTypes/seven/Underscorer.aj
index 7834247e4357cb8550b37ef76c9efc55dbbbe299..1ec6d59ca591b8a51963813484a05b468c25920c 100644 (file)
--- a/tests/features169/itdInnerTypes/seven/Underscorer.aj
+++ b/tests/features169/itdInnerTypes/seven/Underscorer.aj
@@ -1,11 +1,11 @@
 package a.b.c;
 
 public aspect Underscorer {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

diff --git a/tests/features169/itdInnerTypes/seven/Vote.java b/tests/features169/itdInnerTypes/seven/Vote.java
index 8d22bdc7ac2bcf0476f338cf0c0c3404564720b5..65b20f93db69ce006e1aef236df833e302fb53ff 100644 (file)
--- a/tests/features169/itdInnerTypes/seven/Vote.java
+++ b/tests/features169/itdInnerTypes/seven/Vote.java
@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Vote {
 
-  public static Vote._ _() { return new Vote._(null); }
+  public static Vote.__ __() { return new Vote.__(null); }
 
   static class RealInner {}
 

diff --git a/tests/features169/itdInnerTypes/six/Runner.java b/tests/features169/itdInnerTypes/six/Runner.java
index f9bd75421127f31ec6ac08439439d5b19b4f19e0..14dcfcae7b4e71ac2470f8beb9f9e9a4c2481c91 100644 (file)
--- a/tests/features169/itdInnerTypes/six/Runner.java
+++ b/tests/features169/itdInnerTypes/six/Runner.java
@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

diff --git a/tests/features169/itdInnerTypes/six/Vote.java b/tests/features169/itdInnerTypes/six/Vote.java
index f0f94b25bc678fadebba4dc5a528f97ef4156e47..af31119405d247bd33089a31f931e76426b17ca5 100644 (file)
--- a/tests/features169/itdInnerTypes/six/Vote.java
+++ b/tests/features169/itdInnerTypes/six/Vote.java
@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Vote {
 
-  public static Vote._ field = new Vote._(null);
+  public static Vote.__ field = new Vote.__(null);
 
   static class RealInner {}
 

diff --git a/tests/features169/itdInnerTypes/six/Vote_Amender.aj b/tests/features169/itdInnerTypes/six/Vote_Amender.aj
index ec80d28dfc184c230b7f21aa5eeb86869450d41a..0e9ce5cf6f12f824b0a3c1464b7df93f4448b98d 100644 (file)
--- a/tests/features169/itdInnerTypes/six/Vote_Amender.aj
+++ b/tests/features169/itdInnerTypes/six/Vote_Amender.aj
@@ -1,11 +1,11 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

diff --git a/tests/features169/itdInnerTypes/ten/Aspect1.java b/tests/features169/itdInnerTypes/ten/Aspect1.java
index 5d95096547d0cb289a1bad214da14a6867c64c5e..63745a51a24dcf44f9e50a5283f3619d00ec9624 100644 (file)
--- a/tests/features169/itdInnerTypes/ten/Aspect1.java
+++ b/tests/features169/itdInnerTypes/ten/Aspect1.java
@@ -1,8 +1,8 @@
 aspect Aspect1 {
-  public static class Construction._ {
+  public static class Construction.__ {
     private String string;
-    public _(String string) { this.string = string; }
-    public _() { this.string = "nothing"; }
+    public __(String string) { this.string = string; }
+    public __() { this.string = "nothing"; }
     public String toString() {
       return string; 
     }

diff --git a/tests/features169/itdInnerTypes/ten/Aspect2.java b/tests/features169/itdInnerTypes/ten/Aspect2.java
index 0048ddf60b106e5bd8b254134c709b0e6f9e6acb..d2855913ea619f0f838c6dfa99adc8fd693bc351 100644 (file)
--- a/tests/features169/itdInnerTypes/ten/Aspect2.java
+++ b/tests/features169/itdInnerTypes/ten/Aspect2.java
@@ -1,3 +1,3 @@
 aspect Aspect2 {
-  public Construction._ Construction._() { return new _("abc"); }
+  public Construction.__ Construction.__() { return new __("abc"); }
 }

diff --git a/tests/features169/itdInnerTypes/ten/Construction.java b/tests/features169/itdInnerTypes/ten/Construction.java
index 43b32a4f8b94fadefa0b015f31637744537063ec..0c22f3e3fcfac58951a9867eee1d979728247e12 100644 (file)
--- a/tests/features169/itdInnerTypes/ten/Construction.java
+++ b/tests/features169/itdInnerTypes/ten/Construction.java
@@ -1,6 +1,6 @@
 public class Construction {
   public static void main(String []argv) {
-    new _();
-    System.out.println(new _("abcde"));
+    new __();
+    System.out.println(new __("abcde"));
   }
 }

diff --git a/tests/features169/itdInnerTypes/three/Runner.java b/tests/features169/itdInnerTypes/three/Runner.java
index cc36878ae0978248125b5f5853797bea96ece378..42fc8b7db18d4452e9e0f0312060cdffc2e0bd26 100644 (file)
--- a/tests/features169/itdInnerTypes/three/Runner.java
+++ b/tests/features169/itdInnerTypes/three/Runner.java
@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.class)
+@RelatedType(value=Vote.__.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

diff --git a/tests/features169/itdInnerTypes/three/Vote_Amender.aj b/tests/features169/itdInnerTypes/three/Vote_Amender.aj
index 457ec506d8d14bcb2db06c46e327f7cc2967ef89..c620f0b368f49891302232eec842b5af20621239 100644 (file)
--- a/tests/features169/itdInnerTypes/three/Vote_Amender.aj
+++ b/tests/features169/itdInnerTypes/three/Vote_Amender.aj
@@ -1,10 +1,10 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     private String choice = "abc";
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
   }
 }

diff --git a/tests/features169/itdInnerTypes/two/Runner.java b/tests/features169/itdInnerTypes/two/Runner.java
index eb5987ad57a76818e4d88d90edf5efb4fbc7f62e..085fd910aa477b30eb82e0e0cf058dfec8ca1e22 100644 (file)
--- a/tests/features169/itdInnerTypes/two/Runner.java
+++ b/tests/features169/itdInnerTypes/two/Runner.java
@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
   }
 }

diff --git a/tests/features169/itdInnerTypes/two/Vote_Amender.aj b/tests/features169/itdInnerTypes/two/Vote_Amender.aj
index 1c5a95016a3065f764ecd8977248a41fc2d00e5f..30325e0bccf1da6313e36dbe2b00cf49539b0789 100644 (file)
--- a/tests/features169/itdInnerTypes/two/Vote_Amender.aj
+++ b/tests/features169/itdInnerTypes/two/Vote_Amender.aj
@@ -1,9 +1,9 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
   }
 }

diff --git a/tests/multiIncremental/prInner4/base/A.aj b/tests/multiIncremental/prInner4/base/A.aj
index f5f70f8ccead2ccb36c5e6afbfa7c906bce23adb..60996e0a18698e030fd569d3192d92cf6e358bbe 100644 (file)
--- a/tests/multiIncremental/prInner4/base/A.aj
+++ b/tests/multiIncremental/prInner4/base/A.aj
@@ -1,5 +1,5 @@
 aspect A {
-  public static class C._ {
+  public static class C.__ {
     public void printmessages() {
       System.out.println("message");
     }

diff --git a/tests/multiIncremental/prInner4/base/C.java b/tests/multiIncremental/prInner4/base/C.java
index 83973ea9036968372ae3a859cd2268336d07cde6..e27e3501c54512b3170c013ead71625dfa2b04e1 100644 (file)
--- a/tests/multiIncremental/prInner4/base/C.java
+++ b/tests/multiIncremental/prInner4/base/C.java
@@ -1,5 +1,5 @@
 public class C {
   public static void main(String []argv) {
-    new _();
+    new __();
   }
 }

diff --git a/tests/multiIncremental/prInner4/inc1/A.aj b/tests/multiIncremental/prInner4/inc1/A.aj
index f5f70f8ccead2ccb36c5e6afbfa7c906bce23adb..60996e0a18698e030fd569d3192d92cf6e358bbe 100644 (file)
--- a/tests/multiIncremental/prInner4/inc1/A.aj
+++ b/tests/multiIncremental/prInner4/inc1/A.aj
@@ -1,5 +1,5 @@
 aspect A {
-  public static class C._ {
+  public static class C.__ {
     public void printmessages() {
       System.out.println("message");
     }

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml
index e4dbec2fa4bd98d62ba552468604c19099e64d26..97168ab1f5043df777f1669d883db8360fa832e1 100644 (file)
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml
@@ -66,14 +66,14 @@
    </ajc-test>
 
    <ajc-test dir="features169/itdInnerTypes/nine" title="vote - itd mixture 2">
-     <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5"/>
+     <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5" vm=""/>
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -83,10 +83,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -96,10 +96,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -109,10 +109,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -122,10 +122,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -135,10 +135,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -149,9 +149,9 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>