Changeset: 399 fdbozzo - 09/08/2014 14:39:34:
- Agregado caso de prueba para orden de métodos (basado en el enviado por Ryan) - Limpieza de código - Actualización de historial en header foxbin2prg.prg
This commit is contained in:
fdbozzo
@@ -873,6 +873,64 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
|
||||
ENDFUNC
|
||||
|
||||
|
||||
*******************************************************************************************************************************************
|
||||
FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaLaLibreria_CLASSLIB_METHOD_ORDER_BUG_TEST_VCX_YValidarEl_BUG_DelOrdenDeMetodosDeClases_v1_19_29
|
||||
LOCAL lnCodError, lnCodError_Esperado ;
|
||||
, lc_File, lc_InputFile, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado, loReg, lcTipoBinario, lcTXT0, lcTXT1 ;
|
||||
, 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.
|
||||
*loCnv.l_PropSort_Enabled = .F. && Para buscar diferencias
|
||||
*loCnv.l_MethodSort_Enabled = .F. && Para buscar diferencias
|
||||
|
||||
|
||||
*-- DATOS DE ENTRADA
|
||||
STORE 0 TO lnCodError
|
||||
lc_File = 'CLASSLIB_METHOD_ORDER_BUG_TEST.VCX'
|
||||
lc_InputFile = FORCEPATH( lc_File, oFXU_LIB.cPathDatosReadOnly )
|
||||
lc_OutputFile = FORCEPATH( lc_File, oFXU_LIB.cPathDatosTest )
|
||||
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. )
|
||||
|
||||
*-- Comparo resultados
|
||||
lcTXT0 = FORCEPATH( FORCEEXT(lc_File,'VC2'), ADDBS( oFXU_LIB.cPathDatosReadOnly ) )
|
||||
lcTXT1 = FORCEPATH( FORCEEXT(lc_File,'VC2'), ADDBS( oFXU_LIB.cPathDatosTest ) )
|
||||
|
||||
llEqual = ( FILETOSTR( lcTXT0 ) == FILETOSTR( lcTXT1 ) )
|
||||
|
||||
THIS.messageout( "Se comparan archivos VC2, para saber si hay cambios" )
|
||||
THIS.messageout( "lcTXT0 = " + lcTXT0 )
|
||||
THIS.messageout( "lcTXT1 = " + lcTXT1 )
|
||||
|
||||
THIS.asserttrue( llEqual, "COMPARACI<43>N DE VC2" )
|
||||
|
||||
CATCH TO loEx
|
||||
THIS.Evaluate_results( loEx, lnCodError_Esperado, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado )
|
||||
|
||||
FINALLY
|
||||
USE IN (SELECT("ARCHIVOBIN_IN"))
|
||||
USE IN (SELECT("TABLABIN"))
|
||||
STORE NULL TO loModulo, loCnv
|
||||
RELEASE loModulo, loCnv
|
||||
ENDTRY
|
||||
|
||||
ENDFUNC
|
||||
|
||||
|
||||
*******************************************************************************************************************************************
|
||||
FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaLaLibreria_FB2P_TEST_VCX_YValidarEl_BUG_Del_PROCEDURE_SIN_ENDPROC
|
||||
LOCAL lnCodError, lnCodError_Esperado ;
|
||||
|
||||
@@ -72,32 +72,36 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
|
||||
*******************************************************************************************************************************************
|
||||
FUNCTION Deberia_ObtenerLaUbicacionDelBloque_IF_ENDIF_CuandoCodigoCon_IF_ENDIF_predominante_esEvaluado
|
||||
LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(2,2) ;
|
||||
, laLineasExclusion(10), laLineasExclusion_Esperadas(10)
|
||||
, laLineasExclusion(12), laLineasExclusion_Esperadas(12)
|
||||
LOCAL loObj AS c_conversor_prg_a_bin OF "FOXBIN2PRG.PRG"
|
||||
loObj = THIS.icObj
|
||||
|
||||
*-- Input and expected params
|
||||
STORE '' TO lcMethod
|
||||
laExpected_Pos(1,1) = 3
|
||||
laExpected_Pos(1,2) = 5
|
||||
laExpected_Pos(2,1) = 7
|
||||
laExpected_Pos(2,2) = 9
|
||||
laExpected_Pos(1,2) = 6
|
||||
laExpected_Pos(2,1) = 8
|
||||
laExpected_Pos(2,2) = 11
|
||||
laLineasExclusion_Esperadas( 3) = .T.
|
||||
laLineasExclusion_Esperadas( 4) = .T.
|
||||
laLineasExclusion_Esperadas( 5) = .T.
|
||||
laLineasExclusion_Esperadas( 7) = .T.
|
||||
laLineasExclusion_Esperadas( 8) = .T.
|
||||
laLineasExclusion_Esperadas( 9) = .T.
|
||||
laLineasExclusion_Esperadas(10) = .T.
|
||||
laLineasExclusion_Esperadas(11) = .T.
|
||||
|
||||
TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2
|
||||
<<C_PROC>> myMethod_B
|
||||
*-- Code Block
|
||||
<<C_IF_F>>
|
||||
<<C_TEXT>>
|
||||
value ;
|
||||
<<C_ENDIF>>
|
||||
*-- Code Block
|
||||
<<C_IF_F>>
|
||||
<<C_ENDTEXT>>
|
||||
value ,
|
||||
<<C_ENDIF>>
|
||||
<<C_ENDPROC>>
|
||||
ENDTEXT
|
||||
@@ -138,7 +142,7 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
|
||||
<<C_IF_F>>
|
||||
<<C_IF_F>>
|
||||
<<C_TEXT>>
|
||||
*-- Code Block
|
||||
*-- Code Block ;
|
||||
<<C_ENDTEXT>>
|
||||
<<C_ENDIF>>
|
||||
<<C_ENDIF>>
|
||||
@@ -159,32 +163,36 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
|
||||
*******************************************************************************************************************************************
|
||||
FUNCTION Deberia_ObtenerLaUbicacionDelBloque_TEXT_ENDTEXT_CuandoCodigoCon_TEXT_ENDTEXT_predominante_esEvaluado
|
||||
LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(2,2) ;
|
||||
, laLineasExclusion(10), laLineasExclusion_Esperadas(10)
|
||||
, laLineasExclusion(12), laLineasExclusion_Esperadas(12)
|
||||
LOCAL loObj AS c_conversor_prg_a_bin OF "FOXBIN2PRG.PRG"
|
||||
loObj = THIS.icObj
|
||||
|
||||
*-- Input and expected params
|
||||
STORE '' TO lcMethod
|
||||
laExpected_Pos(1,1) = 3
|
||||
laExpected_Pos(1,2) = 5
|
||||
laExpected_Pos(2,1) = 7
|
||||
laExpected_Pos(2,2) = 9
|
||||
laExpected_Pos(1,2) = 6
|
||||
laExpected_Pos(2,1) = 8
|
||||
laExpected_Pos(2,2) = 11
|
||||
laLineasExclusion_Esperadas( 3) = .T.
|
||||
laLineasExclusion_Esperadas( 4) = .T.
|
||||
laLineasExclusion_Esperadas( 5) = .T.
|
||||
laLineasExclusion_Esperadas( 7) = .T.
|
||||
laLineasExclusion_Esperadas( 8) = .T.
|
||||
laLineasExclusion_Esperadas( 9) = .T.
|
||||
laLineasExclusion_Esperadas(10) = .T.
|
||||
laLineasExclusion_Esperadas(11) = .T.
|
||||
|
||||
TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2
|
||||
<<C_PROC>> myMethod_B
|
||||
*-- Code Block
|
||||
<<C_TEXT>>
|
||||
<<C_IF_F>>
|
||||
value ;
|
||||
<<C_ENDTEXT>>
|
||||
*-- Code Block
|
||||
<<C_TEXT>>
|
||||
<<C_ENDIF>>
|
||||
value ,
|
||||
<<C_ENDTEXT>>
|
||||
<<C_ENDPROC>>
|
||||
ENDTEXT
|
||||
|
||||
Reference in New Issue
Block a user