From f37ab9ecfd9e34a7957eafba8e7bf577710ac18b Mon Sep 17 00:00:00 2001 From: mwebster Date: Wed, 16 Aug 2006 09:57:32 +0000 Subject: [PATCH] Bug 153907 "Facilitate LTW testing in a custom ClassLoader hierarchy" (fix build break and improve diagnostics) --- lib/test/testing-client.jar | Bin 6645 -> 10360 bytes .../aspectj/testing/server/TestServer.java | 4 ++-- .../testing/server/TestServerTest.java | 4 ++-- .../newsrc/org/aspectj/testing/AntSpec.java | 12 +++++++++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/test/testing-client.jar b/lib/test/testing-client.jar index cac1fe9bfe7370ccce9d766345d86e020c0b00b7..42c85210f9af42778363a82bcedd1052bbbe7ecd 100644 GIT binary patch literal 10360 zcmaKSWl&w)mNiarcXtoY!3oa6-QC>@4#C~sAvgzjIk;PJ4el-hf|Kvwe%<}LzUtd^ zRqZ)<)f{83+O_}8HHNYrGz=od-*GL3&ix<7e?DOT%1*9Utjhn`f&8BxCT`9aX70BC zM<@3G*XeHI=5FKoe{mE21H#S1^{a*Je{c2aKaPzoirP+r4*@a52LVC;4?y+5wzP2l zY-Vrb<~FSB>xaFBBWz{a#MvbPhJr~(*Ty6@0iZ`m5*j9l%Af~hk{-^TiSd}2G$G}n zMC+2_IM{)fT7|zb%f{G%92Dw-=n_?n@btENai$Hz7%jhxS~Xu~W;)zFzjCaRzdt0r zr1)M><@)~c?D4(ou(EV}+D0RRz@cR%W!;EZ;}%pKwJ}t_VP+k=u}7J?4JIl-(;j(u zceHfoT!3!dWhSw53#`q^=G#cM)7}je<5@!2$qTdG;+y z4F;x5H|%$hI9LtiwQf$BHuNj^H4MRobtX_fRl6;Q+M#OCrl9zhQ?KrLqkWKV&mRxg z0BEP1UBIp0#zw`i0)K$sXpYVvF3QIUVejCyr^g%VW1Fp4PJElM3CmXhG>>De-3_q_ zcmavYg;vcU$>?g%`o!jl6Mo1Jj$*t3!gI34PjsdaUU6z8$1nt9fUqkn7?$I}3f3l)q-OQL9AB3La3cRN#KeWj>zfj`8QW9XR0 zoi&Ee2deookyf|>wFq?Sq017diob)O)|K6L=rMNfycg2+@hC{BeA*>elasW?PchHJ zn6}EC=YLr$yC`|CRG>D6YUKRfVC7jp7xc77zUBT+FR*nRAZ3 zjOrOVSfKl?I%FQ^{f$i>Dn5LyeBC@)A8VpM3V8YuDYJX%GNspSDHMct*XX-#DR@3$ z2l!;wFpQ-vYp4v;F+0(q z&@JQ-4cN0)tgaoP_VR=K%>la1h?egl=Qa56HGat@g_47W1W zCBqV{j4Pv~drEBW!qi#hmX?3hXc#z{R@Gj~nSS^cSqaNc7i?#!YosMsnO0U+^^`C& zg{jlXX=qxezvODSIb^vh%5gN|h}SAsm+{HQgt%-K7D?%LWevC9Yhxrx0fE${lZA9m zmT9gSVK$aD&8(_Ls*|ST^GUj!=rMEyY12duV^)trCQGN^&{fLHr+CGdWu>p96G-LUx&-skjV8E?0Iz@1x!=X6Nza8)qO((ZU zG|(_+v9~zM@WVLIfguV#tkj@EZ58+Bsy_9^iFUcdqaE$qd$1>yk)hm~%^y<ve*oNkaG=(} zo%Wt)2Ymodj#EHuzSAxtM zoWD~N+S=~9)!e8rP2lH?*_%>{^;g0Gr3xB&80`Q~4q(0p9{c2LPNX_u?CLjPW4tx_ z;<~cwIrQisKrSu-CIc=?D5n&`JgXdg{!?L)(w-W2t|HHrb&+i>BT3+x5grhI$jekN zYrAjID>SDZ#Sbolu%6^f-X?uG1JbjP2U^!81JVK6QJEk8C@gzvhHaon;PJI|p zDUcC6q8wLvt76sLMr2M$u#r=0{K7m}sb~3eCAMfe&6}>@%fE!r9eA9+0CA&*9 zp%nf)k<|MI%y3qm@2rhMWgfRj)&}-|^JGUTyMP_Q4HSU2K?X0uaQ8^V(Qx0F_4Y)8 zw0o);OOSu0*t5gCU_k@yVn&Z)sbpB3Yu(g9%Pjc)@~mL@_-lGWsiO5$bWrc$zTYh^ z;M(?yar;@w2s|+@w*elQMk2&aT)9Q*{Ic{-X_pgbHj%A6%t_6D2Z3=WFKV^VGZW1z zTbMFpWk73e(sbUgui&;M{F?BIw5M*D4EYVBfa50NsXSFmuTbUWX+bZ2(I!k4>4V^p zX`l2B`yh>!;Ky9>CheY33?5J0%!Yi722c0U48})$5Lx3x0=@cNM0k+o2}SYmHdN@V zkk_@t1T}#ot)3E``WZH-#t*VPa4+E#VEGRMAaGPEDs^5JT4XR#dHH5V&60M?JF@`s zDZesp@Hd2L<6M1o`h(mQNOg?Ds#m0N_WZHVCSCuI1aF(YKGD;S!iVdvJm}9rpxvqi zJw#r1aQOEfYH<}8%&>s)R4Pu?j_>VUG?U63(NeE=$&ezH@Hly%cS^ffaDshZe0A4a z{iI0t`7WP6W+ub2g_FuA)T1%3E15c&SKHaA(BwF}^B+1bYFFGNyv}kj_4JiS)RK5h z+S`bGl^+F1+RrLM=lhol&X4D}6N+%lBWB~u)Kc)`0WJ>=iS5%jmJMm;=##9qyoU?V z<$k&z6Xj{;Ui{?mC5(hZW!cIou;exdYi6fR`_o4&(DO1%u9q0bm_Svz6u&A< zZiiT@J6AWwT3_NvffG$h zgb5(!q46@B4o|rCoxeuhr61PSS zI*%pet8km<{HcOVBOEgSB{fBK7G| zax#)Aj_2J1{wsSh&k5No3L)fa0o;5+D5NHOVp<|R$e#Sy?s2dIT0w~FgBRPM1%8t+ zbjbEC&Y8BKzyCHJ!2S-bX$3}S9{hw4iOjkXV&fH>VYZO~Nm zBuz70`wIs#;THIxea3U#vGp^r69D_u*klwEUAl+E; z#^p)x9P{;&we*pt?HCC-+~8q84Wr&jv)oAg1_f?H)kW19vdy#hC)h_+LV*k5px&|+ z%|M^tY~h~(%r{OlSWdchHF71&W+i`oe~Qj{SbQUcBU}EtLzFHhZYyu$n=$*Ip7J_C ziO^e5Qikv($%TG1<4PEV^%jTvnvh z@?+fap!b+s1U>bpqX+jU#Ik4;!9vlj4eL#S_~udf=27<7b_Okv%&$>6Qg|bBdc|=Q zQ9^iV(~DxWHR;htGaZTBZ(V%}T_(t_tA0dwSwu|JxAZMs($xz7wakk5;J1s@Jhs78 zDI)9k(W7uh>C%pEcYem{_g8ojd374BiE#gPn*J?cz7VIu7hdFx2tmJ9OL8*d#J;=J zX2mpyN*I@d0~-dqPg-_{AD{8BnQ0|7v(tXaBIy~+OJ%L`WaWe7OTNMSVQxHO4^NrU z_fsiHD-FVWVW;mj@#JUd`Z1^Z-B|Yy-{~plBgJGMyXA2aQ{@}E+`P38-~CJuUo;e= zx2Y)Cb^XC}gA?^*iLv#wXWQk;bj%oj(>wtc7OR+Lt3nwaYgj1U4GeOhCpo;5YGf}G z=dBPg-gX3f0EEd~aa@kiWQ5NtbizFQQ|GWkx(wQjjEI}s)xnY4-VrA}z)5=pOwm$0 z@0>FQ1Ck{C+M?P9O)DeqX275%`BIRk_{X9a7e7PCw$)%FNk^iDUZ;@3@ub|EO=oTw zc^G;Uo2*(DnTQC)vIwHFB`s~7#$eLXwU1@86l;k$@Ab}8|OEbLRN zEWOH+Sfwf~9{rthl{3j42Iqoveo8pZ-0VT&Zl>fQJ8+Qc4+%<&8khW4 zPWU(jA?>5&V4B3BhQ#2K#2~lCpjK3Pjl`e_Dq*}17xB5|pcCf;+YE4UT4Im|l@L{r zi#VODWJ?GjM<^>#$l;|$xwUlIRXZqfo20TPy0rJ(G1RC}$#O@3Iag5a z3At2#^PB_Z*2%oSKNY^Ae|+@9d*XbPwEjI1@!h??7s(HXOl}%5maC2VDIME=;Mw9c z_lk!xUaY!W!5D6$Q|=^g*+iF$;`Q&8%LtP~*Kc6osh5hr{1Ud*KBHYHA@Kej-2r=` zEPZhAf*RiLE4FaTwy`5#6l$SdfD5zRE%_`Yw}sBDF~(+R;Z%*{Lb$D{SQkHliB~;m z9u?0qV!Wdk`+gY4fLXofDSZGc|ANNyc?nf6qwR}mt#8FL>Lg;TXltn%QM+EJ$X1n! z+#{N6)4GXwRyyc1jFr+pgoCu^OBKIn`l*c^=pxU^#n5yvJ-LS3@nkdB&$ zp(L_+#HxnDbg3DzhYu3l^zGVyqjSda*n=XG)+DtNd^bu@cupJ>#Fen8jkqO~x{06d zMB@i~i*j&{*@!8V9CfEK>d`Q8oZYm)Glp0Rk2}|&Vhh^R=^r3ZU^UNeHNciSuC1`V zcCu`2yE*QBNd(*sD|VA5ZzT{DdDXQ9Jx-v!_2BFs!R3pFwSN{qo{I^iFl27ESe@PT zr%eqgaIrrjMs+A95-j16mgJSwFz&2c2j`j;Wl_xC$oNEkM#@OjhU)iy9l$ujidgkI zgK!2xn}GR01>3e#HC(h{PHyE#h5gACHKm8YL%REdd=Vbtz*fB??Q^SJn!IwxhF^HJ z-gAvA?_WXZU&(sWRN50zJu_*vEMO9+rUS`9gb;q##&AxzJtuh5+E2&(R=0K4khP?=(^J(Bq3ru(=7DI+Y@Z6a>lQG-?`Jyu3 zS0om?jgzFWnqp~$?;ScKo;j|l7LC6N_! zrNsojF?2Ef{#BkiWiL6we$6{qpl~u16ktn$tWqux85gs-hU*i@v(NeK(iZtQ7Ma~z z<8d=f-SvVitWGWUq}#YF&fod&wb}kcRy9MksB;6Vrq4QQ z1tMH5keI$P9v;3l7}=kz01YJfThv~XZs;^}t=*W+Ubg`alPQ>Fb`f$sY?(r$tI1n( zdS6+vfrMv8*)8fk{|b%P(r6u3Z>Ztcr`GO!N0@G>5&76D)gFhNQcm4RM%%ZZZ$Ez3 zH6!wv)g#nG{2cXrFkL63z%N?v*XBk}S@hu*cldU<=;0hh7^LeVG_)wSTH^RElrU`C zR-RWdMsw~PcP5Hw@)kxtKKwrVJW(hjv8+q&fOf?Q@hVWBt}krRxxGFR;b_7jG2%Hn z^H@R^&RtEm9kYm*p1%sM%%XB(1MAS+%cxc^wskNywOH#m0Y^vw)li{0YOno3|7)Be z)nQvgRHa*LW(oANMem{;x3ENSC&`4GZkE?S_Nx5 zZ(IMGzqR`Vq`JIFDr&n0woIX+6yJ`kY^2tg))yQ^FcZV1KJ4(>QoVdPTsmk)OnVa% z_`u(;+D-Z!WE2sxM6^@*qTnU}jw@KZ^=YOOAlmlgpuU*HF2{X7w>0F1-xEvqDFP0t z9SXaLUas*4y|;KFGX6&%*p`clq>}N^<>-QYMm9<9#1Z?Ytz`2ro!*jC_H+foU7~I+iCs+<^$*Sc0KL9V zxa~d4ml2#GeJyl>owCMio|A%{7QCL#{XPKJnP~K-Q8HbESkwzX4qrs|+W@G?=mX!k zRYHu4xr`d545QeG@I96o!5hC1I3$OFuN|ENtcy3Q*EXa@#QFB6toQSdd9J@3{Kh=O zwoSqu|R=<2q1)jVEPAn;XieWzf}gc|BxvDr8J~zBY3H=czh&SayfDNe4?P3 z!Y4u-fwO5|!#5Gc2SaeICilq{)~|WXD9!g-TMFL6K~FC)0&|zAk46|A=SzTuou$*J zQnZNiU1f1OwZIJbn67rYb=u8G-aj2qJSfFnbC1*hkDG4SIv-6NclTjV0Y|Vfv#jM* zyip()FLYMzC;d>nqr+jg0K1Y*8s<+g;#@-*jndQFaHot{I zr{N5}Q&6}hlyQ$*@_6K$m0S3JD}N==A=E{eq z86~OHR9PDrg()-h)e9l{Igj+#Y}ZFWIy?Fidg5~`qcu%{bZOweg{1D|vW@BtYUlI~ zYVA@fjFGGZdy3fu8DGv zKjb>SuN-BQ?c5PAUKiGarF&{Q>n=9ji=evsdI1KRp8jDnZRPEAZj(WSxtFBBP7PePYIArWYCiFUl_Oh7rY4`6mG51nq=VusFWPVu(44|Qc` z^9p?h(*Xvx3e}#M(4BHsiG5eyYf(0S3U%PCH{-RBuR^m=sWZw~GBxpo)WVdZal2qZ zg^NT*R{|iM{N%v0QppOM!{gUr2$oa4tO9G?5<*k!U@|_&Bn~~zR0H;+KMJ`Kt(tnA z<(}s*)F3DzK`O*o(b-MNgn1vu3i0$**6)hmxBt=PTwNnH>a+=YR0VqE=*q5yIYiNV z>*0u_`Spd+=SLn8W2;|9{O2xw2&YlPUXWUOhup(T;fXGy{*jAr2cd*8R0TGXGWkYdvHHX%yEK*XS}U3`yAS5RSMOc$c@}V zgIoWR@0l;1k?4-xv?gM~YCdZ;?h_G#d6wx%GFpAyXkYgXefdgI_F7Aa9aYrA!IkvF zm)7L7R2Cu_5K$Ur*(1kuUAbecMe&B|WKAl4j(HQ!X6wDoM!Mmt8S0X6lWH8i{V5)5 zh-*$<+b&SgF@uGfXA+l{R;xf3JeXd?VZM*7+G?NDPUE@WXmIu2jwqblt=2H=6^WCR zc5sxV!Oz6@^ARXDaxFQLq;;d_t!@Vhr>c?n>dJQvHd1t-QCzc_6v8Z@C?5CA*Eh@3 zkDZ(L5h7W@EW5a(q3ck(YBO(R@imWO@wI5bNK>6|ID}l&lIm#IEbd(gZ>Pf_Qs_yU zFQ&8e8BdCOucnK0NC;+~8@g__Sm@K@o0aBR&>ye4X6g}Wa+#|^)5rnr?K|~LG1=wf zS2-B!ilX=PQx-rBJZx;n<0^Xb32efk-ltUW;(xk| z?H`v!t-7$LOsB&%rIIj~EWB9mo3)!yQvIrkD;SB&uve!@p5l0Dwxt9B)LeE_ye zS-os2+jKLuNs=s^^0sk_Kj7Z_l>$^NA$mZVh#DiS-gwU;ytMW5?@YiU?!L^pVTsc0 z$?1Kk(Ft*lSvR#+?WV!8VUlIbG{EjO11q zS=BywT&A}F1X|5cb)*KqHfMO$eO;jVz3u&wT}q#WTD3M=kH2(L+X{4$6JX3flvf)! z-f{=I3;v{@oXo6ZIJt6krh4Q8m-=>|>oz(q)WG0R1z(~RzM=M`FmVJFFLn&&9Lj-f zz(syp5_OxJ@3T9Wwz(_j7ae5{>Q!hxY4S>4$EZ`xSSJ#-!|i?7_IB5^ciuC3<(mX8 zU7)@G5J7E+2>~KzHEYdnRU656DeDeu7Od-OT9(t51%k`f>MZ#mPUl~FX5Us_Yi%Je zCaUXlIXx^XkL7I^#B(0oFL2$i?yV~~yV`@tek_uehlowY(f*<#nn ziB*Kyu52QJr!pjf4g~~@b^7mytJ`icL{HED$pt-X_0B?NyRO263A?mYzeY7@r`DRY z=mbdb%;~K2?f*>OvEMa&r;|`iCpe8_>>#hA8+{uJ$(X}7lGr(c;&q7k4E;P9?HS5i ze3%k08MIHxZq2gi|1v;j}SFrDeaNIL0oZLUliwA%>}LOqkOtuB)u9V z1PE$~Rm7zN=KfrmcHH^iTH3l`QSH3mz|4{KQF$S4$%1W@%mD^szi?_LWuDwVd=)Ix2-0?^3o3#ysHUd(ta?cC4viYAceECo{+?b*X>+E(1N!3r8d584!N_g zpLTJ3eWU0}*zGPzdM5Y3N2fgjrSSF%3dr1((f){t+~Ez#PF31v6ON&JBBs5?e1Ene z9-h2EU2z%kx(TVF5j6Awo-o9z>x3Td_oLraV-`$IkgZN)Xugv_1S8h;` zJg{0`tD-_6Jl+tufVPR*0SMO|7%rGf`~KSB`+0#-Act;wccnytXHWa)Q7 zJj%m78l|`j))Tlrf%TuqA#w#*%%&?bGT1IN+QxeIOsjteA{t72nc6K*nMT<*iA{LUp&y6V#+Ez^_W~`}HtTU!7=Lvaur6E$&BO!C? zF4epLq+w)R!^QcNi0MSfNx5=VMyI-`L!6yuefVW}EKZMFCU%3YDl#X*+o7%QV#d-+ zQ)*9;Om~CS%X0L64ehs8=^f~&In~kt*3$EF0g*6x{@*waff#728{$;mw|(i9QuL8D zrm-}8eNd=XcVtJ`iC3h@S5;6s^31(ieZu_}{z$cEu)5Mz0CuFk*gueB;JDkG=wZL4 zCvxE-D*>MU(F)3+Mw)YI`&0+o;qS$7?_P%=+1z%0=))N%SvMvPe)1Kn`rBN0&vpze z)v(01qh|*4C7xI*kBj=E;xyIS_f3t|_cm9{V{5ZSC%&Z8BYW>bph#Su;Mv-=OY7W0 z_I+gbW%owPr{LurqH}`y>;0EkV8C)N^{^;q&e%a^9fXf%eiMWj#0wDr$^uF0UWN^J3xXnyxi9hL+>upJyU7?d8A$IpX zY0=TU4=3(lS1%O^{8cC!v!`n9*vvUg5~V(wk_p+zY`Mwaj|=p(9@FmG3IGp`7LOqo zDKj7Ky%*~Vh&Y1pF9?i1Id+5UzGT8dDt^hZ_X}{rSX{j^Wr4wVqOR8aJxVF(=vFg9 zH3%K{R7ee^u+!9BmVD0@4wk_3I5Mx{r@AdvK%bj-(a}ERz4&I K#1QS@Z~qTj)Nl3x literal 6645 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 KAAkM}0PsI_nmA$r diff --git a/testing-client/src/org/aspectj/testing/server/TestServer.java b/testing-client/src/org/aspectj/testing/server/TestServer.java index 4e2f15388..c21aeed97 100644 --- a/testing-client/src/org/aspectj/testing/server/TestServer.java +++ b/testing-client/src/org/aspectj/testing/server/TestServer.java @@ -34,8 +34,8 @@ public class TestServer implements Runnable { private ClassLoader rootLoader; private Map loaders = new HashMap(); - private String mainClass = "UnknowClass"; - private String mainLoader = "UnknowLoader"; + private String mainClass = "UnknownClass"; + private String mainLoader = "UnknownLoader"; public void initialize () throws IOException { createRootLoader(); diff --git a/testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java b/testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java index f0f043e67..0c278588e 100644 --- a/testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java +++ b/testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java @@ -26,7 +26,7 @@ public class TestServerTest extends TestCase { public void testInitialize() { try { - server.setWorkingDirectory("./testdata"); + server.setWorkingDirectory("../testing-client/testdata"); server.initialize(); } catch (IOException ex) { @@ -35,6 +35,6 @@ public class TestServerTest extends TestCase { } public void testSetWorkingDirectory() { - server.setWorkingDirectory("./testdata"); + server.setWorkingDirectory("../testing-client/testdata"); } } diff --git a/testing/newsrc/org/aspectj/testing/AntSpec.java b/testing/newsrc/org/aspectj/testing/AntSpec.java index 8ea86cdb5..da83578fa 100644 --- a/testing/newsrc/org/aspectj/testing/AntSpec.java +++ b/testing/newsrc/org/aspectj/testing/AntSpec.java @@ -73,6 +73,7 @@ public class AntSpec implements ITestStep { Project p = new Project(); final StringBuffer stdout = new StringBuffer(); final StringBuffer stderr = new StringBuffer(); + final StringBuffer verboseLog = new StringBuffer(); try { // read the Ant file p.init(); @@ -101,7 +102,13 @@ public class AntSpec implements ITestStep { public void buildFinished(BuildEvent event) { super.buildFinished(event); if (event.getException() != null) { - AjcTestCase.fail(failMessage + "failure " + event.getException()); + StringBuffer message = new StringBuffer(); + message.append(event.getException().toString()).append("\n"); + message.append(verboseLog); + message.append(stdout); + message.append(stderr); +// AjcTestCase.fail(failMessage + "failure " + event.getException()); + AjcTestCase.fail(message.toString()); } } public void targetFinished(BuildEvent event) { @@ -122,6 +129,9 @@ public class AntSpec implements ITestStep { case Project.MSG_WARN: stderr.append(event.getMessage()).append('\n'); break; + case Project.MSG_VERBOSE: + verboseLog.append(event.getMessage()).append('\n'); + break; } } }; -- 2.39.5