aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/features169/itdInnerTypes/Construction.java4
-rw-r--r--tests/features169/itdInnerTypes/Construction3.java8
-rw-r--r--tests/features169/itdInnerTypes/Construction4.java8
-rw-r--r--tests/features169/itdInnerTypes/eight/Runner.java5
-rw-r--r--tests/features169/itdInnerTypes/eight/Underscorer.aj4
-rw-r--r--tests/features169/itdInnerTypes/eight/Vote.java2
-rw-r--r--tests/features169/itdInnerTypes/five/Runner.java5
-rw-r--r--tests/features169/itdInnerTypes/five/Vote_Amender.aj4
-rw-r--r--tests/features169/itdInnerTypes/four/Runner.java5
-rw-r--r--tests/features169/itdInnerTypes/four/Vote_Amender.aj4
-rw-r--r--tests/features169/itdInnerTypes/nine/Runner.java5
-rw-r--r--tests/features169/itdInnerTypes/nine/Underscorer.aj6
-rw-r--r--tests/features169/itdInnerTypes/nine/Vote.java2
-rw-r--r--tests/features169/itdInnerTypes/one/Vote_Amender.aj2
-rw-r--r--tests/features169/itdInnerTypes/separate/Basic.java4
-rw-r--r--tests/features169/itdInnerTypes/separate/Basic2.java2
-rw-r--r--tests/features169/itdInnerTypes/separate2/Basic.java4
-rw-r--r--tests/features169/itdInnerTypes/separate2/Basic2.java2
-rw-r--r--tests/features169/itdInnerTypes/seven/Runner.java5
-rw-r--r--tests/features169/itdInnerTypes/seven/Underscorer.aj4
-rw-r--r--tests/features169/itdInnerTypes/seven/Vote.java2
-rw-r--r--tests/features169/itdInnerTypes/six/Runner.java5
-rw-r--r--tests/features169/itdInnerTypes/six/Vote.java2
-rw-r--r--tests/features169/itdInnerTypes/six/Vote_Amender.aj4
-rw-r--r--tests/features169/itdInnerTypes/ten/Aspect1.java6
-rw-r--r--tests/features169/itdInnerTypes/ten/Aspect2.java2
-rw-r--r--tests/features169/itdInnerTypes/ten/Construction.java4
-rw-r--r--tests/features169/itdInnerTypes/three/Runner.java5
-rw-r--r--tests/features169/itdInnerTypes/three/Vote_Amender.aj4
-rw-r--r--tests/features169/itdInnerTypes/two/Runner.java2
-rw-r--r--tests/features169/itdInnerTypes/two/Vote_Amender.aj4
-rw-r--r--tests/multiIncremental/prInner4/base/A.aj2
-rw-r--r--tests/multiIncremental/prInner4/base/C.java2
-rw-r--r--tests/multiIncremental/prInner4/inc1/A.aj2
-rw-r--r--tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml56
35 files changed, 90 insertions, 97 deletions
diff --git a/tests/features169/itdInnerTypes/Construction.java b/tests/features169/itdInnerTypes/Construction.java
index 40f965b3d..f86e14e2a 100644
--- 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 b4f197352..e37fd9ab1 100644
--- 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 5c97371b8..7505be1e7 100644
--- 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 f9bd75421..14dcfcae7 100644
--- 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 93ca709d6..03ec84b53 100644
--- 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 8d22bdc7a..65b20f93d 100644
--- 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 f9bd75421..14dcfcae7 100644
--- 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 ec80d28df..0e9ce5cf6 100644
--- 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 f9bd75421..14dcfcae7 100644
--- 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 44a4ff750..3b8220e96 100644
--- 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 f9bd75421..14dcfcae7 100644
--- 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 2d633bfc7..7068d473b 100644
--- 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 956c7e1bb..5dc9828cd 100644
--- 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 4c8c7ee2d..043b38fe5 100644
--- 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 b76e6a43f..332f2f476 100644
--- 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 f44b45b3d..b569e5dc7 100644
--- 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 44aed7c7c..5f7d8bd48 100644
--- 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 f44b45b3d..b569e5dc7 100644
--- 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 f9bd75421..14dcfcae7 100644
--- 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 7834247e4..1ec6d59ca 100644
--- 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 8d22bdc7a..65b20f93d 100644
--- 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 f9bd75421..14dcfcae7 100644
--- 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 f0f94b25b..af3111940 100644
--- 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 ec80d28df..0e9ce5cf6 100644
--- 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 5d9509654..63745a51a 100644
--- 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 0048ddf60..d2855913e 100644
--- 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 43b32a4f8..0c22f3e3f 100644
--- 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 cc36878ae..42fc8b7db 100644
--- 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 457ec506d..c620f0b36 100644
--- 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 eb5987ad5..085fd910a 100644
--- 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 1c5a95016..30325e0bc 100644
--- 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 f5f70f8cc..60996e0a1 100644
--- 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 83973ea90..e27e3501c 100644
--- 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 f5f70f8cc..60996e0a1 100644
--- 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 e4dbec2fa..97168ab1f 100644
--- 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>