357012/357013

2 files changed, 47 insertions, 6 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
index a6182f18e..27f6c58ae 100644
--- a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
@@ -35,12 +35,24 @@ public class Ajc1612Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	// runTest("itd split compilation");
 	// }
 
-	public void testClassRef() throws Exception {
+	public void testNotEqualWithAnnotationValues_357013() throws Exception {
+		runTest("annotation values not equal");
+	}
+
+	public void testNotEqualWithAnnotationValues_357013_2() throws Exception {
+		runTest("annotation values not equal 2");
+	}
+
+	public void testClassRef_357012() throws Exception {
 		runTest("class reference in annotation value");
 	}
 
-	public void testClassRef2() throws Exception {
-		runTest("class reference in annotation value 2");
+	public void testClassRefInvalidName_357012_2() throws Exception {
+		runTest("class reference in annotation value - invalid typename");
+	}
+
+	public void testClassRef_357012_3() throws Exception {
+		runTest("class reference in annotation value 3");
 	}
 
 	public void testAnnotationFieldBindingOptimization_356612() throws Exception {
diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
index 60ba01244..efabde26a 100644
--- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
@@ -3,17 +3,46 @@
 <suite>
 
 <ajc-test dir="bugs1612/prx" title="class reference in annotation value">
-<compile files="C.java" options="-1.5"/>
+<compile files="C.java" options="-1.5 -showWeaveInfo">
+<message kind="weave" text="Join point 'field-get(int C.i)' in Type 'C' (C.java:17) advised by before advice from 'X' (C.java:22)"/>
+</compile>
 <run class="C">
 </run>
 </ajc-test>
 
-<ajc-test dir="bugs1612/prx" title="class reference in annotation value 2">
-<compile files="D.java" options="-1.5"/>
+<ajc-test dir="bugs1612/prx" title="annotation values not equal">
+<compile files="D.java" options="-1.5 -showWeaveInfo">
+<message kind="weave" text="Join point 'field-get(int D.i)' in Type 'D' (D.java:20) advised by before advice from 'X' (D.java:26)"/>
+<message kind="weave" text="Join point 'field-get(int D.j)' in Type 'D' (D.java:21) advised by before advice from 'X' (D.java:26)"/>
+</compile>
 <run class="D">
 </run>
 </ajc-test>
 
+<ajc-test dir="bugs1612/prx" title="class reference in annotation value 3">
+<compile files="E.java" options="-1.5 -showWeaveInfo">
+<message kind="weave" text="Join point 'field-get(int E.i)' in Type 'E' (E.java:17) advised by before advice from 'X' (E.java:22)"/>
+</compile>
+<run class="E">
+</run>
+</ajc-test>
+
+<ajc-test dir="bugs1612/prx" title="annotation values not equal 2">
+<compile files="F.java" options="-1.5 -showWeaveInfo">
+<message kind="weave" text="Join point 'field-get(int F.i)' in Type 'F' (F.java:20) advised by before advice from 'X' (F.java:26)"/>
+<message kind="weave" text="Join point 'field-get(int F.j)' in Type 'F' (F.java:21) advised by before advice from 'X' (F.java:26)"/>
+</compile>
+<run class="F">
+</run>
+</ajc-test>
+
+
+<ajc-test dir="bugs1612/prx" title="class reference in annotation value - invalid typename">
+<compile files="G.java" options="-1.5 -showWeaveInfo">
+<message kind="weave" text="Join point 'field-get(int C.i)' in Type 'C' (C.java:17) advised by before advice from 'X' (C.java:22)"/>
+</compile>
+</ajc-test>
+
 <ajc-test dir="bugs1612/pr356612" title="annotation field binding optimization">
 <compile files="AnnoBinding.java" options="-1.5"/>
 <run class="AnnoBinding">