From 9380b983d27b392777788c754cfdc27691d52032 Mon Sep 17 00:00:00 2001
From: acolyer <acolyer>
Date: Fri, 10 Dec 2004 11:26:37 +0000
Subject: [PATCH] testing for @args

---
 .../java5/annotations/args/AtArgsAspect.java  | 125 ++++++++++++++++++
 .../args/TestingArgsAnnotations.jar           | Bin 0 -> 4228 bytes
 .../args/TestingArgsAnnotations.java          |  84 ++++++++++++
 .../ajc150/AnnotationRuntimeTests.java        |   8 +-
 4 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 tests/java5/annotations/args/AtArgsAspect.java
 create mode 100644 tests/java5/annotations/args/TestingArgsAnnotations.jar
 create mode 100644 tests/java5/annotations/args/TestingArgsAnnotations.java

diff --git a/tests/java5/annotations/args/AtArgsAspect.java b/tests/java5/annotations/args/AtArgsAspect.java
new file mode 100644
index 000000000..5a5c8a4f7
--- /dev/null
+++ b/tests/java5/annotations/args/AtArgsAspect.java
@@ -0,0 +1,125 @@
+public aspect AtArgsAspect {
+	
+	
+	pointcut myMethod() : execution(* myMethod(..));
+		
+	// Exact number of args
+	// test 0
+	before() : myMethod() && @args(*,*,*,*,*) {
+		System.out.print("@args(*,*,*,*,*): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(*,*,*,*,*) {
+		System.out.print("@args(*,*,*,*,*): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	
+	// One too few
+	// test 1
+	before() : myMethod() && @args(*,*,*,*) {
+		System.out.print("@args(*,*,*,*): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(*,*,*,*) {
+		System.out.print("@args(*,*,*,*): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	
+	// One too many
+	// test 2
+	before() : myMethod() && @args(*,*,*,*,*,*) {
+		System.out.print("@args(*,*,*,*,*,*): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(*,*,*,*,*,*) {
+		System.out.print("@args(*,*,*,*,*,*): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+
+	// Exact number of args + ellipsis
+	// test 3
+	before() : myMethod() && @args(*,*,..,*,*,*) {
+		System.out.print("@args(*,*,..,*,*,*): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(*,*,..,*,*,*) {
+		System.out.print("@args(*,*,..,*,*,*): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+
+	// Too few + ellipsis
+	// test 4
+	before() : myMethod() && @args(*,*,*,..) {
+		System.out.print("@args(*,*,*,..): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(*,*,*,..) {
+		System.out.print("@args(*,*,*,..): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	
+	// Now we get to test some annotations!
+	
+	// Non-inherited 
+	// test 5
+	before() : myMethod() && @args(@MyAnnotation,..) {
+		System.out.print("@args(@MyAnnotation,..): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(@MyAnnotation,..) {
+		System.out.print("@args(@MyAnnotation,..): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+
+	// test 6
+	before() : myMethod() && @args(@MyAnnotation,*,*,@MyAnnotation,*) {
+		System.out.print("@args(@MyAnnotation,*,*,@MyAnnotation,*): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(@MyAnnotation,*,*,@MyAnnotation,*) {
+		System.out.print("@args(@MyAnnotation,*,*,@MyAnnotation,*): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+
+	// test 7
+	before() : myMethod() && @args(@MyAnnotation,*,*,@MyAnnotation,@MyAnnotation) {
+		System.out.print("@args(@MyAnnotation,*,*,@MyAnnotation,@MyAnnotation): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(@MyAnnotation,*,*,@MyAnnotation,@MyAnnotation) {
+		System.out.print("@args(@MyAnnotation,*,*,@MyAnnotation,@MyAnnotation): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	
+	// Inherited
+	// test 8
+	before() : myMethod() && @args(..,@MyInheritableAnnotation,*) {
+		System.out.print("@args(..,@MyInheritableAnnotation,*): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(..,@MyInheritableAnnotation,*) {
+		System.out.print("@args(..,@MyInheritableAnnotation,*): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+
+	// test 9
+	before() : myMethod() && @args(..,@MyInheritableAnnotation,@MyInheritableAnnotation) {
+		System.out.print("@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation) {
+		System.out.print("@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+
+	// test 10
+	before() : myMethod() && @args(..,@MyInheritableAnnotation,@MyInheritableAnnotation,@MyInheritableAnnotation) {
+		System.out.print("@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation,@MyInheritableAnnotation): ");
+		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+	before() : myMethod() && !@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation,@MyInheritableAnnotation) {
+		System.out.print("@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation,@MyInheritableAnnotation): ");
+		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
+	}
+
+}
\ No newline at end of file
diff --git a/tests/java5/annotations/args/TestingArgsAnnotations.jar b/tests/java5/annotations/args/TestingArgsAnnotations.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8068f1f459a7e0a1868111afcad22920d1744a46
GIT binary patch
literal 4228
zcma)92UJtp77Z;FDWRjGh9*S<f^<+?C?S9}m7+rEW`YJnlOiP|9RX1g3t&M75f~L|
zLZnFxC?Fsu218Z)06IZ_qI^NtALpO9-dZoo-8XOVd(S;*+rSwZ`2Z}`3u%$40@x9(
z07d}9#NOb5xfKlhtqlNR0NB8pS!g5Zw}#pLBbbjm;wKnkU}X+7v9nh~z?Kmm?UwKZ
zN<AF#1M*!RgbG{bUR5F)qhx_lG)MGcA2PCDo7p=hAg$oTcy&T<-AhK0EO<=d>YWJz
zg^&s9S>GkhB8Kk!i_m|YPcWta4ej235!+oXn5n-SC?Qd90Rf(AoffZbKsdq*G}rNc
zNfFW3_4x1<9ugNLZjXCb`O-H&1b$F3%%4p^TcH8RMKnst6qnajJ{&%I_O!nK*eG2d
z5>%LQgQc4LYg|`rBFDS9iN)8F`G<nwGApu<>vf8@CkcpLg=wXc4u0XA#U61X6K#LR
z_@ksh69$=^UTZHWT-qaZT=pBvQytdlE7u?pt^l4b@!BW@amoY}#)m@=lk068PJMY8
zFEGSt!4fNvx(0rIk!w0pkj~U+O3dNVpM5M5uu`LuJJk_i*}{5aLDQdl7Yrx+)3BwE
zi(^3#a^7Px$#WW?=}yrWig}&8VwTF@i0<F?G2GH8wbKtz)5k|mebHaRWU3r1QTdpy
zjA-F%f9_Uql9lfq?&Cco@&%8}3f)(myFb;rHumx@*9E#E(Keq-pDG{jherLVmbj(m
z_FQ63P735tui`#PlH`?Q{1p7sOBFb;LN&5hIs~36E#}wuVx`jd0l%=+d$sPNf$s7i
z-%V8tC+m$hOXt+ST)XT$V1|6H>+_|=r<~0E^oTnQy7^LR6Al>yOiLv$u7gt5Z**cf
zF(8+mK6*~iex-h^eA1|TMn^nkFgEHQmMBIOLM_YJwU;V{)V~U0^g{@d6oWl6M?knS
zAHSTVYb@H1@df9NA%Th7QX|KlJ(?W5pKkWaO?7iknVKLOmg_?OffLISwRFWQ3vRF0
zy4OIU;gmORDArX}q(orBl056H*f&c9!#pRNAaa_E1W&uWm{KRzRL?)My72Okj7s2=
z$@19RjwV;esd@<;W1**!4lFlHtjv|{V&xPgM+MF;OS~of;!(Wbi;Q~T&ZPBi#Ow4c
zy)~R?rm;&c^dUW<vTLH=zfS|>t!1`GzzvV`<&D34bpOEt>6q+kh>t5HiJ7Gz(zJ01
z8deYttqDHWP4MHdTwq==ELc2%pQ_hV?O<o{-mD#=t85BQKA6kx#61)<RIAOw6|;m5
zmMCJUw6QtaVOQm>v(;~0CxfqiZ6k!czk-c8fe7I@>juh1i<4e-(vu^ry1sUOIUN&r
zb)+UYSaM2tQpv|%Fjww+D*ej6G%?=iWe<SME!Dhg(;}=K_BQ;j={oiN7U3jiX(f>b
z-g0;W=us`SRW?DKRKib6U;C&rB<Dg&OBo1tQfn#VMV12>+1Kf4vVaS3+#*pWG5*&@
zH`$WKs+tXd1eABE*@x$;0JmbF;S)iL^&<u-o=?_#E5`HUS{qP>20Yh7VdEiO${wAH
z4)*H5!w%mB0E@ny1%<Ha*|Xlwf76!AVs*b-hOfm-mi4c@Z!lObe~;Wtoe5V?d%Fi@
zuijp{No<+OK$9&aO1vPd?U<~&3bQjvoCC~zqp&g&WKzkPi?Qy8Mf*oRs_*1nr@QIY
z(fDa~?lzc<F|8~sDWG`?I@Ib)X%R@i5?-<So#})Tw&5w2DJ|Fkc?0lJe?^2Epwa$;
zZh^l3=pUqUh!-@{5#vus2NH3P*}yXjdzc!MLRQWQ;oGX{D!3_!_8hKH<IxakHatu0
zWLKRJ(e)1o7^yM&(PN{5`Be!S0rhrwbGipHs4J{3lggrC-V?qK9;Ak&C#CW~%Qipc
zop&ha%zeocH>yhxamww^ycIuL;hBk+G+cyWNrqpeie}9o5oZ|jV+WpBG{xDRa;Z==
zR8T!Gk}7=MaP7Xg%nU<Zo{^|8*(PKSVu4m4cGb+<%WwbvgbQ$V`BX*aCHvbo7XQxN
zh*kk?Jp(<_H1@l7(D}>%ojwo<Gy+-$0o8+mK|w%H81ONX@}}UU{qv4Idl+y!y_b~H
zQ4`owu;SiQQ$xvU%;=!hxYrgpmK(!>a$^>gd5t8}?cR)D-E>AnR>@d^SxTgp`^l=h
zC|gHA4D}0L!~NWkZN>7<Q=+3UN3&ka*?Z)|<!C0egDOwxzgINa7;t|K^=*r&_dl<s
z$ag;GXdh3EZ=jny%5ygvoYjj&dIM0z=f20!FSi2s?bQ|n?=2QDs!lc?O>G)@vs!PN
zMl9XCP8XRqP|;cy<8I(uQ#cc@brY~+L*9QbOG};|cLEeI%5fKRk)UM)^NRv~?Kv`A
z&mzenf_?4|70N{yrwsSl!Z3HI#G>={tTa=3hJqW#h?O2@vUay5ss-hrnQHqN9gfZz
zZD6aczSd=$S$cI&vNqplpOZ5NiK#3hebBf#<ob8*P=>dVllAAh0?zvM@*EhCoJZst
z0j>A5K_r28UVWP*+?DjSWKL=hdeKFted4zZEleF@?->y2i}p6acn56D67XZQm)Ii$
zz$Tyw<Y&KQv(k<p?WvS#5wp`9B5wN9vf}UAG*7fk2;}pfI{x0d>)xF!a3=!{F;9oW
zp`__x!FHF(9u=?CbOzo)Ha0)X<a}r&EG+CKA#m-JSk%Un!Ue^;XA3grtTplcd*;U(
zc*WQvJxJq>_ZAW^<we)v7|UfGnMxBYy-0QqgvQ#_r#tbX9vsEaLIT52(ghTqgm`Pv
z60yZ5RRoi8x6^OyIhfu?o&7j(`Yjq?Kj+G%$HGNnX7jU?sM{B35QvbN=omfP-9O7*
zhffE`MLuwNzYO;DFSUR_oHlI|?aUVZJhpsY3KKNnrZgvA;<y}R<JLQfoj*So*6sk+
zbs0_AXAp8t5L&T%wmogGFElx8TwrO=Y1EZa4Gw)i;CgDLbd?kNxz{-*VlzxUU$!k$
z6=I%$Za^{4O>e2-wy645sY@x(&%LfkfR&!HXQ5Ez88NO)FRx$zL-o0H{s3Ce@>Ilz
zH*%k<x)SLCu1pa6q@V2}b7br>eYdBJ(&(fCH;aJ0?8Pf7Iy^9b&3?^(Ep^RA^-&xW
zNta}4wOPGi%32aVKjNKBxE3U;F8Q+A_?@$hS@1Hr_p1LQiraeX{L>ozS+R<kb5a%Z
z3YkG)1!d+$M7~J0mk$s=NZUaL*)^w8b?Cw58P`nwrR8!-y_L)gl}WpBNIgJNj{XpQ
z=18)UIZh55pl)Js95Kh*OR(n~oz_Y~n-`patYI$GKaFJnle^H;_m8QVbEILUP+5zz
zwRy8SgHV=C*J4jf23j~)_iE>$n%DV8joSuw(ze+2BHidK`%tg+FAg??9|YLH7xI$~
zWsiN9xXSUWn6hFmoW#s<F{E88bW(YY>=0!*DLm7{*_EkA4pO!h9-I+J2p_;I!)nss
zYPZ_#B~0t3xlq1jEQY_f<kWvFuTtXD<4#WO;=YeQd#yL~9QQ?*%zGY&ar_F0n;I#2
zcUb$BwaOPi;9|CU)J5E8M|#5Mp2TA(jb=|uA}L~g6Rb_XnOW=OOt1lnZ?-?5;QDy2
znO2MAi3UbTl?2Fj^7-sFZt%K>`uu!lai#O%*<PSmpZY|fq+*fSlh&B!((W_G$!gDx
z!^+A^m51NtXo%m6d=^ptcprJ`wNcfQ1}#HHG)u;hGXMZlz@10e(a3~fEQK^RL;c)>
z+@L5ov^Ui4XEB0q=jv8nvTpFB)ulp}9<|(VvHhbcu8TJnn7DOutG7SaB_us=bT!l1
zD7_gcN&y_U$h+g7dLz1}Mq{3%<IB={`h~<+Q$ZsxNiK<o8*(L|bn<mVtysJ8C@Bfc
ztZcD9iA=JS2a`ft!fTVuiMD+d8SS9^bu8l^&^i+rmf93te>2;o<kZQv#S~(xrNac~
z!Hmnm<9k@O3$dafrf;dn6=B1@&gVEM_k0MRfuQwYO&v@EbFQ3By)7oHy&yCK3+(o0
z|Hdv<?@!`NQTTCy)m@S|>!6aC`+k7Y(enX*^<4ioR5Z`^Yy31(GzVq_{}sB^0?{1T
zcIZ(be?oWoubnf{tkO=CK(k8Q(M)~ZGETceI~(d>K@(JdTW(@EXlI}LD`=j|eyj7|
z4cgho{R--&Znmw4b~k8eL-Z@?BURn4c5gRmXD>nPmA0dc>3?-jyYV|~xA-=g`qWBI
z2}J1c`;XnT?JRh-dcPglsEiPyzp4Jar`nmBv<kT$WmGT!yL!2ECR!%%+{Cm@-VQtV
Y|1+;`;7n9C004ICMWHS`hJ*I$KWVT+IsgCw

literal 0
HcmV?d00001

diff --git a/tests/java5/annotations/args/TestingArgsAnnotations.java b/tests/java5/annotations/args/TestingArgsAnnotations.java
new file mode 100644
index 000000000..a6cb252ce
--- /dev/null
+++ b/tests/java5/annotations/args/TestingArgsAnnotations.java
@@ -0,0 +1,84 @@
+public class TestingArgsAnnotations {
+
+	private static boolean[] expected;
+	private static int index = 0;
+
+	private static void setExpectedMatches(boolean[] matches) {
+		System.out.println();
+		System.out.println("New Test Run");
+		System.out.println("===============================");
+		expected = matches;
+		index = 0;
+	}
+	
+	public static boolean expected() {
+		System.out.print("Test " + index + ": ");
+		return expected[index++];
+	}
+	
+	public static void main(String[] args) {
+		A a = new A();
+		B b = new B();
+		C c = new C();
+		D d = new D();
+		E e = new E();
+		
+		A reallyB = new B();
+		C reallyD = new D();
+		D reallyE = new E();
+		
+		// now make some calls...
+		setExpectedMatches(new boolean[] {true,false,false,true,true,false,false,false,true,true,false});
+		myMethod(a,b,c,d,e);
+		
+		setExpectedMatches(new boolean[] {true,false,false,true,true,true,true,false,true,true,false});
+		myMethod(b,b,c,d,e);
+		
+		setExpectedMatches(new boolean[] {true,false,false,true,true,true,true,false,true,true,false});
+		myMethod(reallyB,b,c,d,e);
+		
+		setExpectedMatches(new boolean[] {true,false,false,true,true,false,false,false,true,true,true});
+		myMethod(a,b,reallyD,d,e);
+		
+		setExpectedMatches(new boolean[] {true,false,false,true,true,false,false,false,true,true,true});
+		myMethod(a,b,reallyD,reallyE,e);
+	}
+	
+	public static void myMethod(A a, B b, C c, D d, E e) {
+		return;
+	}
+	
+}
+
+@MyClassRetentionAnnotation
+class A {
+  public void doSomething() {}
+}
+
+
+@MyAnnotation
+class B extends A {
+  public void doSomething() {}
+}
+
+class C {}
+
+@MyInheritableAnnotation
+@MyAnnotation
+class D extends C {
+  public void doSomething() {}
+}
+
+class E extends D {
+  public void doSomething() {}
+}
+
+
+@interface MyClassRetentionAnnotation {}
+
+@java.lang.annotation.Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
+@interface MyAnnotation {}
+
+@java.lang.annotation.Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Inherited
+@interface MyInheritableAnnotation {}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java b/tests/src/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java
index 8b5403bc1..966bf884a 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java
@@ -44,10 +44,16 @@ public class AnnotationRuntimeTests extends TestUtils {
     
     public void test003_InheritableOrNot() {
         CompilationResult cR = binaryWeave("TestingAnnotations.jar","ThisOrTargetTests.aj",0,0);   
-        System.out.println(cR);
     }
     
     // TODO extra tests
     // run the result of test003 and validate matches (needs 1.5 runtime)
     // test inheritable annotation not present on type [should generate runtime test]
+    
+    public void test004_ArgsSuite() {
+    	baseDir = new File("../tests/java5/annotations/args");
+        CompilationResult cR = binaryWeave("TestingArgsAnnotations.jar","AtArgsAspect.java",0,0);  
+        // TODO need to RUN the result of these tests...
+        System.out.println(cR);
+    }
 }
-- 
2.39.5