Changeset: 270 fdbozzo - 04/06/2014 23:35:36:

Ajuste de test y limpieza
This commit is contained in:
fdbozzo
2014-06-05 00:10:20 +02:00
parent 3be2989f90
commit 2714822af0
8 changed files with 27 additions and 9 deletions

View File

@@ -89,7 +89,6 @@ WITH loProject.FILES
.ADD('..\ut__foxbin2prg__c_conversor_base__dobackup.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />
.ADD('..\ut__foxbin2prg__c_conversor_base__get_separatedpropandvalue.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />
.ADD('..\ut__foxbin2prg__c_conversor_base__gettimestamp.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />
.ADD('..\ut__foxbin2prg__c_conversor_base__identificarbloquesdecodigo.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />
.ADD('..\ut__foxbin2prg__c_conversor_base__identificarbloquesdeexclusion.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />
.ADD('..\ut__foxbin2prg__c_conversor_base__normalizarvalorpropiedad.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />
.ADD('..\ut__foxbin2prg__c_conversor_base__rowtimestamp.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="0" ID="0" ObjRev="0" />

Binary file not shown.

Binary file not shown.

View File

@@ -1539,8 +1539,12 @@ DEFINE CLASS f_base AS form
LOCAL retVal
tcFilename = EVL(tcFilename, 'optiongroup')
IF NOT '\' $ tcFilename
tcFilename = SYS(5) + ADDBS(CURDIR()) + "TESTS\DATOS_TEST\" + tcFilename + '.bmp'
ENDIF
Declare Integer formtobmp IN "TESTS\PCT_DLL.dll" integer hwnd,String bmpFileName
retVal = formtobmp( THISFORM.HWnd, SYS(5) + ADDBS(CURDIR()) + "TESTS\DATOS_TEST\" + tcFilename + '.bmp' )
retVal = formtobmp( THISFORM.HWnd, tcFilename )
*Declare Integer formtobmpA IN "TESTS\PCT_DLL.dll" string bmpfilename,integer nX,integer nY,integer nX2,integer nY2

View File

@@ -102,10 +102,17 @@ DEFINE CLASS CL_FXU_CONFIG AS CUSTOM
*----------------------------------------------------------------------------------------
PROCEDURE SETUP_COMUN
IF DIRECTORY( THIS.cPathDatosTest )
ERASE (FORCEPATH( '*.*', THIS.cPathDatosTest ) )
ERASE ( FORCEPATH( '*.*', THIS.cPathDatosTest ) )
ELSE
TRY
MKDIR (THIS.cPathDatosTest)
MKDIR ( THIS.cPathDatosTest )
CATCH
ENDTRY
ENDIF
IF NOT DIRECTORY( ADDBS(THIS.cPathDatosTest) + 'bmps' )
TRY
MKDIR ( ADDBS(THIS.cPathDatosTest) + 'bmps' )
CATCH
ENDTRY
ENDIF

View File

@@ -952,6 +952,9 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
#ENDIF
TRY
THIS.messageout( this.ICCURRENTTEST )
THIS.messageout( '' )
IF VARTYPE(tnComparacionEsperada) = "L"
tnComparacionEsperada = 1
ENDIF
@@ -998,7 +1001,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
ELSE
loCtl = CREATEOBJECT( tcControlName )
ENDIF
loCtl.c_testname = tcTestName + '_0'
*loCtl.c_testname = tcTestName + '_0'
loCtl.c_testname = FORCEPATH( THIS.ICCURRENTTEST + '_0.bmp', ADDBS(oFXU_LIB.cPathDatosTest) + 'bmps' )
IF loCtl.BaseClass = 'Formset'
loCtl.Forms(1).ALWAYSONTOP= .T.
loCtl.SHOW()
@@ -1032,7 +1036,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
ELSE
loCtl = CREATEOBJECT( tcControlName )
ENDIF
loCtl.c_testname = tcTestName + '_1'
*loCtl.c_testname = tcTestName + '_1'
loCtl.c_testname = FORCEPATH( THIS.ICCURRENTTEST + '_1.bmp', ADDBS(oFXU_LIB.cPathDatosTest) + 'bmps' )
IF loCtl.BaseClass = 'Formset'
loCtl.Forms(1).ALWAYSONTOP= .T.
loCtl.SHOW()
@@ -1048,15 +1053,18 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
CLEAR CLASSLIB (lcLib)
*-- Comparo resultados
lcBMP0 = FORCEPATH( tcTestName + '_0.bmp', oFXU_LIB.cPathDatosTest )
lcBMP1 = FORCEPATH( tcTestName + '_1.bmp', oFXU_LIB.cPathDatosTest )
*lcBMP0 = FORCEPATH( tcTestName + '_0.bmp', oFXU_LIB.cPathDatosTest )
*lcBMP1 = FORCEPATH( tcTestName + '_1.bmp', oFXU_LIB.cPathDatosTest )
lcBMP0 = FORCEPATH( THIS.ICCURRENTTEST + '_0.bmp', ADDBS(oFXU_LIB.cPathDatosTest) + 'bmps' )
lcBMP1 = FORCEPATH( THIS.ICCURRENTTEST + '_1.bmp', ADDBS(oFXU_LIB.cPathDatosTest) + 'bmps' )
llEqual = ( FILETOSTR( lcBMP0 ) == FILETOSTR( lcBMP1 ) )
THIS.messageout( "Se comparan bitmaps de pantalla, para saber si hay cambios est<73>ticos y detectar fallos al ensamblar el binario" )
THIS.messageout( "lcBMP0 = " + lcBMP0 )
THIS.messageout( "lcBMP1 = " + lcBMP1 )
THIS.messageout( "Comparaci<63>n esperada = " + IIF(llEqual, "IGUALES", "DISTINTOS") )
THIS.messageout( "Comparaci<63>n esperada = " + ICASE(tnComparacionEsperada = 0, "DISTINTOS", tnComparacionEsperada = 1, "IGUALES", "NO_COMPARAR") )
THIS.messageout( "Comparaci<63>n realizada = " + IIF(llEqual, "IGUALES", "DISTINTOS") )
DO CASE
CASE tnComparacionEsperada = 0