Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs

@@ -34,9 +34,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {

mcs/class/System.Data/Test/System.Data/ConstraintTest.cs

@@ -34,9 +34,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {

mcs/class/System.Data/Test/System.Data/DataRelationCollectionTest.cs

@@ -30,9 +30,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {

mcs/class/System.Data/Test/System.Data/DataRelationTest.cs

@@ -34,9 +34,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {

mcs/class/System.Data/Test/System.Data/DataTableReadWriteXmlTest.cs

@@ -35,7 +35,6 @@ namespace MonoTests.System.Data
     [TestFixture]
     public class DataTableReadWriteXmlTest
     {
-        public static readonly string EOL = Environment.NewLine;
 
         void StandardizeXmlFormat(ref string xml)
         {
@@ -126,11 +125,11 @@ namespace MonoTests.System.Data
             // Get XML for DataSet writes.
             sw.GetStringBuilder().Length = 0;
             ds.WriteXml(sw);
-            string xmlDSNone = sw.ToString().Replace ("\n", EOL);
+            string xmlDSNone = sw.ToString();
             
             sw.GetStringBuilder().Length = 0;
             ds.WriteXml(sw, XmlWriteMode.DiffGram);
-            string xmlDSDiffGram = sw.ToString().Replace ("\n", EOL);
+            string xmlDSDiffGram = sw.ToString();
 
             sw.GetStringBuilder().Length = 0;
             ds.WriteXml(sw, XmlWriteMode.WriteSchema);
@@ -188,11 +187,11 @@ namespace MonoTests.System.Data
             
             sw.GetStringBuilder().Length = 0;
             ds.WriteXml(sw);
-            xmlDSNone = sw.ToString().Replace ("\n", EOL);
+            xmlDSNone = sw.ToString();
             
             sw.GetStringBuilder().Length = 0;
             ds.WriteXml(sw, XmlWriteMode.DiffGram);
-            xmlDSDiffGram = sw.ToString().Replace ("\n", EOL);
+            xmlDSDiffGram = sw.ToString();
 
             sw.GetStringBuilder().Length = 0;
             ds.WriteXml(sw, XmlWriteMode.WriteSchema);

mcs/class/System.Data/Test/System.Data/DataTableTest.cs.REMOVED.git-id

@@ -1 +1 @@
-388f547212ad45907957b767ab265f33591a724b
+12aeaa4ad4d536103f019c69e9ab187d19cfd6fe

mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs

@@ -40,7 +40,7 @@ using Microsoft.CSharp;
 namespace MonoTests.System.Data
 {
 	[TestFixture]
-	public class TypedDataSetGeneratorTest : Assertion
+	public class TypedDataSetGeneratorTest
 	{
 		private ICodeGenerator gen;
 		private ICodeCompiler compiler;
@@ -70,20 +70,20 @@ namespace MonoTests.System.Data
 		public void TestGenerateIdName ()
 		{
 		
-			AssertEquals ("#1", "a", TypedDataSetGenerator.GenerateIdName ("a", gen));
-			AssertEquals ("#2", "_int", TypedDataSetGenerator.GenerateIdName ("int", gen));
-			AssertEquals ("#3", "_", TypedDataSetGenerator.GenerateIdName ("_", gen));
-			AssertEquals ("#3-2", "_", TypedDataSetGenerator.GenerateIdName ("_", gen));
-			AssertEquals ("#4", "_1", TypedDataSetGenerator.GenerateIdName ("1", gen));
-			AssertEquals ("#4-2", "_1", TypedDataSetGenerator.GenerateIdName ("1", gen));
-			AssertEquals ("#5", "_1a", TypedDataSetGenerator.GenerateIdName ("1a", gen));
-			AssertEquals ("#6", "_1_2", TypedDataSetGenerator.GenerateIdName ("1*2", gen));
-			AssertEquals ("#7", "__", TypedDataSetGenerator.GenerateIdName ("-", gen));
-			AssertEquals ("#8", "__", TypedDataSetGenerator.GenerateIdName ("+", gen));
-			AssertEquals ("#9", "_", TypedDataSetGenerator.GenerateIdName ("", gen));
-			AssertEquals ("#10", "___", TypedDataSetGenerator.GenerateIdName ("--", gen));
-			AssertEquals ("#11", "___", TypedDataSetGenerator.GenerateIdName ("++", gen));
-			AssertEquals ("#12", "\u3042", TypedDataSetGenerator.GenerateIdName ("\u3042", gen));
+			Assert.AreEqual ("a", TypedDataSetGenerator.GenerateIdName ("a", gen), "#1");
+			Assert.AreEqual ("_int", TypedDataSetGenerator.GenerateIdName ("int", gen), "#2");
+			Assert.AreEqual ("_", TypedDataSetGenerator.GenerateIdName ("_", gen), "#3");
+			Assert.AreEqual ("_", TypedDataSetGenerator.GenerateIdName ("_", gen), "#3-2");
+			Assert.AreEqual ("_1", TypedDataSetGenerator.GenerateIdName ("1", gen), "#4");
+			Assert.AreEqual ("_1", TypedDataSetGenerator.GenerateIdName ("1", gen), "#4-2");
+			Assert.AreEqual ("_1a", TypedDataSetGenerator.GenerateIdName ("1a", gen), "#5");
+			Assert.AreEqual ("_1_2", TypedDataSetGenerator.GenerateIdName ("1*2", gen), "#6");
+			Assert.AreEqual ("__", TypedDataSetGenerator.GenerateIdName ("-", gen), "#7");
+			Assert.AreEqual ("__", TypedDataSetGenerator.GenerateIdName ("+", gen), "#8");
+			Assert.AreEqual ("_", TypedDataSetGenerator.GenerateIdName ("", gen), "#9");
+			Assert.AreEqual ("___", TypedDataSetGenerator.GenerateIdName ("--", gen), "#10");
+			Assert.AreEqual ("___", TypedDataSetGenerator.GenerateIdName ("++", gen), "#11");
+			Assert.AreEqual ("\u3042", TypedDataSetGenerator.GenerateIdName ("\u3042", gen), "#12");
 		}
 
 		[Test]
@@ -98,7 +98,7 @@ namespace MonoTests.System.Data
 			ccu.Namespaces.Add (cns);
 			CompilerResults r = compiler.CompileAssemblyFromDom (
 				new CompilerParameters (), ccu);
-			AssertEquals (0, r.Errors.Count);
+			Assert.AreEqual (0, r.Errors.Count);
 		}
 	}
 }

mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs

@@ -33,9 +33,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {

mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest.cs

@@ -174,9 +174,9 @@ namespace MonoTests.System.Data.Xml
 			StringWriter sw = new StringWriter ();
 			XmlTextWriter xw = new XmlTextWriter (sw);
 			Doc.DataSet.WriteXml (xw);
-			string s = sw.ToString ();
+			string s = sw.ToString ().Replace ("\r", "").Replace ("\n", Environment.NewLine);
 			Assert.AreEqual (xml, s, "#1");
-			Assert.AreEqual (xml, Doc.InnerXml, "#2");
+			Assert.AreEqual (xml, Doc.InnerXml.Replace ("\r", "").Replace ("\n", Environment.NewLine), "#2");
 			Assert.AreEqual ("EndOfFile", Reader.ReadState.ToString (), "test#01");
 
 			DataSet Set = Doc.DataSet;

mcs/class/System.Data/Test/test-config-file

@@ -0,0 +1,45 @@
+	<configSections>
+		<section name="system.data_test" 
+			type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+		<section name="connectionStrings_test"
+			type="System.Configuration.ConnectionStringsSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+	</configSections>
+	<system.data>
+		<DbProviderFactories>
+			<add name="ProviderTest2.Name"
+				invariant="ProviderTest2.InvariantName"
+				support="FF"
+				description="ProviderTest2.Description"
+				type="ProviderTest2.AssemblyQualifiedName"/>
+		</DbProviderFactories>
+	</system.data>
+	<system.data_test>
+		<DbProviderFactories>
+			<add name="ProviderTest3.Name"
+				invariant="ProviderTest3.InvariantName"
+				support="FF"
+				description="ProviderTest3.Description"
+				type="ProviderTest3.AssemblyQualifiedName"/>
+			<clear />
+			<add name="ProviderTest4.Name"
+				invariant="ProviderTest4.InvariantName"
+				support="FF"
+				description="ProviderTest4.Description"
+				type="ProviderTest4.AssemblyQualifiedName"/>
+			<add name="ProviderTest5.Name"
+				invariant="ProviderTest5.InvariantName"
+				support="FF"
+				description="ProviderTest5.Description"
+				type="ProviderTest5.AssemblyQualifiedName"/>
+			<remove invariant="ProviderTest5.InvariantName" />
+			<add name="ProviderTest.Name"
+				invariant="ProviderTest.InvariantName"
+				support="FF"
+				description="ProviderTest.Description"
+				type="ProviderTest.AssemblyQualifiedName"/>
+		</DbProviderFactories>
+	</system.data_test>
+	<connectionStrings_test>
+		<add name="Publications" providerName="System.Data.SqlClient" 
+			connectionString="Data Source=MyServer;Initial Catalog=pubs;integrated security=SSPI" />
+	</connectionStrings_test>