From f6d0013eb2cddf9946ab07d0a4e129cc9c0869bb Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Mon, 21 Jan 2019 09:47:07 -0800 Subject: [PATCH] 389678: overweaving test resources --- .../389678/OverWeave_1/src/Application.java | 9 +++++++++ tests/bugs193/389678/OverWeave_1/src/MyAspect.aj | 5 +++++ .../bugs193/389678/OverWeave_2/src/MyAspect2.aj | 5 +++++ .../bugs193/389678/OverWeave_4/src/MyAspect3.aj | 5 +++++ tests/bugs193/389678/ow1.jar | Bin 0 -> 2828 bytes tests/bugs193/389678/ow2.jar | Bin 0 -> 1630 bytes tests/bugs193/389678/ow4.jar | Bin 0 -> 1630 bytes tests/bugs193/389678/run.sh | 10 ++++++++++ tests/bugs193/389678/runow.sh | 4 ++++ 9 files changed, 38 insertions(+) create mode 100644 tests/bugs193/389678/OverWeave_1/src/Application.java create mode 100644 tests/bugs193/389678/OverWeave_1/src/MyAspect.aj create mode 100644 tests/bugs193/389678/OverWeave_2/src/MyAspect2.aj create mode 100644 tests/bugs193/389678/OverWeave_4/src/MyAspect3.aj create mode 100644 tests/bugs193/389678/ow1.jar create mode 100644 tests/bugs193/389678/ow2.jar create mode 100644 tests/bugs193/389678/ow4.jar create mode 100755 tests/bugs193/389678/run.sh create mode 100755 tests/bugs193/389678/runow.sh diff --git a/tests/bugs193/389678/OverWeave_1/src/Application.java b/tests/bugs193/389678/OverWeave_1/src/Application.java new file mode 100644 index 000000000..1d98f01e7 --- /dev/null +++ b/tests/bugs193/389678/OverWeave_1/src/Application.java @@ -0,0 +1,9 @@ +public class Application { + public static void main(String[] args) { + sayHelloTo("world"); + } + + public static void sayHelloTo(String subject) { + System.out.println("Hello " + subject + "!"); + } +} diff --git a/tests/bugs193/389678/OverWeave_1/src/MyAspect.aj b/tests/bugs193/389678/OverWeave_1/src/MyAspect.aj new file mode 100644 index 000000000..cb9d42081 --- /dev/null +++ b/tests/bugs193/389678/OverWeave_1/src/MyAspect.aj @@ -0,0 +1,5 @@ +public aspect MyAspect { + before() : execution(* Application.*(..)) { + System.out.println(this.getClass().getName() + " -> " + thisJoinPointStaticPart); + } +} diff --git a/tests/bugs193/389678/OverWeave_2/src/MyAspect2.aj b/tests/bugs193/389678/OverWeave_2/src/MyAspect2.aj new file mode 100644 index 000000000..b59a2464f --- /dev/null +++ b/tests/bugs193/389678/OverWeave_2/src/MyAspect2.aj @@ -0,0 +1,5 @@ +public aspect MyAspect2 { + before() : execution(* *(..)) { + System.out.println(this.getClass().getName() + " -> " + thisJoinPointStaticPart); + } +} diff --git a/tests/bugs193/389678/OverWeave_4/src/MyAspect3.aj b/tests/bugs193/389678/OverWeave_4/src/MyAspect3.aj new file mode 100644 index 000000000..2c40e42c6 --- /dev/null +++ b/tests/bugs193/389678/OverWeave_4/src/MyAspect3.aj @@ -0,0 +1,5 @@ +public aspect MyAspect3 { + before() : execution(* *(..)) { + System.out.println(this.getClass().getName() + " -> " + thisJoinPointStaticPart); + } +} diff --git a/tests/bugs193/389678/ow1.jar b/tests/bugs193/389678/ow1.jar new file mode 100644 index 0000000000000000000000000000000000000000..acb5cc6d46c2cfa5eed7e8ec850e3f33f3d53eb5 GIT binary patch literal 2828 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 literal 0 HcmV?d00001 diff --git a/tests/bugs193/389678/ow2.jar b/tests/bugs193/389678/ow2.jar new file mode 100644 index 0000000000000000000000000000000000000000..b04346f1e25000644f2595234e95d65b484567be GIT binary patch literal 1630 zcmZ{kdo&Xc6vvlWlOc^Fp?AWzOj<>1@|Zj(B~fW!KmMv;=k&ejo_o)^_uTLO>*I`)l~V@*fk1%t3fu|si_`&f z0JJq039)ywfuWI3_BPfoSSZ?NNdN%MpqrZHU7|w5n?5s|7fqeGDVY-K_qWN zFdRy_>=_jF1UKLUc2!>@Zs^`w9JMu%i#wAa<6MSgT9z8*l>5$|+;O`25$`h8lfcRB zd6%=ac2Q5-Up?ncQpggP`ui19FnYdiJZ&pWOV7imCXMfSV_8#KGuc!93qQWMl>icI z-mdqewU}pq7Sztdd};fFHRd)W;zh06K~3_#J_iL#KD8VOCBv;g-jESi4+inlb-E&0 z?3ozYruu{Y0Lj^n#J8Lo>mjpmkiMCxei%Dj#+`&M`L4}*F+9O~Clx6CI3p{I7Cn@d z$fucXIpv%@>~xqgw=@~3!rSRrj2E(LJnz4-t3)L!~1&cPiMaHo{{xG z1kFr?V6FpwB}|MMI9!=XfJfAwdty%Q;LyBF#g*Gn8XgVUW^4|J)0^Vds95-LB{|yA zWgByxOX!)I{R&QbRnbiTBpv27f2bAm5d?N!f!10m@dOe?qQV zXw4*Ru+qTn^NY_D_k$iDg=M7!bG*k>0Nr+e71ju;l-dR{QheXw`J?3!^R$j7w#`Jodx zgF1}&^a%xltP35$kz8h6gl!*4cCEP_CQo3GiKO{pDSNVf3%V@7rGG40CzFJz$x~52 zseBG2U?h||T{V?pCq*rV41JWEty=uBMK#?joY{H_JOF{2kk1lWBBgzAOuruMKhdBi z#uth+yn5+(W6xgN)}l18GhCA#{>HzDOG>?Rz3>{TRhNcTCR39mss!SRQQ<(8aNZZM z&bHO~7=Xe?5H)mXEk?Sl!yKTYH|1~TfQTEd?YpaQS46fkZn}VMBcT{|YTR809&>e^h`Q1%K`0z5R0-G4 zPi0$Hxf-~pbh!+N2KOXGHKl)m-uSLn)z zTMb?XKU}w2tsi+@{^$eKYDR87`Y^M__^mf6RinmMYcwbHJ)Ohd9#ez=-%E82;7bWFilh;k)MmYBr zd_EObYF58Q;EK0-=Pv1gMwDCMi@o0!Yn#cxSQo3I17AomP#y19aO%GOiIn{Od>1{B7;_dS+lX6Suzs@ubNI*YaQOV5!JC-qqNd2M z?_D4IL59lzo}5$}C86Fe89J6TL^^4?Z>4_sFm}8O%p?)FjF4ZJU8N|dDp*@l9sp1T ztx|N2j5^>a#(yR3D#rh>KSBNXE5ACd()gz+EA4M=c1Fo7tS-o`MD$9nUwI7x_z!gf B;2;11 literal 0 HcmV?d00001 diff --git a/tests/bugs193/389678/ow4.jar b/tests/bugs193/389678/ow4.jar new file mode 100644 index 0000000000000000000000000000000000000000..85f5a057f97a47bad762650ae9edb95c5abb7367 GIT binary patch literal 1630 zcmZ{kdpr{g6vs#2k0f*NlIxRK9&O93a`lirXI3+2^D3^kS{{utuWk~}jgVL5k;g?I z30d5wh|SESEo(xW$CyV%Ufn|L@>ktHpMK|aKIeQs=X}oZ{Pjh`cSryMGBPrN4YJ8; zz;^-yBmf9oS1SnYwB133)oGZWt&1xZVJGSa09FvaJx*{4v`-NZF=Y308c;?&(=lNP z)DZ!OA^O6qs3;;B>VSYQp@?h_gw+d!2!sNmH~ui-bYv@$Kebodnj#{t zNJN}ps43Jhz?VdNj1DBJpn+F|(#aX2@?~X0+Z%>rTpqr|?IJ`guvo72V0sJIW{FJ7 z3vwWvHs_&4v0vL3*Ka7H@E&&Ro8>8%T}lF4xOJ{s<$Lq=yORqeBsPg1$tGPEZEj3w z1MGbKWsDhkjWZEA-*vj0mV&orOIxy5(+czLrP#(jDJ$3S)&=wwPPx?!5)IBSNmyUT z4}|&h!!(xqOF$RQ4fs9nFFeRC`d2zzaM3545OT9DUV56}YL$Ct-2kY)D^{1n%FIv+ zHVS=be%+j|EGdi-Wro~JtAyL{eRC+(bd}2D5Y7CC{%Aybs4kqUdsPtZbkKF12U>8Gg-R3wk&F&IRWw*S`lpq48)x=z*RLNjEM^#(P<$H{$yx&>QHDAwW9#SyL zuaIBu$|-z+?Z_wU&RJVi-Jk1?-pS@c?74xl+Iw;Ql1jwWwet8Y+YL_S%CXm zI!yVnPqX7(TMng<3C%=wcJ3n|>R5QIM!#_$zeoUGmc84qhceZf968_cr;kD6oX&kw zvHurtII0sEbbB&_2A)@^Bdd$bYYZ`ld}{osfHRXVs;})wxWS%W;99|RkiArc8vbnI zeI{)-CnJ!6qoJvU_+=!I@vJ(Kl9X^v0#(utL%oHWR<)|Isa$`}jlqutl47jAKClEz z1?8Xt&V}i&_dGY$ki0NeZqSWlIL8aHOiYNwzx|Pcf@UFZKgU0yAX=>aN%=z8#;lI@ zu{l>S7bnl<<(K}D(#Y{5KlKPy?K))mmxtVkAIx^KKU*7DXmW^AF&K9*zSp`Z^2vic zy5mu)s`|7{&^U*@*ECB@dL7QX%A~umMl;ya)I2;G?0?F0FIEmL-fuXwQ<5L| z+;%;s+xw=mq~l+W)_!}@Td}-KiDot9rNh5xP-*9614?_7CDV2^S6yd z>v`oXr#zRRec7oox2KjF;k ALI3~& literal 0 HcmV?d00001 diff --git a/tests/bugs193/389678/run.sh b/tests/bugs193/389678/run.sh new file mode 100755 index 000000000..883bc7aa2 --- /dev/null +++ b/tests/bugs193/389678/run.sh @@ -0,0 +1,10 @@ +echo "ow1" +ajc -1.8 -sourceroots OverWeave_1/src -outjar ow1.jar -showWeaveInfo +echo "ow2" +ajc -1.8 -sourceroots OverWeave_2/src -outjar ow2.jar -showWeaveInfo +echo "ow4 build" +ajc -1.8 -sourceroots OverWeave_4/src -outjar ow4.jar -showWeaveInfo +echo "ow3" +ajc -1.8 -d out -inpath ow1.jar -aspectpath ow2.jar -showWeaveInfo -sourceroots OverWeave_3/src -outjar ow3.jar + +java -classpath out:/Users/aclement/installs/aspectj192/lib/aspectjrt.jar:ow2.jar Application diff --git a/tests/bugs193/389678/runow.sh b/tests/bugs193/389678/runow.sh new file mode 100755 index 000000000..c2ca8d3b1 --- /dev/null +++ b/tests/bugs193/389678/runow.sh @@ -0,0 +1,4 @@ +ajc -1.8 -sourceroots OverWeave_1/src -outjar ow1.jar +ajc -1.8 -sourceroots OverWeave_2/src -outjar ow2.jar +ajc -1.8 -Xset:overWeaving=true -d out -inpath ow1.jar -aspectpath ow2.jar -sourceroots OverWeave_3/src +java -classpath out:/Users/aclement/installs/aspectj192/lib/aspectjrt.jar:ow2.jar Application -- 2.39.5