From 3875260e02d5ac312c35ff034d7b75407b52820c Mon Sep 17 00:00:00 2001
From: Andy Clement <andrew.clement@gmail.com>
Date: Thu, 16 Aug 2012 11:05:05 -0700
Subject: [PATCH] testcode 356594

---
 tests/bugs171/pr356594/Code.aj                |  14 +++++++
 tests/bugs171/pr384398_2/A$InnerA.class       | Bin 0 -> 382 bytes
 tests/bugs171/pr384398_2/A.class              | Bin 0 -> 319 bytes
 tests/bugs171/pr384398_2/B.class              | Bin 0 -> 636 bytes
 .../org/aspectj/systemtest/AllTests17.java    |   2 +
 .../systemtest/ajc171/Ajc171Tests.java        |  39 ++++++++++++++++++
 .../systemtest/ajc171/AllTestsAspectJ171.java |  25 +++++++++++
 .../org/aspectj/systemtest/ajc171/ajc171.xml  |  12 ++++++
 8 files changed, 92 insertions(+)
 create mode 100644 tests/bugs171/pr356594/Code.aj
 create mode 100644 tests/bugs171/pr384398_2/A$InnerA.class
 create mode 100644 tests/bugs171/pr384398_2/A.class
 create mode 100644 tests/bugs171/pr384398_2/B.class
 create mode 100644 tests/src/org/aspectj/systemtest/ajc171/Ajc171Tests.java
 create mode 100644 tests/src/org/aspectj/systemtest/ajc171/AllTestsAspectJ171.java
 create mode 100644 tests/src/org/aspectj/systemtest/ajc171/ajc171.xml

diff --git a/tests/bugs171/pr356594/Code.aj b/tests/bugs171/pr356594/Code.aj
new file mode 100644
index 000000000..4dd38ea21
--- /dev/null
+++ b/tests/bugs171/pr356594/Code.aj
@@ -0,0 +1,14 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface Foo {}
+@Retention(RetentionPolicy.RUNTIME)
+@interface Bar {}
+
+class C {
+}
+
+aspect X {
+declare @type: C: @Foo @Bar;
+}
+
diff --git a/tests/bugs171/pr384398_2/A$InnerA.class b/tests/bugs171/pr384398_2/A$InnerA.class
new file mode 100644
index 0000000000000000000000000000000000000000..64909196075bfadb8c2f34454048bbdc53db6dff
GIT binary patch
literal 382
zcmZ8dO-sW-5Pg%x#H6uJTfc8g54D03uZj=~f)Mo3;C<6BbxWE`KE%J}K?D!}0DqJ?
z8xX22JM(7d?VH*8`u_L?aDhV?Cb}Lh^c-wE*dv%i2tqGjh-VRIBA<u%=|WDcOM*L5
z^ITMQA(@sWoUyA%RSwPx?RX|b`68B2nG7Rcxl*~Rt_j`Y-_pqg!5Xh-tkH>8F7N7P
zDvLy<8E3r7sxGGTM(Mzg&h!vITzEcO*mrP1=&v^#+~&C~BIf=AzX9V+l%*^Q!T)dY
z<U>7zzb=C#UW3IOG5Bu42El2f%^=X-855rte70L09WzsNz0v6#X!H)_wc)hc>epa3
S10D7T0_?K)IBTMh9ncSz_(}x;

literal 0
HcmV?d00001

diff --git a/tests/bugs171/pr384398_2/A.class b/tests/bugs171/pr384398_2/A.class
new file mode 100644
index 0000000000000000000000000000000000000000..8a42b52b915dadf68a09608fc555188c1b493e0a
GIT binary patch
literal 319
zcmZWk%Sr=55UkE7yJlTYG+z+#5IwlyQ9~dE1R>}l!TW5|gbAC8>_hx5Pl5+Oz>gAZ
z$BXDR^i)?@H(j4!?;ilJFo+SL7oi{FB*Lj6ymL;AsUY!SmYcHFlKj{@TTKMP==@R8
zp6%Bv=*_Lu`+ApYu{2purn|5kXR5j&9*vjR^R0O{X>QymeaN=Ds%|F#DM7s0*TqV2
zZL=esUN%z+A{_9LwWj)Fc2BvcysQ6rp<wV^arR>XL$qkEdBWf(<}RzDuYu0R8|2lu
cW9FE0aG=cya7f%jf+PPQBlHT|Cfk9015Lm|5&!@I

literal 0
HcmV?d00001

diff --git a/tests/bugs171/pr384398_2/B.class b/tests/bugs171/pr384398_2/B.class
new file mode 100644
index 0000000000000000000000000000000000000000..3296bd3513ea24565dff8389f0af1bbde3b3775f
GIT binary patch
literal 636
zcmZuv-AV#M6#mB5U7fbnEbY%q=|U3}yj27hf?&%F!|-y|L05E*b&VdYZWI!FfF3G3
zyV<JI%{gZd=lhvC^ZE7u0icL9hYxWD2?a+S$2j4TaLS?JOhJ-CE*qv{R~V#Bw#DGD
zPkMqOtQn@bpN%`hdeA!~>hS4gEbfFonDhvAYnsBUGN^7*AL-Mnm@*_XS*<4u;zb`n
zjYOe(^)pvu2sMqqsoOJ)sB(X%%GywW)(a!u>=&B0Wtja^CGR1_j&Q>s2<ulpy`}LV
zngn@sGPAnk#&FEbwY(#tB8U)~-n7UN+dQruD>zqiflCLGQlTQe4XZIk)}|Ysq3GHS
z!M?EFw;)ow<9fhtlBsBB%X%r>LW(xwqfLR<LJSB|<aA0>W|RZh3$QmT7<MSiZd0O)
zJQ2_tEyC|o#Fy~3X<A!CYUkQ>_#YPtyn0yYClDct$cRwoLzLpa$Fr84LtevvB)JEX
UR#glKF3BPGD04C<5#=t}H<NUJNB{r;

literal 0
HcmV?d00001

diff --git a/tests/src/org/aspectj/systemtest/AllTests17.java b/tests/src/org/aspectj/systemtest/AllTests17.java
index f026ae59a..37a02c350 100644
--- a/tests/src/org/aspectj/systemtest/AllTests17.java
+++ b/tests/src/org/aspectj/systemtest/AllTests17.java
@@ -7,12 +7,14 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.aspectj.systemtest.ajc170.AllTestsAspectJ170;
+import org.aspectj.systemtest.ajc171.AllTestsAspectJ171;
 
 public class AllTests17 {
 
 	public static Test suite() {
 		TestSuite suite = new TestSuite("AspectJ System Test Suite - JDK 1.7");
 		// $JUnit-BEGIN$
+		suite.addTest(AllTestsAspectJ171.suite());
 		suite.addTest(AllTestsAspectJ170.suite());
 		suite.addTest(AllTests16.suite());
 		suite.addTest(AllTests15.suite());
diff --git a/tests/src/org/aspectj/systemtest/ajc171/Ajc171Tests.java b/tests/src/org/aspectj/systemtest/ajc171/Ajc171Tests.java
new file mode 100644
index 000000000..344a11ea3
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc171/Ajc171Tests.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2008-2012 Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Andy Clement - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.systemtest.ajc171;
+
+import java.io.File;
+
+import junit.framework.Test;
+
+import org.aspectj.testing.XMLBasedAjcTestCase;
+
+/**
+ * @author Andy Clement
+ */ 
+public class Ajc171Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+	
+//	public void testMultipleAnnos_356594() {
+//		runTest("multiple annos 1");
+//	}
+	
+	// ---
+
+	public static Test suite() {
+		return XMLBasedAjcTestCase.loadSuite(Ajc171Tests.class);
+	}
+
+	@Override
+	protected File getSpecFile() {
+		return new File("../tests/src/org/aspectj/systemtest/ajc171/ajc171.xml");
+	}
+
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc171/AllTestsAspectJ171.java b/tests/src/org/aspectj/systemtest/ajc171/AllTestsAspectJ171.java
new file mode 100644
index 000000000..78e321b84
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc171/AllTestsAspectJ171.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Andy Clement - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.systemtest.ajc171;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTestsAspectJ171 {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("AspectJ 1.7.1 tests");
+		// $JUnit-BEGIN$
+		suite.addTest(Ajc171Tests.suite());
+		// $JUnit-END$
+		return suite;
+	}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc171/ajc171.xml b/tests/src/org/aspectj/systemtest/ajc171/ajc171.xml
new file mode 100644
index 000000000..981820a62
--- /dev/null
+++ b/tests/src/org/aspectj/systemtest/ajc171/ajc171.xml
@@ -0,0 +1,12 @@
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
+
+<suite>
+
+	<ajc-test dir="bugs171/pr356594" title="multiple annos 1">
+		<compile files="Code.aj" options="-1.5 -showWeaveInfo">
+			<message kind="weave" text="'C' (Code.aj:8) is annotated with @Bar type annotation from 'X' (Code.aj:12)"/>
+			<message kind="weave" text="'C' (Code.aj:8) is annotated with @Foo type annotation from 'X' (Code.aj:12)"/>
+		</compile>
+	</ajc-test>
+   
+</suite>
-- 
2.39.5