From a085db64dfe4f0e0d84784cea95037150097fcaf Mon Sep 17 00:00:00 2001
From: Roy Johnson <roy.l.johnson@gmail.com>
Date: Wed, 11 Oct 2006 22:51:44 +0000
Subject: [PATCH] Added new directory in t/ for collateral tests.

fix - article.t false failure on collateral copy.

Added new test to article.t for purge method.
---
 docs/changelog/7.x.x.txt               |   1 +
 t/Asset/Wobject/Article.t              |  28 +++++++++++++++++++------
 t/supporting_collateral/page_title.jpg | Bin 0 -> 24549 bytes
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 t/supporting_collateral/page_title.jpg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 15ab292e0..249def051 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -29,6 +29,7 @@
    directory.
  - Added a Sync Profile to LDAP workflow activity that will grab a single user
    profile from LDAP instead of all of them.
+ - fix: Article.t copy collateral test false failure.
 
 7.0.9
  - Removed the need for DateTime::Cron::Simple, which also added the ability
diff --git a/t/Asset/Wobject/Article.t b/t/Asset/Wobject/Article.t
index 064c3481b..6ec5de769 100644
--- a/t/Asset/Wobject/Article.t
+++ b/t/Asset/Wobject/Article.t
@@ -55,7 +55,7 @@ my $newArticleSettings = {
 	templateId   => "PBtmpl0000000000000084",
 	linkURL      => "http://www.snapcount.org",
 	linkTitle    => "I'm thinking of getting metal legs",
-	storageId    => "FKGH2yiNQoC2E_FqbMYebw", # This is the storageId of main_bg.jpg from the default wg 7 style 3
+	storageId    => "ImadeThisUp",
 };
 $article->update($newArticleSettings);
 
@@ -64,23 +64,39 @@ foreach my $newSetting (keys %{$newArticleSettings}) {
 }
 
 # Test the duplicate method... not for assets, just the extended duplicate functionality of the article wobject
-my $filename = "main_bg.jpg";
+my $filename = "page_title.jpg";
+
+# Use some test collateral to create a storage location and assign it to our article
+my $storage = WebGUI::Storage::Image->create($session);
+$storage->addFileFromFilesystem("../../supporting_collateral/".$filename);
+$article->update({storageId=>$storage->getId});
 
 my $duplicateArticle = $article->duplicate();
 isa_ok($duplicateArticle, 'WebGUI::Asset::Wobject::Article');
 
-my $storageId = $duplicateArticle->get("storageId");
-my $storage = WebGUI::Storage::Image->get($session,$storageId);
-my $duplicateFilename = $storage->getFiles->[0];
+my $duplicateStorageId = $duplicateArticle->get("storageId");
+my $duplicateStorage = WebGUI::Storage::Image->get($session,$duplicateStorageId);
+my $duplicateFilename = $duplicateStorage->getFiles->[0];
 
 is ($duplicateFilename, $filename, "duplicate method copies collateral");
 
+# Test the purge method to see if it gets rid of the collateral
+
+$duplicateArticle->purge();
+
+# The get method will create the directory if it doesnt exist... very strange.
+$duplicateStorage = WebGUI::Storage::Image->get($session,$duplicateStorageId);
+
+# so lets check for the file instead
+$duplicateFilename = $duplicateStorage->getFiles->[0];
+
+is ($duplicateFilename, undef, 'purge method deletes collateral');
+
 TODO: {
         local $TODO = "Tests to make later";
         ok(0, 'Test exportAssetData method');
 	ok(0, 'Test getStorageLocation method');
 	ok(0, 'Test indexContent method');
-	ok(0, 'Test purge method');
 	ok(0, 'Test purgeCache method');
 	ok(0, 'Test purgeRevision method');
 	ok(0, 'Test view method... maybe?');
diff --git a/t/supporting_collateral/page_title.jpg b/t/supporting_collateral/page_title.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8b8159f80df7df7829f25265d65de3323611a1b8
GIT binary patch
literal 24549
zcmeHP30PA{*PameO%QQc5Kvr#$<0a-$;S>>q_VkvEe#~WXdsXTL0XMftF8SjuBA#9
z*IKJx1gm~lo4VCq>n^p5qT)(r5d{pn-?=vd60}RczkQy6xmWLG=FB<go_Xh;xkH{O
z2fvEnL>^;e;$slahKAzcAHr|hEr~9a%MeOPK*JG2j>v)59nqmigMWzD7uk_@gfeLT
zI_lGCLrpq1po1YOQGd8qG&Wi90rkZT<;d1#y9qvjLeBa*2nBkye}+qx8B*WZrz$l{
z^;Bi9Z)7stcY-`eqAXA&HjBj%VR1v)m@mc)VF^NbEO3G7>uAR3;y6O<Y})<Xq^+a3
z*Abgggv*{rH^pdgJ`UQz&T-I&n2!T6F~v(8Y184`cCyhOffj*?@e?=4l8_Nt)*@GO
zOzDvc$Oiuvxsxp<nL}9O*U)_A>ged`<ml?;<m&0-?BeO&&DFJ=cW*B*Z!fRjp04C&
z`Y<-SmNYjP7dLk|4|jKu9`5e$J&3}+htb6I&p5z;K%S1s4XvZo{E&?&jqXXqufwpN
z@xwF`L}^DOF9?{p=s*-(J9`I5CubL+gJmZT+0ffNJrK>7Mz^uGv2(C@w4=Lnpwp9X
zJE%Km7d~F><(Ky^+rG!r^*bW`1H6+CWN^5ux#uDs1}{slyH%g5=JniAK5t0W@)Sw*
z!HpVzuk)$Z(uRuphc4vbZj1?BvFW{?D-U11^K|pKM=srMN|Vi4@bPE6e!N`sOb|OE
zt6*Wtmfc6M+<WecY-}J}TQVjGdpjN(!XT`>Ekuy#=Vix!cWDnIf&)qC>No)zw^VbN
zMJ9V^s=4)p?TG*!hVTxahafigl0>KSHPY&i5Pmy?z|IixpOGt_e5NN7p{G-|^K?CK
zJP{p{XqV%tQL;0)jaeZO@8OTD+G$@B`)pjTu6_|iebPVq$Pc6HKPVr^qF)H}zqasQ
zZkbo}=8=v1<U{WyUdPd@!EW_>QRCndeHYw5T(*BGxb=<|J^p^%tn^*8e3a|^iB>)x
zUG=Pbn;{WLr<cv0#BuWM9~!x7&+UG#?3muidM%lEZQh6V)iVYe-1W(!S1%u%{^{Gu
z`52A@aa41hc~R6TS@_*4?I$=o>W`zMwXULjiH2S{S|2idGmh?;Js*W5zml!m*1)zi
zI6Ahyim)ho=+jdE+VvXIDedj0INCqK-luU3j$Cl`({*MNj-DpISc9Xb<J$zSqa2P`
zwRo4cE;J~XwMF8HpT6kLCzv4<NBxW29`0e`XpN{j-LT;P?9#RYWoli+u=dIbQBya4
z<?Laz*W;*^d4yR2F=9Ac9BXL$XK(G9GCdPVks48gVe#32RkifcnJVVbihq0G(UxMp
zO7#4Tn}-Y<9Np5k_FLbod^%$mF__IAwe2|igK=GLI$g8xty>QaOIxqT`9z-0IJtXz
z-i>qFQF}*kzqls$Ue4sjZL8?oTF2VGq9-SI6+Fh#j%&}fJ6o4rZQAwtqsP~e-pg(s
z{$qdrk(j^|zko*~RkQNzZr$#GBR#U<)B@$}eIw^-Tb|&Rc&&42=bp$J$wI*q@d>tr
z$pz^_mSzRfN3S*Y8FwgRXD4<l8fiC#>~rrl5zRqHk8Y%l*zpFEntd$W^hUDnM3zv{
zj8@KM8}>oM2KI8|awhjhqGm(J(?nDu3Z_g3Jqjpc2ZoDglB{2~x<f+j)-*)yvF$oM
zQWDfDA$>MO8=+j-WnX#G?-Sjx?85&$eIzoDgl|NQ6~=Az594h@aUe($`Q9+%)0b${
z<DoE)hiD?=on(^+pUyA>G0H+xl#Vn=4z~j8q+deK;v(KPri-*~f3LL*iC|v3OhFRz
zoP31>K8RPdeTFhWN1{&5n3f4GlU-7#27?ws0F(l+UxhL!i>MRVSgA~7-j2{HvrTO>
zjHIlorhYOsd$mHIDOIN_#;U=XX7L<5vJb@F;dUS!@lj^J9kNu){9Fr>y;3F5lIKWs
z^0UFlH9DE_o=D1|?IzCGC}X8LQk7UEm4E=H%*>UVl%0*rgoNmc&(89NkH35T^n8^f
zC3<2CJjw(v0luXqL7gSFkl2eAniO%Ch0Hxu3U<;$O}siTC1GraQmG&uI<|`~l%1w3
zRYl<nc~(18-Hd~eYZrs1gG4G5=PNW&b($enX<nh8)-JYGcge_#R4SAzGjKhP{v%>L
zI=}>tQ|1s@J86`;iTN6})SNiZ3Lw%;Qr8Tn1_<?%+y$n1YFBk~1r8-1gk0gKiR#F@
zakY7pb((2!B2Jw~LX-QDEuoKWXFx%KxDIaE^Jq5_>irhTC!^kQDx=PE)H$x^8Fh}M
z&T)V7IgZ@72Em?#P%7N8M<LV=g(C@4q6~QH`=Zy;RH$p<R+BY2+#s(%(C|f(D4F~d
z*R<yuPZ<v6YaX6~-x3a-s?p?zFqt{(kz(R6?2(zuY-XW2mx+yJF;S?fFjt&8U8?cT
zkit85wBM8Obbh{a$!Na`yaZN4ZlrXoJg!J3O)eUjl36r8Qz-Ehg*k^7h7@M!W=l0<
z-@<G~jyj}pv>)j_1nPvC>E}zTXr_<$<BY^cVnG;&`Gq<A`uc{dB(jjCs2Gzav_|`x
zLM$jK7+Js>sZ?b#F`-b%WU-lSb`WR;sb}VB#DzgQYJa1Xc0W;4b*4(5tC1^nd<nl|
zIN4}M`}q+M>bOiHigObZIv({(G_tdq9qz$86i`Y?2#Hc==4VTDH1Sbk`T255NDPN7
z;6_IT3s_NDR5*r(LsJ;eX2<XZ0znKG5lWzIY1bK!$!C0yS|iTMly>+O{5hXyb|#;p
zOk&(-IFKL{(RY#m34DGZovzS?M5?54<cfkjjQD;gh{XwF2~#j`2>fRWgNSczSR@$c
znwC(6Bq$|v*-SGZ+#oiV(*7M!5DUKSG5Ijl?CJvuClPDJf69xwZWlk~c;JKsr>rpY
ztD0AT8D%yklk#6Z6_U)3naG8sB)K3YnM|odO7Kt(D;KjQsw6W+rc`B%HDU5>ah8-h
zEmxWq%IuW>)dA+Ve@WL7r^R~e=qC3V3*K~eg^-6vm{e&PCzSarvDxf&cE`!p8l`F`
zvxDV-75z1GS?5M%F&d)h<$(~=5cnemCPYkZKVeuX^Cg+t5XioXNm8{^kx%LiV9l^t
zOpGW^rsmyUO(*@nsd;x-(@x9O9JwZpZF*W4aaXHxFsvEUD0!At4K_SJgUu7b9SpaS
z!RE6WYylT;kOgxYJPr$P4C){c<}lboK7+%;7#u7ZZXtumhMU6%8Tb*f;09d*(dI!v
z+#D{4Jt{^J6%!FDi01Q!Tpm}*4~~q8j=;EBj4&cPGA1V46u3oXrm+9AZBPo|e!rU4
zM9<4SAfzF$%L}E7iBWP`o@#;%JYjGs^OZejD0lWxGP49Oyt1RKA-Q~#;oU6_3j*qq
zHfFM}>K2%B_`!TGgUb@~S!4<GB*56ll1)mCB?sg@%&5a<5LN=RggJ%z0tu8L;Rf?q
zWC`;Lb(l>kVg3aiU<XlxK9oYD3<gaoiDz+uD?~{=g##QSO0b2Jv;_unF)s8HB}5CQ
zQ6eDg!9*#9IH4qUggmGV*o0gFY=aUw$;E`=lPC#WVK8AU3?_7h!Gw-bNa_eNvQBst
zlHP<u;)z1ir;vz*&BFK$;4K5V&fqfyj9`Y40nlI=17kBV4g=#dfXASO2^c_nHt51q
zfRzA?ga_*d=ng9b2tO)3I!Y*rVq?)*WK3iXmlGk30*HdcBLvYHpC1`+noNrs`(2hB
zxerGwIG8azPG;>pWXCb+Z>e<h>~C>zbV@zMDsU;dD7dUbz$#^mT@+kaAz+m<#V!gi
zs}QhCnPL|OmsJQ@rA)Dlg3BrdtWu`fMZski0#+$g?4sbZ3IVH>DRxnCS%rXA$`rdO
zxU53JDrJgY6kJvzV3jh(E($KI5U@&_ViyIMRR~z6OtFiC%PIt{Ql{8N!DST!Rw+~L
zqTsR$0jrcLc2RIyg@9Gc6uT(6tU|ylWr|%CTvj1ql`_RH3NEV<uuA!N+2!2%TSsXQ
z{J^mQe#!XCtUQkP#090JtD}RXtGlzKqqDn*8zkCs^Y}AKb!bkI)yLV%#mULV-Nntt
z-IK`5V@k(kMOGfRO<I?%JVPKW&j$EasDpV@9%O4rx3Q-oQ&t`u8@hR~<*&JIXmlbg
zkG%sO3L7=ehVE&L>>w>q_;`CSF{I_`!Ct!F!P}S>=N6}DMqPkvZvEg$Zt}7X<(cY(
zyr{tC8!Py|QY4x~=c^ru%yV+?-Dm!a=$K7A(=MbA?b~p>k;u#=&3|vDF+0z1B<Bf^
zn>e-b{ZBsMbL{H<=3&D4N%EN=tlIjo<CPCuhKG!qJgsQa>M!=5`1xV0F^dn~&JHpQ
z**enc*<?l?B9TzI-FS%DKJVS7?Dae9dK@@+%Rj<9DMMAy3E)P~?YS&@@P^FtgAVHR
zyy~cVy;7FLjP&j^gdg2EP@+i{G;FLmG<4X7+l}*AY}#oVa*SC<A@hVn7BT-$$d-wJ
zYTw+hd-5ZW<_h;u(pG(hBip=HJ5mjl@Q(nQKWBK6t2lSlw$Qg0uV3}W=#M;#n-!^3
zE|s)3SJlM|wlQDS>uxUgf5?2%z-)%xMPJO^AC05gaNFXjDbYKvNeWGY-t+XslLo!A
z+5i344-NVc4Nf?ExK=q{TeVbsK-89eB(;5B)J5eu()BYqR)=kXiXY6GwslMC#q{TQ
z((53ZQc8WQGA;f2ZS8^nH%!wPT>QE2$uZr{GQ-xIre19=z4Tr<x)f?nlwPmt@4Qe2
z&pR11Fl^(}7XdqdnKj^Ot<)@5-XhleW!NtsXD8$6hm5b9YD~j=bebI22RJ$#ha)lu
z9Ib`yOU7Z1o~a}0rY>sKlB3c#o);N`(%svnHH|3oO{H-}`>IHm2AAod7Mn0?dEjFj
zPx6&gBkErZNYnxD(U2U9#K%w++YWgO6&t~=zaKYMV9oB#tv?F`cCY(vi+X4IosFHd
z;P<^eU>bj4oNQvxPvb|VrzM5FcQRL7*tY^lGm;t_b?TK5PF&aam+#r@^NsFagJMTs
z{?7q=ZO!(pc{67%{%+yf+O$RXpKm=-5!f$&`o);4&u`l9(Y1ZDT#utl>B+DS=YpqR
z9F*o7&7Z7%G07=z?X$f12OO6vD$92r#eaI-vcoV>%c!c;H6;qxRh<;*nXtstWJg=w
z^cC8J#NxQo-tRrBRM5j97u_s@)l*$|I`9S<dCyS%lH9WC#g&(3z_)Z*kBhY2vbxuZ
z<v2lh`iN+CV)I~P@$cEv7!N$`bYZ4mL@vt8ioC>{<xkpubQKnRbRXU`sas?nsVq}y
z+rvM7U(j%x%w+~Uz$&Z8=hJE0Sk!?)>TfxBl6Y?MEf_WQNqSAIC`<o!6U!-J^{3d!
zXD{W94ID7XZmPpuBl`R}dvUsxp$W!3@e2pOdt3kSz1kiD92J!Oe=iRHvoq|z9g#X<
z>`;dbj8*K8Ni82-v$N;k&0A^3y}jR8jo4Yf_JFopnA2@LFRRtrQ&C*YYQ;1=!!K{4
z4M^3=d_|R7nezN;!wVcOFq}HWY0Qlpu|c-O&usz!&b!$|uRRt#44#~yCi+#^tbBZU
zt$r_i#paYRXBI9hlqd>5D^_{&6_xf%{M;vP1!*|?_)&4ofI$7F(nouD>v#WCd+dRz
zW_u~PeyVKAQnn0W>aUdQ1sk;|M?sgiX5SsrlDDTAl6K(e#Hq4+_vbCi@rKRJr%Q13
zq1fk*OS-#zZyRD^k@94%zkZ3MpesHNA&D*9hCmj+{rwD+t{GxsS@Yoa=61iT;Y?LS
zNP5fHK6eIQ#?gxH+J=fieFTn%%S9JA8<zRhE2fXRwB>{S{T}p9$xK~&T$c1s{8s;f
zIdg}*h2K}<=unYBU$I-ixWq91$bvGreS?Blu1wmQCd(Z6T`z`uX5}ZmX5YMN_lg;@
z=Z3E8Q+$8z&>s(dd0BcvS~9TriGa3$9Cm!s#vb0M{Fv`gk7LKLEERZGR>+RLQOZ}O
znktTqPK}*^@=e!a(Sze1bc6lMVgf%tag_H_>QDWq4DlPcY>fLO!<aIk23?j@*mv8s
zC-aZ$7cVzVJFaV<9s}6UfOLrGAw%O#omr@7vL;o|+OhSNYE8^g_wn<ymc(Gcwu&l8
z%?jHcy|DNEyfbgyIoLB%d-<Tb$CItUZZku(>bJqfbmkM}R&`=^V$(3~riJ<`jutZ_
zxRS4I$=O3hs69PNU@;+rW~F)fg*ftkwp+g$(l@SLC93ZA_s+S$ITNeQDJ7{gXQBlL
zxApUWu4-6WY)F&f=>7D&34yIEbmt=tLGx$*CoI>RW9Xvax(P=~C9QGVBi|H%^{}ep
zdLEAaLAJWW!uxV<-3>VWGisrCGxRoU%~nxyL$~SL6KSHBNy`m`v@5w~4<Th{e7ELZ
zo=w-M7^ZwBx}zy;OjBC8FIO7+ozvZ2qr0QgHNL5|^j>cWuT{2;If|nZZ0%uY!)MFe
z#-u+OgrlAo%sFlDKEYzqoHq9^IyM^C>#&J9x+_a;e$S9{Uc2?Rwg6G})mRIrd~eBf
z3!+%?{Ai2Ax4OF{eDvFo<H$ot@$f&`Z7Cj7Jf!x+j_vk;;(n-o<C3=H&?C9_fBp?6
zytltJQ8%UZ1KD_IkMg)vw5D5C)q(G<wm34rw^n?f`@*gJv*{BT#YIhvFPQaT=T?ue
z)UA-EXFU_i#g}fLEE(@~(93?j*KxntJ%_o|UPLA=Pb}$=onWtsb6DW_y<hY_ID?%z
zUQ>pjf6`L%L!TWJs{UVoG{@IewZwicx>urKGq&!AVnx{JFAnu-3;ZR0jO;A0=G0Lq
Gyz<|ysWE{7

literal 0
HcmV?d00001