Changeset: 387 fdbozzo - 01/08/2014 01:16:35:

- Agregados casos de prueba para comprobar el nuevo array aLineasExclusion

TESTS/ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion.prg

@@ -27,7 +27,7 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 
 	*******************************************************************************************************************************************
 	FUNCTION Evaluate_results
-		LPARAMETERS taExpected_Pos, taPos, tnPos_Count
+		LPARAMETERS taExpected_Pos, taPos, tnPos_Count, taLineasExclusion_Esperadas, taLineasExclusion
 
 		LOCAL loObj AS c_conversor_base OF "FOXBIN2PRG.PRG"
 		loObj	= THIS.icObj
@@ -37,11 +37,24 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 			RETURN .T.
 		ENDIF
 		
+		*-- INFORMACI<43>N
 		THIS.messageout( "Pares de posiciones esperados: " + TRANSFORM(tnPos_Count) )
 		FOR I = 1 TO tnPos_Count
 			THIS.messageout( "Posici<63>n de Inicio/Fin esperados: " + TRANSFORM(taExpected_Pos(I,1)) + ',' + TRANSFORM(taExpected_Pos(I,2)) )
 		ENDFOR
+
+		THIS.messageout( "" )
+
+		IF TYPE( "taLineasExclusion",1 ) = "A"
+			FOR I = 1 TO ALEN(taLineasExclusion_Esperadas,1)
+				THIS.messageout( "L<>nea de exclusi<73>n " + STR(I,2) + " esperada: " + TRANSFORM( taLineasExclusion_Esperadas(I) ) ;
+					+ IIF( taLineasExclusion_Esperadas(I), ' <', '' ) )
+			ENDFOR
+		ENDIF
+
+		THIS.messageout( REPLICATE("*",80) )
 		
+		*-- TESTS
 		THIS.assertequals( ALEN(taExpected_Pos,1), ALEN(taPos,1), "Posici<63>n de Inicio/Fin" )
 
 		FOR I = 1 TO tnPos_Count
@@ -49,12 +62,17 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 				, TRANSFORM(taPos(I,1)) + ',' + TRANSFORM(taPos(I,2)) ;
 				, "Posici<63>n de Inicio/Fin" )
 		ENDFOR
+		
+		IF TYPE( "taLineasExclusion",1 ) = "A"
+			THIS.assertequalsarrays( @taLineasExclusion_Esperadas, @taLineasExclusion, "L<>neas de Exclusi<73>n" )
+		ENDIF
 	ENDFUNC
 
 
 	*******************************************************************************************************************************************
 	FUNCTION Deberia_ObtenerLaUbicacionDelBloque_IF_ENDIF_CuandoCodigoCon_IF_ENDIF_predominante_esEvaluado
-		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(2,2)
+		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(2,2) ;
+			, laLineasExclusion(10), laLineasExclusion_Esperadas(10)
 		LOCAL loObj AS c_conversor_prg_a_bin OF "FOXBIN2PRG.PRG"
 		loObj	= THIS.icObj
 		
@@ -64,6 +82,12 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		laExpected_Pos(1,2)	= 5
 		laExpected_Pos(2,1)	= 7
 		laExpected_Pos(2,2)	= 9
+		laLineasExclusion_Esperadas( 3)	= .T.
+		laLineasExclusion_Esperadas( 4)	= .T.
+		laLineasExclusion_Esperadas( 5)	= .T.
+		laLineasExclusion_Esperadas( 7)	= .T.
+		laLineasExclusion_Esperadas( 8)	= .T.
+		laLineasExclusion_Esperadas( 9)	= .T.
 
 		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
 			<<C_PROC>> myMethod_B
@@ -81,16 +105,18 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		lnLineas	= ALINES( laLineas, lcMethod )
 
 		*-- Test
-		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , , @lnPos_Count, @laPos )
+		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , @laLineasExclusion, @lnPos_Count, @laPos )
 		
-		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count )
+		*-- Evaluaci<EFBFBD>n de resultados
+		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count, @laLineasExclusion_Esperadas, @laLineasExclusion )
 		
 	ENDFUNC
 
 
 	*******************************************************************************************************************************************
 	FUNCTION Deberia_ObtenerLaUbicacionDelBloque_IF_ENDIF_Externo_CuandoCodigoCon_IF_ENDIF_predominante_esEvaluado
-		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(1,2)
+		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(1,2) ;
+			, laLineasExclusion(10), laLineasExclusion_Esperadas(10)
 		LOCAL loObj AS c_conversor_prg_a_bin OF "FOXBIN2PRG.PRG"
 		loObj	= THIS.icObj
 		
@@ -98,6 +124,13 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		STORE '' TO lcMethod
 		laExpected_Pos(1,1)	= 3
 		laExpected_Pos(1,2)	= 9
+		laLineasExclusion_Esperadas( 3)	= .T.
+		laLineasExclusion_Esperadas( 4)	= .T.
+		laLineasExclusion_Esperadas( 5)	= .T.
+		laLineasExclusion_Esperadas( 6)	= .T.
+		laLineasExclusion_Esperadas( 7)	= .T.
+		laLineasExclusion_Esperadas( 8)	= .T.
+		laLineasExclusion_Esperadas( 9)	= .T.
 
 		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
 			<<C_PROC>> myMethod_B
@@ -115,16 +148,18 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		lnLineas	= ALINES( laLineas, lcMethod )
 
 		*-- Test
-		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , , @lnPos_Count, @laPos )
+		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , @laLineasExclusion, @lnPos_Count, @laPos )
 		
-		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count )
+		*-- Evaluaci<EFBFBD>n de resultados
+		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count, @laLineasExclusion_Esperadas, @laLineasExclusion )
 		
 	ENDFUNC
 
 
 	*******************************************************************************************************************************************
 	FUNCTION Deberia_ObtenerLaUbicacionDelBloque_TEXT_ENDTEXT_CuandoCodigoCon_TEXT_ENDTEXT_predominante_esEvaluado
-		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(2,2)
+		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(2,2) ;
+			, laLineasExclusion(10), laLineasExclusion_Esperadas(10)
 		LOCAL loObj AS c_conversor_prg_a_bin OF "FOXBIN2PRG.PRG"
 		loObj	= THIS.icObj
 		
@@ -134,6 +169,12 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		laExpected_Pos(1,2)	= 5
 		laExpected_Pos(2,1)	= 7
 		laExpected_Pos(2,2)	= 9
+		laLineasExclusion_Esperadas( 3)	= .T.
+		laLineasExclusion_Esperadas( 4)	= .T.
+		laLineasExclusion_Esperadas( 5)	= .T.
+		laLineasExclusion_Esperadas( 7)	= .T.
+		laLineasExclusion_Esperadas( 8)	= .T.
+		laLineasExclusion_Esperadas( 9)	= .T.
 
 		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
 			<<C_PROC>> myMethod_B
@@ -151,9 +192,10 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		lnLineas	= ALINES( laLineas, lcMethod )
 
 		*-- Test
-		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , , @lnPos_Count, @laPos )
+		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , @laLineasExclusion, @lnPos_Count, @laPos )
 		
-		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count )
+		*-- Evaluaci<EFBFBD>n de resultados
+		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count, @laLineasExclusion_Esperadas, @laLineasExclusion )
 		
 	ENDFUNC
 
@@ -237,7 +279,8 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 
 	*******************************************************************************************************************************************
 	FUNCTION Deberia_NoEncontrarBloque_TEXT_ENDTEXT_CuandoEvaluaUnaLineaQueComienzaConUnCampoLlamado_Text_YLineaAnteriorTerminaEn_Coma
-		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(1,2)
+		LOCAL lcMethod, laLineas(1), lnLineas, laPos(1,2), lnPos_Count, laExpected_Pos(1,2) ;
+			, laLineasExclusion(29), laLineasExclusion_Esperadas(29)
 		LOCAL loObj AS c_conversor_prg_a_bin OF "FOXBIN2PRG.PRG"
 		loObj	= THIS.icObj
 		
@@ -245,6 +288,9 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		STORE '' TO lcMethod
 		laExpected_Pos(1,1)	= 4
 		laExpected_Pos(1,2)	= 15
+		FOR I = 4 TO 15
+			laLineasExclusion_Esperadas(I)	= .T.
+		ENDFOR
 
 		TEXT TO lcMethod NOSHOW TEXTMERGE FLAGS 1 PRETEXT 1+2+4
 			<<C_PROC>> myMethod_B
@@ -281,9 +327,10 @@ DEFINE CLASS ut__foxbin2prg__c_conversor_base__IdentificarBloquesDeExclusion as
 		lnLineas	= ALINES( laLineas, lcMethod )
 
 		*-- Test
-		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , , @lnPos_Count, @laPos )
+		loObj.identificarBloquesDeExclusion( @laLineas, lnLineas, , @laLineasExclusion, @lnPos_Count, @laPos )
 		
-		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count )
+		*-- Evaluaci<EFBFBD>n de resultados
+		THIS.Evaluate_results( @laExpected_Pos, @laPos, lnPos_Count, @laLineasExclusion_Esperadas, @laLineasExclusion )
 		
 	ENDFUNC