From 2a276639ccd449fea9a786f46697f37910d87b01 Mon Sep 17 00:00:00 2001 From: fdbozzo Date: Wed, 14 Jan 2015 20:11:07 +0100 Subject: [PATCH] =?UTF-8?q?Changeset:=20633=20-=20Arreglo=20de=20separaci?= =?UTF-8?q?=C3=B3n=20de=20lineas=20y=20comentarios=20-=20Arreglo=20de=20te?= =?UTF-8?q?st=20unitarios=20sobre=20configuraci=C3=B3n=20CFG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...n2prg__c_foxbin2prg__EvaluarConfiguracion.prg | 4 ++-- foxbin2prg.prg | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg b/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg index afabb67..d20a73a 100644 --- a/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg +++ b/TESTS/ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion.prg @@ -290,7 +290,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O ADDPROPERTY( loFB2P_Esperado, 'MNX_Conversion_Support', 1 ) ADDPROPERTY( loFB2P_Esperado, 'DBF_Conversion_Support', 2 ) ADDPROPERTY( loFB2P_Esperado, 'DBC_Conversion_Support', 1 ) - ADDPROPERTY( loFB2P_Esperado, 'n_ShowProgressbar', 0 ) + ADDPROPERTY( loFB2P_Esperado, 'n_ShowProgressbar', 1 ) ADDPROPERTY( loFB2P_Esperado, 'l_ShowErrors', .T. ) ADDPROPERTY( loFB2P_Esperado, 'l_Recompile', .T. ) ADDPROPERTY( loFB2P_Esperado, 'l_NoTimestamps', .T. ) @@ -999,7 +999,7 @@ DEFINE CLASS ut__foxbin2prg__c_foxbin2prg__EvaluarConfiguracion AS FxuTestCase O *-- DATOS DE ENTRADA STORE 0 TO lnCodError lcSeteo = 'n_ShowProgressbar' - leValorEsperado = .T. + leValorEsperado = 1 *-- TEST diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 6deb31d..a6ddb03 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -2853,7 +2853,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM IF ln_AT_Cmt > 0 tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) ) - tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS + tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9), ' ' ) && Quito TABS y espacios ENDIF RETURN (ln_AT_Cmt > 0) @@ -4393,13 +4393,12 @@ DEFINE CLASS C_CONVERSOR_BASE AS SESSION *--------------------------------------------------------------------------------------------------- LPARAMETERS tcLine, tcComment LOCAL ln_AT_Cmt + tcComment = '' ln_AT_Cmt = AT( '&'+'&', tcLine) IF ln_AT_Cmt > 0 tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) ) - tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS - ELSE - tcComment = '' + tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9), ' ' ) && Quito TABS y espacios ENDIF RELEASE tcLine, tcComment @@ -13703,13 +13702,12 @@ DEFINE CLASS CL_CUS_BASE AS CUSTOM *--------------------------------------------------------------------------------------------------- LPARAMETERS tcLine, tcComment LOCAL ln_AT_Cmt + tcComment = '' ln_AT_Cmt = AT( '&'+'&', tcLine) IF ln_AT_Cmt > 0 tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) ) - tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS - ELSE - tcComment = '' + tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9), ' ' ) && Quito TABS y espacios ENDIF RELEASE tcLine, tcComment @@ -13792,9 +13790,7 @@ DEFINE CLASS CL_COL_BASE AS COLLECTION IF ln_AT_Cmt > 0 tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) ) - tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS - ELSE - tcComment = '' + tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9), ' ' ) && Quito TABS y espacios ENDIF RELEASE tcLine, tcComment