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

Test Bug Fix: DBF INTEGER AUTOINC test is failing because of a bad DBF reference value

Browse Source 
DBF INTEGER AUTOINC test: Added more info about NextVal and Step values
This commit is contained in:
fdbozzo
2017-12-02 14:29:08 +01:00
parent 62353694a2
commit af768fe7a1
6 changed files with 3210 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
TESTS/DATOS_READONLY/fb2p_free.dbf
View File

Binary file not shown.

BIN
TESTS/DATOS_READONLY/fb2p_free.fpt
View File

Binary file not shown.

3182
TESTS/FXUResults.db2 Normal file
View File

File diff suppressed because one or more lines are too long

13
TESTS/ft__foxbin2prg__c_conversor_prg_a_dbf.prg
View File

@@ -126,14 +126,19 @@ DEFINE CLASS ft__foxbin2prg__c_conversor_prg_a_dbf AS FxuTestCase OF FxuTestCase
*-- Visualizaci<63>n de valores
THIS.messageout( 'Cantidad de campos: ' + TRANSFORM(lnFields_OUT) )
THIS.messageout( '' )
THIS.messageout( PADR('Nombre',12) + ' ' + PADC('Tipo',4) + ' ' + PADL('Long',4) + ' ' + PADL('Dec',4) )
THIS.messageout( PADR('----------',12) + ' ' + PADC('----',4) + ' ' + PADL('----',4) + ' ' + PADL('---',4) )
THIS.messageout( PADR('Nombre',12) + ' ' + PADC('Tipo',4) + ' ' + PADL('Long',4) + ' ' + PADL('Dec',4) ;
+ ' ' + PADL('Next',4) + ' ' + PADL('Step',4) )
THIS.messageout( PADR('----------',12) + ' ' + PADC('----',4) + ' ' + PADL('----',4) + ' ' + PADL('---',4) ;
+ ' ' + PADL('----',4) + ' ' + PADL('----',4) )
FOR I = 1 TO lnFields_IN
THIS.messageout( PADR(laCampos_IN(I,1),12) + ' ' + PADC(laCampos_IN(I,2),4) + ' ' + PADL(laCampos_IN(I,3),4) + ' ' + PADL(laCampos_IN(I,4),4) )
THIS.messageout( PADR(laCampos_IN(I,1),12) + ' ' + PADC(laCampos_IN(I,2),4) ;
+ ' ' + PADL(laCampos_IN(I,3),4) + ' ' + PADL(laCampos_IN(I,4),4) ;
+ ' ' + PADL(laCampos_IN(I,17),4) + ' ' + PADL(laCampos_IN(I,18),4) )
ENDFOR
THIS.messageout( PADR('----------',12) + ' ' + PADC('----',4) + ' ' + PADL('----',4) + ' ' + PADL('---',4) )
THIS.messageout( PADR('----------',12) + ' ' + PADC('----',4) + ' ' + PADL('----',4) + ' ' + PADL('---',4) ;
+ ' ' + PADL('----',4) + ' ' + PADL('----',4) )
*-- Evaluaci<63>n de valores

3
TESTS/fxuresults.dbf.cfg Normal file
View File

@@ -0,0 +1,3 @@
DBF_Conversion_Support: 4
DBF_Conversion_Order: UPPER(TCLASS)+UPPER(TNAME)
DBF_Conversion_Condition: .T.

31
foxbin2prg.prg
View File

@@ -887,7 +887,7 @@ DEFINE CLASS c_foxbin2prg AS Session
IF ATC("\PROGRAM FILES", THIS.c_TempDir) > 0 OR ATC("\ARCHIVOS DE PROGRAMA", THIS.c_TempDir) > 0
THIS.c_TempDir = GETENV("TEMP")
ENDIF
THIS.c_LogFile = ADDBS( THIS.c_TempDir ) + 'FoxBin2Prg_Debug.LOG'
THIS.c_ErrorLogFile = ADDBS( THIS.c_TempDir ) + 'FoxBin2Prg_Error.LOG'
@@ -3710,7 +3710,7 @@ DEFINE CLASS c_foxbin2prg AS Session
*-- OPTIMIZACIÓN VC2/SC2/DC2: VERIFICO SI EL ARCHIVO BASE FUE PROCESADO PARA DESCARTAR REPROCESOS
IF .n_UseClassPerFile > 0 AND .l_RedirectClassPerFileToMain ;
OR NOT EMPTY(.c_ClassToConvert)
OR NOT EMPTY(.c_ClassToConvert)
DO CASE
CASE .n_RedirectClassType = 1 OR NOT EMPTY(.c_ClassToConvert) && Redireccionar solo esta clase
@@ -10240,23 +10240,23 @@ DEFINE CLASS c_conversor_prg_a_vcx AS c_conversor_prg_a_bin
IF toFoxBin2Prg.n_RedirectClassType = 1 OR NOT EMPTY(toFoxBin2Prg.c_ClassToConvert) && Redireccionar solo esta clase a main
llReplaceClass = .T.
IF EMPTY(toFoxBin2Prg.c_ClassToConvert)
toFoxBin2Prg.c_OutputFile = FULLPATH( FORCEEXT( lcBaseFilename, 'VCX' ), .c_InputFile)
ELSE
loClase = toModulo._Clases(1)
* Ajusto el nombre interno de la clase al indicado en el nombre del archivo
loClase._nombre = toFoxBin2Prg.c_ClassToConvert
loClase._objname = toFoxBin2Prg.c_ClassToConvert
loClase._Nombre = toFoxBin2Prg.c_ClassToConvert
loClase._ObjName = toFoxBin2Prg.c_ClassToConvert
* Reemplazo la propiedad Name
lnRow = ASCAN(loClase._props, 'Name', 1, -1, 1, 2+4+8)
lnRow = ASCAN(loClase._Props, 'Name', 1, -1, 1, 2+4+8)
IF lnRow > 0
loClase._props(lnRow,2) = toFoxBin2Prg.c_ClassToConvert
loClase._Props(lnRow,2) = toFoxBin2Prg.c_ClassToConvert
ENDIF
* Y finalmente actualizo el memo
loClase._PROPERTIES = .classProps2Memo( @loClase, @toFoxBin2Prg )
ENDIF
toFoxBin2Prg.doBackup( .F., .T., '', '', '' )
IF ADIR( laFiles, toFoxBin2Prg.c_OutputFile, "", 1 ) = 1
@@ -15306,10 +15306,8 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
FUNCTION OcxOutsideProjDir
LPARAMETERS tcOcx, tcProjDir
* (This method is taken from Open Source project TwoFox, from Christof Wallenhaupt - http://www.foxpert.com/downloads.htm)
* Returns .T. when the OCX control resides outside the project directory
LOCAL lcOcxDir, llOutside
lcOcxDir = UPPER (JUSTPATH (m.tcOcx))
IF LEFT(m.lcOcxDir, LEN(m.tcProjDir)) == m.tcProjDir
@@ -15319,12 +15317,12 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
ENDIF
RETURN m.llOutside
ENDFUNC
PROCEDURE TruncateOle2 (tcOcx)
* (This method is taken from Open Source project TwoFox, from Christof Wallenhaupt - http://www.foxpert.com/downloads.htm)
* Cambios de un campo OLE2 exclusivamente en el nombre del archivo
PROCEDURE TruncateOle2 (tcOcx)
REPLACE OLE2 WITH STRTRAN ( ;
OLE2 ;
,"OLEObject = " + m.tcOcx ;
@@ -15381,7 +15379,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
SELECT _TABLAORIG.*,RECNO() regnum FROM _TABLAORIG INTO CURSOR TABLABIN ;
WHERE PLATFORM == 'WINDOWS ' ;
AND ( PROPER(RESERVED1) == "Class" AND LOWER(OBJNAME) == toFoxBin2Prg.c_ClassToConvert ;
OR LOWER(parent) == toFoxBin2Prg.c_ClassToConvert ) ;
OR LOWER( ALLTRIM( GETWORDNUM( _TABLAORIG.PARENT + '.', 1, '.' ) ) ) == toFoxBin2Prg.c_ClassToConvert ) ;
OR PLATFORM == 'COMMENT ' AND LOWER(OBJNAME) == toFoxBin2Prg.c_ClassToConvert
ENDIF
@@ -15469,9 +15467,12 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
*-------------------------------------------------------------------------------
lnObjCount = 0
lnRecno = RECNO()
LOCATE FOR UPPER( TABLABIN.PLATFORM ) = "WINDOWS" AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName)
LOCATE FOR UPPER( TABLABIN.PLATFORM ) = "WINDOWS" ;
AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName)
SCAN REST WHILE UPPER( TABLABIN.PLATFORM ) = "WINDOWS" ;
AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName)
SCAN REST WHILE UPPER( TABLABIN.PLATFORM ) = "WINDOWS" AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName)
lnObjCount = lnObjCount + 1
loRegObj = NULL
SCATTER MEMO NAME loRegObj