diff --git a/TESTS/DATOS_READONLY/fb2p_test.pj2 b/TESTS/DATOS_READONLY/fb2p_test.pj2 index 7f4d5df..1343724 100644 --- a/TESTS/DATOS_READONLY/fb2p_test.pj2 +++ b/TESTS/DATOS_READONLY/fb2p_test.pj2 @@ -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" /> diff --git a/TESTS/DATOS_READONLY/fb2p_test.pjt b/TESTS/DATOS_READONLY/fb2p_test.pjt index f88d1fa..765bccf 100644 Binary files a/TESTS/DATOS_READONLY/fb2p_test.pjt and b/TESTS/DATOS_READONLY/fb2p_test.pjt differ diff --git a/TESTS/DATOS_READONLY/fb2p_test.pjx b/TESTS/DATOS_READONLY/fb2p_test.pjx index 8ef0695..528207e 100644 Binary files a/TESTS/DATOS_READONLY/fb2p_test.pjx and b/TESTS/DATOS_READONLY/fb2p_test.pjx differ diff --git a/TESTS/DATOS_READONLY/lib_controles.vc2 b/TESTS/DATOS_READONLY/lib_controles.vc2 index 12c5f35..b45371b 100644 --- a/TESTS/DATOS_READONLY/lib_controles.vc2 +++ b/TESTS/DATOS_READONLY/lib_controles.vc2 @@ -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 diff --git a/TESTS/DATOS_READONLY/lib_controles.vct b/TESTS/DATOS_READONLY/lib_controles.vct index eca42c2..494203c 100644 Binary files a/TESTS/DATOS_READONLY/lib_controles.vct and b/TESTS/DATOS_READONLY/lib_controles.vct differ diff --git a/TESTS/DATOS_READONLY/lib_controles.vcx b/TESTS/DATOS_READONLY/lib_controles.vcx index 713e6c8..731868d 100644 Binary files a/TESTS/DATOS_READONLY/lib_controles.vcx and b/TESTS/DATOS_READONLY/lib_controles.vcx differ diff --git a/TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg b/TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg index bdf5490..90583d6 100644 --- a/TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg +++ b/TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg @@ -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 diff --git a/TESTS/ut__foxbin2prg.prg b/TESTS/ut__foxbin2prg.prg index 22475db..f997390 100644 --- a/TESTS/ut__foxbin2prg.prg +++ b/TESTS/ut__foxbin2prg.prg @@ -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éticos y detectar fallos al ensamblar el binario" ) THIS.messageout( "lcBMP0 = " + lcBMP0 ) THIS.messageout( "lcBMP1 = " + lcBMP1 ) - THIS.messageout( "Comparación esperada = " + IIF(llEqual, "IGUALES", "DISTINTOS") ) + THIS.messageout( "Comparación esperada = " + ICASE(tnComparacionEsperada = 0, "DISTINTOS", tnComparacionEsperada = 1, "IGUALES", "NO_COMPARAR") ) + THIS.messageout( "Comparación realizada = " + IIF(llEqual, "IGUALES", "DISTINTOS") ) DO CASE CASE tnComparacionEsperada = 0