From ddcfc420706c60db22c4160616005a281d2ff00d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 4 Sep 2014 18:55:43 +0200 Subject: [PATCH] Cleanup namespace names of class lib tests to follow convention A couple of the test suites didn't follow the MonoTests. naming convention for the namespace. --- .../Test/NvdlValidatingReaderTests.cs | 2 +- mcs/class/Mono.Data.Tds/Test/bug-4786.cs | 4 +- .../Test/Mono.Options/OptionContextTest.cs | 2 +- .../Test/Mono.Options/OptionSetTest.cs | 2 +- .../Mono.Options/Test/Mono.Options/OptionTest.cs | 2 +- mcs/class/Mono.Options/Test/Mono.Options/Utils.cs | 2 +- .../Test/ChangeInterceptorAttributeTests.cs | 6 +- .../Test/DataServiceExceptionTests.cs | 6 +- .../System.Data.Services/Test/DataServiceTests.cs | 6 +- .../Test/ETagAttributeTests.cs | 6 +- .../Test/ExpandSegmentCollectionTests.cs | 5 +- .../Test/ExpandSegmentTests.cs | 6 +- .../Test/IgnorePropertiesAttributeTests.cs | 6 +- .../Test/MimeTypeAttributeTests.cs | 5 +- .../Test/QueryInterceptorAttributeTests.cs | 6 +- .../Test/System.Data.Common/DbDataReaderMock.cs | 2 +- .../Test/System.Data.Common/DbDataReaderTest.cs | 2 +- .../Test/System.Data/BinarySerializationTest.cs | 3 + .../Test/System.Data/ConstraintExceptionTest.cs | 2 +- .../Test/System.Data/DBConcurrencyExceptionTest.cs | 2 +- .../System.Data/Test/System.Data/DataSetTest2.cs | 110 ++++++++++----------- .../Test/System.Data/DataTableCollectionTest2.cs | 14 +-- .../System.Data/Test/System.Data/DataTableTest2.cs | 2 +- .../System.Data/Test/System.Data/DataTableTest3.cs | 2 +- .../System.Data/Test/System.Data/DataTableTest4.cs | 22 ++--- .../System.Data/Test/System.Data/DataTableTest5.cs | 2 +- .../System.Data/Test/System.Data/DataViewTest2.cs | 27 ++--- .../DeletedRowInaccessibleExceptionTest.cs | 2 +- .../Test/System.Data/DuplicateNameExceptionTest.cs | 2 +- .../Test/System.Data/EvaluateExceptionTest.cs | 2 +- .../Test/System.Data/ForeignKeyConstraintTest2.cs | 2 +- .../System.Data/InRowChangingEventExceptionTest.cs | 2 +- .../System.Data/InvalidConstraintExceptionTest.cs | 2 +- .../System.Data/MissingPrimaryKeyExceptionTest.cs | 4 +- .../Test/System.Data/NoNullAllowedExceptionTest.cs | 2 +- .../Test/System.Data/ReadOnlyExceptionTest.cs | 2 +- .../Test/System.Data/RowNotInTableExceptionTest.cs | 2 +- .../Test/System.Data/SyntaxErrorExceptionTest.cs | 2 +- .../Test/System.Data/TrailingSpaceTest.cs | 4 +- .../Test/System.Data/UniqueConstraintTest2.cs | 2 +- .../Test/System.Data/VersionNotFoundException.cs | 4 +- .../Test/System.Data/XmlDataLoaderTest.cs | 4 +- .../Test/System.Data/XmlDataReaderTest.cs | 4 +- .../CommunicationObjectSyncTest.cs | 2 +- .../Test/System.ServiceProcess/ServiceBaseTest.cs | 7 +- .../AnnotationPathPointTest.cs | 2 +- .../AnovaResultTest.cs | 2 +- .../ArrowAnnotationTest.cs | 2 +- .../AxisScaleBreakStyleTest.cs | 2 +- .../ChartElementTest.cs | 2 +- .../DataPointTest.cs | 2 +- .../System.XML/Test/System.Xml/XmlResolverTest.cs | 2 +- .../Test/System.Xml/XmlSecureResolverCas.cs | 4 +- .../Test/System.Xml/XmlSecureResolverTests.cs | 2 +- .../Test/System.Net/NetworkCredentialTest.cs | 2 +- .../Test/System.IO.Packaging/FakePackage.cs | 6 +- .../Test/System.IO.Packaging/FakePackagePart.cs | 4 +- .../System.IO.Packaging/FakePackagePartTests.cs | 9 +- .../Test/System.IO.Packaging/FakePackageTests.cs | 4 +- .../Test/System.IO.Packaging/FakeStream.cs | 3 +- .../Test/System.IO.Packaging/PackUriHelperTests.cs | 2 +- .../System.IO.Packaging/PackagePartFileTests.cs | 4 +- .../System.IO.Packaging/PackagePartStreamTests.cs | 6 +- .../Test/System.IO.Packaging/PackagePartTest.cs | 4 +- .../PackageRelationshipTests.cs | 4 +- .../Test/System.IO.Packaging/PackageTest.cs | 8 +- .../Test/System.IO.Packaging/TestBase.cs | 4 +- mcs/class/corlib/Test/Mono/DataConvertTest.cs | 8 +- .../corlib/Test/System.IO/DirectoryInfoTest.cs | 2 +- mcs/class/corlib/Test/System.IO/DirectoryTest.cs | 4 +- 70 files changed, 222 insertions(+), 179 deletions(-) diff --git a/mcs/class/Commons.Xml.Relaxng/Test/NvdlValidatingReaderTests.cs b/mcs/class/Commons.Xml.Relaxng/Test/NvdlValidatingReaderTests.cs index e7d600c5ea0..8f0ae73cf6d 100644 --- a/mcs/class/Commons.Xml.Relaxng/Test/NvdlValidatingReaderTests.cs +++ b/mcs/class/Commons.Xml.Relaxng/Test/NvdlValidatingReaderTests.cs @@ -13,7 +13,7 @@ using System.Xml; using Commons.Xml.Nvdl; using NUnit.Framework; -namespace MonoTests.Commons.Xml.Nvdl +namespace MonoTests.Commons.Xml.Relaxng { [TestFixture] public class NvdlValidatingReaderTests diff --git a/mcs/class/Mono.Data.Tds/Test/bug-4786.cs b/mcs/class/Mono.Data.Tds/Test/bug-4786.cs index e8436a7deca..91f8a06fc1a 100644 --- a/mcs/class/Mono.Data.Tds/Test/bug-4786.cs +++ b/mcs/class/Mono.Data.Tds/Test/bug-4786.cs @@ -27,11 +27,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -namespace bug4786test +namespace MonoTests.Mono.Data.Tds { using NUnit.Framework; - using Mono.Data.Tds.Protocol; + using global::Mono.Data.Tds.Protocol; using System; using System.Net; using System.Net.Sockets; diff --git a/mcs/class/Mono.Options/Test/Mono.Options/OptionContextTest.cs b/mcs/class/Mono.Options/Test/Mono.Options/OptionContextTest.cs index 8eb61b2c93b..ec3fb02270f 100644 --- a/mcs/class/Mono.Options/Test/Mono.Options/OptionContextTest.cs +++ b/mcs/class/Mono.Options/Test/Mono.Options/OptionContextTest.cs @@ -39,7 +39,7 @@ using NUnit.Framework; #if NDESK_OPTIONS namespace Tests.NDesk.Options #else -namespace Tests.Mono.Options +namespace MonoTests.Mono.Options #endif { [TestFixture] diff --git a/mcs/class/Mono.Options/Test/Mono.Options/OptionSetTest.cs b/mcs/class/Mono.Options/Test/Mono.Options/OptionSetTest.cs index 086c6d9c8c2..688297a0f68 100644 --- a/mcs/class/Mono.Options/Test/Mono.Options/OptionSetTest.cs +++ b/mcs/class/Mono.Options/Test/Mono.Options/OptionSetTest.cs @@ -46,7 +46,7 @@ using NUnit.Framework; #if NDESK_OPTIONS namespace Tests.NDesk.Options #else -namespace Tests.Mono.Options +namespace MonoTests.Mono.Options #endif { class FooConverter : TypeConverter { diff --git a/mcs/class/Mono.Options/Test/Mono.Options/OptionTest.cs b/mcs/class/Mono.Options/Test/Mono.Options/OptionTest.cs index 5242609162a..fad1b484784 100644 --- a/mcs/class/Mono.Options/Test/Mono.Options/OptionTest.cs +++ b/mcs/class/Mono.Options/Test/Mono.Options/OptionTest.cs @@ -39,7 +39,7 @@ using NUnit.Framework; #if NDESK_OPTIONS namespace Tests.NDesk.Options #else -namespace Tests.Mono.Options +namespace MonoTests.Mono.Options #endif { class DefaultOption : Option { diff --git a/mcs/class/Mono.Options/Test/Mono.Options/Utils.cs b/mcs/class/Mono.Options/Test/Mono.Options/Utils.cs index e5439aae4c3..074478e3e21 100644 --- a/mcs/class/Mono.Options/Test/Mono.Options/Utils.cs +++ b/mcs/class/Mono.Options/Test/Mono.Options/Utils.cs @@ -31,7 +31,7 @@ using System; #if NDESK_OPTIONS namespace Tests.NDesk.Options #else -namespace Tests.Mono.Options +namespace MonoTests.Mono.Options #endif { static class Utils { diff --git a/mcs/class/System.Data.Services/Test/ChangeInterceptorAttributeTests.cs b/mcs/class/System.Data.Services/Test/ChangeInterceptorAttributeTests.cs index d8d0e157a8e..3cc769d05e3 100644 --- a/mcs/class/System.Data.Services/Test/ChangeInterceptorAttributeTests.cs +++ b/mcs/class/System.Data.Services/Test/ChangeInterceptorAttributeTests.cs @@ -26,9 +26,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System; +using System.Data.Services; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class ChangeInterceptorAttributeTests { [Test] @@ -45,4 +47,4 @@ namespace System.Data.Services.Tests { Assert.AreEqual ("setName", ci.EntitySetName); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data.Services/Test/DataServiceExceptionTests.cs b/mcs/class/System.Data.Services/Test/DataServiceExceptionTests.cs index 6058fc3e386..5f9758a44c5 100644 --- a/mcs/class/System.Data.Services/Test/DataServiceExceptionTests.cs +++ b/mcs/class/System.Data.Services/Test/DataServiceExceptionTests.cs @@ -26,9 +26,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System; +using System.Data.Services; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class DataServiceExceptionTests { [Test] @@ -68,4 +70,4 @@ namespace System.Data.Services.Tests { Assert.AreEqual (inner, ex.InnerException); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data.Services/Test/DataServiceTests.cs b/mcs/class/System.Data.Services/Test/DataServiceTests.cs index 58b67859593..2bcc6a9dd75 100644 --- a/mcs/class/System.Data.Services/Test/DataServiceTests.cs +++ b/mcs/class/System.Data.Services/Test/DataServiceTests.cs @@ -26,9 +26,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System; +using System.Data.Services; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class DataServiceTests { [Test] @@ -79,4 +81,4 @@ namespace System.Data.Services.Tests { this.OnStartProcessingRequest (args); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data.Services/Test/ETagAttributeTests.cs b/mcs/class/System.Data.Services/Test/ETagAttributeTests.cs index 8b40de6c5bd..706e02c6992 100644 --- a/mcs/class/System.Data.Services/Test/ETagAttributeTests.cs +++ b/mcs/class/System.Data.Services/Test/ETagAttributeTests.cs @@ -26,10 +26,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System; +using System.Data.Services; using System.Linq; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class ETagAttributeTests { [Test] @@ -63,4 +65,4 @@ namespace System.Data.Services.Tests { Assert.AreEqual ("bar", e.PropertyNames[1]); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data.Services/Test/ExpandSegmentCollectionTests.cs b/mcs/class/System.Data.Services/Test/ExpandSegmentCollectionTests.cs index e0eb629d5be..cd5e9a1d31f 100644 --- a/mcs/class/System.Data.Services/Test/ExpandSegmentCollectionTests.cs +++ b/mcs/class/System.Data.Services/Test/ExpandSegmentCollectionTests.cs @@ -26,10 +26,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Data.Services; using System.Linq.Expressions; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class ExpandSegmentCollectionTests { [Test] @@ -101,4 +102,4 @@ namespace System.Data.Services.Tests { Assert.IsFalse (esc.HasFilter); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data.Services/Test/ExpandSegmentTests.cs b/mcs/class/System.Data.Services/Test/ExpandSegmentTests.cs index f64faa8fad2..ce6712c94e0 100644 --- a/mcs/class/System.Data.Services/Test/ExpandSegmentTests.cs +++ b/mcs/class/System.Data.Services/Test/ExpandSegmentTests.cs @@ -26,10 +26,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System; +using System.Data.Services; using System.Linq.Expressions; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class ExpandSegmentTests { [Test] @@ -84,4 +86,4 @@ namespace System.Data.Services.Tests { { new ExpandSegment ("first", null), new ExpandSegment ("second", null), new ExpandSegment ("third", null) })); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data.Services/Test/IgnorePropertiesAttributeTests.cs b/mcs/class/System.Data.Services/Test/IgnorePropertiesAttributeTests.cs index 04c17e3d3ce..090b3bf64bd 100644 --- a/mcs/class/System.Data.Services/Test/IgnorePropertiesAttributeTests.cs +++ b/mcs/class/System.Data.Services/Test/IgnorePropertiesAttributeTests.cs @@ -26,10 +26,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System; +using System.Data.Services; using System.Linq; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class IgnorePropertiesAttributeTests { [Test] @@ -63,4 +65,4 @@ namespace System.Data.Services.Tests { Assert.AreEqual ("bar", e.PropertyNames[1]); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data.Services/Test/MimeTypeAttributeTests.cs b/mcs/class/System.Data.Services/Test/MimeTypeAttributeTests.cs index 6b5533ffa50..824cab9fcb1 100644 --- a/mcs/class/System.Data.Services/Test/MimeTypeAttributeTests.cs +++ b/mcs/class/System.Data.Services/Test/MimeTypeAttributeTests.cs @@ -26,9 +26,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Data.Services; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class MimeTypeAttributeTests { [Test] @@ -39,4 +40,4 @@ namespace System.Data.Services.Tests { Assert.AreEqual ("type", mt.MimeType); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data.Services/Test/QueryInterceptorAttributeTests.cs b/mcs/class/System.Data.Services/Test/QueryInterceptorAttributeTests.cs index b483fbe1cdd..e4b0147cccd 100644 --- a/mcs/class/System.Data.Services/Test/QueryInterceptorAttributeTests.cs +++ b/mcs/class/System.Data.Services/Test/QueryInterceptorAttributeTests.cs @@ -26,9 +26,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System; +using System.Data.Services; using NUnit.Framework; -namespace System.Data.Services.Tests { +namespace MonoTests.System.Data.Services { [TestFixture] public class QueryInterceptorAttributeTests { [Test] @@ -45,4 +47,4 @@ namespace System.Data.Services.Tests { new QueryInterceptorAttribute (null); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data/Test/System.Data.Common/DbDataReaderMock.cs b/mcs/class/System.Data/Test/System.Data.Common/DbDataReaderMock.cs index 5d561b44dd5..2957cd73deb 100644 --- a/mcs/class/System.Data/Test/System.Data.Common/DbDataReaderMock.cs +++ b/mcs/class/System.Data/Test/System.Data.Common/DbDataReaderMock.cs @@ -31,7 +31,7 @@ using System.Data; using System.Data.Common; using System.IO; -namespace Test.System.Data.Common +namespace MonoTests.System.Data.Common { internal class DbDataReaderMock : DbDataReader { diff --git a/mcs/class/System.Data/Test/System.Data.Common/DbDataReaderTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DbDataReaderTest.cs index 0a7235f1b90..20d5c1ab0bf 100644 --- a/mcs/class/System.Data/Test/System.Data.Common/DbDataReaderTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Common/DbDataReaderTest.cs @@ -32,7 +32,7 @@ using System.Data; using System.Data.Common; using System.IO; -namespace Test.System.Data.Common +namespace MonoTests.System.Data.Common { [TestFixture] public class DbDataReaderTest diff --git a/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs b/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs index 5eae92a3963..efbe64a1a4a 100644 --- a/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs +++ b/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs @@ -12,6 +12,8 @@ using System.Threading; using NUnit.Framework; +namespace MonoTests.System.Data +{ [TestFixture] public class BinarySerializationTest { @@ -751,3 +753,4 @@ public class BinarySerializationTest } #endif +} diff --git a/mcs/class/System.Data/Test/System.Data/ConstraintExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/ConstraintExceptionTest.cs index c98a03c5aa4..fe575137ea4 100644 --- a/mcs/class/System.Data/Test/System.Data/ConstraintExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/ConstraintExceptionTest.cs @@ -33,7 +33,7 @@ using System.IO; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class ConstraintExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/DBConcurrencyExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/DBConcurrencyExceptionTest.cs index bfae78d6e6e..35e876ff51f 100644 --- a/mcs/class/System.Data/Test/System.Data/DBConcurrencyExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DBConcurrencyExceptionTest.cs @@ -31,7 +31,7 @@ using System.Data; using NUnit.Framework; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DBConcurrencyExceptionTest diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs index 27df0f58984..6e338558389 100644 --- a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs @@ -39,7 +39,7 @@ using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; using System.Globalization; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DataSetTest2 @@ -448,7 +448,7 @@ namespace MonoTests_System.Data dt.Rows.Add(new object[] {2,"Value3","Value4"}); dt.Rows.Add(new object[] {3,"Value5","Value5"}); - System.Text.StringBuilder resultXML = new System.Text.StringBuilder(); + StringBuilder resultXML = new StringBuilder(); resultXML.Append("<" + ds.DataSetName + "xmlns=\"namespace\">"); @@ -975,13 +975,13 @@ namespace MonoTests_System.Data [Test] public void Locale() { DataSet ds = new DataSet("MyDataSet"); - System.Globalization.CultureInfo culInfo = System.Globalization.CultureInfo.CurrentCulture ; + CultureInfo culInfo = CultureInfo.CurrentCulture ; // Checking Locale default from system Assert.AreEqual(culInfo, ds.Locale , "DS156"); // Checking Locale get/set - culInfo = new System.Globalization.CultureInfo("fr"); // = french + culInfo = new CultureInfo("fr"); // = french ds.Locale = culInfo ; Assert.AreEqual(culInfo , ds.Locale , "DS157"); } @@ -1998,11 +1998,11 @@ namespace MonoTests_System.Data ds1.Tables.Add(DataProvider.CreateParentDataTable()); ds1.Tables.Add(DataProvider.CreateChildDataTable()); - System.IO.MemoryStream ms = new System.IO.MemoryStream(); + MemoryStream ms = new MemoryStream(); //write xml schema only ds1.WriteXmlSchema(ms); - System.IO.MemoryStream ms1 = new System.IO.MemoryStream(ms.GetBuffer()); + MemoryStream ms1 = new MemoryStream(ms.GetBuffer()); //copy schema DataSet ds2 = new DataSet(); ds2.ReadXmlSchema(ms1); @@ -2073,7 +2073,7 @@ namespace MonoTests_System.Data Assert.AreEqual(0, ds2.Tables[1].Rows.Count , "DS282"); //try to delete the file - System.IO.File.Delete(sTempFileName); + File.Delete(sTempFileName); } [Test] public void ReadXmlSchema_ByTextReader() @@ -2082,11 +2082,11 @@ namespace MonoTests_System.Data ds1.Tables.Add(DataProvider.CreateParentDataTable()); ds1.Tables.Add(DataProvider.CreateChildDataTable()); - System.IO.StringWriter sw = new System.IO.StringWriter(); + StringWriter sw = new StringWriter(); //write xml file, schema only ds1.WriteXmlSchema(sw); - System.IO.StringReader sr = new System.IO.StringReader(sw.GetStringBuilder().ToString()); + StringReader sr = new StringReader(sw.GetStringBuilder().ToString()); //copy both data and schema DataSet ds2 = new DataSet(); ds2.ReadXmlSchema(sr); @@ -2122,14 +2122,14 @@ namespace MonoTests_System.Data ds1.Tables.Add(DataProvider.CreateParentDataTable()); ds1.Tables.Add(DataProvider.CreateChildDataTable()); - System.IO.StringWriter sw = new System.IO.StringWriter(); - System.Xml.XmlTextWriter xmlTW = new System.Xml.XmlTextWriter(sw); + StringWriter sw = new StringWriter(); + XmlTextWriter xmlTW = new XmlTextWriter(sw); //write xml file, schema only ds1.WriteXmlSchema(xmlTW); xmlTW.Flush(); - System.IO.StringReader sr = new System.IO.StringReader(sw.ToString()); - System.Xml.XmlTextReader xmlTR = new System.Xml.XmlTextReader(sr); + StringReader sr = new StringReader(sw.ToString()); + XmlTextReader xmlTR = new XmlTextReader(sr); //copy both data and schema DataSet ds2 = new DataSet(); @@ -2196,7 +2196,7 @@ namespace MonoTests_System.Data Assert.AreEqual(ds2.Tables[1].Rows.Count, ds1.Tables[1].Rows.Count , "DS299"); //try to delete the file - System.IO.File.Delete(sTempFileName); + File.Delete(sTempFileName); } [Test] @@ -2212,7 +2212,7 @@ namespace MonoTests_System.Data ds1.Tables[1].Rows.Add(new object[] {7,2," "," ",new DateTime(2000,1,1,0,0,0,0),35}); ds1.Tables[1].Rows.Add(new object[] {7,3,"","",new DateTime(2000,1,1,0,0,0,0),35}); - System.IO.MemoryStream ms = new System.IO.MemoryStream(); + MemoryStream ms = new MemoryStream(); //write xml file, data only ds1.WriteXml(ms); @@ -2241,7 +2241,7 @@ namespace MonoTests_System.Data { string input = string.Empty; - System.IO.StringReader sr; + StringReader sr; DataSet ds = new DataSet(); input += ""; @@ -2261,7 +2261,7 @@ namespace MonoTests_System.Data input += " "; input += ""; - sr = new System.IO.StringReader(input); + sr = new StringReader(input); ds.ReadXml(sr); @@ -2311,7 +2311,7 @@ namespace MonoTests_System.Data { DataSet ds = new DataSet("TestDataSet"); string input = string.Empty; - System.IO.StringReader sr; + StringReader sr; input += ""; input += "10.0"; @@ -2320,7 +2320,7 @@ namespace MonoTests_System.Data input += "22.2302/12/2001"; input += "1.9704/20/20033.0"; input += "TODAY"; - sr = new System.IO.StringReader(input); + sr = new StringReader(input); ds.EnforceConstraints = false; ds.ReadXml(sr); @@ -2339,7 +2339,7 @@ namespace MonoTests_System.Data { m_ds = new DataSet("Stocks"); string input = string.Empty; - System.IO.StringReader sr; + StringReader sr; input += ""; input += ""; @@ -2408,7 +2408,7 @@ namespace MonoTests_System.Data input += " "; input += ""; - sr = new System.IO.StringReader(input); + sr = new StringReader(input); m_ds.EnforceConstraints = true; m_ds.ReadXml(sr); this.privateTestCase("TestCase 1", "Company", "name='Microsoft Corp.'", "Stock", "name='MSFT'", "DS320"); @@ -2444,14 +2444,14 @@ namespace MonoTests_System.Data #region "TestCase 1 - Empty string" // Empty string DataSet ds = new DataSet(); - System.IO.StringReader sr = new System.IO.StringReader (string.Empty); - System.Xml.XmlTextReader xReader = new System.Xml.XmlTextReader(sr); + StringReader sr = new StringReader (string.Empty); + XmlTextReader xReader = new XmlTextReader(sr); try { ds.ReadXml (xReader); Assert.Fail("DS335: ReadXml Failed to throw XmlException"); } - catch (System.Xml.XmlException) {} + catch (XmlException) {} catch (AssertionException exc) {throw exc;} catch (Exception exc) { @@ -2635,8 +2635,8 @@ namespace MonoTests_System.Data private void PrivateTestCase(string a_name, string a_expected, string a_xmlData) { DataSet ds = new DataSet(); - System.IO.StringReader sr = new System.IO.StringReader(a_xmlData) ; - System.Xml.XmlTextReader xReader = new System.Xml.XmlTextReader(sr) ; + StringReader sr = new StringReader(a_xmlData) ; + XmlTextReader xReader = new XmlTextReader(sr) ; ds.ReadXml (xReader); Assert.AreEqual(a_expected, this.dataSetDescription(ds), "DS337"); } @@ -2681,8 +2681,8 @@ namespace MonoTests_System.Data xmlData += "3"; xmlData += ""; xmlData += ""; - System.IO.StringReader sr = new System.IO.StringReader(xmlData) ; - System.Xml.XmlTextReader xReader = new System.Xml.XmlTextReader(sr) ; + StringReader sr = new StringReader(xmlData) ; + XmlTextReader xReader = new XmlTextReader(sr) ; ds.ReadXml (xReader); Assert.AreEqual(3, ds.Tables["c"].Rows.Count, "DS338"); } @@ -2738,7 +2738,7 @@ namespace MonoTests_System.Data ds1.Tables[1].Rows.Add(new object[] {7,2," "," ",new DateTime(2000,1,1,0,0,0,0),35}); ds1.Tables[1].Rows.Add(new object[] {7,3,"","",new DateTime(2000,1,1,0,0,0,0),35}); - System.IO.StringWriter sw = new System.IO.StringWriter(); + StringWriter sw = new StringWriter(); //write xml file, data only ds1.WriteXml(sw); @@ -2747,7 +2747,7 @@ namespace MonoTests_System.Data //clear the data ds2.Clear(); - System.IO.StringReader sr = new System.IO.StringReader(sw.GetStringBuilder().ToString()); + StringReader sr = new StringReader(sw.GetStringBuilder().ToString()); ds2.ReadXml(sr); //check xml data @@ -2777,8 +2777,8 @@ namespace MonoTests_System.Data ds1.Tables[1].Rows.Add(new object[] {7,2," "," ",new DateTime(2000,1,1,0,0,0,0),35}); ds1.Tables[1].Rows.Add(new object[] {7,3,"","",new DateTime(2000,1,1,0,0,0,0),35}); - System.IO.StringWriter sw = new System.IO.StringWriter(); - System.Xml.XmlTextWriter xmlTW = new System.Xml.XmlTextWriter(sw); + StringWriter sw = new StringWriter(); + XmlTextWriter xmlTW = new XmlTextWriter(sw); //write xml file, data only ds1.WriteXml(xmlTW); @@ -2788,8 +2788,8 @@ namespace MonoTests_System.Data DataSet ds2 = ds1.Copy(); //clear the data ds2.Clear(); - System.IO.StringReader sr = new System.IO.StringReader(sw.ToString()); - System.Xml.XmlTextReader xmlTR = new System.Xml.XmlTextReader(sr); + StringReader sr = new StringReader(sw.ToString()); + XmlTextReader xmlTR = new XmlTextReader(sr); ds2.ReadXml(xmlTR); //check xml data @@ -2847,8 +2847,8 @@ namespace MonoTests_System.Data [Test] public void WriteXmlSchema_Relations_ForeignKeys () { - System.IO.MemoryStream ms = null; - System.IO.MemoryStream ms1 = null; + MemoryStream ms = null; + MemoryStream ms1 = null; DataSet ds1 = new DataSet(); @@ -2884,10 +2884,10 @@ namespace MonoTests_System.Data new DataColumn[] {col1_5, col1_6}, new DataColumn[] {col2_5, col2_6}); - ms = new System.IO.MemoryStream(); + ms = new MemoryStream(); ds1.WriteXmlSchema (ms); - ms1 = new System.IO.MemoryStream (ms.GetBuffer()); + ms1 = new MemoryStream (ms.GetBuffer()); DataSet ds2 = new DataSet(); ds2.ReadXmlSchema(ms1); @@ -3096,18 +3096,18 @@ namespace MonoTests_System.Data [Test] public void WriteXml_ByTextWriterXmlWriteMode() { - System.IO.StringReader sr = null; - System.IO.StringWriter sw = null; + StringReader sr = null; + StringWriter sw = null; try // For real { // ReadXml - DataSetOut DataSet oDataset = new DataSet("DataSetOut"); - sw = new System.IO.StringWriter(); - oDataset.WriteXml(sw,System.Data.XmlWriteMode.WriteSchema); + sw = new StringWriter(); + oDataset.WriteXml(sw, XmlWriteMode.WriteSchema); - sr = new System.IO.StringReader(sw.GetStringBuilder().ToString()); + sr = new StringReader(sw.GetStringBuilder().ToString()); oDataset = new DataSet("DataSetOut"); oDataset.ReadXml(sr); @@ -3252,13 +3252,13 @@ namespace MonoTests_System.Data { DataSet ds = new DataSet(); string input = "2"; - System.IO.StringReader sr = new System.IO.StringReader(input) ; - System.Xml.XmlTextReader xReader = new System.Xml.XmlTextReader(sr) ; + StringReader sr = new StringReader(input) ; + XmlTextReader xReader = new XmlTextReader(sr) ; ds.ReadXml (xReader); - System.Text.StringBuilder sb = new System.Text.StringBuilder(); - System.IO.StringWriter sw = new System.IO.StringWriter(sb); - System.Xml.XmlTextWriter xWriter = new System.Xml.XmlTextWriter(sw); + StringBuilder sb = new StringBuilder(); + StringWriter sw = new StringWriter(sb); + XmlTextWriter xWriter = new XmlTextWriter(sw); ds.WriteXml(xWriter); string output = sb.ToString(); Assert.AreEqual(input,output, "DS76"); @@ -3267,20 +3267,20 @@ namespace MonoTests_System.Data DataSet ds = new DataSet(); string input = "2"; string expectedOutput = "2"; - System.IO.StringReader sr = new System.IO.StringReader(input) ; - System.Xml.XmlTextReader xReader = new System.Xml.XmlTextReader(sr) ; + StringReader sr = new StringReader(input) ; + XmlTextReader xReader = new XmlTextReader(sr) ; ds.ReadXml (xReader); - System.Text.StringBuilder sb = new System.Text.StringBuilder(); - System.IO.StringWriter sw = new System.IO.StringWriter(sb); - System.Xml.XmlTextWriter xWriter = new System.Xml.XmlTextWriter(sw); + StringBuilder sb = new StringBuilder(); + StringWriter sw = new StringWriter(sb); + XmlTextWriter xWriter = new XmlTextWriter(sw); ds.WriteXml(xWriter); string output = sb.ToString(); Assert.AreEqual(expectedOutput,output, "DS77"); } { DataSet ds = new DataSet("DSName"); - System.IO.StringWriter sr = new System.IO.StringWriter(); + StringWriter sr = new StringWriter(); ds.WriteXml(sr); Assert.AreEqual("",sr.ToString(), "DS78"); } @@ -3315,7 +3315,7 @@ namespace MonoTests_System.Data ds.Tables.Remove("ChildTable"); //Get the xml representation of the dataset. - System.IO.StringWriter sr = new System.IO.StringWriter(); + StringWriter sr = new StringWriter(); ds.WriteXml(sr); string xml = sr.ToString(); diff --git a/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest2.cs b/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest2.cs index 9229265648c..053825e3501 100644 --- a/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest2.cs @@ -28,10 +28,12 @@ using NUnit.Framework; using System; +using System.Collections; +using System.ComponentModel; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DataTableCollectionTest2 { @@ -143,7 +145,7 @@ namespace MonoTests_System.Data { counter = 0; DataSet ds = new DataSet(); - ds.Tables.CollectionChanged+=new System.ComponentModel.CollectionChangeEventHandler(Tables_CollectionChanged); + ds.Tables.CollectionChanged+=new CollectionChangeEventHandler(Tables_CollectionChanged); ds.Tables.Add(); ds.Tables.Add(); Assert.AreEqual(2, counter, "DTC15"); @@ -153,7 +155,7 @@ namespace MonoTests_System.Data Assert.AreEqual(4, counter, "DTC16"); } - private void Tables_CollectionChanged(object sender, System.ComponentModel.CollectionChangeEventArgs e) + private void Tables_CollectionChanged(object sender, CollectionChangeEventArgs e) { counter++; } @@ -163,7 +165,7 @@ namespace MonoTests_System.Data { counter = 0; DataSet ds = new DataSet(); - ds.Tables.CollectionChanging+=new System.ComponentModel.CollectionChangeEventHandler(Tables_CollectionChanging); + ds.Tables.CollectionChanging+=new CollectionChangeEventHandler(Tables_CollectionChanging); ds.Tables.Add(); ds.Tables.Add(); Assert.AreEqual(2, counter, "DTC17"); @@ -173,7 +175,7 @@ namespace MonoTests_System.Data Assert.AreEqual(4, counter, "DTC18"); } - private void Tables_CollectionChanging(object sender, System.ComponentModel.CollectionChangeEventArgs e) + private void Tables_CollectionChanging(object sender, CollectionChangeEventArgs e) { counter++; } @@ -233,7 +235,7 @@ namespace MonoTests_System.Data ds.Tables.Add(); int count=0; - System.Collections.IEnumerator myEnumerator = ds.Tables.GetEnumerator(); + IEnumerator myEnumerator = ds.Tables.GetEnumerator(); while (myEnumerator.MoveNext()) { diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest2.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest2.cs index 331875ac888..bed6e55e50c 100644 --- a/mcs/class/System.Data/Test/System.Data/DataTableTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/DataTableTest2.cs @@ -36,7 +36,7 @@ using MonoTests.System.Data.Utils; using NUnit.Framework; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DataTableTest2 diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest3.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest3.cs index 6fc2d64b20b..c706778c67b 100644 --- a/mcs/class/System.Data/Test/System.Data/DataTableTest3.cs +++ b/mcs/class/System.Data/Test/System.Data/DataTableTest3.cs @@ -31,7 +31,7 @@ using System.Xml; using NUnit.Framework; -namespace Monotests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DataTableTest3 diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest4.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest4.cs index 2cdd5af913b..c7cb3a35e85 100644 --- a/mcs/class/System.Data/Test/System.Data/DataTableTest4.cs +++ b/mcs/class/System.Data/Test/System.Data/DataTableTest4.cs @@ -31,7 +31,7 @@ using System.IO; using System.Xml; using NUnit.Framework; -namespace Monotests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DataTableTest4 @@ -1600,7 +1600,7 @@ namespace Monotests_System.Data DataSet ds = new DataSet (); DataTable table = new DataTable ("ParentTable"); XmlReadMode mode = XmlReadMode.Auto; - table.Columns.Add (new DataColumn ("id", System.Type.GetType ("System.Int32"))); + table.Columns.Add (new DataColumn ("id", Type.GetType ("System.Int32"))); ds.Tables.Add (table); using (FileStream stream = new FileStream (tempFile, FileMode.Open)) { @@ -1638,7 +1638,7 @@ namespace Monotests_System.Data using (FileStream stream = new FileStream (tempFile, FileMode.Open)) { DataSet ds = new DataSet (); DataTable table = new DataTable ("Table1"); - table.Columns.Add (new DataColumn ("id", System.Type.GetType ("System.Int32"))); + table.Columns.Add (new DataColumn ("id", Type.GetType ("System.Int32"))); ds.Tables.Add (table); try { @@ -1852,7 +1852,7 @@ namespace Monotests_System.Data DataTable table = new DataTable ("DummyTable"); //define the table schame partially with a column name which does not match with any //table columns in the diffgram - table.Columns.Add (new DataColumn ("WrongColumnName", System.Type.GetType ("System.String"))); + table.Columns.Add (new DataColumn ("WrongColumnName", Type.GetType ("System.String"))); XmlReadMode mode = XmlReadMode.Auto; @@ -2013,8 +2013,8 @@ namespace Monotests_System.Data Assert.AreEqual ("NewDataSet", table.DataSet.DataSetName, "#2"); Assert.AreEqual (2, table.Columns.Count, "#3"); Assert.AreEqual (2, table.Rows.Count, "#4"); - Assert.AreEqual (typeof (System.Int32), table.Columns [0].DataType, "#5"); - Assert.AreEqual (typeof (System.String), table.Columns [1].DataType, "#6"); + Assert.AreEqual (typeof (Int32), table.Columns [0].DataType, "#5"); + Assert.AreEqual (typeof (String), table.Columns [1].DataType, "#6"); Assert.AreEqual (1, table.Constraints.Count, "#7"); Assert.AreEqual (typeof (UniqueConstraint), table.Constraints [0].GetType (), "#8"); Assert.AreEqual (1, table.ChildRelations.Count, "#9"); @@ -2027,9 +2027,9 @@ namespace Monotests_System.Data Assert.AreEqual ("NewDataSet", table1.DataSet.DataSetName, "#14"); Assert.AreEqual (3, table1.Columns.Count, "#15"); Assert.AreEqual (4, table1.Rows.Count, "#16"); - Assert.AreEqual (typeof (System.Int32), table1.Columns [0].DataType, "#17"); - Assert.AreEqual (typeof (System.String), table1.Columns [1].DataType, "#18"); - Assert.AreEqual (typeof (System.Int32), table1.Columns [2].DataType, "#19"); + Assert.AreEqual (typeof (Int32), table1.Columns [0].DataType, "#17"); + Assert.AreEqual (typeof (String), table1.Columns [1].DataType, "#18"); + Assert.AreEqual (typeof (Int32), table1.Columns [2].DataType, "#19"); Assert.AreEqual (2, table1.Constraints.Count, "#20"); Assert.AreEqual (typeof (UniqueConstraint), table1.Constraints [0].GetType (), "#21"); Assert.AreEqual (typeof (ForeignKeyConstraint), table1.Constraints [1].GetType (), "#22"); @@ -2045,8 +2045,8 @@ namespace Monotests_System.Data Assert.AreEqual ("NewDataSet", table1.DataSet.DataSetName, "#29"); Assert.AreEqual (2, table1.Columns.Count, "#30"); Assert.AreEqual (8, table1.Rows.Count, "#31"); - Assert.AreEqual (typeof (System.Int32), table1.Columns [0].DataType, "#32"); - Assert.AreEqual (typeof (System.String), table1.Columns [1].DataType, "#33"); + Assert.AreEqual (typeof (Int32), table1.Columns [0].DataType, "#32"); + Assert.AreEqual (typeof (String), table1.Columns [1].DataType, "#33"); Assert.AreEqual (1, table1.Constraints.Count, "#34"); Assert.AreEqual (typeof (ForeignKeyConstraint), table1.Constraints [0].GetType (), "#35"); Assert.AreEqual (1, table1.ParentRelations.Count, "#36"); diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest5.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest5.cs index 3bcbf75889a..0cacc8ea9ef 100644 --- a/mcs/class/System.Data/Test/System.Data/DataTableTest5.cs +++ b/mcs/class/System.Data/Test/System.Data/DataTableTest5.cs @@ -34,7 +34,7 @@ using System.Xml.Serialization; using NUnit.Framework; -namespace Monotests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DataTableTest5 diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest2.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest2.cs index f6c6b3f9a8c..58ca232fb53 100644 --- a/mcs/class/System.Data/Test/System.Data/DataViewTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/DataViewTest2.cs @@ -28,12 +28,13 @@ using NUnit.Framework; using System; -using System.IO; +using System.Collections; using System.ComponentModel; +using System.IO; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DataViewTest2 { @@ -41,7 +42,7 @@ namespace MonoTests_System.Data class EventProperties //hold the event properties to be checked { - public System.ComponentModel.ListChangedType lstType ; + public ListChangedType lstType ; public int NewIndex; public int OldIndex; } @@ -508,7 +509,7 @@ namespace MonoTests_System.Data //create the dataview for the table DataView dv = new DataView(dt); - System.Collections.IEnumerator ienm = null; + IEnumerator ienm = null; // GetEnumerator != null ienm = dv.GetEnumerator(); @@ -549,7 +550,7 @@ namespace MonoTests_System.Data DataView dv = new DataView(dt); //add event handler - dv.ListChanged +=new System.ComponentModel.ListChangedEventHandler(dv_ListChanged); + dv.ListChanged +=new ListChangedEventHandler(dv_ListChanged); // ----- Change Value --------- evProp = null; @@ -557,7 +558,7 @@ namespace MonoTests_System.Data dv[1]["String1"] = "something"; Assert.AreEqual(true , evProp!=null , "DV58"); // change value - ListChangedType - Assert.AreEqual(System.ComponentModel.ListChangedType.ItemChanged, evProp.lstType , "DV59"); + Assert.AreEqual(ListChangedType.ItemChanged, evProp.lstType , "DV59"); // change value - NewIndex Assert.AreEqual(1, evProp.NewIndex, "DV60"); // change value - OldIndex @@ -569,7 +570,7 @@ namespace MonoTests_System.Data dv.AddNew(); Assert.AreEqual(true , evProp!=null , "DV62"); // Add New - ListChangedType - Assert.AreEqual(System.ComponentModel.ListChangedType.ItemAdded , evProp.lstType , "DV63"); + Assert.AreEqual(ListChangedType.ItemAdded , evProp.lstType , "DV63"); // Add New - NewIndex Assert.AreEqual(6, evProp.NewIndex, "DV64"); // Add New - OldIndex @@ -581,7 +582,7 @@ namespace MonoTests_System.Data dv.Sort = "ParentId Desc"; Assert.AreEqual(true , evProp!=null , "DV66"); // sort - ListChangedType - Assert.AreEqual(System.ComponentModel.ListChangedType.Reset , evProp.lstType , "DV67"); + Assert.AreEqual(ListChangedType.Reset , evProp.lstType , "DV67"); // sort - NewIndex Assert.AreEqual(-1, evProp.NewIndex, "DV68"); // sort - OldIndex @@ -627,12 +628,12 @@ namespace MonoTests_System.Data Assert.AreEqual(true , evProp != null , "DV168"); // Clear DataTable - should emit ListChangedType.Reset - Assert.AreEqual(System.ComponentModel.ListChangedType.Reset , evProp.lstType , "DV169"); + Assert.AreEqual(ListChangedType.Reset , evProp.lstType , "DV169"); // Clear DataTable - should clear view count Assert.AreEqual(0, dt.DefaultView.Count , "DV169"); } - private void dv_ListChanged(object sender, System.ComponentModel.ListChangedEventArgs e) + private void dv_ListChanged(object sender, ListChangedEventArgs e) { evProp = new EventProperties(); evProp.lstType = e.ListChangedType; @@ -646,7 +647,7 @@ namespace MonoTests_System.Data // this test also check DataView.Count property DataRowView[] drvResult = null; - System.Collections.ArrayList al = new System.Collections.ArrayList(); + ArrayList al = new ArrayList(); //create the source datatable DataTable dt = DataProvider.CreateChildDataTable(); @@ -763,7 +764,7 @@ namespace MonoTests_System.Data */ //DataRowView[] drvResult = null; - System.Collections.ArrayList al = new System.Collections.ArrayList(); + ArrayList al = new ArrayList(); DataTable dt = DataProvider.CreateParentDataTable(); @@ -821,7 +822,7 @@ namespace MonoTests_System.Data private DataRow[] GetResultRows(DataTable dt,DataRowState State) { //get expected rows - System.Collections.ArrayList al = new System.Collections.ArrayList(); + ArrayList al = new ArrayList(); DataRowVersion drVer = DataRowVersion.Current; //From MSDN - The row the default version for the current DataRowState. diff --git a/mcs/class/System.Data/Test/System.Data/DeletedRowInaccessibleExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/DeletedRowInaccessibleExceptionTest.cs index 89fdeb547b1..be2810330fd 100644 --- a/mcs/class/System.Data/Test/System.Data/DeletedRowInaccessibleExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DeletedRowInaccessibleExceptionTest.cs @@ -33,7 +33,7 @@ using System.IO; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DeletedRowInaccessibleExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/DuplicateNameExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/DuplicateNameExceptionTest.cs index c26a71db1e1..77cf583fc81 100644 --- a/mcs/class/System.Data/Test/System.Data/DuplicateNameExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DuplicateNameExceptionTest.cs @@ -33,7 +33,7 @@ using System.IO; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class DuplicateNameExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/EvaluateExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/EvaluateExceptionTest.cs index dd6fe52c914..a9c41f0c2a1 100644 --- a/mcs/class/System.Data/Test/System.Data/EvaluateExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/EvaluateExceptionTest.cs @@ -33,7 +33,7 @@ using System.IO; using System.Data; //using GHTUtils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class EvaluateExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest2.cs b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest2.cs index c0ed174c96d..591fef23f04 100644 --- a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest2.cs @@ -31,7 +31,7 @@ using System; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class ForeignKeyConstraintTest2 { diff --git a/mcs/class/System.Data/Test/System.Data/InRowChangingEventExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/InRowChangingEventExceptionTest.cs index 08dd7f08c69..549076cbb39 100644 --- a/mcs/class/System.Data/Test/System.Data/InRowChangingEventExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/InRowChangingEventExceptionTest.cs @@ -33,7 +33,7 @@ using System.IO; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class InRowChangingEventExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/InvalidConstraintExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/InvalidConstraintExceptionTest.cs index 1aacff1ee99..04c19bfc75f 100644 --- a/mcs/class/System.Data/Test/System.Data/InvalidConstraintExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/InvalidConstraintExceptionTest.cs @@ -33,7 +33,7 @@ using System.IO; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class InvalidConstraintExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/MissingPrimaryKeyExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/MissingPrimaryKeyExceptionTest.cs index 75791b325b4..14404f2b35f 100644 --- a/mcs/class/System.Data/Test/System.Data/MissingPrimaryKeyExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/MissingPrimaryKeyExceptionTest.cs @@ -32,7 +32,7 @@ using System.Data; using NUnit.Framework; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] class MissingPrimaryKeyExceptionTest @@ -57,4 +57,4 @@ namespace MonoTests_System.Data tbl.Rows.Contains("Something"); } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data/Test/System.Data/NoNullAllowedExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/NoNullAllowedExceptionTest.cs index 5b1506a857d..45a5c5f3f76 100644 --- a/mcs/class/System.Data/Test/System.Data/NoNullAllowedExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/NoNullAllowedExceptionTest.cs @@ -33,7 +33,7 @@ using System.IO; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class NoNullAllowedExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/ReadOnlyExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/ReadOnlyExceptionTest.cs index 4969ea0a93d..dd16e85714a 100644 --- a/mcs/class/System.Data/Test/System.Data/ReadOnlyExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/ReadOnlyExceptionTest.cs @@ -33,7 +33,7 @@ using System.IO; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class ReadOnlyExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/RowNotInTableExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/RowNotInTableExceptionTest.cs index 349bdb8ae88..edade038354 100644 --- a/mcs/class/System.Data/Test/System.Data/RowNotInTableExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/RowNotInTableExceptionTest.cs @@ -31,7 +31,7 @@ using System; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class RowNotInTableExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/SyntaxErrorExceptionTest.cs b/mcs/class/System.Data/Test/System.Data/SyntaxErrorExceptionTest.cs index 875be983894..e1e2b08e24b 100644 --- a/mcs/class/System.Data/Test/System.Data/SyntaxErrorExceptionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/SyntaxErrorExceptionTest.cs @@ -32,7 +32,7 @@ using System.Text; using System.IO; using System.Data; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class SyntaxErrorExceptionTest { diff --git a/mcs/class/System.Data/Test/System.Data/TrailingSpaceTest.cs b/mcs/class/System.Data/Test/System.Data/TrailingSpaceTest.cs index 788cc5a390e..8c6d6a0d863 100644 --- a/mcs/class/System.Data/Test/System.Data/TrailingSpaceTest.cs +++ b/mcs/class/System.Data/Test/System.Data/TrailingSpaceTest.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using System; using System.Data; -namespace Monotests_Mono.Data.SqlExpressions +namespace MonoTests.System.Data { [TestFixture] public class ComparisonTest { @@ -10,7 +10,7 @@ namespace Monotests_Mono.Data.SqlExpressions [Test] public void TestStringTrailingSpaceHandling () { // test for bug 79695 - does not ignore certain trailing whitespace chars when comparing strings - System.Data.DataTable dataTable = new System.Data.DataTable ("Person"); + DataTable dataTable = new DataTable ("Person"); dataTable.Columns.Add ("Name", typeof (string)); dataTable.Rows.Add (new object[] {"Mike "}); DataRow[] selectedRows = dataTable.Select ("Name = 'Mike'"); diff --git a/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest2.cs b/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest2.cs index a21d94f1883..4e0224430c0 100644 --- a/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest2.cs @@ -31,7 +31,7 @@ using System; using System.Data; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class UniqueConstraintTest2 { diff --git a/mcs/class/System.Data/Test/System.Data/VersionNotFoundException.cs b/mcs/class/System.Data/Test/System.Data/VersionNotFoundException.cs index 8c2e7a9f7f1..235e30890a2 100644 --- a/mcs/class/System.Data/Test/System.Data/VersionNotFoundException.cs +++ b/mcs/class/System.Data/Test/System.Data/VersionNotFoundException.cs @@ -32,7 +32,7 @@ using System.Data; using NUnit.Framework; using MonoTests.System.Data.Utils; -namespace MonoTests_System.Data +namespace MonoTests.System.Data { [TestFixture] class VersionNotFoundExceptionTest @@ -73,4 +73,4 @@ namespace MonoTests_System.Data object obj = drParent[0,DataRowVersion.Original]; } } -} \ No newline at end of file +} diff --git a/mcs/class/System.Data/Test/System.Data/XmlDataLoaderTest.cs b/mcs/class/System.Data/Test/System.Data/XmlDataLoaderTest.cs index dee7e6e378f..2e0fe018304 100644 --- a/mcs/class/System.Data/Test/System.Data/XmlDataLoaderTest.cs +++ b/mcs/class/System.Data/Test/System.Data/XmlDataLoaderTest.cs @@ -32,7 +32,7 @@ using System.Xml; using NUnit.Framework; -namespace Monotests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class XmlDataLoaderTest @@ -74,7 +74,7 @@ namespace Monotests_System.Data DataSet ds = new DataSet ("Set"); DataTable dt = new DataTable ("Test"); dt.Columns.Add ("CustName", typeof (String)); - dt.Columns.Add ("Type", typeof (System.Type)); + dt.Columns.Add ("Type", typeof (Type)); ds.Tables.Add (dt); return ds; } diff --git a/mcs/class/System.Data/Test/System.Data/XmlDataReaderTest.cs b/mcs/class/System.Data/Test/System.Data/XmlDataReaderTest.cs index 546db60bfb9..9bff68d0b92 100644 --- a/mcs/class/System.Data/Test/System.Data/XmlDataReaderTest.cs +++ b/mcs/class/System.Data/Test/System.Data/XmlDataReaderTest.cs @@ -33,7 +33,7 @@ using System.Xml.Serialization; using System.Xml.Schema; using NUnit.Framework; -namespace Monotests_System.Data +namespace MonoTests.System.Data { [TestFixture] public class XmlDataReaderTest @@ -103,7 +103,7 @@ namespace Monotests_System.Data StringReader sr = new StringReader (xml); XmlTextReader xr = new XmlTextReader (sr); DataTable tbl = new DataTable("CustomTypesTable"); - tbl.Columns.Add("Dummy", typeof(System.UInt32)); + tbl.Columns.Add("Dummy", typeof(UInt32)); tbl.Columns.Add("FuncXml", typeof(CustomTypeXml)); DataSet ds = new DataSet("CustomTypesData"); diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/CommunicationObjectSyncTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/CommunicationObjectSyncTest.cs index 1650bead02d..798a77915f1 100644 --- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/CommunicationObjectSyncTest.cs +++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/CommunicationObjectSyncTest.cs @@ -35,7 +35,7 @@ using System.ServiceModel.Channels; using Microsoft.VisualStudio.TestTools.UnitTesting; using Mono.Moonlight.UnitTesting; -namespace MoonTest.ServiceModel { +namespace MonoTests.System.ServiceModel.Channels { [TestClass] public class CommunicationObjectSyncTest { diff --git a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceBaseTest.cs b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceBaseTest.cs index 7a3c014f7cd..ec6a3a236b8 100644 --- a/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceBaseTest.cs +++ b/mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceBaseTest.cs @@ -27,10 +27,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.ComponentModel; using System.ServiceProcess; using NUnit.Framework; -namespace Test +namespace MonoTests.System.ServiceProcess { [TestFixture] public class ServiceBaseTest @@ -84,7 +85,7 @@ namespace Test /// /// Required designer variable. /// - private System.ComponentModel.IContainer components = null; + private IContainer components = null; /// /// Clean up any resources being used. @@ -107,7 +108,7 @@ namespace Test /// private void InitializeComponent() { - components = new System.ComponentModel.Container(); + components = new Container(); this.ServiceName = "ServiceFoo"; } diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AnnotationPathPointTest.cs b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AnnotationPathPointTest.cs index 1933373d27b..a802e4b8c03 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AnnotationPathPointTest.cs +++ b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AnnotationPathPointTest.cs @@ -27,7 +27,7 @@ using System; using System.Windows.Forms.DataVisualization.Charting; using NUnit.Framework; -namespace ChartingTests +namespace MonoTests.System.Windows.Forms.DataVisualization.Charting { [TestFixture] public class AnnotationPathPointTest diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AnovaResultTest.cs b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AnovaResultTest.cs index 8a146d266bd..ef1f648777d 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AnovaResultTest.cs +++ b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AnovaResultTest.cs @@ -27,7 +27,7 @@ using System; using System.Windows.Forms.DataVisualization.Charting; using NUnit.Framework; -namespace ChartingTests +namespace MonoTests.System.Windows.Forms.DataVisualization.Charting { [TestFixture] public class AnovaResultTest diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/ArrowAnnotationTest.cs b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/ArrowAnnotationTest.cs index ccc57005014..9fced81aade 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/ArrowAnnotationTest.cs +++ b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/ArrowAnnotationTest.cs @@ -27,7 +27,7 @@ using System; using System.Windows.Forms.DataVisualization.Charting; using NUnit.Framework; -namespace ChartingTests +namespace MonoTests.System.Windows.Forms.DataVisualization.Charting { [TestFixture] public class ArrowAnnotationTest diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AxisScaleBreakStyleTest.cs b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AxisScaleBreakStyleTest.cs index e820427d526..3871898efdf 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AxisScaleBreakStyleTest.cs +++ b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/AxisScaleBreakStyleTest.cs @@ -28,7 +28,7 @@ using System.Windows.Forms.DataVisualization.Charting; using NUnit.Framework; using System.Drawing; -namespace ChartingTests +namespace MonoTests.System.Windows.Forms.DataVisualization.Charting { [TestFixture] public class AxisScaleBreakStyleTest diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/ChartElementTest.cs b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/ChartElementTest.cs index c7053c6a7ee..3afeffe4238 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/ChartElementTest.cs +++ b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/ChartElementTest.cs @@ -27,7 +27,7 @@ using System; using System.Windows.Forms.DataVisualization.Charting; using NUnit.Framework; -namespace ChartingTests +namespace MonoTests.System.Windows.Forms.DataVisualization.Charting { [TestFixture] public class ChartElementTest diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/DataPointTest.cs b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/DataPointTest.cs index 5431d77ea52..ec98463aa9b 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/DataPointTest.cs +++ b/mcs/class/System.Windows.Forms.DataVisualization/Test/System.Windows.Forms.DataVisualization.Charting/DataPointTest.cs @@ -27,7 +27,7 @@ using System; using System.Windows.Forms.DataVisualization.Charting; using NUnit.Framework; -namespace ChartingTests +namespace MonoTests.System.Windows.Forms.DataVisualization.Charting { [TestFixture] public class DataPointTest diff --git a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs index fcdc34e7f7a..80a46e5c99f 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs @@ -33,7 +33,7 @@ using System.Xml; using NUnit.Framework; -namespace MonoTest.System.Xml { +namespace MonoTests.System.Xml { [TestFixture] public class XmlResolverTest { diff --git a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs index 52de90d1414..2e5316c1ffe 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs @@ -38,7 +38,7 @@ using System.Security.Permissions; using System.Security.Policy; using System.Xml; -using MonoTestsXml; +using MonoTests.System.Xml; namespace MonoCasTests.System.Xml { @@ -85,4 +85,4 @@ namespace MonoCasTests.System.Xml { } } -#endif \ No newline at end of file +#endif diff --git a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs index c97407de984..a2eaa8b1064 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs @@ -20,7 +20,7 @@ using System.Security.Permissions; using System.Xml; using NUnit.Framework; -namespace MonoTestsXml +namespace MonoTests.System.Xml { [TestFixture] public class XmlSecureResolverTests diff --git a/mcs/class/System/Test/System.Net/NetworkCredentialTest.cs b/mcs/class/System/Test/System.Net/NetworkCredentialTest.cs index 610b4aca31f..dbe3255cd68 100644 --- a/mcs/class/System/Test/System.Net/NetworkCredentialTest.cs +++ b/mcs/class/System/Test/System.Net/NetworkCredentialTest.cs @@ -31,7 +31,7 @@ using System.Net; using NUnit.Framework; -namespace MoonTest.System.Net { +namespace MonoTests.System.Net { [TestFixture] public class NetworkCredentialTest { diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackage.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackage.cs index 54df0eb5e8e..2818cd5e453 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackage.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackage.cs @@ -25,9 +25,11 @@ using System; +using System.IO; +using System.IO.Packaging; using System.Collections.Generic; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { public class FakePackage : Package { Dictionary Parts { get; set; } @@ -77,4 +79,4 @@ namespace System.IO.Packaging.Tests { return p; } } -} \ No newline at end of file +} diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackagePart.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackagePart.cs index 9a7871c6ed0..1ca0bb20f05 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackagePart.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackagePart.cs @@ -24,9 +24,11 @@ // using System; +using System.IO; +using System.IO.Packaging; using System.Collections.Generic; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { class FakePackagePart : PackagePart { diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackagePartTests.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackagePartTests.cs index 731aed62ff9..216a1686f64 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackagePartTests.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackagePartTests.cs @@ -26,9 +26,12 @@ using System; using System.Linq; using System.Collections.Generic; +using System.IO; +using System.IO.Packaging; +using System.Xml; using NUnit.Framework; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { [TestFixture] public class FakePackagePartTests : TestBase { @@ -146,7 +149,7 @@ namespace System.IO.Packaging.Tests { } [Test] - [ExpectedException (typeof (Xml.XmlException))] + [ExpectedException (typeof (XmlException))] public void CreateDupeRelationship () { part.CreateRelationship (uris [1], TargetMode.External, "blah", "asda"); @@ -154,7 +157,7 @@ namespace System.IO.Packaging.Tests { } [Test] - [ExpectedException (typeof (Xml.XmlException))] + [ExpectedException (typeof (XmlException))] public void CreateDupeRelationshipId () { part.CreateRelationship (uris [1], TargetMode.External, "blah", "asda"); diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackageTests.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackageTests.cs index bd751542927..bfea3c84973 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackageTests.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakePackageTests.cs @@ -26,11 +26,13 @@ using System; using System.Collections.Generic; +using System.IO; +using System.IO.Packaging; using System.Linq; using System.Text; using NUnit.Framework; -namespace System.IO.Packaging.Tests +namespace MonoTests.System.IO.Packaging { [TestFixture] diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakeStream.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakeStream.cs index b095375b177..aafc02e25ed 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/FakeStream.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/FakeStream.cs @@ -25,9 +25,10 @@ using System; +using System.IO; using System.Collections.Generic; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { public class FakeStream : MemoryStream { public bool canRead; diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackUriHelperTests.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackUriHelperTests.cs index c5361214f7b..d231315a0e9 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackUriHelperTests.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackUriHelperTests.cs @@ -8,7 +8,7 @@ using System; using System.IO.Packaging; using NUnit.Framework; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { [TestFixture] public class PackUriHelperTests { diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartFileTests.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartFileTests.cs index 3f2850b602b..557e4a98b51 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartFileTests.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartFileTests.cs @@ -3,7 +3,7 @@ using System.IO; using System.IO.Packaging; using NUnit.Framework; -namespace System.IO.Packaging.Tests +namespace MonoTests.System.IO.Packaging { [TestFixture] public class PackagePartFileTests @@ -135,4 +135,4 @@ namespace System.IO.Packaging.Tests } } } -} \ No newline at end of file +} diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartStreamTests.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartStreamTests.cs index 915c2a09a98..1bf60221082 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartStreamTests.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartStreamTests.cs @@ -26,11 +26,13 @@ using System; using System.Collections.Generic; +using System.IO; +using System.IO.Packaging; using System.Linq; using System.Text; using NUnit.Framework; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { [TestFixture] public class PackagePartStreamTests : TestBase { @@ -190,4 +192,4 @@ namespace System.IO.Packaging.Tests { Assert.IsTrue (stream.Length > buffer.Length * 2, "#4"); } } -} \ No newline at end of file +} diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartTest.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartTest.cs index 07015c20173..ad7eb968c3a 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartTest.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackagePartTest.cs @@ -26,12 +26,14 @@ using System; using System.Collections.Generic; +using System.IO; +using System.IO.Packaging; using System.Linq; using System.Text; using NUnit.Framework; using System.Xml; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { [TestFixture] public class PackagePartTest : TestBase { diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageRelationshipTests.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageRelationshipTests.cs index 8c4b031de95..6ce92d31e57 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageRelationshipTests.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageRelationshipTests.cs @@ -28,12 +28,14 @@ using System; using System.Collections.Generic; +using System.IO; +using System.IO.Packaging; using System.Linq; using System.Text; using System.Xml; using NUnit.Framework; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { [TestFixture] public class PackageRelationshipTests : TestBase { diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageTest.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageTest.cs index ae7c5945de9..933449052f3 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageTest.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/PackageTest.cs @@ -26,11 +26,13 @@ using System; using System.Collections.Generic; +using System.IO; +using System.IO.Packaging; using System.Linq; using System.Text; using NUnit.Framework; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { [TestFixture] public class PackageTest : TestBase { @@ -411,8 +413,8 @@ namespace System.IO.Packaging.Tests { [ExpectedException (typeof (FileFormatException))] public void WriteOnlyAccessExists () { - System.IO.File.Create (path).Close (); + File.Create (path).Close (); package = Package.Open (path, FileMode.OpenOrCreate, FileAccess.Write); } } -} \ No newline at end of file +} diff --git a/mcs/class/WindowsBase/Test/System.IO.Packaging/TestBase.cs b/mcs/class/WindowsBase/Test/System.IO.Packaging/TestBase.cs index 6d8b43d057e..28afcd43151 100644 --- a/mcs/class/WindowsBase/Test/System.IO.Packaging/TestBase.cs +++ b/mcs/class/WindowsBase/Test/System.IO.Packaging/TestBase.cs @@ -26,11 +26,13 @@ using System; using System.Collections.Generic; +using System.IO; +using System.IO.Packaging; using System.Linq; using System.Text; using NUnit.Framework; -namespace System.IO.Packaging.Tests { +namespace MonoTests.System.IO.Packaging { public abstract class TestBase { protected string contentType = "mime/type"; diff --git a/mcs/class/corlib/Test/Mono/DataConvertTest.cs b/mcs/class/corlib/Test/Mono/DataConvertTest.cs index 89f99e918c1..f02a6a7db40 100644 --- a/mcs/class/corlib/Test/Mono/DataConvertTest.cs +++ b/mcs/class/corlib/Test/Mono/DataConvertTest.cs @@ -8,7 +8,7 @@ using Mono; using NUnit.Framework.SyntaxHelpers; #endif -namespace MonoTests { +namespace MonoTests.Mono { [TestFixture] public class DataConverterTest @@ -50,9 +50,9 @@ namespace MonoTests { [Test] public void StringAlignment () { - byte[] packed = Mono.DataConverter.Pack ("bz8", 1, TEST_STRING); + byte[] packed = global::Mono.DataConverter.Pack ("bz8", 1, TEST_STRING); - IList unpacked = Mono.DataConverter.Unpack ("bz8", packed, 0); + IList unpacked = global::Mono.DataConverter.Unpack ("bz8", packed, 0); Assert.AreEqual(1, (byte) unpacked[0]); Assert.AreEqual(TEST_STRING, new string((char[]) unpacked[1])); @@ -65,4 +65,4 @@ namespace MonoTests { Assert.That ((f - 3.14f), Is.LessThanOrEqualTo (Single.Epsilon)); } } -} \ No newline at end of file +} diff --git a/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs b/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs index 699f94be803..cbb58727eb4 100644 --- a/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs +++ b/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs @@ -1111,7 +1111,7 @@ namespace MonoTests.System.IO try { Directory.CreateDirectory (path); Directory.CreateDirectory (dir); - Mono.Unix.UnixSymbolicLinkInfo li = new Mono.Unix.UnixSymbolicLinkInfo (link); + global::Mono.Unix.UnixSymbolicLinkInfo li = new global::Mono.Unix.UnixSymbolicLinkInfo (link); li.CreateSymbolicLinkTo (dir); DirectoryInfo info = new DirectoryInfo (path); diff --git a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs index 82536169f59..f2d7e03d3d6 100644 --- a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs +++ b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs @@ -374,11 +374,11 @@ public class DirectoryTest string path = TempFolder + DSC + "ExistsAccessDenied"; Directory.CreateDirectory (path); - Mono.Posix.Syscall.chmod (path, 0); + global::Mono.Posix.Syscall.chmod (path, 0); try { Assert.IsFalse (Directory.Exists(path + DSC + "b")); } finally { - Mono.Posix.Syscall.chmod (path, (Mono.Posix.FileMode) 755); + global::Mono.Posix.Syscall.chmod (path, (global::Mono.Posix.FileMode) 755); Directory.Delete (path); } } -- 2.11.4.GIT