diff --git a/TESTS/ft__foxbin2prg__c_conversor_prg_a_dbc.prg b/TESTS/ft__foxbin2prg__c_conversor_prg_a_dbc.prg index 3b245ad..2c243a5 100644 --- a/TESTS/ft__foxbin2prg__c_conversor_prg_a_dbc.prg +++ b/TESTS/ft__foxbin2prg__c_conversor_prg_a_dbc.prg @@ -102,27 +102,27 @@ DEFINE CLASS ft__foxbin2prg__c_conversor_prg_a_dbc AS FxuTestCase OF FxuTestCase *-- DATOS DE ENTRADA - STORE 0 TO lnCodError + STORE 0 TO lnCodError, lnCodError_Esperado lc_File = 'FB2P_DBC.DBC' - lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) - lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) + 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,'*') ) oFXU_LIB.copiarArchivosParaTest( 'EVENTSFILE.PRG' ) *-- Genero el DC2 - loCnv.Ejecutar( FORCEEXT(lc_File,'DBC'), '', '', '', '1', '0', '1',.F.,.F.,.T. ) + loCnv.Ejecutar( FORCEEXT(lc_OutputFile,'DBC'), '', '', '', '1', '0', '1',.F.,.F.,.T. ) *-- Regenero el DBC - loCnv.Ejecutar( FORCEEXT(lc_File,'DC2'), '', '', '', '1', '0', '1',.F.,.F.,.T. ) + loCnv.Ejecutar( FORCEEXT(lc_OutputFile,'DC2'), '', '', '', '1', '0', '1',.F.,.F.,.T. ) *-- Renombro el DC2 a DC3 (ORIGINAL) RENAME (FORCEEXT(lc_OutputFile,'DC2')) TO (FORCEEXT(lc_OutputFile,'DC3')) *-- Genero el DC2 desde el DBC regenerado *WAIT WINDOW TIMEOUT 2 && Para forzar una diferencia de 2 segundos entre el DC2 y el DC3 - loCnv.Ejecutar( FORCEEXT(lc_File,'DBC'), '', '', '', '1', '0', '1',.F.,.F.,.T. ) + loCnv.Ejecutar( FORCEEXT(lc_OutputFile,'DBC'), '', '', '', '1', '0', '1',.F.,.F.,.T. ) *-- Comparo los DC2 y DC3 - lcDC2 = STREXTRACT( FILETOSTR( FORCEEXT(lc_File,'DC2') ), '', '' ) - lcDC3 = STREXTRACT( FILETOSTR( FORCEEXT(lc_File,'DC3') ), '', '' ) + lcDC2 = STREXTRACT( FILETOSTR( FORCEEXT(lc_OutputFile,'DC2') ), '', '' ) + lcDC3 = STREXTRACT( FILETOSTR( FORCEEXT(lc_OutputFile,'DC3') ), '', '' ) *-- Visualización de valores diff --git a/TESTS/ft__foxbin2prg__c_conversor_prg_a_dbf.prg b/TESTS/ft__foxbin2prg__c_conversor_prg_a_dbf.prg index 0e8e61d..2bdc3b1 100644 --- a/TESTS/ft__foxbin2prg__c_conversor_prg_a_dbf.prg +++ b/TESTS/ft__foxbin2prg__c_conversor_prg_a_dbf.prg @@ -102,7 +102,7 @@ DEFINE CLASS ft__foxbin2prg__c_conversor_prg_a_dbf AS FxuTestCase OF FxuTestCase *-- DATOS DE ENTRADA - STORE 0 TO lnCodError + STORE 0 TO lnCodError, lnCodError_Esperado lc_File = 'FB2P_FREE.DB2' lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) @@ -174,7 +174,7 @@ DEFINE CLASS ft__foxbin2prg__c_conversor_prg_a_dbf AS FxuTestCase OF FxuTestCase *-- DATOS DE ENTRADA - STORE 0 TO lnCodError + STORE 0 TO lnCodError, lnCodError_Esperado lc_File = 'FB2P_FREE.DB2' lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) @@ -247,7 +247,7 @@ DEFINE CLASS ft__foxbin2prg__c_conversor_prg_a_dbf AS FxuTestCase OF FxuTestCase *-- DATOS DE ENTRADA - STORE 0 TO lnCodError + STORE 0 TO lnCodError, lnCodError_Esperado lc_File = 'FB2P_FREE.DB2' lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) @@ -320,7 +320,7 @@ DEFINE CLASS ft__foxbin2prg__c_conversor_prg_a_dbf AS FxuTestCase OF FxuTestCase *-- DATOS DE ENTRADA - STORE 0 TO lnCodError + STORE 0 TO lnCodError, lnCodError_Esperado lc_File = 'FB2P_FREE.DB2' lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) diff --git a/TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg b/TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg index bde0bd7..7d56aba 100644 --- a/TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg +++ b/TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg @@ -88,6 +88,9 @@ DEFINE CLASS CL_FXU_CONFIG AS CUSTOM THIS.cPath = THIS.cPath + ';FOXUNIT' ENDIF + THIS.cPathDatosReadOnly = ADDBS( SYS(5) + CURDIR() ) + THIS.cPathDatosReadOnly + THIS.cPathDatosTest = ADDBS( SYS(5) + CURDIR() ) + THIS.cPathDatosTest + SET PATH TO (THIS.cPath) ENDPROC diff --git a/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg b/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg index 840eb8c..9152d58 100644 --- a/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg +++ b/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg @@ -171,10 +171,10 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O ADDPROPERTY( loFB2P_Esperado, 'l_ShowErrors', .T. ) ADDPROPERTY( loFB2P_Esperado, 'l_Recompile', .T. ) ADDPROPERTY( loFB2P_Esperado, 'l_NoTimestamps', .T. ) - ADDPROPERTY( loFB2P_Esperado, 'l_ClearUniqueID', .F. ) + ADDPROPERTY( loFB2P_Esperado, 'l_ClearUniqueID', .T. ) ADDPROPERTY( loFB2P_Esperado, 'l_Debug', .F. ) ADDPROPERTY( loFB2P_Esperado, 'n_ExtraBackupLevels', 1 ) - ADDPROPERTY( loFB2P_Esperado, 'l_OptimizeByFilestamp', .T. ) + ADDPROPERTY( loFB2P_Esperado, 'l_OptimizeByFilestamp', .F. ) *STRTOFILE('', 'TESTS\DATOS_TEST\foxbin2prg.cfg') @@ -868,7 +868,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O ******************************************************************************************************************************************* - FUNCTION Deberia_Setear_ClearUniqueID_False_CuandoNoExistaElArhivo_foxbin2prg_cfg + FUNCTION Deberia_Setear_ClearUniqueID_True_CuandoNoExistaElArhivo_foxbin2prg_cfg LOCAL lnCodError, lnCodError_Esperado, lcSeteo, leValorEsperado, leValor ; , loFB2P AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ; , loEx AS EXCEPTION @@ -886,7 +886,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O *-- DATOS DE ENTRADA STORE 0 TO lnCodError lcSeteo = 'l_ClearUniqueID' - leValorEsperado = .F. + leValorEsperado = .T. *-- TEST diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 70a30fc..bd620af 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -507,8 +507,8 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM l_AllowMultiConfig = .T. l_Recompile = .T. l_NoTimestamps = .T. - l_ClearUniqueID = .F. - l_OptimizeByFilestamp = .T. + l_ClearUniqueID = .T. + l_OptimizeByFilestamp = .F. l_MethodSort_Enabled = .T. && Para Unit Testing se puede cambiar a .F. para buscar diferencias l_PropSort_Enabled = .T. && Para Unit Testing se puede cambiar a .F. para buscar diferencias l_ReportSort_Enabled = .T. && Para Unit Testing se puede cambiar a .F. para buscar diferencias @@ -1385,7 +1385,8 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM SET ESCAPE OFF ENDIF - loFSO = .o_FSO + loFSO = .o_FSO + tcRecompile = EVL(tcRecompile,'1') DO CASE CASE VERSION(5) < 900