romfast/foxbin2prg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changeset: 322 fdbozzo - 22/06/2014 20:02:43:

Browse Source
This commit is contained in:
fdbozzo
2014-06-22 20:02:54 +02:00
parent 98d7dc275e fd6b5bcdad
commit 5ff7d54951
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
TESTS/ft__foxbin2prg__c_conversor_prg_a_dbc.prg
View File

@@ -102,27 +102,27 @@ DEFINE CLASS ft__foxbin2prg__c_conversor_prg_a_dbc AS FxuTestCase OF FxuTestCase
*-- DATOS DE ENTRADA *-- DATOS DE ENTRADA
STORE 0 TO lnCodError STORE 0 TO lnCodError, lnCodError_Esperado
lc_File = 'FB2P_DBC.DBC' lc_File = 'FB2P_DBC.DBC'
lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_InputFile = FORCEPATH( lc_File, oFXU_LIB.cPathDatosReadOnly )
lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) lc_OutputFile = FORCEPATH( lc_File, oFXU_LIB.cPathDatosTest )
lcTipoBinario = UPPER( JUSTEXT( lc_OutputFile ) ) lcTipoBinario = UPPER( JUSTEXT( lc_OutputFile ) )
oFXU_LIB.copiarArchivosParaTest( FORCEEXT(lc_File,'*') ) oFXU_LIB.copiarArchivosParaTest( FORCEEXT(lc_File,'*') )
oFXU_LIB.copiarArchivosParaTest( 'EVENTSFILE.PRG' ) oFXU_LIB.copiarArchivosParaTest( 'EVENTSFILE.PRG' )
*-- Genero el DC2 *-- 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 *-- 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) *-- Renombro el DC2 a DC3 (ORIGINAL)
RENAME (FORCEEXT(lc_OutputFile,'DC2')) TO (FORCEEXT(lc_OutputFile,'DC3')) RENAME (FORCEEXT(lc_OutputFile,'DC2')) TO (FORCEEXT(lc_OutputFile,'DC3'))
*-- Genero el DC2 desde el DBC regenerado *-- Genero el DC2 desde el DBC regenerado
*WAIT WINDOW TIMEOUT 2 && Para forzar una diferencia de 2 segundos entre el DC2 y el DC3 *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 *-- Comparo los DC2 y DC3
lcDC2 = STREXTRACT( FILETOSTR( FORCEEXT(lc_File,'DC2') ), '<DATABASE>', '</DATABASE>' ) lcDC2 = STREXTRACT( FILETOSTR( FORCEEXT(lc_OutputFile,'DC2') ), '<DATABASE>', '</DATABASE>' )
lcDC3 = STREXTRACT( FILETOSTR( FORCEEXT(lc_File,'DC3') ), '<DATABASE>', '</DATABASE>' ) lcDC3 = STREXTRACT( FILETOSTR( FORCEEXT(lc_OutputFile,'DC3') ), '<DATABASE>', '</DATABASE>' )
*-- Visualizaci<63>n de valores *-- Visualizaci<63>n de valores

8
TESTS/ft__foxbin2prg__c_conversor_prg_a_dbf.prg
View File

@@ -102,7 +102,7 @@ DEFINE CLASS ft__foxbin2prg__c_conversor_prg_a_dbf AS FxuTestCase OF FxuTestCase
*-- DATOS DE ENTRADA *-- DATOS DE ENTRADA
STORE 0 TO lnCodError STORE 0 TO lnCodError, lnCodError_Esperado
lc_File = 'FB2P_FREE.DB2' lc_File = 'FB2P_FREE.DB2'
lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' )
lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) 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 *-- DATOS DE ENTRADA
STORE 0 TO lnCodError STORE 0 TO lnCodError, lnCodError_Esperado
lc_File = 'FB2P_FREE.DB2' lc_File = 'FB2P_FREE.DB2'
lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' )
lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) 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 *-- DATOS DE ENTRADA
STORE 0 TO lnCodError STORE 0 TO lnCodError, lnCodError_Esperado
lc_File = 'FB2P_FREE.DB2' lc_File = 'FB2P_FREE.DB2'
lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' )
lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) 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 *-- DATOS DE ENTRADA
STORE 0 TO lnCodError STORE 0 TO lnCodError, lnCodError_Esperado
lc_File = 'FB2P_FREE.DB2' lc_File = 'FB2P_FREE.DB2'
lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' ) lc_InputFile = FORCEPATH( lc_File, 'TESTS\DATOS_READONLY' )
lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' ) lc_OutputFile = FORCEPATH( lc_File, 'TESTS\DATOS_TEST' )

3
TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg
View File

@@ -88,6 +88,9 @@ DEFINE CLASS CL_FXU_CONFIG AS CUSTOM
THIS.cPath = THIS.cPath + ';FOXUNIT' THIS.cPath = THIS.cPath + ';FOXUNIT'
ENDIF ENDIF
THIS.cPathDatosReadOnly = ADDBS( SYS(5) + CURDIR() ) + THIS.cPathDatosReadOnly
THIS.cPathDatosTest = ADDBS( SYS(5) + CURDIR() ) + THIS.cPathDatosTest
SET PATH TO (THIS.cPath) SET PATH TO (THIS.cPath)
ENDPROC ENDPROC

8
TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg
View File

@@ -171,10 +171,10 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
ADDPROPERTY( loFB2P_Esperado, 'l_ShowErrors', .T. ) ADDPROPERTY( loFB2P_Esperado, 'l_ShowErrors', .T. )
ADDPROPERTY( loFB2P_Esperado, 'l_Recompile', .T. ) ADDPROPERTY( loFB2P_Esperado, 'l_Recompile', .T. )
ADDPROPERTY( loFB2P_Esperado, 'l_NoTimestamps', .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, 'l_Debug', .F. )
ADDPROPERTY( loFB2P_Esperado, 'n_ExtraBackupLevels', 1 ) ADDPROPERTY( loFB2P_Esperado, 'n_ExtraBackupLevels', 1 )
ADDPROPERTY( loFB2P_Esperado, 'l_OptimizeByFilestamp', .T. ) ADDPROPERTY( loFB2P_Esperado, 'l_OptimizeByFilestamp', .F. )
*STRTOFILE('', 'TESTS\DATOS_TEST\foxbin2prg.cfg') *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 ; LOCAL lnCodError, lnCodError_Esperado, lcSeteo, leValorEsperado, leValor ;
, loFB2P AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ; , loFB2P AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ;
, loEx AS EXCEPTION , loEx AS EXCEPTION
@@ -886,7 +886,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O
*-- DATOS DE ENTRADA *-- DATOS DE ENTRADA
STORE 0 TO lnCodError STORE 0 TO lnCodError
lcSeteo = 'l_ClearUniqueID' lcSeteo = 'l_ClearUniqueID'
leValorEsperado = .F. leValorEsperado = .T.
*-- TEST *-- TEST

11
foxbin2prg.prg
View File

@@ -1069,7 +1069,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
lo_CFG = THIS lo_CFG = THIS
IF .n_CFG_Actual = 0 THEN IF .n_CFG_Actual = 0 THEN
llExisteConfig = FILE( lcConfigFile ) llExisteConfig = FILE( lcConfigFile )
ENDIF ENDIF
IF llExisteConfig AND .n_CFG_Actual = 0 IF llExisteConfig AND .n_CFG_Actual = 0
@@ -1217,7 +1217,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
IF .l_AllowMultiConfig AND .l_Main_CFG_Loaded AND lo_Configuration.Count > 0 IF .l_AllowMultiConfig AND .l_Main_CFG_Loaded AND lo_Configuration.Count > 0
.n_CFG_Actual = lo_Configuration.Count &&lo_Configuration.GetKey( UPPER( JUSTPATH( lcConfigFile ) ) ) .n_CFG_Actual = lo_Configuration.Count &&lo_Configuration.GetKey( UPPER( JUSTPATH( lcConfigFile ) ) )
ENDIF ENDIF
ENDIF && llExisteConfig ENDIF && llExisteConfig
IF INLIST( TRANSFORM(tcDontShowProgress), '0', '1' ) THEN IF INLIST( TRANSFORM(tcDontShowProgress), '0', '1' ) THEN
@@ -1394,7 +1394,8 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
SET ESCAPE OFF SET ESCAPE OFF
ENDIF ENDIF
loFSO = .o_FSO loFSO = .o_FSO
tcRecompile = EVL(tcRecompile,'1')
DO CASE DO CASE
CASE VERSION(5) < 900 CASE VERSION(5) < 900
@@ -1412,8 +1413,8 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
*-- ARCHIVO DE CONFIGURACI<43>N PRINCIPAL *-- ARCHIVO DE CONFIGURACI<43>N PRINCIPAL
IF NOT THIS.l_ConfigEvaluated THEN IF NOT THIS.l_ConfigEvaluated THEN
.EvaluarConfiguracion( @tcDontShowProgress, @tcDontShowErrors, @tcNoTimestamps, @tcDebug, @tcRecompile, @tcBackupLevels ; .EvaluarConfiguracion( @tcDontShowProgress, @tcDontShowErrors, @tcNoTimestamps, @tcDebug, @tcRecompile, @tcBackupLevels ;
, @tcClearUniqueID, @tcOptimizeByFilestamp ) , @tcClearUniqueID, @tcOptimizeByFilestamp )
ENDIF ENDIF
IF .l_ShowProgress IF .l_ShowProgress