From 5270506186cf468fd0fc12d73cbe15327968e3dd Mon Sep 17 00:00:00 2001 From: aclement Date: Wed, 2 Feb 2011 19:31:03 +0000 Subject: [PATCH] 335682 --- tests/bugs1611/pr335682/case2.jar | Bin 0 -> 2571 bytes tests/bugs1611/pr335682/case2_source.zip | Bin 0 -> 1144 bytes tests/bugs1611/pr335682/case3.jar | Bin 0 -> 2565 bytes tests/bugs1611/pr335682/case3_source.zip | Bin 0 -> 1141 bytes tests/bugs1611/pr335682/case5.jar | Bin 0 -> 2458 bytes tests/bugs1611/pr335682/case5_source.zip | Bin 0 -> 1144 bytes .../systemtest/ajc1611/Ajc1611Tests.java | 12 +++++++++++ .../aspectj/systemtest/ajc1611/ajc1611.xml | 19 +++++++++++++++--- 8 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 tests/bugs1611/pr335682/case2.jar create mode 100644 tests/bugs1611/pr335682/case2_source.zip create mode 100644 tests/bugs1611/pr335682/case3.jar create mode 100644 tests/bugs1611/pr335682/case3_source.zip create mode 100644 tests/bugs1611/pr335682/case5.jar create mode 100644 tests/bugs1611/pr335682/case5_source.zip diff --git a/tests/bugs1611/pr335682/case2.jar b/tests/bugs1611/pr335682/case2.jar new file mode 100644 index 0000000000000000000000000000000000000000..5698c8b08a806a371cc03714c53b4cb7ec5ac8bc GIT binary patch literal 2571 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 aO#kW?G;+_@5nxLKAV74h-9~t~cYg!+LR2sS literal 0 HcmV?d00001 diff --git a/tests/bugs1611/pr335682/case2_source.zip b/tests/bugs1611/pr335682/case2_source.zip new file mode 100644 index 0000000000000000000000000000000000000000..a9585961db9b6a237071e56db25d9c0b8a5491b7 GIT binary patch literal 1144 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 In;FCd0AswjA^-pY literal 0 HcmV?d00001 diff --git a/tests/bugs1611/pr335682/case5.jar b/tests/bugs1611/pr335682/case5.jar new file mode 100644 index 0000000000000000000000000000000000000000..a8fe73c6946bd84dad1f4fb0ab67de749dc42350 GIT binary patch literal 2458 zcmaJ@2{e>@A0ABMGnHh?Qpl2R27{=W48vf|n2aSxe9VGtnXxNd31bUoWKEXPRb(fn zl6;oISkwK+RTJ4smJsoA?)g4$=ezfL&wI}Mp8q+|?|q;1d!F-PQCvVl0MG74w=;kN z4nPn91fY$q;9ygXu__vlF*P>ASwYao+noTwGP;Xljsipaj-bFwJzdOdOSM6bkDq-Z zW@r^tbYDPejU`nDVuFTzwWRhi!R=k9;7^}FedYvUQQSOLgSPSKcL!7 z$=y=|#Y>e;p{QDs{QTj5R1(1-Lhy9<^ZVVJ<;$`XyxNxD9+>kMZ3uC&uSerpMbKzV zsiQ@heySe})RUn|i4PTE6q=ki#SB=m`GOTS(0F-$@|1Yj;-OGZCyqHkSqA1wjILVO z4c*3^uy3UKreWCjYO-VmC-u|=g;;g-nQxeDj5>z+$ZDxKZ8kR&Xjoo0{|gCMUB_6{ zX33IbwXf0G=3c!nX+cUL8B`1@xZb1)>!~JdGbhiKO6pS)d?=WxZZ1*XDV5NtselzW zO-wQ9u2^qc=#dXPSA$MHQIl2XK{oUQRUVDveM)Ko;cA^nfW*eJ_xPBO?4W1ERoSz3 z&eyJ|S1`l+YIO-TZP2jPC2K~NUblv4LMV99)AjiiQ%SE&B=CspT4>7JcsV(c*D&sj z&)r^c_PJ&(Z%kvjEcGQ_RmiIL3K84!OiagC($_2fV(HVG&H$VrksiJPnmhw4o&PSw z@bF>wiuS|r2Jv>fIG@yo_noJRz5C`Gb@kIzL65dg(+%Rn-1G~X$9YmrYTeW7KHoW7 zcm6lGJI zftKfI3LMa>{`4BxsoVf{nr)Go+Tn_SIHt0VdLR4qm2@Sa2~9F-Ue`wmBZ$GLC|F04 z>CI~^(h9ZxStNXN;9Pma0Moz$VF2Z|;Y4kTI=o&Kk?Hgyr!NQRVRh zry1yctjC0+_g3VHv^OjxbVpJ6*dm)xK<`e`Y>3FiE3NlsAdt>eX7MW##?Y@i+v^QN z$CK7EHH&4P`SWs_$Jly68S?MfW5hQNrEypIHiB=Dnp;kUSiOSJEca`uETHlYUM;to zr&fu%1b{zUgD7UDp<$fXj!WsL_#FvJdipXvO+xZGU*JZNu2WlE)MkC-TVWsbzKQ%t z?js=N{Z-?uNnhOC&btKDkXue-lQ4JM`qrxlE6wgO_n8yYh1_=APJ}h5y|`(Vyme6# z2mplh{axHh9EcmNFNN&xNg|?2{%#cFACVJ{Mx$Ev`NMEtwzIZI{0PL?-ogY|i$gf2 zlX#bvPwv^6*?ZmP53>z+vbZB|TrwL8uHfO|CQqn;A;4aZUII9bVe{ZRJr0nPo{r1x z;(ss7l6Pk0IkTgB9KdOsojv1J-N`P#8lK77$5rpHeXgypTI1uLN7@RDt{Fog(9WHtoW9?bP9m08Qbt>kv!9IK zEp_=9OhI*aqn&yhIxr;8eOWoFzj?6^CFL3AT~K=XEpy~e;QJDeTCVz*_pPVDDX(+7 zNaQUa*^_OIEfPDwD@ruS-^nI)K(@VdIIUTazf&gKSCa1&@9`WLTN6yHNk^o)1j980};XQofC^32;eiz7m#~J2@27ua}OL zRzFq@h14uXO?Bq2*>rr2y!Y#{SUpL=YBvPE8@L0_idfAycF4rp^Oy&9qgO z(@^@iG0It}gLsuv4s~obXgN61ix2OYuN_fadF$$7Y+cM_dT!{2Y+BnZffdfqorZdWL<#4KU%d&pLNn=} zmM@TEE@-(Kxvk7%oeOU-`_jjNljEv;ThxTt;N#-lH6PdB7IAP20`|+s!5*+zHvWvi zsvZYf_Bz8sd+&9IeMIa&{#AqcndRWN??u5r7Ir`EzbyYR7=C6t_{V$h*oWNVeWpKo X1&cbgdj!~(00wVMae-rIiw{_GY7 literal 0 HcmV?d00001 diff --git a/tests/bugs1611/pr335682/case5_source.zip b/tests/bugs1611/pr335682/case5_source.zip new file mode 100644 index 0000000000000000000000000000000000000000..3edf3ac2faa5a009827f40e2b9bcacfd05bbbe3b GIT binary patch literal 1144 zcmWIWW@Zs#-~hsyN=G{eBp}Ve!jPPwtDlyiuOCp9pO%@En&O*Ul98XHmz7wS`0o@0 zL+`nbT!#z<*dEwUC_fP~eNTfoJGWJccPD?rvg=a0#fo#BG;7NjH+3}cy8Gep|G$iH zB&|ZGvE3EYT{__qZ==#`;TXs753G6b2{T)N+V!H);d~m;jz4`^m`7v`%|kwr&4ni%C;2UTfUOdia(=d3D$#tsBR({8W}`$!!gh{=e(z z``as~l)YFImh)@-*3|3oRdjy6w=nVz^WxicWLI1Gs=JjR1l=DTj<~sKao!gPwJk35 z^BgaJyyJg~&+Lo%+=6>MQk>L3-3(Ume)#8M&rTiBH7DP0Y0&f$K6a^O5?{&QIbq%p zSJtoVTcOEw$gc&Un3IWY1Mh zGrp0x-Tc7Dl`GqxysImHl+v_ML`$bQS6fKDPnI)!Q_j@q`=;pbJ>j%4TZhpqJ@uM} z|Kq~;4NuawBn~af`r0_jyLYjA_!FDJ#>S*f-Fzli|R4dBKDnH*?Vvq6k{txTF?w^wCR6$XixsDWqgYZ!XDhQ)^Uns z7dQO+Zo*CBxz4ZbEtWL5>isqwV8zzgDkYJ^yFAxdgY=O)5@O_!}GqGW3f;eZI)6$>qxKHoYCx@@s&z5bE z7nxad>f{5ph`epDA8f6Y`R|}}V%E%eu=-U!1$=^Z(=LFpX<-U690!_ZPcvLT>|L3S-DVi2Gc7>US+z@jO@o0Scu OiWvy60O>wv5Dx%)%*71= literal 0 HcmV?d00001 diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java index aee6649d7..4929b6cdd 100644 --- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java @@ -25,6 +25,18 @@ public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase { runTest("pr335682"); } + public void testDeserialization_335682_2() { + runTest("pr335682 - 2"); + } + + public void testDeserialization_335682_3() { + runTest("pr335682 - 3"); + } + + public void testDeserialization_335682_5() { + runTest("pr335682 - 5"); + } + public void testNPEAddSerialVersionUID_bug335783() { runTest("pr335783"); } diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml index afcd5a8e5..a40d87eed 100644 --- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml +++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml @@ -2,9 +2,22 @@ - - - + + + + + + + + + + + + + + + + -- 2.39.5