Increase tests' correctness as now they better follow the .NET behavior, and

Cleanup the ondotnet target of the System.Web 2.0 test suite (0 failures), making it an efficient reference point for new tests verification.

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

diff --git a/mcs/class/System.Web/Test/System.Web.Hosting/ApplicationHostTest.cs b/mcs/class/System.Web/Test/System.Web.Hosting/ApplicationHostTest.cs
index 0435d36036e0cc1e7a32808f1a4c6bc1451c08b5..4ebe4b6ae7058548b17e732e8770b859e12348bd 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Hosting/ApplicationHostTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Hosting/ApplicationHostTest.cs
@@ -59,7 +59,8 @@ namespace MonoTests.System.Web.Hosting {
        [TestFixture]
        public class ApplicationHostTest {
 
-               [SetUp] public void Setup ()
+               [SetUp] 
+               public void Setup ()
                {
                        try {
                                //
@@ -92,7 +93,9 @@ namespace MonoTests.System.Web.Hosting {
                        ApplicationHost.CreateApplicationHost (null, null, null);
                }
 
-               [Test][ExpectedException (typeof (UriFormatException))]
+               [Test]
+        [Category ("NotWorking")]
+        [ExpectedException (typeof (ArgumentException))]
                public void ConstructorTestNull2 ()
                {
                        //
@@ -101,7 +104,9 @@ namespace MonoTests.System.Web.Hosting {
                        ApplicationHost.CreateApplicationHost (null, "/app", ".");
                }
 
-               [Test][ExpectedException (typeof (UriFormatException))]
+               [Test]
+        [Category("NotWorking")]
+        [ExpectedException (typeof (ArgumentNullException))]
                public void ConstructorTestNull3 ()
                {
                        //

diff --git a/mcs/class/System.Web/Test/System.Web.Hosting/VirtualPathProviderTest.cs b/mcs/class/System.Web/Test/System.Web.Hosting/VirtualPathProviderTest.cs
index f8076c4dbbdc73b681daebe272379823390c9301..8e2904063f8b52eb73790c38930414d7be971418 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Hosting/VirtualPathProviderTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Hosting/VirtualPathProviderTest.cs
@@ -82,14 +82,14 @@ namespace MonoTests.System.Web.Hosting {
                public void FileExists1 ()
                {
                        DummyVPP dummy = new DummyVPP ();
-                       Assert.IsNull (dummy.FileExists ("hola.aspx"));
+                       Assert.IsFalse (dummy.FileExists ("hola.aspx"));
                }
 
                [Test]
                public void DirectoryExists1 ()
                {
                        DummyVPP dummy = new DummyVPP ();
-                       Assert.IsNull (dummy.DirectoryExists ("hola"));
+                       Assert.IsFalse (dummy.DirectoryExists ("hola"));
                }
 
                [Test]

diff --git a/mcs/class/System.Web/Test/System.Web.Profile/ProfileInfoTest.cs b/mcs/class/System.Web/Test/System.Web.Profile/ProfileInfoTest.cs
index 4a9f762d9a78014623870cf123694048d66586f7..6ae556ccfb5e0aad5ff066bdf015d2149b1daedb 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Profile/ProfileInfoTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Profile/ProfileInfoTest.cs
@@ -47,8 +47,8 @@ namespace MonoTests.System.Web.Profile {
                        ProfileInfoPoker poker = new ProfileInfoPoker();
 
                        Assert.IsNull (poker.UserName, "A1");
-                       Assert.AreEqual (DateTime.MinValue, poker.LastUpdatedDate, "A2");
-                       Assert.AreEqual (DateTime.MinValue, poker.LastActivityDate, "A3");
+                       Assert.AreEqual (DateTime.MinValue, poker.LastUpdatedDate.Date, "A2");
+                       Assert.AreEqual (DateTime.MinValue, poker.LastActivityDate.Date, "A3");
                        Assert.IsFalse  (poker.IsAnonymous, "A4");
                        Assert.AreEqual (0, poker.Size, "A5");
                }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
index 4e443e6d515e39065ae627a68ee5506ad43b6166..2f2df633ba78bcb9d06c61bda87a5f9227c880c7 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
@@ -33,7 +33,7 @@ using System.Text;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
-
+using MonoTests.stand_alone.WebHarness;
 using NUnit.Framework;
 
 namespace MonoTests.System.Web.UI.HtmlControls {
@@ -219,9 +219,9 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        FormPoker form = new FormPoker ();
                        form.Page = p;
 #if NET_2_0
-                       Assert.AreEqual ("<div>\r\n<input type=\"hidden\" name=\"__VIEWSTATE\" id=\"\r\n__VIEWSTATE\" value=\"\" />\r\n</div>", form.RenderChildren ().Trim (), "A1");
+                       HtmlDiff.AssertAreEqual ("<div>\r\n<input type=\"hidden\" name=\"__VIEWSTATE\" id=\"\r\n__VIEWSTATE\" value=\"\" />\r\n</div>", form.RenderChildren ().Trim (), "A1");
 #else
-                       Assert.AreEqual ("<input type=\"hidden\" name=\"__VIEWSTATE\" value=\"\" />", form.RenderChildren ().Trim (), "A1");
+                       HtmlDiff.AssertAreEqual ("<input type=\"hidden\" name=\"__VIEWSTATE\" value=\"\" />", form.RenderChildren ().Trim (), "A1");
 #endif
                }
 

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs
index fd9a66a97cf9d609cef2209e5d84f435b05a3c33..10d6549e76af55ad77a57a772133f2f58daaa9e3 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputButtonTest.cs
@@ -32,7 +32,7 @@ using System.IO;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
-
+using MonoTests.stand_alone.WebHarness;
 using NUnit.Framework;
 
 namespace MonoTests.System.Web.UI.HtmlControls {
@@ -137,9 +137,9 @@ namespace MonoTests.System.Web.UI.HtmlControls {
 
                        p.DoRenderAttributes (tw);
 #if NET_2_0
-                       Assert.AreEqual (" name type=\"button\" ValidationGroup=\"VG\" /", sw.ToString (), "A2");
+                       HtmlDiff.AssertAreEqual (" name type=\"button\" ValidationGroup=\"VG\" /", sw.ToString (), "A2");
 #else
-                       Assert.AreEqual (" name type=\"button\" /", sw.ToString (), "A2");
+                       HtmlDiff.AssertAreEqual (" name type=\"button\" /", sw.ToString (), "A2");
 #endif
                }
 
@@ -182,6 +182,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                public void RenderOnclick2 ()
                {
                        Page page = new Page ();
+                       page.EnableEventValidation = false;
                        HtmlInputButtonPoker it = new HtmlInputButtonPoker ("button");
                        page.Controls.Add (it);
                        it.ID = "id1";
@@ -201,22 +202,26 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                }
 
                [Test]
-               [Category ("NotWorking")]
+                [Category ("NotWorking")]
                public void RenderOnclick4 ()
                {
                        Page page = new Page ();
+                       page.EnableEventValidation = false;
                        HtmlInputButtonPoker it = new HtmlInputButtonPoker ("submit");
                        page.Controls.Add (it);
                        it.ID = "id1";
                        it.ServerClick += new EventHandler (EmptyHandler);
                        string rendered = it.RenderToString ();
-                       Assert.IsTrue (rendered.IndexOf ("onclick") == -1, "#01");
+                       Assert.IsTrue (rendered.IndexOf ("onclick") != -1, "#01");
+                       Assert.IsTrue (rendered.IndexOf ("__doPostBack") != -1, "#02");
+                       Assert.IsTrue (rendered.IndexOf ("type=\"submit\"") != -1, "#03");
                }
 
                [Test]
                public void RenderOnclick5 ()
                {
                        Page page = new Page ();
+                       page.EnableEventValidation = false;
                        RequiredFieldValidator val = new RequiredFieldValidator ();
                        val.ControlToValidate = "id1";
                        page.Validators.Add (val);

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputCheckBoxTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputCheckBoxTest.cs
index 7aa978ab2531caa9e0322be16dc10ed8fa97edd8..7dc44005b4f145f185722d0982a37696a17b097c 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputCheckBoxTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputCheckBoxTest.cs
@@ -31,7 +31,7 @@ using System;
 using System.IO;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
-
+using MonoTests.stand_alone.WebHarness;
 using NUnit.Framework;
 
 namespace MonoTests.System.Web.UI.HtmlControls {
@@ -86,7 +86,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        Assert.AreEqual (1, c.Attributes.Count, "Attributes.Count after");
                }
 
-               [Test]
+               [Test] 
                public void Render ()
                {
                        TestHtmlInputCheckBox c = new TestHtmlInputCheckBox ();
@@ -101,9 +101,9 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        s = c.Render ();
 
 #if NET_2_0
-                       Assert.AreEqual ("<input name=\"*1*\" type=\"checkbox\" id=\"*1*\" checked=\"checked\" />", s);
+                       HtmlDiff.AssertAreEqual ("<input name=\"*1*\" id=\"*1*\" type=\"checkbox\" checked=\"checked\" />", s, "Render fail");
 #else
-                       Assert.AreEqual ("<input name=\"*1*\" id=\"*1*\" type=\"checkbox\" checked=\"checked\" />", s);
+                       HtmlDiff.AssertAreEqual ("<input name=\"*1*\" type=\"checkbox\" id=\"*1*\" checked=\"checked\" />", s, "Render fail");
 #endif
                }
        }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputControlTest.cs
index 1fa9bc33f663bdf513bf262989d7d452946989ac..a741ae1a9c7d79da058346833b47e47ff78376f7 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputControlTest.cs
@@ -31,7 +31,7 @@ using System;
 using System.IO;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
-
+using MonoTests.stand_alone.WebHarness;
 using NUnit.Framework;
 
 namespace MonoTests.System.Web.UI.HtmlControls {
@@ -189,13 +189,13 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        ic.Name = "mono";
                        ic.Value = "value";
 
-                       Assert.AreEqual (" name type=\"test\" value=\"value\" /", ic.RenderAttributes ());
+                       HtmlDiff.AssertAreEqual (" name type=\"test\" value=\"value\" /", ic.RenderAttributes (), "RenderAttributes failed #1");
 
                        ic.ID = "toto";
 #if NET_2_0
-                       Assert.AreEqual (" name=\"toto\" type=\"test\" id=\"toto\" value=\"value\" /", ic.RenderAttributes ());
+                       HtmlDiff.AssertAreEqual (" name=\"toto\" id=\"toto\" type=\"test\" value=\"value\" /", ic.RenderAttributes (), "RenderAttributes failed #2");
 #else
-                       Assert.AreEqual (" name=\"toto\" id=\"toto\" type=\"test\" value=\"value\" /", ic.RenderAttributes ());
+                       HtmlDiff.AssertAreEqual(" name=\"toto\" id=\"toto\" type=\"test\" value=\"value\" /", ic.RenderAttributes() , "RenderAttributes failed #3");
 #endif
                }
 
@@ -214,7 +214,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        ic.Value = "s3kr3t";
 
                        // logic to hide password isn't in HtmlInputControl
-                       Assert.AreEqual (" name type=\"password\" value=\"s3kr3t\" /", ic.RenderAttributes ());
+                       HtmlDiff.AssertAreEqual (" name type=\"password\" value=\"s3kr3t\" /", ic.RenderAttributes (), "Password failed");
                }
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputTextTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputTextTest.cs
index b3d18806b5a7355c794fbffc60f37da3feefdf88..80f68f725b52338499ca61727075758bbe455481 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputTextTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlInputTextTest.cs
@@ -32,7 +32,7 @@ using System.Collections.Specialized;
 using System.IO;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
-
+using MonoTests.stand_alone.WebHarness;
 using NUnit.Framework;
 
 namespace MonoTests.System.Web.UI.HtmlControls {
@@ -90,7 +90,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
 #if NET_2_0
                public bool LoadPost (string key, NameValueCollection nvc)
                {
-                       return base.LoadPostData (key, nvc);
+                       return base.LoadPostData(key, nvc);
                }
 
                public void Raise ()
@@ -200,11 +200,11 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        it.Value = "s3kr3t";
 #if NET_2_0
                        // value is there, maybe because a new HtmlInputPassword class exists ?
-                       Assert.AreEqual (" name=\"mono\" type=\"password\" id=\"mono\" maxlength=\"2\" size=\"4\" value=\"s3kr3t\" /", it.RenderAttributes ());
+                       HtmlDiff.AssertAreEqual (" name=\"mono\" id=\"mono\" type=\"password\" maxlength=\"2\" size=\"4\" value=\"s3kr3t\" /", it.RenderAttributes (),"Render failed");
                        Assert.IsFalse (it.ViewStateValueChanged, "ViewStateValueChanged");
                        Assert.IsFalse (it.AttributeValueChanged, "AttributeValueChanged");
 #else
-                       Assert.AreEqual (" name=\"mono\" id=\"mono\" type=\"password\" maxlength=\"2\" size=\"4\" /", it.RenderAttributes ());
+                       HtmlDiff.AssertAreEqual(" name=\"mono\" id=\"mono\" type=\"password\" maxlength=\"2\" size=\"4\" /", it.RenderAttributes(),"Render failed");
                        Assert.IsTrue (it.ViewStateValueChanged, "ViewStateValueChanged");
                        Assert.IsTrue (it.AttributeValueChanged, "AttributeValueChanged");
 #endif

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlMetaTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlMetaTest.cs
index d95c23406e57867b52b6688e063d97fcf89064b4..4d56374cf92e859260106d9572d2bd86dddd7392 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlMetaTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlMetaTest.cs
@@ -28,8 +28,8 @@
 
 #if NET_2_0
 
-using NUnit.Framework;
-
+using NUnit.Framework;\r
+using MonoTests.stand_alone.WebHarness;
 using System;
 using System.IO;
 using System.Web.UI;
@@ -87,7 +87,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        meta.Content = "Content";
                        meta.HttpEquiv = "Equiv";
                        meta.Scheme = "Scheme";
-                       Assert.AreEqual ("<meta name=\"Name\" content=\"Content\" http-equiv=\"Equiv\" scheme=\"Scheme\" />", meta.Render(), "A1");
+                       HtmlDiff.AssertAreEqual ("<meta name=\"Name\" content=\"Content\" http-equiv=\"Equiv\" scheme=\"Scheme\" />", meta.Render(), "A1");
                }
 
                [Test]
@@ -100,4 +100,4 @@ namespace MonoTests.System.Web.UI.HtmlControls {
        }
 }
 
-#endif
+#endif\r

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlTextAreaTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlTextAreaTest.cs
index 1e938449fd09b0f5e7103587691fe3d6f181808a..df6226858a954d8e9dafc0c6db5a9a9420edd98e 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlTextAreaTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlTextAreaTest.cs
@@ -190,10 +190,10 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        ta.Name = "mono";
                        ta.Value = "value";
                        // value is out
-                       Assert.AreEqual (" name cols=\"4\" rows=\"2\"", ta.RenderAttributes ());
+                       HtmlDiff.AssertAreEqual (" name cols=\"4\" rows=\"2\"", ta.RenderAttributes (),"RenderAttributes failed #1");
 
                        ta.ID = "go";
-                       Assert.AreEqual (" name=\"go\" id=\"go\" cols=\"4\" rows=\"2\"", ta.RenderAttributes ());
+                       HtmlDiff.AssertAreEqual (" name=\"go\" id=\"go\" cols=\"4\" rows=\"2\"", ta.RenderAttributes (),"RenderAttributes failed #2");
                }
 
                [Test]
@@ -223,10 +223,10 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        ta.Name = "mono";
                        ta.Value = "value";
                        // value is out
-                       Assert.AreEqual ("<textarea name cols=\"4\" rows=\"2\">value</textarea>", ta.Render ());
+                       HtmlDiff.AssertAreEqual ("<textarea name cols=\"4\" rows=\"2\">value</textarea>", ta.Render (),"Render #1");
 
                        ta.ID = "go";
-                       Assert.AreEqual ("<textarea name=\"go\" id=\"go\" cols=\"4\" rows=\"2\">value</textarea>", ta.Render ());
+                       HtmlDiff.AssertAreEqual ("<textarea name=\"go\" id=\"go\" cols=\"4\" rows=\"2\">value</textarea>", ta.Render (),"Render #2");
                }
 
                [Test]

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/AccessDataSourceTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/AccessDataSourceTest.cs
index 449e3ca90b787fe1e24321d2cf9fe11ab1df05f2..ff5c0a3c3efa419287317351df1c6c1764d02a0e 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/AccessDataSourceTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/AccessDataSourceTest.cs
@@ -139,10 +139,10 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual ("", sql.CacheKeyDependency, "A1");
                        Assert.IsTrue (sql.CancelSelectOnNullParameter, "A2");
                        Assert.AreEqual (ConflictOptions.OverwriteChanges, sql.ConflictDetection, "A3");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.DeleteCommandType, "A4");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.InsertCommandType, "A5");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.SelectCommandType, "A6");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.UpdateCommandType, "A7");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.DeleteCommandType, "A4");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.InsertCommandType, "A5");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.SelectCommandType, "A6");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.UpdateCommandType, "A7");
                        Assert.AreEqual ("{0}", sql.OldValuesParameterFormatString, "A8");
 
                        // SqlCacheDependency access should raise an exception
@@ -171,8 +171,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual ("", sql.FilterExpression, "A26");
                        Assert.AreEqual ("", sql.DataFile, "A27");
                }
-       }
-
+    }
 }
 
 #endif

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/CalendarTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/CalendarTest.cs
index ec3fc4a54d631e7c072706269494d29cf6416d0c..cc9c428b11429e473a5cdafcbbe61b7af053ed49 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/CalendarTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/CalendarTest.cs
@@ -36,6 +36,7 @@ using System.IO;
 using System.Web;
 using System.Web.UI;
 using System.Globalization;
+using System.Threading;
 
 class PokerCalendar : System.Web.UI.WebControls.Calendar {
        public PokerCalendar ()
@@ -246,6 +247,7 @@ namespace MonoTests.System.Web.UI.WebControls
                }
 
                [Test]
+        [Category ("NotWorking")]
                public void SelectDateProperty ()
                {
                        PokerCalendar c = new PokerCalendar ();
@@ -256,7 +258,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual (today, c.SelectedDate, "SelectDateProperty #1");
 
                        c.SelectedDate = now;
-                       Assert.AreEqual (today, c.SelectedDate, "SelectDateProperty #2");
+                       Assert.AreEqual (now, c.SelectedDate, "SelectDateProperty #2");
                }
 
                [Test]
@@ -608,6 +610,7 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test]
                public void TestRenderMonthStartsOnSunday ()
                {
+                       Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
                        PokerCalendar p = new PokerCalendar ();
                        p.TodaysDate = new DateTime (2005, 5, 14);
                        
@@ -652,6 +655,7 @@ namespace MonoTests.System.Web.UI.WebControls
                */
 
                [Test]
+        [Category ("NotWorking")] 
                public void HaveBaseAttributes ()
                {
                        PokerCalendar p = new PokerCalendar ();
@@ -660,8 +664,8 @@ namespace MonoTests.System.Web.UI.WebControls
                        p.TodaysDate = new DateTime (2005, 8, 4);
                        p.SelectedDate = p.TodaysDate;
                        string s = p.Render();
-                       Assert.IsTrue (s.IndexOf ("adios") != -11, "#01");
-                       Assert.IsTrue (p.CS_Called == false, "#01");
+                       Assert.IsTrue (s.IndexOf ("adios") != -1, "#01");
+                       Assert.IsTrue (p.CS_Called == true, "#02");
                }
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageButtonTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageButtonTest.cs
index 03cfa0b602d1721208a0cfe5a4c443c0bfb8fd02..ea51aa3c5b9c9355381731ff1ca9a53d19489691 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageButtonTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ImageButtonTest.cs
@@ -118,6 +118,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        HtmlTextWriter tw = new HtmlTextWriter (sw);
 
                        Page page = new Page ();
+            page.EnableEventValidation = false;
                        ImageButton b = new ImageButton ();                     
                        page.Controls.Add (b);
                        page.RenderControl (tw);

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/LoginTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/LoginTest.cs
index 027cd0fe00d0d7b5fd483bda4430e77b39af2ef9..dafe27f9a35bcb998384235c368dd50bd1e9b5cd 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/LoginTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/LoginTest.cs
@@ -39,18 +39,62 @@ using NUnit.Framework;
 
 namespace MonoTests.System.Web.UI.WebControls {
        
-       public class LoginTemplate : WebControl, ITemplate {
+    public class LoginTemplate :WebControl, ITemplate {
                public LoginTemplate() {
                        ID = "kuku";
-               }
-                       
-               void ITemplate.InstantiateIn(Control container) {
+        }
+        void ITemplate.InstantiateIn(Control container) {
                        container.Controls.Add(this);
                }
-
-       }
-
-       public class TestLogin : Login {
+    }
+
+    public class LayoutTemplate :WebControl, ITemplate
+    {
+        TextBox user;
+        TextBox pass;
+        CheckBox remme;
+        Button login;
+        Literal failure;
+
+        public LayoutTemplate(){
+            Buildcontrols();
+            Addtocontainer();
+        }
+
+        #region build
+        public void Buildcontrols()
+        {
+            user = new TextBox();
+            pass = new TextBox();
+            remme = new CheckBox();
+            login = new Button();
+            failure = new Literal();
+
+            ID = "Template";
+            user.ID = "UserName";
+            pass.ID = "Password";
+            remme.ID = "RememberMe";
+            login.ID = "Login";
+            failure.ID = "FailureText";
+        }
+
+        public void Addtocontainer()
+        {
+            this.Controls.Add(user);
+            this.Controls.Add(pass);
+            this.Controls.Add(remme);
+            this.Controls.Add(login);
+            this.Controls.Add(failure);
+        }
+        #endregion
+
+        void ITemplate.InstantiateIn(Control container)
+        {
+            container.Controls.Add(this);
+        }
+    }
+    
+    public class TestLogin : Login {
 
                public string Tag {
                        get { return base.TagName; }
@@ -573,14 +617,26 @@ namespace MonoTests.System.Web.UI.WebControls {
                        TestLogin l = new TestLogin ();
                        l.FailureAction = (LoginFailureAction) Int32.MinValue;
                }
-               
+
+        [Test]
+        public void LayoutTemplate()
+        {
+            TestLogin l = new TestLogin();
+            l.LayoutTemplate = new LayoutTemplate();
+            l.DoEnsureChildControls();
+            Assert.IsNotNull(l.FindControl("Template"), "LoginTemplate");
+            Assert.IsNotNull(l.FindControl("UserName"), "UserName");
+        }
+
+
                [Test]
-               public void LayoutTemplate ()
+        [Category ("NotWorking")]
+        [ExpectedException(typeof(HttpException))]
+               public void LayoutTemplateException ()
                {
                        TestLogin l = new TestLogin ();
                        l.LayoutTemplate = new LoginTemplate();
                        l.DoEnsureChildControls();
-                       Assert.IsNotNull(l.FindControl("kuku"), "LoginTemplate");
                }
 
                [Test]

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonTest.cs
index 8c20cee44fd9449c07625969850c1ac7def16b25..2e58b86f317d8f1bdf2118b032d92fd449d6baaf 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonTest.cs
@@ -167,6 +167,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        TestRadioButton b2 = new TestRadioButton ();
                        b2.GroupName = "mono";
                        Page p = new Page ();
+            p.EnableEventValidation = false;
                        p.ID = "MyPage";
                        p.Controls.Add (b1);
                        p.Controls.Add (b2);

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
index f2fe93dab6a22a4c3b34519b2c74a93cb8a4e34d..2ce56fd7098e4505d81a8790abc17c1d94b363fa 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceTest.cs
@@ -68,11 +68,11 @@ namespace MonoTests.System.Web.UI.WebControls
 
                        Assert.AreEqual ("", sql.CacheKeyDependency, "A1");
                        Assert.IsTrue (sql.CancelSelectOnNullParameter, "A2");
-                       Assert.AreEqual (ConflictOptions.OverwriteChanges, sql.ConflictDetection, "A3");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.DeleteCommandType, "A4");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.InsertCommandType, "A5");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.SelectCommandType, "A6");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.UpdateCommandType, "A7");
+                       Assert.AreEqual(ConflictOptions.OverwriteChanges, sql.ConflictDetection, "A3");
+                       Assert.AreEqual(SqlDataSourceCommandType.Text, sql.DeleteCommandType, "A4");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.InsertCommandType, "A5");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.SelectCommandType, "A6");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.UpdateCommandType, "A7");
                        Assert.AreEqual ("{0}", sql.OldValuesParameterFormatString, "A8");
                        Assert.AreEqual ("", sql.SqlCacheDependency, "A9");
                        Assert.AreEqual ("", sql.SortParameterName, "A10");
@@ -103,17 +103,17 @@ namespace MonoTests.System.Web.UI.WebControls
 
                [Test]
         [Category ("NotWorking")]
-               public void ViewState ()
+        public void ViewState ()
                {
                        SqlPoker sql = new SqlPoker ();
 
                        sql.CacheKeyDependency = "hi";
                        sql.CancelSelectOnNullParameter = false;
                        sql.ConflictDetection = ConflictOptions.CompareAllValues;
-                       sql.DeleteCommandType = SqlDataSourceCommandType.Text;
-                       sql.InsertCommandType = SqlDataSourceCommandType.Text;
-                       sql.SelectCommandType = SqlDataSourceCommandType.Text;
-                       sql.UpdateCommandType = SqlDataSourceCommandType.Text;
+                       sql.DeleteCommandType = SqlDataSourceCommandType.StoredProcedure;
+            sql.InsertCommandType = SqlDataSourceCommandType.StoredProcedure;
+            sql.SelectCommandType = SqlDataSourceCommandType.StoredProcedure;
+            sql.UpdateCommandType = SqlDataSourceCommandType.StoredProcedure;
                        sql.OldValuesParameterFormatString = "{1}";
                        sql.SqlCacheDependency = "hi";
                        sql.SortParameterName = "hi";
@@ -130,10 +130,10 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual ("hi", sql.CacheKeyDependency, "A1");
                        Assert.IsFalse (sql.CancelSelectOnNullParameter, "A2");
                        Assert.AreEqual (ConflictOptions.CompareAllValues, sql.ConflictDetection, "A3");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.DeleteCommandType, "A4");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.InsertCommandType, "A5");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.SelectCommandType, "A6");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.UpdateCommandType, "A7");
+                       Assert.AreEqual(SqlDataSourceCommandType.StoredProcedure, sql.DeleteCommandType, "A4");
+            Assert.AreEqual(SqlDataSourceCommandType.StoredProcedure, sql.InsertCommandType, "A5");
+            Assert.AreEqual(SqlDataSourceCommandType.StoredProcedure, sql.SelectCommandType, "A6");
+            Assert.AreEqual(SqlDataSourceCommandType.StoredProcedure, sql.UpdateCommandType, "A7");
                        Assert.AreEqual ("{1}", sql.OldValuesParameterFormatString, "A8");
                        Assert.AreEqual ("hi", sql.SqlCacheDependency, "A9");
                        Assert.AreEqual ("hi", sql.SortParameterName, "A10");
@@ -152,28 +152,39 @@ namespace MonoTests.System.Web.UI.WebControls
                        sql = new SqlPoker ();
                        sql.LoadFromViewState (state);
 
-                       Assert.AreEqual ("hi", sql.CacheKeyDependency, "B1");
-                       Assert.IsFalse  (sql.CancelSelectOnNullParameter, "B2");
-                       Assert.AreEqual (ConflictOptions.CompareAllValues, sql.ConflictDetection, "B3");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.DeleteCommandType, "B4");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.InsertCommandType, "B5");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.SelectCommandType, "B6");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.UpdateCommandType, "B7");
-                       Assert.AreEqual ("{1}", sql.OldValuesParameterFormatString, "B8");
-                       Assert.AreEqual ("hi", sql.SqlCacheDependency, "B9");
-                       Assert.AreEqual ("hi", sql.SortParameterName, "B10");
-                       Assert.AreEqual (1, sql.CacheDuration, "B11");
-                       Assert.AreEqual (DataSourceCacheExpiry.Sliding, sql.CacheExpirationPolicy, "B12");
-                       Assert.IsTrue   (sql.EnableCaching, "B13");
-                       Assert.AreEqual (SqlDataSourceMode.DataReader, sql.DataSourceMode, "B16");
-                       Assert.AreEqual ("DELETE foo", sql.DeleteCommand, "B17");
-                       Assert.AreEqual ("INSERT foo", sql.InsertCommand, "B20");
-                       Assert.AreEqual ("SELECT foo", sql.SelectCommand, "B22");
-                       Assert.AreEqual ("UPDATE foo", sql.UpdateCommand, "B24");
-                       Assert.AreEqual ("hi", sql.FilterExpression, "B26");
-               }
-       }
-
+            Assert.AreEqual("", sql.CacheKeyDependency, "B1");
+            Assert.IsTrue(sql.CancelSelectOnNullParameter, "B2");
+            Assert.AreEqual(ConflictOptions.OverwriteChanges, sql.ConflictDetection, "B3");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.DeleteCommandType, "B4");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.InsertCommandType, "B5");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.SelectCommandType, "B6");
+            Assert.AreEqual(SqlDataSourceCommandType.Text, sql.UpdateCommandType, "B7");
+            Assert.AreEqual("{0}", sql.OldValuesParameterFormatString, "B8");
+            Assert.AreEqual("", sql.SqlCacheDependency, "B9");
+            Assert.AreEqual("", sql.SortParameterName, "B10");
+            Assert.AreEqual(0, sql.CacheDuration, "B11");
+            Assert.AreEqual(DataSourceCacheExpiry.Absolute, sql.CacheExpirationPolicy, "B12");
+            Assert.IsFalse(sql.EnableCaching, "B13");
+            Assert.AreEqual("", sql.ProviderName, "B14");
+            Assert.AreEqual("", sql.ConnectionString, "B15");
+            Assert.AreEqual(SqlDataSourceMode.DataSet, sql.DataSourceMode, "B16");
+            Assert.AreEqual("", sql.DeleteCommand, "B17");
+            Assert.IsNotNull(sql.DeleteParameters, "B18");
+            Assert.AreEqual(0, sql.DeleteParameters.Count, "B18.1");
+            Assert.IsNotNull(sql.FilterParameters, "B19");
+            Assert.AreEqual(0, sql.FilterParameters.Count, "B19.1");
+            Assert.AreEqual("", sql.InsertCommand, "B20");
+            Assert.IsNotNull(sql.InsertParameters, "B21");
+            Assert.AreEqual(0, sql.InsertParameters.Count, "B21.1");
+            Assert.AreEqual("", sql.SelectCommand, "B22");
+            Assert.IsNotNull(sql.SelectParameters, "B23");
+            Assert.AreEqual(0, sql.SelectParameters.Count, "B23.1");
+            Assert.AreEqual("", sql.UpdateCommand, "B24");
+            Assert.IsNotNull(sql.UpdateParameters, "B25");
+            Assert.AreEqual(0, sql.UpdateParameters.Count, "B25.1");
+            Assert.AreEqual("", sql.FilterExpression, "B26");
+        }
+    }
 }
 
 #endif

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
index 17cb93ae3dc9cd5703cc83962fc5cd084f2da55a..b3ce60a3f829994a05565bdd7e3425ceb2b96929 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
@@ -77,31 +77,31 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.IsFalse (sql.CanUpdate,"A7");
                        Assert.AreEqual (ConflictOptions.OverwriteChanges, sql.ConflictDetection, "A8");
                        Assert.AreEqual ("", sql.DeleteCommand, "A9");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.DeleteCommandType, "A10");
+                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.DeleteCommandType, "A10");
                        Assert.IsNotNull (sql.DeleteParameters, "A11");
                        Assert.AreEqual (0, sql.DeleteParameters.Count, "A12");
                        Assert.AreEqual ("", sql.FilterExpression, "A13");
                        Assert.IsNotNull (sql.FilterParameters, "A14");
                        Assert.AreEqual (0, sql.FilterParameters.Count, "A15");
                        Assert.AreEqual ("", sql.InsertCommand, "A16");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.InsertCommandType, "A17");
+                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.InsertCommandType, "A17");
                        Assert.IsNotNull (sql.InsertParameters, "A18");
                        Assert.AreEqual (0, sql.InsertParameters.Count, "A19");
                        Assert.AreEqual ("{0}", sql.OldValuesParameterFormatString, "A20");
                        Assert.AreEqual ("", sql.SelectCommand, "A21");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.SelectCommandType, "A22");
+                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.SelectCommandType, "A22");
                        Assert.IsNotNull (sql.SelectParameters, "A23");
                        Assert.AreEqual (0, sql.SelectParameters.Count, "A24");
                        Assert.AreEqual ("", sql.SortParameterName, "A25");
                        Assert.AreEqual ("", sql.UpdateCommand, "A26");
-                       Assert.AreEqual (SqlDataSourceCommandType.StoredProcedure, sql.UpdateCommandType, "A27");
+                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.UpdateCommandType, "A27");
                        Assert.IsNotNull (sql.UpdateParameters, "A28");
                        Assert.AreEqual (0, sql.UpdateParameters.Count, "A29");
                }
 
                [Test]
-               [Category ("NotWorking")]
-               public void ViewState ()
+        [Category ("NotWorking")]
+        public void ViewState ()
                {
                        SqlDataSource ds = new SqlDataSource ();
                        SqlViewPoker sql = new SqlViewPoker (ds, "DefaultView", null);
@@ -141,19 +141,35 @@ namespace MonoTests.System.Web.UI.WebControls
                        sql = new SqlViewPoker (ds, "DefaultView", null);
                        sql.LoadFromViewState (state);
 
-                       Assert.IsFalse (sql.CancelSelectOnNullParameter, "B1");
-                       Assert.AreEqual (ConflictOptions.CompareAllValues, sql.ConflictDetection, "B2");
-                       Assert.AreEqual ("delete command", sql.DeleteCommand, "B3");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.DeleteCommandType, "B4");
-                       Assert.AreEqual ("filter expression", sql.FilterExpression, "B5");
-                       Assert.AreEqual ("insert command", sql.InsertCommand, "B6");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.InsertCommandType, "B7");
-                       Assert.AreEqual ("{1}", sql.OldValuesParameterFormatString, "B8");
-                       Assert.AreEqual ("select command", sql.SelectCommand, "B9");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.SelectCommandType, "B10");
-                       Assert.AreEqual ("sort parameter", sql.SortParameterName, "B11");
-                       Assert.AreEqual ("update command", sql.UpdateCommand, "B12");
-                       Assert.AreEqual (SqlDataSourceCommandType.Text, sql.UpdateCommandType, "B13");
+            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("", sql.FilterExpression, "B13");
+            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("{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("", 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");
                }
 
                [Test]

diff --git a/mcs/class/System.Web/Test/System.Web.UI/AttributeCollectionTest.cs b/mcs/class/System.Web/Test/System.Web.UI/AttributeCollectionTest.cs
index 9d6847c00505103f1072dd81428ea3bdc5ea8b35..80bff8f59d5c257f5093a3ae6513174b989dfea2 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/AttributeCollectionTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/AttributeCollectionTest.cs
@@ -113,32 +113,35 @@ namespace MonoTests.System.Web.UI {
                }
 
                [Test]
-               [ExpectedException (typeof (NullReferenceException))]
-               public void InitialNoBag10 ()
+               [Category("NotWorking")]
+               public void InitialNoBag10()
                {
-                       AC ac = new AC (null);
-                       CssStyleCollection css = ac.CssStyle;
-                       int i = css.Count;
+                   AC ac = new AC(null);
+                   CssStyleCollection css = ac.CssStyle;
+                   int i = css.Count;
+                   Assert.AreEqual(0, i, "InitialNoBag10");
                }
 
                [Test]
-               [ExpectedException (typeof (NullReferenceException))]
-               public void InitialNoBag11 ()
+               [Category("NotWorking")]
+               public void InitialNoBag11()
                {
-                       AC ac = new AC (null);
-                       CssStyleCollection css = ac.CssStyle;
-                       ICollection coll = css.Keys;
+                   AC ac = new AC(null);
+                   CssStyleCollection css = ac.CssStyle;
+                   ICollection coll = css.Keys;
+                   Assert.AreEqual(0, coll.Count, "InitialNoBag11");
                }
 
                [Test]
-               [ExpectedException (typeof (NullReferenceException))]
-               public void InitialNoBag12 ()
+               [Category("NotWorking")]
+               public void InitialNoBag12()
                {
-                       AC ac = new AC (null);
-                       CssStyleCollection css = ac.CssStyle;
-                       string v = css ["hola"];
+                   AC ac = new AC(null);
+                   CssStyleCollection css = ac.CssStyle;
+                   string v = css["hola"];
+                   Assert.AreEqual(null, v, "InitialNoBag12");
                }
-
+                       
                [Test]
                public void InitialBag1 ()
                {

diff --git a/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
index dc97004d26a331b47c641f8dee21d42112c9a9cc..c155aa7e9be09e08eaa05279213e9b78dec99a3b 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
@@ -164,11 +164,11 @@ namespace MonoTests.System.Web.UI
                }
                
                [Test]
-               [Category ("NotWorking")]
+        [Category ("NotWorking")]
                public void IsViewStateEnabled ()
                {
                        DerivedControl c = new DerivedControl ();
-                       Assert.IsFalse (c.DoIsViewStateEnabled);
+                       Assert.IsTrue (c.DoIsViewStateEnabled);
                        Page p = new Page ();
                        c.Page = p;
                        p.Controls.Add (c);

diff --git a/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs b/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
index a1bcbcdba745bbe76d25ae625e0d10ce531f5a4f..20ff2a166b7813b9cb6be99d59fc8c0be1423447 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/HttpRequestTest.cs
@@ -35,6 +35,8 @@ using NUnit.Framework;
 using System.Diagnostics;
 using MonoTests.SystemWeb.Framework;
 using System.IO;
+using System.Threading;
+using System.Globalization;
 
 namespace MonoTests.System.Web {
 
@@ -135,11 +137,13 @@ namespace MonoTests.System.Web {
                [Test]
                public void Test_QueryStringDecoding()
                {
+                       // Note: The string to encode must exist in default encoding language 
+                       // \r - will exist in all encodings
                        string url = "http://www.gnome.org/";
-                       string qs = "umlaut=" + HttpUtility.UrlEncode("\u00e4", Encoding.Default);
+                       string qs = "umlaut=" + HttpUtility.UrlEncode("\r", Encoding.Default);
 
                        HttpRequest r = new HttpRequest ("file", url, qs);
-                       Assert.AreEqual("\u00e4", r.QueryString["umlaut"]);
+                       Assert.AreEqual ("\r", r.QueryString["umlaut"]);
                }
 
                [Test]

diff --git a/mcs/class/System.Web/Test/System.Web/SiteMapNodeTest.cs b/mcs/class/System.Web/Test/System.Web/SiteMapNodeTest.cs
index 625416b3d35672a54808ed50bbb56c38a377e439..4acee5a9771f3de379b093e6585c5ac89b4bac12 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/SiteMapNodeTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/SiteMapNodeTest.cs
@@ -65,13 +65,24 @@ namespace MonoTests.System.Web
        public class SiteMapNodeTest
        {
                [Test]
-               [Category ("NotWorking")]
+        [Category ("NotWorking")]
                public void Node_Null_Attrib_equals ()
                {
+            // Note: dot.net implementation dosn't compare attributes
                        SiteMapNode node = new SiteMapNode (new DummyProvider (), "", "", "", null, null, null, null, null);
                        SiteMapNode node1 = new SiteMapNode (new DummyProvider (), "", "", "", null, null, null, null, null);
                        SiteMapNode node2 = new SiteMapNode (new DummyProvider (), "", "", "", null, null, new NameValueCollection (), null, null);
                        Assert.IsTrue (node.Equals (node1), "both nodes have attrib=null");
+                       Assert.IsTrue (node.Equals (node2), "one node has attrib=null");
+               }
+
+               [Test]
+               public void Node_equals ()
+               {
+                       SiteMapNode node = new SiteMapNode (new DummyProvider (), "Node", "1", "", null, null, null, null, null);
+                       SiteMapNode node1 = new SiteMapNode (new DummyProvider (), "Node", "1", "", null, null, null, null, null);
+                       SiteMapNode node2 = new SiteMapNode (new DummyProvider (), "Node", "2", "", null, null, new NameValueCollection (), null, null);
+                       Assert.IsTrue (node.Equals (node1), "both nodes have attrib=null");
                        Assert.IsFalse (node.Equals (node2), "one node has attrib=null");
                }
 
@@ -83,14 +94,16 @@ namespace MonoTests.System.Web
                        SiteMapNode node1 = new SiteMapNode (new DummyProvider (), "", "", "", null, null, null, null, null);
                        SiteMapNode node2 = new SiteMapNode (new DummyProvider (), "", "", "", null, new int[] { }, null, null, null);
                        Assert.IsTrue (node.Equals (node1));
-                       Assert.IsFalse (node.Equals (node2));
+                       Assert.IsTrue (node.Equals (node2));
                }
 
                [Test]
                public void Node_Null_Attrib_clone ()
                {
                        SiteMapNode node = new SiteMapNode (new DummyProvider (), "", "", "", null, null, null, null, null);
-                       node.Clone ();
+                       SiteMapNode copy = node.Clone ();
+                       Assert.IsNotNull (copy, "Node not created");
+                       Assert.AreEqual (copy, node, "Cloning failed");
                }
        }
 }

diff --git a/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs b/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
index 97da75898f208dcc528f3595d90f1d0641874b4c..8fe0cd7d3a6ce2c2802e653d4a838f89adc25d76 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
+++ b/mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
@@ -66,7 +66,8 @@ namespace MonoTests.System.Web {
                }
 
                [Test]
-               [ExpectedException (typeof (ArgumentNullException))]
+               [Category ("NotWorking")]
+               [ExpectedException (typeof (ArgumentException))]
                public void Combine_ArgException2 ()
                {
                        Assert.AreEqual ("hi/there", VPU.Combine ("hi/there", null), "A1");
@@ -255,7 +256,8 @@ namespace MonoTests.System.Web {
                }
 
                [Test]
-               [ExpectedException (typeof (ArgumentNullException))]
+               [Category ("NotWorking")]
+               [ExpectedException (typeof (ArgumentException))]
                public void Combine2 ()
                {
                        VPU.Combine ("something", null);
@@ -269,14 +271,14 @@ namespace MonoTests.System.Web {
                }
                
                [Test]
-               [ExpectedException (typeof (ArgumentException))]
+               [ExpectedException (typeof (ArgumentNullException))]
                public void GetDirectory2 ()
                {
                        VPU.GetDirectory ("");
                }
 
                [Test]
-               [ExpectedException (typeof (ArgumentNullException))]
+               [ExpectedException (typeof (ArgumentException))]
                public void GetDirectory3 ()
                {
                        VPU.GetDirectory ("hola");
@@ -310,7 +312,7 @@ namespace MonoTests.System.Web {
                {
                        Assert.AreEqual ("", VPU.GetExtension ("/direc/somefilenoextension"));
                        Assert.AreEqual ("", VPU.GetExtension ("/"));
-                       Assert.AreEqual (".aspx", VPU.GetDirectory ("/////direc///somefile.aspx"));
+                       Assert.AreEqual ("/direc/", VPU.GetDirectory ("/////direc///somefile.aspx"));
                }
 
                [Test]
@@ -438,5 +440,5 @@ namespace MonoTests.System.Web {
        }
 }
 
-#endif
-
+#endif\r
+\r