Author: kostat
Date: 2007-05-30 07:52:55 -0400 (Wed, 30 May 2007)
New Revision: 78192
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapDataSourceTest.cs
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
Log:
merge -r 78120:78122
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
2007-05-30 11:43:13 UTC (rev 78191)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
2007-05-30 11:52:55 UTC (rev 78192)
@@ -53,6 +53,11 @@
{
TrackViewState ();
+ }
+
+ public void DoRaiseDataSourceChangedEvent ()
+ {
+ base.RaiseDataSourceChangedEvent (new EventArgs ());
}
public object SaveState ()
@@ -133,10 +138,8 @@
[TestFixture]
public class ObjectDataSourceTest
- {
-
-
-
+ {
+ bool eventChecker;
[TestFixtureTearDown]
public void TearDown ()
{
@@ -1206,6 +1209,94 @@
view.ExecuteUpdate (keys, new_value, old_value);
Assert.AreEqual (true,
MyTableObject.UpdateWithDataObjectTypeNameAllValues,
"UpdateExecute_DataObjectTypeNameCompareAllValues");
Assert.AreEqual ("n_1001, n_Mahesh, n_chand, k_1001,
ov_Mahesh, ov_chand", MyTableObject.UpdatePassedValues,
"UpdateExecute_DataObjectTypeName Values");
+ }
+
+ [Test]
+ public void ObjectDataSource_DataSourceChanged ()
+ {
+ ObjectDataSourcePoker ods = new ObjectDataSourcePoker
();
+ InitObjectDataSource (ods, "");
+ ((IDataSource) ods).DataSourceChanged += new
EventHandler (ObjectDataSourceTest_DataSourceChanged);
+
+ // Check if event raised
+ ods.DoRaiseDataSourceChangedEvent ();
+ Assert.IsTrue (eventChecker, "DataSourceChanged#1");
+
+ eventChecker = false;
+ ods.ConflictDetection =
ConflictOptions.CompareAllValues;
+ Assert.IsFalse (eventChecker, "DataSourceChanged#2");
+
+ eventChecker = false;
+ ods.DataObjectTypeName = "MyData";
+ Assert.IsFalse (eventChecker, "DataSourceChanged#3");
+
+ eventChecker = false;
+ ods.EnablePaging = true;
+ Assert.IsFalse (eventChecker, "DataSourceChanged#4");
+
+ eventChecker = false;
+ ods.FilterExpression = "ID='{0}'";
+ Assert.IsFalse (eventChecker, "DataSourceChanged#5");
+
+
+ eventChecker = false;
+ TextBox TextBox1 = new TextBox ();
+ TextBox1.Text = "1001";
+ FormParameter p = new FormParameter ("ID", "TextBox1");
+ p.DefaultValue = "1002";
+ ods.FilterParameters.Add (p);
+ Assert.IsFalse (eventChecker, "DataSourceChanged#6");
+
+ eventChecker = false;
+ ods.MaximumRowsParameterName = "SelectCount";
+ Assert.IsFalse (eventChecker, "DataSourceChanged#7");
+
+ eventChecker = false;
+ ods.OldValuesParameterFormatString = "ID";
+ Assert.IsFalse (eventChecker, "DataSourceChanged#8");
+
+ eventChecker = false;
+ Parameter dummy = new Parameter ();
+ dummy.Name = "Test";
+ ods.SelectParameters.Add (dummy);
+ Assert.IsFalse (eventChecker, "DataSourceChanged#9");
+
+ eventChecker = false;
+ ods.SortParameterName = "sortExpression";
+ Assert.IsFalse (eventChecker, "DataSourceChanged#10");
+
+ eventChecker = false;
+ ods.StartRowIndexParameterName = "ID";
+ Assert.IsFalse (eventChecker, "DataSourceChanged#11");
+
+ eventChecker = false;
+ ods.CacheDuration = 1000;
+ Assert.IsFalse (eventChecker, "DataSourceChanged#12");
+
+ eventChecker = false;
+ ods.CacheExpirationPolicy =
DataSourceCacheExpiry.Sliding;
+ Assert.IsFalse (eventChecker, "DataSourceChanged#13");
+
+ eventChecker = false;
+ ods.CacheKeyDependency = "ID";
+ Assert.IsFalse (eventChecker, "DataSourceChanged#14");
+
+ eventChecker = false;
+ ods.ConvertNullToDBNull = true;
+ Assert.IsFalse (eventChecker, "DataSourceChanged#15");
+
+ eventChecker = false;
+ ods.EnableCaching = true;
+ Assert.IsFalse (eventChecker, "DataSourceChanged#16");
+
+ eventChecker = false;
+ ods.SqlCacheDependency = "Northwind:Employees";
+ Assert.IsFalse (eventChecker, "DataSourceChanged#17");
+ }
+
+ void ObjectDataSourceTest_DataSourceChanged (object sender,
EventArgs e)
+ {
+ eventChecker = true;
}
//Excpetions
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
2007-05-30 11:43:13 UTC (rev 78191)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
2007-05-30 11:52:55 UTC (rev 78192)
@@ -141,6 +141,11 @@
return base.ExecuteDelete (keys, oldValues);
}
+ public void DoOnDataSourceViewChanged ()
+ {
+ base.OnDataSourceViewChanged (new EventArgs ());
+ }
+
}
[TestFixture]
@@ -931,7 +936,109 @@
}
}
+ #region help_results
+ class eventAssert
+ {
+ private static int _testcounter;
+ private static bool _eventChecker;
+ private eventAssert ()
+ {
+ _testcounter = 0;
+ }
+
+ public static bool eventChecker
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ set
+ {
+ _eventChecker = value;
+ }
+ }
+
+ static private void testAdded ()
+ {
+ _testcounter++;
+ _eventChecker = false;
+ }
+
+ public static void IsTrue (string msg)
+ {
+ Assert.IsTrue (_eventChecker, msg + "#" +
_testcounter);
+ testAdded ();
+
+ }
+
+ public static void IsFalse (string msg)
+ {
+ Assert.IsFalse (_eventChecker, msg + "#" +
_testcounter);
+ testAdded ();
+ }
+ }
+ #endregion
+
[Test]
+ [Category ("NotWorking")]
+ public void ObjectDataSourceView_DataSourceViewChanged ()
+ {
+ ObjectDataSource ds = new ObjectDataSource ();
+ ObjectViewPoker sql = new ObjectViewPoker (ds,
"DefaultView", null);
+ sql.DataSourceViewChanged += new EventHandler
(sql_DataSourceViewChanged);
+
+ sql.DoOnDataSourceViewChanged ();
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.ConflictDetection =
ConflictOptions.CompareAllValues;
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.ConvertNullToDBNull = true;
+ eventAssert.IsFalse ("DataSourceViewChanged");
+
+ sql.DataObjectTypeName = "test";
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.DeleteMethod = "test";
+ eventAssert.IsFalse ("DataSourceViewChanged");
+
+ sql.EnablePaging = true;
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.InsertMethod = "test";
+ eventAssert.IsFalse ("DataSourceViewChanged");
+
+ sql.FilterExpression = "test";
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.MaximumRowsParameterName = "test";
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.SelectCountMethod = "test";
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.SelectMethod = "test";
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.OldValuesParameterFormatString = "test";
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.StartRowIndexParameterName = "test";
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.TypeName = "test";
+ eventAssert.IsTrue ("DataSourceViewChanged");
+
+ sql.UpdateMethod = "test";
+ eventAssert.IsFalse ("DataSourceViewChanged");
+ }
+
+ void sql_DataSourceViewChanged (object sender, EventArgs e)
+ {
+ eventAssert.eventChecker = true;
+ }
+
+ [Test]
public void SelectCountMethod_DataSourceViewChanged ()
{
ObjectViewPoker view = new ObjectViewPoker (new
ObjectDataSource (), "", null);
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapDataSourceTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapDataSourceTest.cs
2007-05-30 11:43:13 UTC (rev 78191)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapDataSourceTest.cs
2007-05-30 11:52:55 UTC (rev 78192)
@@ -121,8 +121,44 @@
// null properties doe's not affects on state bag count
p.StartingNodeUrl = null;
Assert.AreEqual (5, p.StateBag.Count,
"StartingNodeUrl#2");
+ }
+
+
+ [Test]
+ [Category("NotWorking")]
+ public void SiteMapDataSource_DataSourceChanged ()
+ {
+ PokerSiteMapDataSource p = new PokerSiteMapDataSource
();
+ ((IDataSource) p).DataSourceChanged += new EventHandler
(SiteMapDataSourceTest_DataSourceChanged);
+
+ eventChecker = false;
+ p.ShowStartingNode = false;
+ Assert.IsTrue (eventChecker, "DataSourceChanged#1");
+
+ eventChecker = false;
+ p.SiteMapProvider = "test";
+ Assert.IsTrue (eventChecker, "DataSourceChanged#2");
+
+ eventChecker = false;
+ p.StartFromCurrentNode = true;
+ Assert.IsTrue (eventChecker, "DataSourceChanged#3");
+
+ eventChecker = false;
+ p.StartingNodeOffset = 1;
+ Assert.IsTrue (eventChecker, "DataSourceChanged#4");
+
+ eventChecker = false;
+ p.StartingNodeUrl = "default.aspx";
+ Assert.IsTrue (eventChecker, "DataSourceChanged#5");
+ }
+
+ bool eventChecker;
+ void SiteMapDataSourceTest_DataSourceChanged (object sender,
EventArgs e)
+ {
+ eventChecker = true;
}
+
[Test]
public void SiteMapDataSource_GetList ()
{
@@ -262,7 +298,5 @@
}
}
}
-
-
}
#endif
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
2007-05-30 11:43:13 UTC (rev 78191)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
2007-05-30 11:52:55 UTC (rev 78192)
@@ -62,6 +62,11 @@
{
LoadViewState (savedState);
}
+
+ public void DoRaiseDataSourceChangedEvent ()
+ {
+ base.RaiseDataSourceChangedEvent(new EventArgs());
+ }
}
class CustomSqlDataSourceView : SqlDataSourceView
@@ -774,6 +779,103 @@
return sb.ToString ();
}
+ #region help_results
+ class eventAssert
+ {
+ private static int _testcounter;
+ private static bool _eventChecker;
+ private eventAssert ()
+ {
+ _testcounter = 0;
+ }
+
+ public static bool eventChecker
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ set
+ {
+ _eventChecker = value;
+ }
+ }
+
+ static private void testAdded ()
+ {
+ _testcounter++;
+ _eventChecker = false;
+ }
+
+ public static void IsTrue (string msg)
+ {
+ Assert.IsTrue (_eventChecker, msg + "#" +
_testcounter);
+ testAdded ();
+
+ }
+
+ public static void IsFalse (string msg)
+ {
+ Assert.IsFalse (_eventChecker, msg + "#" +
_testcounter);
+ testAdded ();
+ }
+ }
+ #endregion
+
+ [Test]
+ [Category ("NotWorking")]
+ public void SqlDataSource_DataSourceViewChanged ()
+ {
+ SqlPoker sql = new SqlPoker ();
+ ((IDataSource) sql).DataSourceChanged += new
EventHandler (SqlDataSourceTest_DataSourceChanged);
+
+ sql.DoRaiseDataSourceChangedEvent ();
+ eventAssert.IsTrue ("SqlDataSourceView"); // Assert
include counter the first is zero
+ sql.CacheKeyDependency = "hi";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.CancelSelectOnNullParameter = false;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.ConflictDetection =
ConflictOptions.CompareAllValues;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.DeleteCommandType =
SqlDataSourceCommandType.StoredProcedure;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.InsertCommandType =
SqlDataSourceCommandType.StoredProcedure;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.SelectCommandType =
SqlDataSourceCommandType.StoredProcedure;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.UpdateCommandType =
SqlDataSourceCommandType.StoredProcedure;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.OldValuesParameterFormatString = "{1}";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.SqlCacheDependency = "hi";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.SortParameterName = "hi";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.CacheDuration = 1;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.CacheExpirationPolicy =
DataSourceCacheExpiry.Sliding;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.EnableCaching = true;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.DataSourceMode = SqlDataSourceMode.DataReader;
+ eventAssert.IsTrue ("SqlDataSourceView");
+ sql.DeleteCommand = "DELETE foo";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.InsertCommand = "INSERT foo";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.SelectCommand = "SELECT foo";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.UpdateCommand = "UPDATE foo";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.FilterExpression = "hi";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ }
+
+ void SqlDataSourceTest_DataSourceChanged (object sender,
EventArgs e)
+ {
+ eventAssert.eventChecker = true;
+ }
+
//exceptions
[Test]
[ExpectedException (typeof (NotSupportedException))]
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
2007-05-30 11:43:13 UTC (rev 78191)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
2007-05-30 11:52:55 UTC (rev 78192)
@@ -61,6 +61,11 @@
{
LoadViewState (savedState);
}
+
+ public void DoOnDataSourceViewChanged ()
+ {
+ base.OnDataSourceViewChanged (new EventArgs());
+ }
}
[TestFixture]
@@ -157,7 +162,7 @@
}
[Test]
- public void ViewState ()
+ public void ViewState ()
{
SqlDataSource ds = new SqlDataSource ();
SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView",
null);
@@ -192,44 +197,131 @@
Assert.AreEqual ("update command", sql.UpdateCommand,
"A12");
Assert.AreEqual (SqlDataSourceCommandType.Text,
sql.UpdateCommandType, "A13");
- object state = sql.SaveToViewState();
+ object state = sql.SaveToViewState ();
Assert.IsNull (state, "ViewState is null");
sql = new SqlViewPoker (ds, "DefaultView", null);
sql.LoadFromViewState (state);
- Assert.IsTrue(sql.CancelSelectOnNullParameter, "B1");
- Assert.IsFalse(sql.CanDelete, "B2");
- Assert.IsFalse(sql.CanInsert, "B3");
- Assert.IsFalse(sql.CanPage, "B4");
- Assert.IsFalse(sql.CanRetrieveTotalRowCount, "B5");
- Assert.IsTrue(sql.CanSort, "B6");
- Assert.IsFalse(sql.CanUpdate, "B7");
+ Assert.IsTrue (sql.CancelSelectOnNullParameter, "B1");
+ Assert.IsFalse (sql.CanDelete, "B2");
+ Assert.IsFalse (sql.CanInsert, "B3");
+ Assert.IsFalse (sql.CanPage, "B4");
+ Assert.IsFalse (sql.CanRetrieveTotalRowCount, "B5");
+ Assert.IsTrue (sql.CanSort, "B6");
+ Assert.IsFalse (sql.CanUpdate, "B7");
Assert.AreEqual (ConflictOptions.OverwriteChanges,
sql.ConflictDetection, "B8");
Assert.AreEqual ("", sql.DeleteCommand, "B9");
- Assert.AreEqual(SqlDataSourceCommandType.Text,
sql.DeleteCommandType, "B10");
- Assert.IsNotNull(sql.DeleteParameters, "B11");
- Assert.AreEqual(0, sql.DeleteParameters.Count, "B12");
+ Assert.AreEqual (SqlDataSourceCommandType.Text,
sql.DeleteCommandType, "B10");
+ Assert.IsNotNull (sql.DeleteParameters, "B11");
+ Assert.AreEqual (0, sql.DeleteParameters.Count, "B12");
Assert.AreEqual ("", sql.FilterExpression, "B13");
- Assert.IsNotNull(sql.FilterParameters, "B14");
- Assert.AreEqual(0, sql.FilterParameters.Count, "B15");
+ Assert.IsNotNull (sql.FilterParameters, "B14");
+ Assert.AreEqual (0, sql.FilterParameters.Count, "B15");
Assert.AreEqual ("", sql.InsertCommand, "B16");
- Assert.AreEqual(SqlDataSourceCommandType.Text,
sql.InsertCommandType, "B17");
- Assert.IsNotNull(sql.InsertParameters, "B18");
- Assert.AreEqual(0, sql.InsertParameters.Count, "B19");
+ Assert.AreEqual (SqlDataSourceCommandType.Text,
sql.InsertCommandType, "B17");
+ Assert.IsNotNull (sql.InsertParameters, "B18");
+ Assert.AreEqual (0, sql.InsertParameters.Count, "B19");
Assert.AreEqual ("{0}",
sql.OldValuesParameterFormatString, "B20");
Assert.AreEqual ("", sql.SelectCommand, "B21");
- Assert.AreEqual(SqlDataSourceCommandType.Text,
sql.SelectCommandType, "B22");
- Assert.IsNotNull(sql.SelectParameters, "B23");
- Assert.AreEqual(0, sql.SelectParameters.Count, "B24");
+ Assert.AreEqual (SqlDataSourceCommandType.Text,
sql.SelectCommandType, "B22");
+ Assert.IsNotNull (sql.SelectParameters, "B23");
+ Assert.AreEqual (0, sql.SelectParameters.Count, "B24");
Assert.AreEqual ("", sql.SortParameterName, "B25");
Assert.AreEqual ("", sql.UpdateCommand, "B26");
- Assert.AreEqual(SqlDataSourceCommandType.Text,
sql.UpdateCommandType, "B27");
- Assert.IsNotNull(sql.UpdateParameters, "B28");
- Assert.AreEqual(0, sql.UpdateParameters.Count, "B29");
+ Assert.AreEqual (SqlDataSourceCommandType.Text,
sql.UpdateCommandType, "B27");
+ Assert.IsNotNull (sql.UpdateParameters, "B28");
+ Assert.AreEqual (0, sql.UpdateParameters.Count, "B29");
}
+ #region help_results
+ class eventAssert
+ {
+ private static int _testcounter;
+ private static bool _eventChecker;
+ private eventAssert ()
+ {
+ _testcounter = 0;
+ }
+
+ public static bool eventChecker
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ set
+ {
+ _eventChecker = value;
+ }
+ }
+
+ static private void testAdded ()
+ {
+ _testcounter++;
+ _eventChecker = false;
+ }
+
+ public static void IsTrue (string msg)
+ {
+ Assert.IsTrue (_eventChecker, msg + "#" +
_testcounter);
+ testAdded ();
+
+ }
+
+ public static void IsFalse (string msg)
+ {
+ Assert.IsFalse (_eventChecker, msg + "#" +
_testcounter);
+ testAdded ();
+ }
+ }
+ #endregion
+
[Test]
+ [Category ("NotWorking")]
+ public void SqlDataSourceView_DataSourceViewChanged ()
+ {
+ SqlDataSource ds = new SqlDataSource ();
+ SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView",
null);
+ sql.DataSourceViewChanged += new EventHandler
(sql_DataSourceViewChanged);
+ sql.DoOnDataSourceViewChanged ();
+ eventAssert.IsTrue ("SqlDataSourceView"); // Assert
include counter the first is zero
+ /* XXX test parameters */
+
+ sql.CancelSelectOnNullParameter = false;
+ eventAssert.IsTrue ("SqlDataSourceView");
+ sql.ConflictDetection =
ConflictOptions.CompareAllValues;
+ eventAssert.IsTrue ("SqlDataSourceView");
+ sql.DeleteCommandType = SqlDataSourceCommandType.Text;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.DeleteCommand = "delete command";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.FilterExpression = "filter expression";
+ eventAssert.IsTrue ("SqlDataSourceView");
+ sql.InsertCommand = "insert command";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.InsertCommandType = SqlDataSourceCommandType.Text;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.OldValuesParameterFormatString = "{1}";
+ eventAssert.IsTrue ("SqlDataSourceView");
+ sql.SelectCommand = "select command";
+ eventAssert.IsTrue ("SqlDataSourceView");
+ sql.SelectCommandType = SqlDataSourceCommandType.Text;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.SortParameterName = "sort parameter";
+ eventAssert.IsTrue ("SqlDataSourceView");
+ sql.UpdateCommand = "update command";
+ eventAssert.IsFalse ("SqlDataSourceView");
+ sql.UpdateCommandType = SqlDataSourceCommandType.Text;
+ eventAssert.IsFalse ("SqlDataSourceView");
+ }
+
+ void sql_DataSourceViewChanged (object sender, EventArgs e)
+ {
+ eventAssert.eventChecker = true;
+ }
+
+ [Test]
public void CanDelete ()
{
SqlDataSource ds = new SqlDataSource ();
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
2007-05-30 11:43:13 UTC (rev 78191)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
2007-05-30 11:52:55 UTC (rev 78192)
@@ -72,6 +72,11 @@
{
base.OnTransforming (e);
}
+
+ public void DoOnDataSourceChanged ()
+ {
+ base.OnDataSourceChanged (new EventArgs ());
+ }
}
[TestFixture]
@@ -82,7 +87,7 @@
[TestFixtureSetUp]
public void CopyTestResources ()
{
-#if DOT_NET
+#if DOT_NET
WebTest.CopyResource (GetType (),
"MonoTests.System.Web.UI.WebControls.Resources.XMLDataSourceTest.xml",
"XMLDataSourceTest.xml");
WebTest.CopyResource (GetType (),
"MonoTests.System.Web.UI.WebControls.Resources.XMLDataSourceTest.xsl",
"XMLDataSourceTest.xsl");
WebTest.CopyResource (GetType (),
"MonoTests.System.Web.UI.WebControls.Resources.XMLDataSourceTest1.aspx",
"XMLDataSourceTest1.aspx");
@@ -90,12 +95,12 @@
WebTest.CopyResource (GetType (),
"MonoTests.System.Web.UI.WebControls.Resources.XMLDataSourceTest3.aspx",
"XMLDataSourceTest3.aspx");
WebTest.CopyResource (GetType (),
"MonoTests.System.Web.UI.WebControls.Resources.XMLDataSourceTest4.aspx",
"XMLDataSourceTest4.aspx");
#else
- WebTest.CopyResource (GetType (),
"XMLDataSourceTest.xml", "XMLDataSourceTest.xml");
- WebTest.CopyResource (GetType (),
"XMLDataSourceTest.xsl", "XMLDataSourceTest.xsl");
- WebTest.CopyResource (GetType (),
"XMLDataSourceTest1.aspx", "XMLDataSourceTest1.aspx");
- WebTest.CopyResource (GetType (),
"XMLDataSourceTest2.aspx", "XMLDataSourceTest2.aspx");
- WebTest.CopyResource (GetType (),
"XMLDataSourceTest3.aspx", "XMLDataSourceTest3.aspx");
- WebTest.CopyResource (GetType (),
"XMLDataSourceTest4.aspx", "XMLDataSourceTest4.aspx");
+ WebTest.CopyResource (GetType (),
"XMLDataSourceTest.xml", "XMLDataSourceTest.xml");
+ WebTest.CopyResource (GetType (),
"XMLDataSourceTest.xsl", "XMLDataSourceTest.xsl");
+ WebTest.CopyResource (GetType (),
"XMLDataSourceTest1.aspx", "XMLDataSourceTest1.aspx");
+ WebTest.CopyResource (GetType (),
"XMLDataSourceTest2.aspx", "XMLDataSourceTest2.aspx");
+ WebTest.CopyResource (GetType (),
"XMLDataSourceTest3.aspx", "XMLDataSourceTest3.aspx");
+ WebTest.CopyResource (GetType (),
"XMLDataSourceTest4.aspx", "XMLDataSourceTest4.aspx");
#endif
}
@@ -169,7 +174,76 @@
Assert.AreEqual ("", copy.TransformFile, "A2");
}
+ #region help_results
+ class eventAssert
+ {
+ private static int _testcounter;
+ private static bool _eventChecker;
+ private eventAssert ()
+ {
+ _testcounter = 0;
+ }
+
+ public static bool eventChecker
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ set
+ {
+ _eventChecker = value;
+ }
+ }
+
+ static private void testAdded ()
+ {
+ _testcounter++;
+ _eventChecker = false;
+ }
+
+ public static void IsTrue (string msg)
+ {
+ Assert.IsTrue (_eventChecker, msg + "#" +
_testcounter);
+ testAdded ();
+
+ }
+
+ public static void IsFalse (string msg)
+ {
+ Assert.IsFalse (_eventChecker, msg + "#" +
_testcounter);
+ testAdded ();
+ }
+ }
+ #endregion
+
[Test]
+ public void XmlDataSource_DataSourceViewChanged ()
+ {
+ DSPoker p = new DSPoker ();
+ ((IDataSource) p).DataSourceChanged += new EventHandler
(XmlDataSourceTest_DataSourceChanged);
+ p.DoOnDataSourceChanged ();
+ eventAssert.IsTrue ("XmlDataSource"); // Assert include
counter the first is zero
+
+ p.Data = data;
+ eventAssert.IsTrue ("XmlDataSource");
+ p.Transform = "transform";
+ eventAssert.IsTrue ("XmlDataSource");
+ p.XPath = "xpath";
+ eventAssert.IsTrue ("XmlDataSource");
+ p.DataFile = "DataFile";
+ eventAssert.IsTrue ("XmlDataSource");
+ p.TransformFile = "TransformFile";
+ eventAssert.IsTrue ("XmlDataSource");
+ }
+
+ void XmlDataSourceTest_DataSourceChanged (object sender,
EventArgs e)
+ {
+ eventAssert.eventChecker = true;
+
+ }
+
+ [Test]
[Category ("NunitWeb")]
public void DataFile ()
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
