* app_test_2.0.config: Modified DbProviderFactories to allow testing

of clear and remove nodes.
* DbProviderFactoriesConfigurationHandler.cs: Added support for
clear node.
* DbProviderFactoriesConfigurationHandlerTest.cs: Changed test to also
verify behavior for clear and remove nodes.

svn path=/trunk/mcs/; revision=73663

mcs/class/System.Data/ChangeLog

@@ -1,3 +1,8 @@
+2007-03-03  Gert Driesen  <[email protected]>
+
+	* app_test_2.0.config: Modified DbProviderFactories to allow testing
+	of clear and remove nodes.
+
 2007-03-03  Gert Driesen  <[email protected]>
 
 	* app_test_2.0.config: Fixed assembly qualified names of config

mcs/class/System.Data/System.Data.Common/ChangeLog

@@ -1,3 +1,8 @@
+2007-03-03  Gert Driesen  <[email protected]>
+
+	* DbProviderFactoriesConfigurationHandler.cs: Added support for
+	clear node.
+
 2007-03-03  Gert driesen  <[email protected]>
 
 	* ConnectionStringsSectionHandler.cs: Removed since the 2.0 config

mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs

@@ -83,6 +83,9 @@ namespace System.Data.Common
 						case "add":
 							AddRow (dt, factoryNode);
 							break;
+						case "clear":
+							dt.Rows.Clear ();
+							break;
 						case "remove":
 							RemoveRow (dt, factoryNode);
 							break;

mcs/class/System.Data/Test/System.Data.Common/ChangeLog

@@ -1,3 +1,8 @@
+2007-03-03  Gert Driesen  <[email protected]>
+
+	* DbProviderFactoriesConfigurationHandlerTest.cs: Changed test to also
+	verify behavior for clear and remove nodes.
+
 2007-03-03  Gert Driesen  <[email protected]>
 
 	* DbProviderFactoriesConfigurationHandlerTest.cs: Fixed tests to

mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs

@@ -74,12 +74,19 @@ namespace MonoTests.System.Data.Common
 			object o = ConfigurationSettings.GetConfig (configSection);
 			DataSet ds = o as DataSet;
 			DataTable dt = ds.Tables [0];
-			Assert.AreEqual (1, dt.Rows.Count, "#A1");
+			Assert.AreEqual (2, dt.Rows.Count, "#A1");
+
 			DataRow r = dt.Rows.Find ("ProviderTest.InvariantName");
-			Assert.AreEqual ("ProviderTest.Name", r ["Name"].ToString (), "#A2");
-			Assert.AreEqual ("ProviderTest.Description", r ["Description"].ToString (), "#A3");
-			Assert.AreEqual ("ProviderTest.InvariantName", r ["InvariantName"].ToString (), "#A4");
-			Assert.AreEqual ("ProviderTest.AssemblyQualifiedName", r ["AssemblyQualifiedName"].ToString (), "#A5");
+			Assert.AreEqual ("ProviderTest.Name", r ["Name"].ToString (), "#B2");
+			Assert.AreEqual ("ProviderTest.Description", r ["Description"].ToString (), "#B3");
+			Assert.AreEqual ("ProviderTest.InvariantName", r ["InvariantName"].ToString (), "#B4");
+			Assert.AreEqual ("ProviderTest.AssemblyQualifiedName", r ["AssemblyQualifiedName"].ToString (), "#B5");
+
+			r = dt.Rows.Find ("ProviderTest4.InvariantName");
+			Assert.AreEqual ("ProviderTest4.Name", r ["Name"].ToString (), "#A2");
+			Assert.AreEqual ("ProviderTest4.Description", r ["Description"].ToString (), "#A3");
+			Assert.AreEqual ("ProviderTest4.InvariantName", r ["InvariantName"].ToString (), "#A4");
+			Assert.AreEqual ("ProviderTest4.AssemblyQualifiedName", r ["AssemblyQualifiedName"].ToString (), "#A5");
 		}
 
 		[Test]

mcs/class/System.Data/app_test_2.0.config

@@ -17,6 +17,23 @@
 	</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"