* roottypes.cs: Rename from tree.cs.

[mono.git] / mcs / class / System.Drawing / Test / DrawingTest / DrawingTestHelper / DrawingTest.cs

diff --git a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTest.cs b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTest.cs
index f5504625c92b4eb72247dd59f96cb472549a2a89..8f0ba78e1956cdf6784f81ad8d3875b3b5dae207 100644 (file)
--- a/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTest.cs
+++ b/mcs/class/System.Drawing/Test/DrawingTest/DrawingTestHelper/DrawingTest.cs
@@ -159,7 +159,7 @@ namespace DrawingTestHelper
        /// <summary>\r
        /// Summary description for DrawingTest.\r
        /// </summary>\r
-       public abstract class DrawingTest {\r
+       public abstract class DrawingTest : IDisposable {\r
 \r
                public const float DEFAULT_FLOAT_TOLERANCE = 1e-5f; \r
                public const int DEFAULT_IMAGE_TOLERANCE = 2; \r
@@ -443,6 +443,18 @@ namespace DrawingTestHelper
                        test.OwnerClass = ownerClass;\r
                        return test;\r
                }\r
+               #region IDisposable Members\r
+\r
+               public void Dispose()\r
+               {\r
+                       // TODO:  Add DrawingTest.Dispose implementation\r
+                       if (_graphics != null) {\r
+                               _graphics.Dispose();\r
+                               _graphics = null;\r
+                       }\r
+               }\r
+\r
+               #endregion\r
        }\r
 \r
 #if TARGET_JVM\r
@@ -477,7 +489,7 @@ namespace DrawingTestHelper
 \r
                protected override Bitmap GetReferenceImage(string testName) {\r
                        try{\r
-                               string dotNetResultsFolder = @"..\Debug\";\r
+                               string dotNetResultsFolder = @"";\r
                                string fileName = dotNetResultsFolder + testName.Replace(":", "_") + ".png";\r
                                return new Bitmap(fileName);\r
                        }\r
@@ -597,6 +609,7 @@ namespace DrawingTestHelper
                        try{\r
                                string fileName = testName.Replace(":", "_") + ".png";\r
                                _bitmap.Save( fileName );\r
+                               GC.Collect();\r
                                return null;\r
                        }\r
                        catch(System.Exception e) {\r