77166 - newarray joinpoint support. "-Xjoinpoints:arrayconstruction"

2 files changed, 20 insertions, 18 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java b/tests/src/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java
index fb46d3b8f..dbd0be4da 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java
@@ -28,15 +28,12 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
  * The changes to expose the new joinpoint are in:
  *   BcelClassWeaver.match(LazyMethodGen mg,InstructionHandle ih,BcelShadow enclosingShadow,List shadowAccumulator)
  *   
- * Determining the type of the array is easy.  Determining the size of the array is not easily statically, it is on the stack.
+ * Determining the type of the array is easy.  Determining the size of the array is not easy statically, it is on the stack.
  * 
  * 
- * to think about:
+ * What still needs testing:
+ * - structure model
  * 
- * args
- * thisJoinPoint - does anything need to manifest in it?
- * wildcards in declaringtype 'Integer*' matches 'Integer[]' ?
- * what is the signature of the joinpoint - are its modifiers simply 'public' ?
  */ 
 
 
@@ -62,6 +59,7 @@ public class NewarrayJoinpointTests extends XMLBasedAjcTestCase {
   public void testUsingTargetAndAfterReturningAdvice() { runTest("using target and after returning");}
   public void testUsingItForReal() { runTest("using it for real");}
   public void testDifferentiatingArrayTypes() { runTest("differentiating array types");}
+  public void testStructureModel() { runTest("structure model");}
 
   //
   public static Test suite() {
diff --git a/tests/src/org/aspectj/systemtest/ajc151/newarray_joinpoint.xml b/tests/src/org/aspectj/systemtest/ajc151/newarray_joinpoint.xml
index 39fa37225..fedc67322 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/newarray_joinpoint.xml
+++ b/tests/src/org/aspectj/systemtest/ajc151/newarray_joinpoint.xml
@@ -4,7 +4,7 @@
 <suite>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="basics">
-        <compile files="One.java" options="-1.5 -showWeaveInfo">
+        <compile files="One.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
           <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'One' (One.java:4) advised by before advice from 'X' (One.java:9)"/>
         </compile>
         <run class="One">
@@ -16,7 +16,7 @@
     
     
     <ajc-test dir="features151/newarrayjoinpoint" title="basics - 2">
-        <compile files="Two.java" options="-1.5 -showWeaveInfo">
+        <compile files="Two.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
           <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Two' (Two.java:4) advised by before advice from 'X' (Two.java:9)"/>
         </compile>
         <run class="Two">
@@ -27,7 +27,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="shouldnt match">
-        <compile files="Three.java" options="-1.5 -showWeaveInfo">
+        <compile files="Three.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
           <message kind="warning" line="9" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
           <message kind="warning" line="10" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
           <message kind="warning" line="11" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
@@ -36,7 +36,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="thisjoinpoint">
-        <compile files="Four.java" options="-1.5 -showWeaveInfo">
+        <compile files="Four.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
           <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Four' (Four.java:4) advised by before advice from 'X' (Four.java:10)"/>
 		  <message kind="weave" text="Join point 'constructor-call(void Foo.&lt;init&gt;(int))' in Type 'Four' (Four.java:5) advised by before advice from 'X' (Four.java:13)"/>
         </compile>
@@ -49,7 +49,7 @@
     </ajc-test>
     
      <ajc-test dir="features151/newarrayjoinpoint" title="different advice kinds">
-        <compile files="Five.java" options="-1.5 -showWeaveInfo">
+        <compile files="Five.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
           <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Five' (Five.java:4) advised by around advice from 'Z' (Five.java:16)"/>
 		  <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Five' (Five.java:4) advised by after advice from 'Y' (Five.java:12)"/>
 		  <message kind="weave" text="Join point 'constructor-call(void java.lang.Integer[].&lt;init&gt;(int))' in Type 'Five' (Five.java:4) advised by afterReturning advice from 'Y' (Five.java:13)"/>
@@ -66,7 +66,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="args">
-        <compile files="Six.java" options="-1.5"/>
+        <compile files="Six.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
         <run class="Six">
           <stderr>
              <line text="Array size = 5"/>
@@ -75,7 +75,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="basic primitive array creation">
-        <compile files="Seven.java" options="-1.5"/>
+        <compile files="Seven.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
         <run class="Seven">
           <stderr>
              <line text="advice running"/>
@@ -84,7 +84,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="multi dimensional array creation">
-        <compile files="Eight.java" options="-1.5"/>
+        <compile files="Eight.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
         <run class="Eight">
           <stderr>
              <line text="advice running 2"/>
@@ -94,7 +94,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="multi dimensional array args">
-        <compile files="Nine.java" options="-1.5"/>
+        <compile files="Nine.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
         <run class="Nine">
           <stderr>
              <line text="advice running 2 (5,6)"/>
@@ -104,7 +104,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="using target and after returning">
-        <compile files="Ten.java" options="-1.5 -showWeaveInfo">
+        <compile files="Ten.java" options="-1.5 -showWeaveInfo -Xjoinpoints:arrayconstruction">
           <message kind="warning" line="13" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
           <message kind="warning" line="17" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
           <message kind="weave" text="Join point 'constructor-call(void Ten.&lt;init&gt;())' in Type 'Ten' (Ten.java:4) advised by afterReturning advice from 'X' (Ten.java:21)"/>
@@ -119,7 +119,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="using it for real">
-        <compile files="Eleven.java" options="-1.5">
+        <compile files="Eleven.java" options="-1.5 -Xjoinpoints:arrayconstruction">
           <!--message kind="weave" text="Join point 'constructor-call(void Ten.&lt;init&gt;())' in Type 'Ten' (Ten.java:4) advised by afterReturning advice from 'X' (Ten.java:21)"/>
           <message kind="weave" text="Join point 'constructor-call(void int[].&lt;init&gt;(int))' in Type 'Ten' (Ten.java:5) advised by afterReturning advice from 'X' (Ten.java:21)"/-->
         </compile>
@@ -131,7 +131,7 @@
     </ajc-test>
     
     <ajc-test dir="features151/newarrayjoinpoint" title="differentiating array types">
-        <compile files="Twelve.java" options="-1.5"/>
+        <compile files="Twelve.java" options="-1.5 -Xjoinpoints:arrayconstruction"/>
         <run class="Twelve">
           <stderr>
              <line text="It is class [I"/>
@@ -149,5 +149,9 @@
           </stderr>
         </run>
     </ajc-test>
+    
+    <ajc-test dir="features151/newarrayjoinpoint" title="structure model">
+        <compile files="Five.java" options="-1.5 -emacssym -Xjoinpoints:arrayconstruction"/>
+    </ajc-test>
 
 </suite>
\ No newline at end of file