Changeset: 156 - Arreglo bug PageFrame (error ActivePage) / Nuevo test unitario para comprobar la solución
- Parámero cNoTimestamps='1' agregado a scripts de conversión batch
This commit is contained in:
fernando
@@ -2,7 +2,7 @@
|
||||
* (ES) AUTOGENERADO - <20><>ATENCI<43>N!! - <20><>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="C:\DESA\foxbin2prg\TESTS\DATOS_READONLY\fb2p_frm_2.scx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries)
|
||||
*< FOXBIN2PRG: Version="1.19" SourceFile="C:\DESA\foxbin2prg\TESTS\DATOS_READONLY\FB2P_FRM_2.SCX" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries)
|
||||
*
|
||||
*
|
||||
DEFINE CLASS Dataenvironment AS dataenvironment
|
||||
@@ -17,7 +17,7 @@ DEFINE CLASS Dataenvironment AS dataenvironment
|
||||
ENDDEFINE
|
||||
|
||||
DEFINE CLASS Form1 AS form
|
||||
*< CLASSDATA: Baseclass="form" Timestamp="2013/12/15 18:41:14" Scale="" Uniqueid="_3XW0B26O1" />
|
||||
*< CLASSDATA: Baseclass="form" Timestamp="2014/02/03 19:55:29" Scale="" Uniqueid="_3XW0B26O1" />
|
||||
*<DefinedPropArrayMethod>
|
||||
*p: a_otra
|
||||
*a: ^a_prop[1,0] && array
|
||||
@@ -109,12 +109,12 @@ DEFINE CLASS Form1 AS form
|
||||
_prop = .F.
|
||||
|
||||
ADD OBJECT 'Commandgroup1' AS commandgroup WITH ;
|
||||
ButtonCount = 2, ;
|
||||
Height = 66, ;
|
||||
ButtonCount = 3, ;
|
||||
Height = 100, ;
|
||||
Left = 12, ;
|
||||
Name = "Commandgroup1", ;
|
||||
Top = 8, ;
|
||||
Value = 1, ;
|
||||
Value = 2, ;
|
||||
Width = 94, ;
|
||||
Command1.Caption = "Command1", ;
|
||||
Command1.Height = 27, ;
|
||||
@@ -170,7 +170,60 @@ DEFINE CLASS Form1 AS form
|
||||
Command2.Visible = .T., ;
|
||||
Command2.WhatsThisHelpID = -1, ;
|
||||
Command2.Width = 84, ;
|
||||
Command2.WordWrap = .F.
|
||||
*< END OBJECT: BaseClass="commandgroup" UniqueID="_3Y813WLQU" Timestamp="2013/12/15 18:41:14" ZOrder="400" />
|
||||
Command2.WordWrap = .F., ;
|
||||
Command3.Caption = "Command3", ;
|
||||
Command3.Height = 27, ;
|
||||
Command3.Left = 5, ;
|
||||
Command3.Name = "Command3", ;
|
||||
Command3.Top = 63, ;
|
||||
Command3.Width = 84
|
||||
*< END OBJECT: BaseClass="commandgroup" UniqueID="_3Y813WLQU" Timestamp="2014/02/03 19:55:29" ZOrder="400" />
|
||||
|
||||
ADD OBJECT 'Optiongroup1' AS optiongroup WITH ;
|
||||
ButtonCount = 3, ;
|
||||
Height = 68, ;
|
||||
Left = 20, ;
|
||||
Name = "Optiongroup1", ;
|
||||
Top = 144, ;
|
||||
Value = 2, ;
|
||||
Width = 71, ;
|
||||
Option1.Caption = "Option1", ;
|
||||
Option1.Height = 17, ;
|
||||
Option1.Left = 5, ;
|
||||
Option1.Name = "Option1", ;
|
||||
Option1.Top = 5, ;
|
||||
Option1.Value = 0, ;
|
||||
Option1.Width = 61, ;
|
||||
Option2.Caption = "Option2", ;
|
||||
Option2.Height = 17, ;
|
||||
Option2.Left = 5, ;
|
||||
Option2.Name = "Option2", ;
|
||||
Option2.Top = 24, ;
|
||||
Option2.Value = 1, ;
|
||||
Option2.Width = 61, ;
|
||||
Option3.Caption = "Option3", ;
|
||||
Option3.Height = 17, ;
|
||||
Option3.Left = 5, ;
|
||||
Option3.Name = "Option3", ;
|
||||
Option3.Top = 43, ;
|
||||
Option3.Width = 61
|
||||
*< END OBJECT: BaseClass="optiongroup" UniqueID="_3ZO00KYM8" Timestamp="2014/02/03 19:55:29" ZOrder="600" />
|
||||
|
||||
ADD OBJECT 'Pageframe1' AS pageframe WITH ;
|
||||
ActivePage = 2, ;
|
||||
ErasePage = .T., ;
|
||||
Height = 132, ;
|
||||
Left = 120, ;
|
||||
Name = "Pageframe1", ;
|
||||
PageCount = 3, ;
|
||||
Top = 12, ;
|
||||
Width = 245, ;
|
||||
Page1.Caption = "Page1", ;
|
||||
Page1.Name = "Page1", ;
|
||||
Page2.Caption = "Page2", ;
|
||||
Page2.Name = "Page2", ;
|
||||
Page3.Caption = "Page3", ;
|
||||
Page3.Name = "Page3"
|
||||
*< END OBJECT: BaseClass="pageframe" UniqueID="_3ZO00KYM7" Timestamp="2014/02/03 19:55:29" ZOrder="500" />
|
||||
|
||||
ENDDEFINE
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -413,7 +413,7 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
|
||||
|
||||
|
||||
*******************************************************************************************************************************************
|
||||
FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaElForm_FB2P_SCX_YValidarLosCamposDelRegistro
|
||||
FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaElForm_FB2P_FRM_1_SCX_YValidarLosCamposDelRegistro
|
||||
LOCAL lnCodError, lnCodError_Esperado ;
|
||||
, lc_File, lc_InputFile, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado, loReg, lcTipoBinario ;
|
||||
, loModulo AS CL_CLASE OF "FOXBIN2PRG.PRG" ;
|
||||
@@ -492,6 +492,171 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
|
||||
ENDFUNC
|
||||
|
||||
|
||||
*******************************************************************************************************************************************
|
||||
FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaElForm_FB2P_FRM_2_SCX_YValidarElOrdenDeLasPropsDelObjeto_PageFrame1
|
||||
LOCAL lnCodError, lnCodError_Esperado ;
|
||||
, lc_File, lc_InputFile, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado, loReg, lcTipoBinario ;
|
||||
, laProps(1), lcProp, I, laProps_Esperado(1) ;
|
||||
, loModulo AS CL_CLASE OF "FOXBIN2PRG.PRG" ;
|
||||
, loCnv AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ;
|
||||
, loEx AS EXCEPTION
|
||||
#IF .F.
|
||||
PUBLIC oFXU_LIB AS CL_FXU_CONFIG OF 'TESTS\fxu_lib_objetos_y_funciones_de_soporte.PRG'
|
||||
#ENDIF
|
||||
|
||||
TRY
|
||||
loEx = NULL
|
||||
loCnv = NEWOBJECT("c_foxbin2prg", "FOXBIN2PRG.PRG")
|
||||
*loCnv.l_Debug = .F.
|
||||
loCnv.l_ShowErrors = .F.
|
||||
*loCnv.l_Test = .T.
|
||||
|
||||
|
||||
*-- DATOS DE ENTRADA
|
||||
STORE 0 TO lnCodError
|
||||
lc_File = 'FB2P_FRM_2.SCX'
|
||||
lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' )
|
||||
lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' )
|
||||
lcTipoBinario = UPPER( JUSTEXT( lc_OutputFile ) )
|
||||
|
||||
oFXU_LIB.copiarArchivosParaTest( FORCEEXT( lc_File, LEFT( JUSTEXT(lc_File),2 ) + '?' ) )
|
||||
|
||||
loCnv.Convertir( lc_OutputFile, .F., .F., .T. )
|
||||
loCnv.Convertir( FORCEEXT(lc_OutputFile, LEFT( JUSTEXT(lc_File),2 ) + '2' ), .F., .F., .T. )
|
||||
|
||||
SELECT 0
|
||||
USE (lc_OutputFile) SHARED AGAIN NOUPDATE ALIAS TABLABIN
|
||||
|
||||
LOCATE FOR ObjName = 'Pageframe1' AND NOT DELETED() AND PLATFORM==PADR("WINDOWS",8)
|
||||
|
||||
this.assertequals( .T., FOUND(), 'No se ha encontrado el objeto "Pageframe1" que se iba a testear' )
|
||||
|
||||
*-- DATOS ESPERADOS
|
||||
STORE 0 TO lnCodError_Esperado
|
||||
SCATTER FIELDS Properties MEMO NAME loReg
|
||||
DIMENSION laProps_Esperado(8)
|
||||
laProps_Esperado( 1) = 'ErasePage'
|
||||
laProps_Esperado( 2) = 'PageCount'
|
||||
laProps_Esperado( 3) = 'ActivePage'
|
||||
laProps_Esperado( 4) = 'Top'
|
||||
laProps_Esperado( 5) = 'Left'
|
||||
laProps_Esperado( 6) = 'Height'
|
||||
laProps_Esperado( 7) = 'Width'
|
||||
laProps_Esperado( 8) = 'Name'
|
||||
|
||||
*-- TEST
|
||||
=ALINES(laProps, loReg.Properties)
|
||||
|
||||
this.messageout( 'L<>nea : Valor esperado => Valor actual' )
|
||||
this.messageout( REPLICATE('-',50) )
|
||||
|
||||
FOR I = 1 TO ALEN(laProps_Esperado)
|
||||
lcProp = GETWORDNUM(laProps(I),1)
|
||||
this.messageout( 'L<>nea ' + TRANSFORM(I) + ': ' + laProps_Esperado(I) + ' => ' + lcProp )
|
||||
ENDFOR
|
||||
|
||||
FOR I = 1 TO ALEN(laProps_Esperado)
|
||||
lcProp = GETWORDNUM(laProps(I),1)
|
||||
this.assertequals( laProps_Esperado(I), lcProp, 'Elemento (' + TRANSFORM(I) + ') del Memo Properties' )
|
||||
ENDFOR
|
||||
|
||||
*USE IN (SELECT("TABLABIN"))
|
||||
|
||||
*THIS.Evaluate_results( loEx, lnCodError_Esperado, lc_OutputFile, lcParent, lcClass, lcObjName ;
|
||||
, loReg_Esperado, loReg, lcTipoBinario )
|
||||
|
||||
CATCH TO loEx
|
||||
THIS.Evaluate_results( loEx, lnCodError_Esperado, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado )
|
||||
|
||||
FINALLY
|
||||
USE IN (SELECT("TABLABIN"))
|
||||
ENDTRY
|
||||
|
||||
ENDFUNC
|
||||
|
||||
|
||||
*******************************************************************************************************************************************
|
||||
FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaElForm_FB2P_FRM_2_SCX_YValidarElOrdenDeLasPropsDelObjeto_Optiongroup1
|
||||
LOCAL lnCodError, lnCodError_Esperado ;
|
||||
, lc_File, lc_InputFile, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado, loReg, lcTipoBinario ;
|
||||
, laProps(1), lcProp, I, laProps_Esperado(1) ;
|
||||
, loModulo AS CL_CLASE OF "FOXBIN2PRG.PRG" ;
|
||||
, loCnv AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ;
|
||||
, loEx AS EXCEPTION
|
||||
#IF .F.
|
||||
PUBLIC oFXU_LIB AS CL_FXU_CONFIG OF 'TESTS\fxu_lib_objetos_y_funciones_de_soporte.PRG'
|
||||
#ENDIF
|
||||
|
||||
TRY
|
||||
loEx = NULL
|
||||
loCnv = NEWOBJECT("c_foxbin2prg", "FOXBIN2PRG.PRG")
|
||||
*loCnv.l_Debug = .F.
|
||||
loCnv.l_ShowErrors = .F.
|
||||
*loCnv.l_Test = .T.
|
||||
|
||||
|
||||
*-- DATOS DE ENTRADA
|
||||
STORE 0 TO lnCodError
|
||||
lc_File = 'FB2P_FRM_2.SCX'
|
||||
lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' )
|
||||
lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' )
|
||||
lcTipoBinario = UPPER( JUSTEXT( lc_OutputFile ) )
|
||||
|
||||
oFXU_LIB.copiarArchivosParaTest( FORCEEXT( lc_File, LEFT( JUSTEXT(lc_File),2 ) + '?' ) )
|
||||
|
||||
loCnv.Convertir( lc_OutputFile, .F., .F., .T. )
|
||||
loCnv.Convertir( FORCEEXT(lc_OutputFile, LEFT( JUSTEXT(lc_File),2 ) + '2' ), .F., .F., .T. )
|
||||
|
||||
SELECT 0
|
||||
USE (lc_OutputFile) SHARED AGAIN NOUPDATE ALIAS TABLABIN
|
||||
|
||||
LOCATE FOR ObjName = 'Optiongroup1' AND NOT DELETED() AND PLATFORM==PADR("WINDOWS",8)
|
||||
|
||||
this.assertequals( .T., FOUND(), 'No se ha encontrado el objeto "Optiongroup1" que se iba a testear' )
|
||||
|
||||
*-- DATOS ESPERADOS
|
||||
STORE 0 TO lnCodError_Esperado
|
||||
SCATTER FIELDS Properties MEMO NAME loReg
|
||||
DIMENSION laProps_Esperado(7)
|
||||
laProps_Esperado( 1) = 'ButtonCount'
|
||||
laProps_Esperado( 2) = 'Value'
|
||||
laProps_Esperado( 3) = 'Top'
|
||||
laProps_Esperado( 4) = 'Left'
|
||||
laProps_Esperado( 5) = 'Height'
|
||||
laProps_Esperado( 6) = 'Width'
|
||||
laProps_Esperado( 7) = 'Name'
|
||||
|
||||
*-- TEST
|
||||
=ALINES(laProps, loReg.Properties)
|
||||
|
||||
this.messageout( 'L<>nea : Valor esperado => Valor actual' )
|
||||
this.messageout( REPLICATE('-',50) )
|
||||
|
||||
FOR I = 1 TO ALEN(laProps_Esperado)
|
||||
lcProp = GETWORDNUM(laProps(I),1)
|
||||
this.messageout( 'L<>nea ' + TRANSFORM(I) + ': ' + laProps_Esperado(I) + ' => ' + lcProp )
|
||||
ENDFOR
|
||||
|
||||
FOR I = 1 TO ALEN(laProps_Esperado)
|
||||
lcProp = GETWORDNUM(laProps(I),1)
|
||||
this.assertequals( laProps_Esperado(I), lcProp, 'Elemento (' + TRANSFORM(I) + ') del Memo Properties' )
|
||||
ENDFOR
|
||||
|
||||
*USE IN (SELECT("TABLABIN"))
|
||||
|
||||
*THIS.Evaluate_results( loEx, lnCodError_Esperado, lc_OutputFile, lcParent, lcClass, lcObjName ;
|
||||
, loReg_Esperado, loReg, lcTipoBinario )
|
||||
|
||||
CATCH TO loEx
|
||||
THIS.Evaluate_results( loEx, lnCodError_Esperado, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado )
|
||||
|
||||
FINALLY
|
||||
USE IN (SELECT("TABLABIN"))
|
||||
ENDTRY
|
||||
|
||||
ENDFUNC
|
||||
|
||||
|
||||
*******************************************************************************************************************************************
|
||||
FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaLaLibreria_FB2P_TEST_VCX_YValidarLosCamposDelRegistro
|
||||
LOCAL lnCodError, lnCodError_Esperado ;
|
||||
|
||||
Reference in New Issue
Block a user