Do not assume the unit tests can write in the application directory (e.g. iOS devices).

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
index 6a63a23207ea76380733151f69a4987b4db4bcd6..a8d26bdae3b2019f7d4381a23ec00c4829c1d638 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
@@ -801,13 +801,14 @@ namespace MonoTests.System.Data
                        dataSet1.Tables.Add(table);\r
                        table.LoadDataRow(new object[]{1, "One"}, false);\r
                        table.LoadDataRow(new object[]{2, "Two"}, false);\r
+                       string file = Path.Combine (Path.GetTempPath (), "schemas-test.xml");\r
                        try {\r
-                               dataSet1.WriteXml("Test/System.Data/schemas/test.xml", XmlWriteMode.WriteSchema);\r
+                               dataSet1.WriteXml (file, XmlWriteMode.WriteSchema);\r
                        }\r
                        catch (Exception ex) {\r
                                Assert.Fail ("DSExtPropTest failed: WriteXml failed with : "+ex.Message);\r
                        } finally {\r
-                               File.Delete ("Test/System.Data/schemas/test.xml");\r
+                               File.Delete (file);\r
                        }\r
                        \r
                        DataSet dataSet2 = new DataSet();\r

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
index fe6701a579ede5b6c267595d56773a8fecf9c440..1bb06ff6c4b6e452679640e3d34cf58c20c5fc0a 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
@@ -2022,7 +2022,7 @@ namespace MonoTests_System.Data
 
                [Test] public void ReadXmlSchema_ByFileName()
                {
-                       string sTempFileName = "tmpDataSet_ReadWriteXml_43899.xml"  ;
+                       string sTempFileName = Path.Combine (Path.GetTempPath (), "tmpDataSet_ReadWriteXml_43899.xml");
 
                        DataSet ds1 = new DataSet();
                        ds1.Tables.Add(DataProvider.CreateParentDataTable());

diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
index d41235ef4b3f9c441d409d9d71642c36a5976658..d752df4f1ac2c291267ff18e0a7ff3f7c12aaaee 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -3091,8 +3091,8 @@ namespace MonoTests.System.Data
                [Test]
                public void ReadWriteXmlSchema_ByFileName ()
                {
-                       string sTempFileName1 = "tmpDataSet_ReadWriteXml_43899-1.xml";
-                       string sTempFileName2 = "tmpDataSet_ReadWriteXml_43899-2.xml";
+                       string sTempFileName1 = Path.Combine (Path.GetTempPath (), "tmpDataSet_ReadWriteXml_43899-1.xml");
+                       string sTempFileName2 = Path.Combine (Path.GetTempPath (), "tmpDataSet_ReadWriteXml_43899-2.xml");
 
                        DataSet ds1 = new DataSet ();
                        ds1.Tables.Add (DataProvider.CreateParentDataTable ());