From c6a12d1c07c5eb4347fff34a005b2b802697c112 Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Sun, 6 Jul 2014 13:43:31 +0200
Subject: [PATCH] Changeset: 345 fdbozzo - 06/07/2014 13:05:21:

---
 TESTS/ut__foxbin2prg.prg | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/TESTS/ut__foxbin2prg.prg b/TESTS/ut__foxbin2prg.prg
index 979ed91..81a72b7 100644
--- a/TESTS/ut__foxbin2prg.prg
+++ b/TESTS/ut__foxbin2prg.prg
@@ -128,10 +128,12 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 					, laProtected(1), lnProtected_Count, laProtected_Esperado(1), lnProtected_Count_Esperado ;
 					, laMethods(1,2), lnMethods_Count, laMethods_Esperado(1,2), lnMethods_Count_Esperado, lcExtraData
 				LOCAL loObj AS c_conversor_bin_a_prg OF "FOXBIN2PRG.PRG"
+				LOCAL loFoxBin2Prg AS c_foxbin2prg OF "FOXBIN2PRG.PRG"
 
 				*-- Algunos ajustes para mejor visualización de caracteres especiales
 				*tcPropValue				= oFXU_LIB.mejorarPresentacionCaracteresEspeciales( tcPropValue )
-				loObj		= NEWOBJECT("c_conversor_bin_a_prg", "FOXBIN2PRG.PRG")
+				loFoxBin2Prg	= NEWOBJECT("c_foxbin2prg", "FOXBIN2PRG.PRG")
+				loObj			= NEWOBJECT("c_conversor_bin_a_prg", "FOXBIN2PRG.PRG")
 
 				*-- Reserved3
 				loObj.get_PropsAndCommentsFrom_RESERVED3( toReg.RESERVED3, .F., @laPropsAndComments, @lnPropsAndComments_Count, '' )
@@ -146,8 +148,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 				loObj.get_PropsFrom_PROTECTED( toReg_Esperado.PROTECTED, .F., @laProtected_Esperado, @lnProtected_Count_Esperado, '' )
 
 				*-- Methods
-				loObj.get_ADD_OBJECT_METHODS( toReg, toReg, '', @laMethods, '', @lnMethods_Count, '', 0, '', 0 )
-				loObj.get_ADD_OBJECT_METHODS( toReg_Esperado, toReg_Esperado, '', @laMethods_Esperado, '', @lnMethods_Count_Esperado, '', 0, '', 0 )
+				loObj.get_ADD_OBJECT_METHODS( toReg, toReg, '', @laMethods, '', @lnMethods_Count, '', 0, '', 0, loFoxBin2Prg )
+				loObj.get_ADD_OBJECT_METHODS( toReg_Esperado, toReg_Esperado, '', @laMethods_Esperado, '', @lnMethods_Count_Esperado, '', 0, '', 0, loFoxBin2Prg )
 				lcExtraData	= tcParent + '.' + tcObjName + ' (' + tcClass + ')'
 
 
@@ -257,6 +259,9 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 					THIS.asserttrue( ASCAN( laMethods, laMethods_Esperado(I,1), 1, -1, 1, 0+2+4) > 0 ;
 						, ' Comprobación de que existe el Method "' + TRANSFORM(laMethods_Esperado(I,1)) + '"' + " para " + lcExtraData )
 				ENDFOR
+				
+				loFoxBin2Prg = NULL
+				RELEASE loFoxBin2Prg
 
 			ENDCASE
 
@@ -438,7 +443,7 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 	*******************************************************************************************************************************************
 	FUNCTION Deberia_Ejecutar_FOXBIN2PRG_ParaElForm_FB2P_FRM_1_SCX_YValidarLosCamposDelRegistro
 		LOCAL lnCodError, lnCodError_Esperado  ;
-			, lc_File, lc_InputFile, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado, loReg, lcTipoBinario ;
+			, lc_File, lc_InputFile, lc_OutputFile, lc_OutputFile2, lcParent, lcClass, lcObjName, loReg_Esperado, loReg, lcTipoBinario ;
 			, loModulo AS CL_CLASE OF "FOXBIN2PRG.PRG" ;
 			, loCnv AS c_foxbin2prg OF "FOXBIN2PRG.PRG" ;
 			, loEx AS EXCEPTION
@@ -457,16 +462,17 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 			*-- DATOS DE ENTRADA
 			STORE 0 TO lnCodError
 			lc_File				= 'FB2P_FRM_1.SCX'
-			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 )
+			lc_OutputFile2		= FORCEEXT(lc_OutputFile, LEFT( JUSTEXT(lc_File),2 ) + '2' )
 			lcTipoBinario		= UPPER( JUSTEXT( lc_OutputFile ) )
 			loCnv.l_NoTimestamps			= .F.
 			loCnv.l_ClearUniqueID			= .F.
 
 			oFXU_LIB.copiarArchivosParaTest( FORCEEXT( lc_File, LEFT( JUSTEXT(lc_File),2 ) + '?' ) )
 
-			loCnv.Convertir( lc_OutputFile, .F., .F., .T. )
-			loCnv.Convertir( FORCEEXT(lc_OutputFile, LEFT( JUSTEXT(lc_File),2 ) + '2' ), .F., .F., .T. )
+			loCnv.Ejecutar( lc_OutputFile, '', '', '', '', '', '', '', '', .T. )
+			loCnv.Ejecutar( lc_OutputFile2, '', '', '', '', '', '', '', '', .T. )
 
 			SELECT 0
 			USE (lc_InputFile) SHARED AGAIN NOUPDATE ALIAS ARCHIVOBIN_IN