From 1f761085e20ee2aa106a196d0148e616138e31fe Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Mon, 8 Jul 2013 12:49:24 +0200 Subject: [PATCH] [JENKINS-18654] testcase as suggested by kutzi --- .../java/hudson/ClassicPluginStrategyTest.java | 17 +++++++++++++++++ .../testDisabledDependencyClassLoader.zip | Bin 0 -> 2879 bytes 2 files changed, 17 insertions(+) create mode 100644 test/src/test/resources/hudson/ClassicPluginStrategyTest/testDisabledDependencyClassLoader.zip diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java index dc23a5b827..43827a0d98 100644 --- a/test/src/test/java/hudson/ClassicPluginStrategyTest.java +++ b/test/src/test/java/hudson/ClassicPluginStrategyTest.java @@ -68,4 +68,21 @@ public class ClassicPluginStrategyTest extends HudsonTestCase { assertTrue("In current impl, " + res + " should be foo1 or foo2", res.contains("/foo1/") || res.contains("/foo2/")); } + + /** + * Test finding resources via DependencyClassLoader. + */ + @LocalData + public void testDisabledDependencyClassLoader() throws Exception { + PluginWrapper p = jenkins.getPluginManager().getPlugin("foo4"); + + Enumeration en = p.classLoader.getResources("index.jelly"); + for (int i = 0; en.hasMoreElements(); i++) { + String res = en.nextElement().toString(); + if (i == 0) + assertTrue("expected foo4, found "+res , res.contains("/foo4/")); + else + fail("disabled dependency should be included"); + } + } } diff --git a/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDisabledDependencyClassLoader.zip b/test/src/test/resources/hudson/ClassicPluginStrategyTest/testDisabledDependencyClassLoader.zip new file mode 100644 index 0000000000000000000000000000000000000000..5dd55f0fa22dca20068795110ff5afb14894dbfd GIT binary patch literal 2879 zcmaKudpy(o8^FI~G55JFexcD#j?AqgsoYXBHh1MR48y|AJ-Krdk&LMvjUs2&nQJa{ zEr&QRl`e!Xl>0~rp~!E`uPmqY+g_j7Yy0DQUeELXJm2s8!I*M`B>)KP8>Nb(i}s(o=L%3m^#~(W1k=SruA0rgYtrv}2D!7L??;0C3R~ zZ^ep~4BJeK4Y(BFPAFFBHsrUA9q69vWZt3B9iIJ(FEQWdR1hAL+nT4evw)s5KfN$C zsp(Xnw7s5aT)sDL!pJi`r2LeHdb4Ve^UEqs`2Odmzh%I+p_!sh*RaC1U6c$^0zDM- zai3Bt&g&4Sj0xsh4BKxT6~MI1@;YGfvc;x3S1CiyVRVmvWz{GcHluy&g&#tZ?9x9F z6=TyQ^g)4~PHW$Oj0hlRsx=u_tp`tRoo`$~Lnh(K-ID&>jOTXO8{UYjB?%yl86*?4 zHn}6`L$z$_L-@;+Xcf?+OQGnU=m9a~%+9q{9*ik31f>aX<^cf!lnVebESmgZ88SV_ z4LD%3_(B2V>0rFKU!V$`T2DaGcEk2g-7cG;p#O#g>&seZcj`o&81AVjA*cd^% zd#M_SGy1kB&^5c|6QBl3kvMwLV2HFqlB_yaB#|BzC{5+n3Bjp5ji1n}D#hmQ%pFHb zGJ3kY3_GL_Ur>@3PgYB`&!4g@-uLHgB5`E-^AT6%nt*(iRLa|6nOR|Qhj4Mo)a0)V zrh2o~#3H}b`ARPb84yS*49&*o10?yDu?T^sII+FogpH2{0E;!#H$+?6f8}8~fDQ*R*G^msd z8o#73C?||c1h{S4o$^8&43p)4VRdfFIvWEMvFY)X;<$QTNFc(8=#6mq4s>-p?cvUz z0Cp!=|MxI%3{a~3k7Ebr$l~emzaQa6^!^t83uPUnz^td|kQ)#?(XR5FR63v#55yM} zl5Wt8s5wzyV3GL0DjZ@1to*h_c}TcI03UJJH^BWGuYRNSyURMC!WlI@=f;;A_fTzd zS1~$66|Y^nLA~#ve3@M%RJ1vcTLi3g2K;qsaz#x|?8oSGhWhiw#hoh5Xw z)!OKNhDjyz0Mc~0xuGNL0lfcH{ zu*4XQaDfJ^tH*Fd#b$iHKy4RgVrtHN(86aQRq69bGOq@!A;%;Or#!Mo3Mu0rnKvcI z#wM}~wq}pR-eumzkHW|<6{0lbqLHy27bHA`_^2yXu45%`#j!r_`byl>>lvL--GTN@ZMWA9E2WThjGl%NFT#bw? zpR+BWw?iI>Cpmq2_CC;94Z;pM(gK!chczD>4n?b9U5H#bLg zd%Ffz*Z!Hfd`qMGu0yD|_~_wdBbpy^c!K8`B>Qq5lQ^(6fb&RiZP;Qw#cZ4;F%OoE zH;o`sSGvVtXoWkidejExjwlDp=UNpPdj(OzH>tQoduziYhpjE9aD*#YYT>HR%esU$ zGgq>gY+C5K(Jk7C_tysHO^?bHQvNt4?k_DX@!nC+D$4uAoD)N=QT7XXW!7Oi(6>8e znUN5@CnYplnff240Ph~_bDymkb3qT` z(b?9=+Ju>yC*r0tg@55SA#wo z%X=;GwNBjLg1_Rpolojr(6ffMdE`MdL`}DKT}suXX=}fM@s`D_c9^;I+Ni3#P_E0& z>NVlh5y|=vYC=1#uZ!VRMU#8|)H!M`{D@E)Zxd6R0m}@zo${mKv2F zNW0>gbFXlF0H`BYtb}q$@OaH7ZE-LL)pkrBbV(y10)BwkVj2q*#`J=d_%Y zqn^ExAo8TD$k!LEto50)7BB$N`PeU35EqPlW3%D3G(RBtP0e}*vFx9mdk*CLp0l3g z-+aE2V_M&w<^K)MK)&0ZvkJD`Ii)B1Llp@e88|!x`EGj7Vm9lJk0aHpej;lT`7S>j zd&pN+uyyhOQgBwYs$a*Mg0r!2{@mOcr_*FOsws&5{IgU)xb){e{?msWz++;gxi^6S w(~j#cv+c-PC)U>(#5N_ybPErARM@Ms1*@k%2>aiE0VKg