Author: krasnov
Date: 2006-11-28 09:35:16 -0500 (Tue, 28 Nov 2006)
New Revision: 68587
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
Log:
* ObjectDataSourceTest.cs: fixed exception message checking
* ObjectDataSourceViewTest.cs: fixed tests that failed because of execution
order
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-11-28 14:34:56 UTC (rev 68586)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-11-28 14:35:16 UTC (rev 68587)
@@ -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
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
===================================================================
---
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
2006-11-28 14:34:56 UTC (rev 68586)
+++
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
2006-11-28 14:35:16 UTC (rev 68587)
@@ -310,8 +310,10 @@
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");
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
===================================================================
---
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
2006-11-28 14:34:56 UTC (rev 68586)
+++
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
2006-11-28 14:35:16 UTC (rev 68587)
@@ -427,6 +427,8 @@
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 @@
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 @@
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 @@
{
private static int maximumRows;
public static DataTable ds = CreateDataTable ();
+ public static void InitDS ()
+ {
+ ds = CreateDataTable ();
+ }
public static DataTable Select ()
{
return ds;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
