testcode 356594

diff --git a/tests/bugs171/pr356594/Code.aj b/tests/bugs171/pr356594/Code.aj
new file mode 100644 (file)
index 0000000..4dd38ea
--- /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 (file)
index 0000000..6490919
Binary files /dev/null and b/tests/bugs171/pr384398_2/A$InnerA.class differ

diff --git a/tests/bugs171/pr384398_2/A.class b/tests/bugs171/pr384398_2/A.class
new file mode 100644 (file)
index 0000000..8a42b52
Binary files /dev/null and b/tests/bugs171/pr384398_2/A.class differ

diff --git a/tests/bugs171/pr384398_2/B.class b/tests/bugs171/pr384398_2/B.class
new file mode 100644 (file)
index 0000000..3296bd3
Binary files /dev/null and b/tests/bugs171/pr384398_2/B.class differ

diff --git a/tests/src/org/aspectj/systemtest/AllTests17.java b/tests/src/org/aspectj/systemtest/AllTests17.java
index f026ae59a4675c527ca40282b6c798dd4d68e3b8..37a02c3503f6e433fd1af117c7417b895dda29c2 100644 (file)
--- 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 (file)
index 0000000..344a11e
--- /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 (file)
index 0000000..78e321b
--- /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 (file)
index 0000000..981820a
--- /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>