266564: annotation style inline problem for double slot var types

4 files changed, 62 insertions, 0 deletions

diff --git a/tests/bugs164/pr266564/AA.java b/tests/bugs164/pr266564/AA.java
new file mode 100644
index 000000000..6a3237bdf
--- /dev/null
+++ b/tests/bugs164/pr266564/AA.java
@@ -0,0 +1,25 @@
+package business;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+
+public class AA {
+
+        public void foo(long docId, String userid) {
+        }
+
+        public static void main(String[] args) {
+                new AA().foo(12, "hello");
+        }
+}
+
+@Aspect
+class Asp {
+
+        @Around("execution(* foo(..))")
+        public Object around(ProceedingJoinPoint pjp) {
+                return pjp.proceed();
+        }
+}
+
diff --git a/tests/bugs164/pr266564/CC.java b/tests/bugs164/pr266564/CC.java
new file mode 100644
index 000000000..69ec05b22
--- /dev/null
+++ b/tests/bugs164/pr266564/CC.java
@@ -0,0 +1,19 @@
+package business;
+
+public class CC {
+
+        public void foo(long docId, String userid) {
+        }
+
+        public static void main(String[] args) {
+                new CC().foo(12, "hello");
+        }
+}
+
+aspect Asp {
+
+        Object around(): execution(* foo(..)) {
+                return proceed();
+        }
+}
+
diff --git a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
index d2971ab9e..b70a06f18 100644
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -34,6 +34,14 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+	public void testAnnoStyleLong_pr266564() {
+		runTest("annotation style long");
+	}
+
+	public void testAnnoStyleLong_pr266564_2() {
+		runTest("annotation style long - 2");
+	}
+
 	public void testUnusedPrivateWarning_pr266420() {
 		runTest("unused private warning");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
index 12b61f240..1e22bcad7 100644
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -2,6 +2,16 @@
 
 <suite>
    
+   <ajc-test dir="bugs164/pr266564" title="annotation style long">
+     <compile files="AA.java" options="-1.5"/>
+     <run class="business.AA"/>
+   </ajc-test>
+   
+   <ajc-test dir="bugs164/pr266564" title="annotation style long - 2">
+     <compile files="CC.java" options="-1.5"/>
+     <run class="business.CC"/>
+   </ajc-test>
+   
    <ajc-test dir="bugs164/pr266420" title="unused private warning">
      <compile files="A.java" options="-1.5 -warn:unusedPrivate"/>
    </ajc-test>