Author: benm
Date: 2005-06-27 15:03:02 -0400 (Mon, 27 Jun 2005)
New Revision: 46590

Modified:
   
trunk/mcs/class/System.Data/Test/System.Data.Tests.Mainsoft/System.Data/DataSet/DataSet_ReadXml_Strg.cs
Log:
tests may not use the cwd for temp files

Modified: 
trunk/mcs/class/System.Data/Test/System.Data.Tests.Mainsoft/System.Data/DataSet/DataSet_ReadXml_Strg.cs
===================================================================
--- 
trunk/mcs/class/System.Data/Test/System.Data.Tests.Mainsoft/System.Data/DataSet/DataSet_ReadXml_Strg.cs
     2005-06-27 18:59:33 UTC (rev 46589)
+++ 
trunk/mcs/class/System.Data/Test/System.Data.Tests.Mainsoft/System.Data/DataSet/DataSet_ReadXml_Strg.cs
     2005-06-27 19:03:02 UTC (rev 46590)
@@ -77,8 +77,8 @@
        {
                Exception exp = null;
        
-               string sTempFileName = "tmpDataSet_ReadWriteXml_43894.xml"  ;
-
+               string temp_file = System.IO.Path.GetTempFileName ();
+               try {
                DataSet ds1 = new DataSet();
                ds1.Tables.Add(GHTUtils.DataProvider.CreateParentDataTable());
                ds1.Tables.Add(GHTUtils.DataProvider.CreateChildDataTable());
@@ -91,14 +91,14 @@
                
 
                //write xml file, data only
-               ds1.WriteXml(sTempFileName);
+               ds1.WriteXml (temp_file);
 
                //copy both data and schema
                DataSet ds2 = ds1.Copy();
                //clear the data
                ds2.Clear();
 
-               ds2.ReadXml(sTempFileName);
+               ds2.ReadXml(temp_file);
        
                //check xml data
                try
@@ -126,12 +126,9 @@
                finally {EndCase(exp); exp = null;}
 
 
-               //try to delete the file
-               try
-               {
-                       System.IO.File.Delete(sTempFileName);
+               } finally {
+                       System.IO.File.Delete (temp_file);
                }
-               catch {}
 
        }
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to