347684: testcode

3 files changed, 80 insertions, 1 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc161/annotationFieldBinding.xml b/tests/src/org/aspectj/systemtest/ajc161/annotationFieldBinding.xml
index 00ff8a5f0..94b99951a 100644
--- a/tests/src/org/aspectj/systemtest/ajc161/annotationFieldBinding.xml
+++ b/tests/src/org/aspectj/systemtest/ajc161/annotationFieldBinding.xml
@@ -39,7 +39,7 @@
    
    <ajc-test dir="features161/optimizedAnnotationBinding" title="case five - not an enum - compiler limitation">
      <compile options="-1.5" files="CaseFive.java">
-       <message kind="error" line="20" text="The field within the annotation must be an enum or string. 'int' is not"/>
+       <message kind="error" line="20" text="The field within the annotation must be an enum, string or int. 'float' is not"/>
      </compile>
    </ajc-test>
    
diff --git a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
index eacd2b7ab..74f32e479 100644
--- a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
@@ -25,6 +25,30 @@ public class Ajc1612Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	// runTest("anno copying");
 	// }
 
+	public void testBindingInts_347684() {
+		runTest("binding ints");
+	}
+
+	public void testBindingInts_347684_2() {
+		runTest("binding ints - 2");
+	}
+
+	public void testBindingInts_347684_3() {
+		runTest("binding ints - 3");
+	}
+
+	public void testBindingInts_347684_4() {
+		runTest("binding ints - 4");
+	}
+
+	public void testBindingInts_347684_5() {
+		runTest("binding ints - 5");
+	}
+
+	public void testBindingInts_347684_6() {
+		runTest("binding ints - 6");
+	}
+
 	public void testIncorrectAnnos_345172() {
 		runTest("incorrect annos");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
index 2b296fa81..25b0cfff7 100644
--- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
@@ -2,6 +2,61 @@
 
 <suite>
 
+<ajc-test dir="bugs1612/pr347684" title="binding ints">
+<compile files="BindingInts.java" options="-1.5"/>
+<run class="BindingInts">
+  <stdout>
+  <line text="execution(void BindingInts.a()) 37"/>
+  </stdout>
+</run>
+</ajc-test>
+
+<ajc-test dir="bugs1612/pr347684" title="binding ints - 2">
+<compile files="BindingInts2.java" options="-1.5"/>
+<run class="BindingInts2">
+  <stdout>
+  <line text="execution(void BindingInts2.a()) 99"/>
+  </stdout>
+</run>
+</ajc-test>
+
+<ajc-test dir="bugs1612/pr347684" title="binding ints - 3">
+<compile files="BindingInts3.java" options="-1.5"/>
+<run class="BindingInts3">
+  <stdout>
+  <line text="execution(void BindingInts3.a()) abc"/>
+  </stdout>
+</run>
+</ajc-test>
+
+<ajc-test dir="bugs1612/pr347684" title="binding ints - 4">
+<compile files="BindingInts4.java" options="-1.5"/>
+<run class="BindingInts4">
+  <stdout>
+  <line text="execution(void BindingInts4.a()) 37 48"/>
+  </stdout>
+</run>
+</ajc-test>
+
+<ajc-test dir="bugs1612/pr347684" title="binding ints - 5">
+<compile files="BindingInts5.java" options="-1.5"/>
+<run class="BindingInts5">
+  <stdout>
+  <line text="execution(void BindingInts5.a()) 37"/>
+  </stdout>
+</run>
+</ajc-test>
+
+
+<ajc-test dir="bugs1612/pr347684" title="binding ints - 6">
+<compile files="BindingInts6.java" options="-1.5"/>
+<run class="BindingInts6">
+  <stdout>
+  <line text="execution(void BindingInts6.a()) 37 1 99"/>
+  </stdout>
+</run>
+</ajc-test>
+
 <ajc-test dir="bugs1612/pr345515" title="anno copying">
 <compile files="Code.java" options="-1.5"/>
 <run class="Code"></run>