From: Yoni Klain <yonik@mono-cvs.ximian.com>
Date: Sun, 9 Jul 2006 06:50:05 +0000 (-0000)
Subject: svn path=/trunk/mcs/; revision=62372
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=4109fa32e240de254fddb217c6973ec81909e700;p=mono.git

svn path=/trunk/mcs/; revision=62372
---

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
index 8f1eb94b1ef..12e66fd4789 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-09 Yoni Klain <yonik@mainsoft.com>
+
+	* ContentTest.cs changes on event test;
+
+
 2006-07-07 Yoni Klain <yonik@mainsoft.com>
 
 	* added PagerSettingsTest.cs;GridViewRowCollectionTest.cs;
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ContentTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ContentTest.cs
index 909b4b7b2e7..27a3b800da8 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ContentTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ContentTest.cs
@@ -119,37 +119,65 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 
 		[Test]
-		[Category ("NotWorking")] 
-		public void Events ()
+		[Category ("NotWorking")]
+		public void Events_DataBinding ()
 		{
 			PokerContent pc = new PokerContent ();
 			pc.DataBinding += new EventHandler (OnDataBindingHandler);
+			// DataBiding event
+			Assert.AreEqual (false, OnDataBinding, "BeforeDataBinding");
+			pc.DoOnDataBinding ();
+			Assert.AreEqual (true, OnDataBinding, "AfterDataBinding");
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void Events_Init ()
+		{
+			PokerContent pc = new PokerContent ();
 			pc.Init += new EventHandler (OnInitHandler);
-			pc.Load += new EventHandler (OnLoadHandler);
+			// Init event
+			Assert.AreEqual (false, OnInit, "BeforeInit");
+			pc.DoOnInit ();
+			Assert.AreEqual (true, OnInit, "AfterInit");
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void Events_PreRender ()
+		{
+			PokerContent pc = new PokerContent ();
 			pc.PreRender += new EventHandler (OnPreRenderHendler);
-			pc.Unload += new EventHandler (OnUnLoadHendler);
-			// Unload event
-			Assert.AreEqual (false, OnUnLoad, "BeforeUnLoad");
-			pc.DoOnUnLoad ();
-			Assert.AreEqual (true, OnUnLoad, "AfterUnLoad");
 			// PreRender event
 			Assert.AreEqual (false, OnPreRender, "BeforePreRender");
 			pc.DoOnPreRender ();
 			Assert.AreEqual (true, OnPreRender, "AfterPreRender");
+		}
+
+		[Test]
+		[Category ("NotWorking")]
+		public void Events_Load ()
+		{
+			PokerContent pc = new PokerContent ();
+			pc.Load += new EventHandler (OnLoadHandler);
 			// Load event
 			Assert.AreEqual (false, OnLoad, "BeforeLoad");
 			pc.DoOnLoad ();
 			Assert.AreEqual (true, OnLoad, "AfterLoad");
-			// Init event
-			Assert.AreEqual (false, OnInit, "BeforeInit");
-			pc.DoOnInit ();
-			Assert.AreEqual (true, OnInit, "AfterInit");
-			// DataBiding event
-			Assert.AreEqual (false, OnDataBinding, "BeforeDataBinding");
-			pc.DoOnDataBinding ();
-			Assert.AreEqual (true, OnDataBinding, "AfterDataBinding");
 		}
-		
+
+		[Test]
+		[Category ("NotWorking")]
+		public void Events_Unload ()
+		{
+			PokerContent pc = new PokerContent ();
+			pc.Unload += new EventHandler (OnUnLoadHendler);
+			// Unload event
+			Assert.AreEqual (false, OnUnLoad, "BeforeUnLoad");
+			pc.DoOnUnLoad ();
+			Assert.AreEqual (true, OnUnLoad, "AfterUnLoad");
+		}
+			
 		[Test]
 		[Category ("NotWorking")] 
 		[ExpectedException (typeof(NotSupportedException))]