tests and fix for pr114332 - reflection api not detecting abstract itdms.

4 files changed, 65 insertions, 0 deletions

diff --git a/tests/java5/reflection/Billing.aj b/tests/java5/reflection/Billing.aj
new file mode 100644
index 000000000..0c9923ea4
--- /dev/null
+++ b/tests/java5/reflection/Billing.aj
@@ -0,0 +1,29 @@
+public aspect Billing {
+
+	public Customer Connection.payer;
+    
+	/**
+     * Connections give the appropriate call rate
+     */
+    public abstract long Connection.callRate();
+
+    public long LongDistance.callRate() { return 1; }
+    public long Local.callRate() { return 2; }
+
+    /**
+     * Customers have a bill paying aspect with state
+     */
+    public long Customer.totalCharge = 0;
+
+    public void Customer.addCharge(long charge){
+        totalCharge += charge;
+    }
+}
+
+class Customer {}
+
+abstract class Connection {}
+
+class LongDistance extends Connection {}
+
+class Local extends Connection {}
diff --git a/tests/java5/reflection/ReflectBilling.java b/tests/java5/reflection/ReflectBilling.java
new file mode 100644
index 000000000..c93292cb1
--- /dev/null
+++ b/tests/java5/reflection/ReflectBilling.java
@@ -0,0 +1,18 @@
+import org.aspectj.lang.reflect.*;
+
+public class ReflectBilling {
+	
+	public static void main(String[] args) {
+		AjType<Billing> billingType = AjTypeSystem.getAjType(Billing.class);
+		InterTypeMethodDeclaration[] itdms = billingType.getDeclaredITDMethods();
+		for(InterTypeMethodDeclaration itdm : itdms) { 
+			System.out.println(itdm); 
+		}
+		InterTypeFieldDeclaration[] itdfs = billingType.getDeclaredITDFields();
+		for(InterTypeFieldDeclaration itdf : itdfs) { 
+			System.out.println(itdf); 
+		}	
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index ff1f25e62..a0cf54cff 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -721,6 +721,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testPointcutParsingOfCompiledPointcuts() {
 	  runTest("pointcut parsing with ajc compiled pointcut references");
   }
+  
+  public void testReflectionOfAbstractITDs() {
+	  runTest("reflection on abstract ITDs (Billing example)");
+  }
 
   /*
    * Load-time weaving bugs
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index ec3a692c8..7920840f4 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -66,6 +66,20 @@
 		<compile files="PointcutLibrary.aj,ReflectOnAjcCompiledPointcuts.java" options="-1.5"></compile>
 		<run class="ReflectOnAjcCompiledPointcuts" classpath="../lib/bcel/bcel.jar"/>
 	</ajc-test>
+	
+	<ajc-test dir="java5/reflection" pr="114322" title="reflection on abstract ITDs (Billing example)">
+		<compile files="ReflectBilling.java,Billing.aj" options="-1.5"/>
+		<run class="ReflectBilling">
+			<stdout>
+				<line text="public abstract long Connection.callRate()"/>
+				<line text="public long LongDistance.callRate()"/>
+				<line text="public long Local.callRate()"/>
+				<line text="public void Customer.addCharge(long)"/>
+				<line text="public Customer Connection.payer"/>
+				<line text="public long Customer.totalCharge"/>
+			</stdout>
+		</run>
+	</ajc-test>
 	    
     <ajc-test dir="bugs150/pr114436" title="ClassFormatError binary weaving perthis">
      <compile files="SimpleTrace.aj,ConcreteSimpleTracing.aj" outjar="aspects.jar"/>