From d0810cba2eea1970a4e2e02770bea5d88650f725 Mon Sep 17 00:00:00 2001 From: fdbozzo Date: Sat, 17 May 2014 18:42:55 +0200 Subject: [PATCH] =?UTF-8?q?Changeset:=20251=20fdbozzo=20-=2017/05/2014=201?= =?UTF-8?q?5:35:23:=20-=20Agregado=20Unit=20Testing=20para=20comprobar=20g?= =?UTF-8?q?eneraci=C3=B3n=20de=20clases,=20forms,=20reportes=20y=20men?= =?UTF-8?q?=C3=BAs=20-=20Agregado=20nuevo=20switch=20OptimizeByFilestamp?= =?UTF-8?q?=20que=20permite=20desactivar=20la=20optimizaci=C3=B3n=20de=20r?= =?UTF-8?q?egeneraci=C3=B3n=20de=20archivos=20seg=C3=BAn=20el=20timestamp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Menu_Comments_Procedure.mn2 | 33 ++++ .../Menu_Comments_Procedure.mnt | Bin 0 -> 1011 bytes .../Menu_Comments_Procedure.mnx | Bin 0 -> 1721 bytes TESTS/DATOS_READONLY/Menu_LineBreak.mn2 | 38 +++++ TESTS/DATOS_READONLY/Menu_LineBreak.mnt | Bin 0 -> 1544 bytes TESTS/DATOS_READONLY/Menu_LineBreak.mnx | Bin 0 -> 1799 bytes .../DATOS_READONLY/test_public_protected.vc2 | 161 ++++++++++++++++++ .../DATOS_READONLY/test_public_protected.vct | Bin 0 -> 3673 bytes .../DATOS_READONLY/test_public_protected.vcx | Bin 0 -> 2559 bytes TESTS/DATOS_READONLY/test_report.fr2 | 102 +++++++++++ TESTS/DATOS_READONLY/test_report.frt | Bin 0 -> 2432 bytes TESTS/DATOS_READONLY/test_report.frx | Bin 0 -> 4300 bytes TESTS/ut__foxbin2prg.prg | 144 ++++++++++++++++ foxbin2prg.cfg | 2 + foxbin2prg.pj2 | 2 +- foxbin2prg.pjt | Bin 376514 -> 381964 bytes foxbin2prg.pjx | Bin 6653 -> 6653 bytes foxbin2prg.prg | 11 +- 18 files changed, 488 insertions(+), 5 deletions(-) create mode 100644 TESTS/DATOS_READONLY/Menu_Comments_Procedure.mn2 create mode 100644 TESTS/DATOS_READONLY/Menu_Comments_Procedure.mnt create mode 100644 TESTS/DATOS_READONLY/Menu_Comments_Procedure.mnx create mode 100644 TESTS/DATOS_READONLY/Menu_LineBreak.mn2 create mode 100644 TESTS/DATOS_READONLY/Menu_LineBreak.mnt create mode 100644 TESTS/DATOS_READONLY/Menu_LineBreak.mnx create mode 100644 TESTS/DATOS_READONLY/test_public_protected.vc2 create mode 100644 TESTS/DATOS_READONLY/test_public_protected.vct create mode 100644 TESTS/DATOS_READONLY/test_public_protected.vcx create mode 100644 TESTS/DATOS_READONLY/test_report.fr2 create mode 100644 TESTS/DATOS_READONLY/test_report.frt create mode 100644 TESTS/DATOS_READONLY/test_report.frx diff --git a/TESTS/DATOS_READONLY/Menu_Comments_Procedure.mn2 b/TESTS/DATOS_READONLY/Menu_Comments_Procedure.mn2 new file mode 100644 index 0000000..e5e7456 --- /dev/null +++ b/TESTS/DATOS_READONLY/Menu_Comments_Procedure.mn2 @@ -0,0 +1,33 @@ +*-------------------------------------------------------------------------------------------------------------------------------------------------------- +* (ES) AUTOGENERADO - ¡¡ATENCIÓN!! - ¡¡NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!! +* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! +*-------------------------------------------------------------------------------------------------------------------------------------------------------- +*< FOXBIN2PRG: Version="1.19" SourceFile="menu_comments_procedure.mnx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) +* +*1 +*REPLACE + +* +DEFINE MENU _MSYSMENU BAR +DEFINE PAD _40O0YW62F OF _MSYSMENU PROMPT "A first Entry" COLOR SCHEME 3 + +ON PAD _40O0YW62F OF _MSYSMENU ACTIVATE POPUP AfirstEntr + + *---------------------------------- + DEFINE POPUP AfirstEntr MARGIN RELATIVE SHADOW COLOR SCHEME 4 + DEFINE BAR 1 OF AfirstEntr PROMPT "Item 1" ; + KEY ALT+1, "ALT+1" && Do something depending on App version + ON SELECTION BAR 1 OF AfirstEntr iif(oApp.Version()=="v1.0",oApp.Run(1), oApp.Run(2)) + + DEFINE BAR 2 OF AfirstEntr PROMPT "Hide Errors" && Setup some very effective error handling + ON SELECTION BAR 2 OF AfirstEntr DO BAR_2_OF_AfirstEntr_FB2P + +DEFINE PAD _40O0YW62G OF _MSYSMENU PROMPT "E\ \ No newline at end of file diff --git a/TESTS/DATOS_READONLY/Menu_Comments_Procedure.mnt b/TESTS/DATOS_READONLY/Menu_Comments_Procedure.mnt new file mode 100644 index 0000000000000000000000000000000000000000..49368e4f8ee52325315e71a3b1fccd858acdefe8 GIT binary patch literal 1011 zcmeHE?MlNi6s@QO6`#N#UJ7E1W3*-X%l_zStAcZ5^MipnKENH}L)80sV*!62GsK{iUW z?F3mm2*xJGnWAj!)W-IToptb)b=0$22R`2 z<6P#ixj@H-Fa&$dSJFv3Y&E6-dBnnXDCReu5V z7@Y6m8*@ExYbekYfUrNSo3`o%%rSVF?|3IjPb2xN(9-nz&m#Gbw-qapfD7xBtTzl{ z>IGa_f1|g3uH35 za6bzDUKd@5>ID1&9^W__8XQvZ;CP384Y41juUQeA+nETw-&q7LUmA^^=h*`pI|edd)u)Wim9c(nkzi&Eq&`LaTEXOO@2AQ z{JPT@yUTrVCqr*)oZe6{Hf;$CmFPVEPxzxs?&jjIh7sAUuU zf4*9tOGK>qSB7ezz%KAy;enbzx9l1*Pc0MaPegqC``l9f`FuAlNjI)kbaOlY4HNu) AM*si- literal 0 HcmV?d00001 diff --git a/TESTS/DATOS_READONLY/Menu_LineBreak.mn2 b/TESTS/DATOS_READONLY/Menu_LineBreak.mn2 new file mode 100644 index 0000000..6ccf1d7 --- /dev/null +++ b/TESTS/DATOS_READONLY/Menu_LineBreak.mn2 @@ -0,0 +1,38 @@ +*-------------------------------------------------------------------------------------------------------------------------------------------------------- +* (ES) AUTOGENERADO - ¡¡ATENCIÓN!! - ¡¡NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!! +* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! +*-------------------------------------------------------------------------------------------------------------------------------------------------------- +*< FOXBIN2PRG: Version="1.19" SourceFile="menu_linebreak.mnx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) +* +*1 +*REPLACE + +* +DEFINE MENU _MSYSMENU BAR +DEFINE PAD _40O0YW62F OF _MSYSMENU PROMPT "A first Entry" COLOR SCHEME 3 + +ON PAD _40O0YW62F OF _MSYSMENU ACTIVATE POPUP AfirstEntr + + *---------------------------------- + DEFINE POPUP AfirstEntr MARGIN RELATIVE SHADOW COLOR SCHEME 4 + DEFINE BAR 1 OF AfirstEntr PROMPT "Item 1" ; + KEY ALT+1, "ALT+1" && Do something depending on App version + ON SELECTION BAR 1 OF AfirstEntr iif(oApp.Version()=="v1.0",oApp.Run(1), oApp.Run(2)) + + DEFINE BAR 2 OF AfirstEntr PROMPT "Hide Errors" + ON SELECTION BAR 2 OF AfirstEntr DO BAR_2_OF_AfirstEntr_FB2P + +DEFINE PAD _40O0YW62G OF _MSYSMENU PROMPT "E\a line break in it + +ON SELECTION PAD _40O101BHZ OF _MSYSMENU messageb("Hello!") + +* \ No newline at end of file diff --git a/TESTS/DATOS_READONLY/Menu_LineBreak.mnt b/TESTS/DATOS_READONLY/Menu_LineBreak.mnt new file mode 100644 index 0000000000000000000000000000000000000000..29d31ac47fe5dbf74af31ab733409b2658ed853e GIT binary patch literal 1544 zcmeH_QA^`M5XU2Uq9?xi>VsoIF2Nd`B0iail%)2+TCsYEB80RV?P9YVcDIV(-knBM zu&MX~3@n+Q`R(k?f5)<{Bg?Y(%=-C$6d(mw%-TqLgWEwbzPPE;gn+FO9+*@bVy@-u zCy0RG$#Jvay#0UD>U@ft?Fp{MKN6rsj(W`a zBV<@0&&U!S!lHm@l!^&nUqM;JF=G#oFtGQpgdH~s>}TI=+Krj}YRVnoZ9uhYxo(w^ zy4dWp3?Y_MNL2+s3<7qdKD5KDq?PnL$y~Ig({5dUaLfOcVJ*Ht&6uu-DkY=(_*}`a zfZbVtQL58ns?c#E2*AFSBAbr1kG^nw70rMUTL_sIvWsDr8c^H)R zG&%AqFq#Y#E2;~=&Tpc0#e62u7I^|zU zhrXEw+IVNE!_f$pa@>Zez4;)#mqRr;*VOz-+I5i!B&W d)u!L{+ugfGhJfwdl#o8+(6PHXnTS2xeFJYgkf#6u literal 0 HcmV?d00001 diff --git a/TESTS/DATOS_READONLY/Menu_LineBreak.mnx b/TESTS/DATOS_READONLY/Menu_LineBreak.mnx new file mode 100644 index 0000000000000000000000000000000000000000..aa36c442651460a8ed536340adc1b29747261199 GIT binary patch literal 1799 zcmeHH%Wl*#6g6#G00L2-q98EhEdnSo?2TQ>>uk~RaKFMkWjzVX z-h?>_;`1W2dF2-^^9XsJS*zTF4)*Q@Z%tXMGrxsBoZz9a+XJ}A;CY52$eTr7K*2r% z5$<1_s?Hk$cLY9+_k1I0pHIZ=)F{`+znX~me4SIlN|Icpm+Mu2niXJ#{W8H*TrZWw6{j=s;r_0+tIF6Cl#5})`bfxTL?su!e@<`y1yA#3~Ts`O-|QYL&5g9jhSRztl_9R-ikZ;x}bsm_6cG zFyZ+?cK3S@KHQ%*`5!_^Ig9!JBd}mZZ$@_~$B5`EBP{xXjOFY;M+0~v$pvpX=x{3M zKW(`wQ7bhx8Z{~Bk{;-jFHTHk@?`)cgw$ z)so~rd|!6{SJn8bNwnAO$M+V$;aZ;??(G9shPeLTBJ=BF3sH~Vn-1=cAJ#{-udSqH V-y6<6`0+tw_@?vET-)V#^bc29d3OK+ literal 0 HcmV?d00001 diff --git a/TESTS/DATOS_READONLY/test_public_protected.vc2 b/TESTS/DATOS_READONLY/test_public_protected.vc2 new file mode 100644 index 0000000..3d8cccc --- /dev/null +++ b/TESTS/DATOS_READONLY/test_public_protected.vc2 @@ -0,0 +1,161 @@ +*-------------------------------------------------------------------------------------------------------------------------------------------------------- +* (ES) AUTOGENERADO - ¡¡ATENCIÓN!! - ¡¡NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!! +* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! +*-------------------------------------------------------------------------------------------------------------------------------------------------------- +*< FOXBIN2PRG: Version="1.19" SourceFile="test_public_protected.vcx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) +* +* +DEFINE CLASS cmdbutton1 AS commandbutton + *< CLASSDATA: Baseclass="commandbutton" Timestamp="" Scale="Pixels" Uniqueid="" /> + + * + *p: invalue + * + + Caption = "Command1" + Height = 27 + invalue = Default Value + Name = "cmdbutton1" + Width = 84 + +ENDDEFINE + +DEFINE CLASS cmdsubbutton AS cmdbutton1 OF "test_public_protected.vcx" + *< CLASSDATA: Baseclass="commandbutton" Timestamp="" Scale="Pixels" Uniqueid="" /> + + PROTECTED invalue + invalue = New Value + Name = "cmdsubbutton" + +ENDDEFINE + +DEFINE CLASS frmform1 AS form + *< CLASSDATA: Baseclass="form" Timestamp="" Scale="Pixels" Uniqueid="" /> + + *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder + *< OBJECTDATA: ObjPath="txtAddedThisThird" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Label1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Command1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Cmdbutton11" UniqueID="" Timestamp="" /> + + * + *m: canprocess + *m: initobjects + *m: processaction + *m: processactionpart1 + *m: processactionpart2 + * + + Caption = "Form" + DoCreate = .T. + Name = "frmform1" + + ADD OBJECT 'Cmdbutton11' AS cmdsubbutton WITH ; + Height = 36, ; + Left = 60, ; + Name = "Cmdbutton11", ; + Top = 144, ; + Width = 120 + *< END OBJECT: ClassLib="test_public_protected.vcx" BaseClass="commandbutton" /> + + ADD OBJECT 'Command1' AS commandbutton WITH ; + Caption = "This button was added second", ; + DefHeight = , ; + DefLeft = , ; + Height = (25), ; + Left = (this.Height), ; + Name = "Command1", ; + Top = 48, ; + Width = 192 + *< END OBJECT: BaseClass="commandbutton" /> + + ADD OBJECT 'Label1' AS label WITH ; + Caption = "This label was added first", ; + Height = 18, ; + Left = 24, ; + Name = "Label1", ; + Top = 12, ; + Width = 144 + *< END OBJECT: BaseClass="label" /> + + ADD OBJECT 'txtAddedThisThird' AS textbox WITH ; + Height = 25, ; + Left = 24, ; + Name = "txtAddedThisThird", ; + Top = 96, ; + Width = 180 + *< END OBJECT: BaseClass="textbox" /> + + PROTECTED PROCEDURE canprocess + ENDPROC + + PROCEDURE Init + * + * Init the form! + * + thisform.Caption = "Hello world!" + ENDPROC + + PROTECTED PROCEDURE initobjects + * + * Initialize some objects here + * + ENDPROC + + PROCEDURE processaction + * + * ProcessActions again, all public + * + * TODO + ENDPROC + + PROTECTED PROCEDURE processactionpart1 + * + * Part 1, do some stuff + * + SELECT 0 + ENDPROC + + PROTECTED PROCEDURE processactionpart2 + ENDPROC + +ENDDEFINE + +DEFINE CLASS frmform2 AS form + *< CLASSDATA: Baseclass="form" Timestamp="" Scale="Pixels" Uniqueid="" /> + + *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder + *< OBJECTDATA: ObjPath="Label1" UniqueID="" Timestamp="" /> + + * + *m: privatemethod && A private method + *m: protectedmethod && A protected method + *m: publicmethod && Regular public method + * + + Caption = "Form" + DoCreate = .T. + Name = "frmform2" + + ADD OBJECT 'Label1' AS label WITH ; + Caption = "Added this control first", ; + Height = 25, ; + Left = 36, ; + Name = "Label1", ; + Top = 24, ; + Width = 205 + *< END OBJECT: BaseClass="label" /> + + HIDDEN PROCEDURE privatemethod && A private method + * Private method + ENDPROC + + PROTECTED PROCEDURE protectedmethod && A protected method + * Protected method + ENDPROC + + PROCEDURE publicmethod && Regular public method + * Pub method + ENDPROC + +ENDDEFINE diff --git a/TESTS/DATOS_READONLY/test_public_protected.vct b/TESTS/DATOS_READONLY/test_public_protected.vct new file mode 100644 index 0000000000000000000000000000000000000000..f0e5bd49b3a67eedd3805a7882e04cda961d9526 GIT binary patch literal 3673 zcmeHJUvJ|?5a0CAwWJO7?(HNbwv|A4RTVW(TY5+!MQN&5lqPC(hd{u|i8qZoCywk* zTk(Q~PT~5>^#=oc=yb+X`oo))#qK~^Rg~Gs2f{t; zOSrV&EEV5(9offtcdJya+au}vL(JCdvH!|ispt;RZEq}~-4i`~>`DHJ=B47XJs|B` zx&y4$Ci8XA4ns95=&fH;z7n%rE%#D*+HM-_wC1i9p?o|VcRaWIcog_jbfs|0=iSSj zSXc(eaNNnzwUGvPEG}|_N*1JHO$Cr2XEv<7&F6Z4Fi?oi@nSC+&?n8<_MTr4ge{5a za=V;4qkY%`nmz`-GDTbK+Cxy(6=6un=t{ryDd@sPY3(kZ_s9-pB}ZrJV=BDUI%(D$ zdk;?<{19$R#dZ8fLoWM*6X4ZIDf@0nv$By&2g37we&Gk6vkGjD<2~|LDyBX&&=S|K z?YW-`9{R{K1)TRqfW(7Ij+abK3Sujcz81w9a{J77ha24XJRWC|GHW;Ynt$(8@e~1U zfiqs&;Eo>y4CT1ji@cpSjvDng-!%N?*2K2bez=~V5{Cza44P)5no>lNa5DQk`+oHkAp5;)4qWMaOXc9HE;@ksQdhJq&2_D9Io2RmtNsqBIb zouyO$({!Ep?2hm>S?1){5q;4$F$tw_Bpboz(Ncb43^ay@teZ&`}k2r6R@&KuzOT3iKY;Rynq~Z^UxX+Qu{i{s2)- z@)5T^gOE^k{h@=1bch;f8f0G6`ggr|sh-?G*PY;goHP;ZijN)SOhQN1%qGjoCc||K zeKJ4H{%Vf3ouy9a#e1!lZn}y>jqjp?kbU2we(Ij1amUk7l4|@m?Ryyu)H-j)OSpEC z-{rE~&?>d_jq9QtQ#;0@acA0G*IwrG*7Q6nuMp8d4U%uDvq=P;RJi>!Tcc)H&_d2fN$Yppi^jZ}-(YY8U%e*h5KGd9QQZr_MD zySiFp#zoXo$`Z?5N3K%e$*QAEX{5eY*bfDZZL=Nrlu`L-A7Wz#atNXEEaVB~D+q;7 zlzayvDwZMh^oC&-atC8}A94++Fe%(l$p0ONB>B(xZ_v&}eoYw=0^0pcHK&&*KTD&U z5jRG8XdYi7Zp@;nMh>s8mYG=yZz*ksRq;can|%-ry9=RsX*>gILTm`ZB=}DuUqgtv J$S^P7zW{Zx4piVP}QQkVPgv?hwU$E!>a1EGy>l z0r;`X{G3OLk2D{&@V1u;y#~)(c+x%}do0wdeAvP}UMga#F!7v?r%6YoG87r{5j&T{ zmjVaCEemHM7m^_FkWX1S_U9)-vA@$fFP}gXrgHRu zX!r>;o`i?i`DicjsH+FVL_&wbN%|i>2vP)M^YtV}cu z)s3Btw_kDwROTj&cktkwQD zw$yvV7R}k2&;`2iOFCYI-+TbZz#oEIkkGkd Pnyh_{kGD{yzp (Solo para binarios VFP 9 / Only for VFP 9 binaries) +* + + + + +