* ObjectDataSourceTest.cs: fixed exception message checking

* ObjectDataSourceViewTest.cs: fixed tests that failed because of execution order

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

mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,9 @@
+2006-11-28  Vladimir Krasnov  <[email protected]>
+
+	* ObjectDataSourceTest.cs: fixed exception message checking
+	* ObjectDataSourceViewTest.cs: fixed tests that failed because of
+	execution order
+
 2006-11-27  Yoni Klain         <[email protected]>
 
 	* LinkButtonTest.cs: added new test for 2.0 

mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs

@@ -310,8 +310,10 @@ namespace MonoTests.System.Web.UI.WebControls
 			try {
 				ods.Delete ();
 			}
-			catch (Exception ex) {
-				Assert.AreEqual (true,ex.Message.Contains ("type 'System.DBNull' cannot be converted to type 'System.String'"), "ConvertNullToDBNull");
+			catch (Exception ex) {
+				Assert.AreEqual (true,
+					ex.Message.Contains ("type 'System.DBNull' cannot be converted to type 'System.String'") || // dotnet
+					ex.Message.Contains ("Value cannot be null."), "ConvertNullToDBNull"); // mono
 				dbnull = true;
 			}
 			Assert.AreEqual (true, dbnull, "ConvertNullToDBNull2");

mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs

@@ -427,6 +427,8 @@ namespace MonoTests.System.Web.UI.WebControls
 			view = (ObjectDataSourceView) ds.DoGetView ("DefaultView");
 			view.Deleting += new ObjectDataSourceMethodEventHandler (Event);
 
+			DataSourceObject.InitDS ();
+
 			Hashtable table = new Hashtable ();
 			table.Add ("ID", "1001");
 			table.Add ("FName", "Yonik");
@@ -482,6 +484,8 @@ namespace MonoTests.System.Web.UI.WebControls
 			view = (ObjectDataSourceView) ds.DoGetView ("DefaultView");
 			view.Selecting += new ObjectDataSourceSelectingEventHandler (view_Selecting);
 
+			DataSourceObject.InitDS ();
+
 			DataView view1 = (DataView) view.Select (new DataSourceSelectArguments ());
 			Assert.AreEqual (1, view1.Count, "SelectedRowsCount");
 			Assert.AreEqual (1001, view1[0].Row["ID"], "SelectedRowsValue#1");
@@ -664,6 +668,8 @@ namespace MonoTests.System.Web.UI.WebControls
 			view = (ObjectDataSourceView) ds.DoGetView ("defaultView");
 			view.Updating += new ObjectDataSourceMethodEventHandler (Event);
 
+			DataSourceObject.InitDS ();
+
 			Hashtable table = new Hashtable ();
 			table.Add ("ID", "1001");
 			table.Add ("FName", "Yonik");
@@ -820,6 +826,10 @@ namespace MonoTests.System.Web.UI.WebControls
 	{
 		private static int maximumRows;
 		public static DataTable ds = CreateDataTable ();
+		public static void InitDS ()
+		{
+			ds = CreateDataTable ();
+		}
 		public static DataTable Select ()
 		{
 			return ds;