From 0fae66242efd3fd91dc7ace349cdcf7e5ebc2ade Mon Sep 17 00:00:00 2001
From: acolyer <acolyer>
Date: Mon, 3 Oct 2005 16:17:15 +0000
Subject: completes all of the MAP bar ITDs

---
 tests/src/org/aspectj/systemtest/ajc150/ajc150.xml |  2 +-
 .../ajc150/ataspectj/AtAjAnnotationGenTests.java   | 20 +++++++++++++++
 .../systemtest/ajc150/ataspectj/annotationgen.xml  | 29 ++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

(limited to 'tests/src')

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index c909bb204..b91a3714d 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2408,7 +2408,7 @@
     </ajc-test>
     
      <ajc-test dir="java5/annotations/declare" title="declare @type - covering enum and class element values - binary weaving">
-        <weave aspectsFiles="EnumAndClassValues.aj" classesFiles="FunkyAnnotations.java" options="-1.5" xlintfile="ignoreTypeNotExposed.properties"/>
+        <weave aspectsFiles="EnumAndClassValues.aj" classesFiles="FunkyAnnotations.java" options="-1.5 -Xdev:Pinpoint" xlintfile="ignoreTypeNotExposed.properties"/>
         <run class="FunkyAnnotations">
         	<stderr>
                <line text="advice running: Red"/>
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java
index ba6717b95..c3711841f 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java
@@ -130,5 +130,25 @@ public class AtAjAnnotationGenTests extends XMLBasedAjcTestCase {
 	public void testRuntimePointcutsReferencingCompiledPointcuts() {
 		runTest("runtime pointcut resolution referencing compiled pointcuts");
 	}
+	
+	public void testDecP() {
+		runTest("ann gen for decp");
+	}
+	
+	public void testDecPAdvanced() {
+		runTest("ann gen for decp 2");
+	}
+	
+	public void testDecS() {
+		runTest("ann gen for decs");
+	}
+	
+	public void testDecPrecedence() {
+		runTest("ann gen for dec precedence");
+	}
+
+	public void testDecAnnotation() {
+		runTest("ann gen for dec annotation");
+	}
 }
 
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
index aa87be080..3e74a541a 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml
@@ -148,5 +148,34 @@
         </compile>
         <run class="RuntimePointcuts" classpath="../lib/bcel/bcel.jar"/>
     </ajc-test>          
+
+   <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decp">
+        <compile files="DeclareParentsTest.aj" options="-1.5">
+        </compile>
+        <run class="DeclareParentsTest"/>
+    </ajc-test>          
+    
+      <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decp 2">
+        <compile files="DeclareParentsTestAdvanced.aj" options="-1.5">
+        </compile>
+        <run class="a.b.c.DeclareParentsTestAdvanced"/>
+    </ajc-test>
     
+    <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decs">
+        <compile files="DeclareSoftTest.aj" options="-1.5">
+        </compile>
+        <run class="DeclareSoftTest"/>
+    </ajc-test>     
+    
+    <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for dec precedence">
+        <compile files="DeclarePrecedenceTest.aj" options="-1.5">
+        </compile>
+        <run class="DeclarePrecedenceTest"/>
+    </ajc-test>     
+    
+     <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for dec annotation">
+        <compile files="DeclareAnnotationTest.aj" options="-1.5">
+        </compile>
+        <run class="DeclareAnnotationTest"/>
+    </ajc-test>  
 </suite>
\ No newline at end of file
-- 
cgit v1.2.3