Changeset: 278 fdbozzo - 05/06/2014 23:04:19:

- Garbage collect en Unit Tests
- Agregada props Stretch en props_image.txt (Kenny Vermassen)
- Agregada props Enabled en props_image.txt

TESTS/DATOS_READONLY/f_form_aa.sc2

@@ -692,8 +692,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx"
 	ADD OBJECT 'Cl_image1' AS cl_image WITH ;
 		Anchor = 0, ;
 		BackStyle = 1, ;
-		BorderColor = 100,100,100, ;
-		BorderStyle = 0, ;
+		BorderColor = 255,0,0, ;
+		BorderStyle = 1, ;
 		ColorSource = 4, ;
 		Comment = "", ;
 		DragIcon = ..\..\, ;
@@ -725,11 +725,14 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx"
 		*< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="image" />
 
 	ADD OBJECT 'Image1' AS image WITH ;
-		Height = 100, ;
+		BorderColor = 255,0,0, ;
+		BorderStyle = 1, ;
+		Enabled = .T., ;
+		Height = 104, ;
 		Left = 764, ;
 		Name = "Image1", ;
 		Picture = bmps\vfpxlogo.bmp, ;
-		Top = 184, ;
+		Top = 180, ;
 		Width = 212
 		*< END OBJECT: BaseClass="image" />
 

TESTS/DATOS_READONLY/f_form_aa2.sc2

@@ -23,7 +23,11 @@ DEFINE CLASS f_form_aa1 AS f_form_aa OF "lib_controles.vcx"
 	DefTop = 
 	DefWidth = 
 	DoCreate = .T.
+	Height = (460)
+	Left = (2)
 	Name = "F_form_aa1"
+	Top = (4)
+	Width = (980)
 	Cl_grid1.AllowAddNew = .F.
 	Cl_grid1.AllowAutoColumnFit = 0
 	Cl_grid1.AllowCellSelection = .T.
@@ -400,8 +404,10 @@ DEFINE CLASS f_form_aa1 AS f_form_aa OF "lib_controles.vcx"
 	Cl_grid1.View = 0
 	Cl_grid1.Visible = .T.
 	Cl_grid1.WhatsThisHelpID = -1
+	Cl_image1.Name = "Cl_image1"
 	cmdCapturar.Name = "cmdCapturar"
 	Edit1.Name = "Edit1"
+	Image1.Name = "Image1"
 	Label1.Name = "Label1"
 	Label2.Name = "Label2"
 	Label3.Name = "Label3"

TESTS/DATOS_READONLY/lib_controles.vc2

@@ -5568,8 +5568,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx"
 	ADD OBJECT 'Cl_image1' AS cl_image WITH ;
 		Anchor = 0, ;
 		BackStyle = 1, ;
-		BorderColor = 100,100,100, ;
-		BorderStyle = 0, ;
+		BorderColor = 255,0,0, ;
+		BorderStyle = 1, ;
 		ColorSource = 4, ;
 		Comment = "", ;
 		DragIcon = ..\..\, ;
@@ -5601,11 +5601,13 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx"
 		*< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="image" />
 
 	ADD OBJECT 'Image1' AS image WITH ;
-		Height = 100, ;
+		BorderColor = 255,0,0, ;
+		BorderStyle = 1, ;
+		Height = 104, ;
 		Left = 764, ;
 		Name = "Image1", ;
 		Picture = bmps\vfpxlogo.bmp, ;
-		Top = 184, ;
+		Top = 180, ;
 		Width = 212
 		*< END OBJECT: BaseClass="image" />
 

TESTS/fxu_lib_objetos_y_funciones_de_soporte.prg

@@ -129,7 +129,15 @@ DEFINE CLASS CL_FXU_CONFIG AS CUSTOM
 	PROCEDURE copiarArchivosParaTest
 		LPARAMETERS tcFileSpec
 
-		COPY FILE (FORCEPATH( tcFileSpec, THIS.cPathDatosReadOnly )) TO (FORCEPATH( tcFileSpec, THIS.cPathDatosTest ))
+		TRY
+			LOCAL loEx AS Exception
+			COPY FILE (FORCEPATH( tcFileSpec, THIS.cPathDatosReadOnly )) TO (FORCEPATH( tcFileSpec, THIS.cPathDatosTest ))
+
+		CATCH TO loEx
+			loEx.UserValue = 'cPathDatosReadOnly = "' + THIS.cPathDatosReadOnly + CHR(13) + CHR(10) ;
+				+ 'cPathDatosTest = "' + THIS.cPathDatosTest
+			THROW
+		ENDTRY
 	ENDPROC
 
 

TESTS/ut__foxbin2prg.prg

@@ -54,8 +54,11 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 			oFXU_LIB = NULL
 		ENDIF
 		RELEASE PROCEDURE 'TESTS\fxu_lib_objetos_y_funciones_de_soporte.PRG'
-		MOUSE AT (THIS.nMouseY), (THIS.nMouseX) PIXELS
+		RELEASE oFXU_LIB
+		CLOSE PROCEDURES
+		CLEAR RESOURCES
 		SYS(1104)
+		MOUSE AT (THIS.nMouseY), (THIS.nMouseX) PIXELS
 
 	ENDFUNC
 
@@ -342,6 +345,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 
 		FINALLY
 			USE IN (SELECT("ARCHIVOBIN_IN"))
+			STORE NULL TO loModulo, loCnv
+			RELEASE loModulo, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -421,6 +426,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 
 		FINALLY
 			USE IN (SELECT("ARCHIVOBIN_IN"))
+			STORE NULL TO loModulo, loCnv
+			RELEASE loModulo, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -503,6 +510,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 		FINALLY
 			USE IN (SELECT("ARCHIVOBIN_IN"))
 			USE IN (SELECT("TABLABIN"))
+			STORE NULL TO loModulo, loCnv
+			RELEASE loModulo, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -586,6 +595,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 
 		FINALLY
 			USE IN (SELECT("TABLABIN"))
+			STORE NULL TO loModulo, loCnv
+			RELEASE loModulo, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -676,6 +687,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 
 		FINALLY
 			USE IN (SELECT("TABLABIN"))
+			STORE NULL TO loModulo, loCnv
+			RELEASE loModulo, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -760,6 +773,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 		FINALLY
 			USE IN (SELECT("ARCHIVOBIN_IN"))
 			USE IN (SELECT("TABLABIN"))
+			STORE NULL TO loModulo, loCnv
+			RELEASE loModulo, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -842,6 +857,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 		FINALLY
 			USE IN (SELECT("ARCHIVOBIN_IN"))
 			USE IN (SELECT("TABLABIN"))
+			STORE NULL TO loModulo, loCnv
+			RELEASE loModulo, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -925,6 +942,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 		FINALLY
 			USE IN (SELECT("ARCHIVOBIN_IN"))
 			USE IN (SELECT("TABLABIN"))
+			STORE NULL TO loModulo, loCnv
+			RELEASE loModulo, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -1001,7 +1020,6 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 			ELSE
 				loCtl = CREATEOBJECT( tcControlName )
 			ENDIF
-			*loCtl.c_testname = tcTestName + '_0'
 			loCtl.c_testname = FORCEPATH( THIS.ICCURRENTTEST + '_0.bmp', ADDBS(oFXU_LIB.cPathDatosTest) + 'bmps' )
 			IF loCtl.BaseClass = 'Formset'
 				loCtl.Forms(1).ALWAYSONTOP= .T.
@@ -1036,7 +1054,6 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 			ELSE
 				loCtl = CREATEOBJECT( tcControlName )
 			ENDIF
-			*loCtl.c_testname = tcTestName + '_1'
 			loCtl.c_testname = FORCEPATH( THIS.ICCURRENTTEST + '_1.bmp', ADDBS(oFXU_LIB.cPathDatosTest) + 'bmps' )
 			IF loCtl.BaseClass = 'Formset'
 				loCtl.Forms(1).ALWAYSONTOP= .T.
@@ -1053,8 +1070,6 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 			CLEAR CLASSLIB (lcLib)
 
 			*-- Comparo resultados
-			*lcBMP0		= FORCEPATH( tcTestName + '_0.bmp', oFXU_LIB.cPathDatosTest )
-			*lcBMP1		= FORCEPATH( tcTestName + '_1.bmp', oFXU_LIB.cPathDatosTest )
 			lcBMP0		= FORCEPATH( THIS.ICCURRENTTEST + '_0.bmp', ADDBS(oFXU_LIB.cPathDatosTest) + 'bmps' )
 			lcBMP1		= FORCEPATH( THIS.ICCURRENTTEST + '_1.bmp', ADDBS(oFXU_LIB.cPathDatosTest) + 'bmps' )
 
@@ -1082,9 +1097,8 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 			THIS.Evaluate_results( loEx, lnCodError_Esperado, lc_OutputFile, lcParent, lcClass, lcObjName, loReg_Esperado )
 
 		FINALLY
-		*	USE IN (SELECT("ARCHIVOBIN_IN"))
-		*	USE IN (SELECT("TABLABIN"))
-			STORE NULL TO loCnv, loCtl
+			STORE NULL TO loCtl, loCnv
+			RELEASE loCtl, loCnv
 		ENDTRY
 
 	ENDFUNC
@@ -1318,6 +1332,7 @@ DEFINE CLASS ut__foxbin2prg AS FxuTestCase OF FxuTestCase.prg
 		*	USE IN (SELECT("ARCHIVOBIN_IN"))
 		*	USE IN (SELECT("TABLABIN"))
 			STORE NULL TO loCnv, loCtl
+			RELEASE loCnv, loCtl
 		ENDTRY
 
 	ENDFUNC

props_image.txt

@@ -12,8 +12,10 @@ DefLeft
 DefHeight
 DefWidth
 Picture
+Stretch
 BackStyle
 BorderStyle
+Enabled
 Height
 HelpContextID
 WhatsThisHelpID