2005-09-20 Sebastien Pouliot <sebastien@ximian.com>
authorSebastien Pouliot <sebastien@ximian.com>
Tue, 20 Sep 2005 15:40:58 +0000 (15:40 -0000)
committerSebastien Pouliot <sebastien@ximian.com>
Tue, 20 Sep 2005 15:40:58 +0000 (15:40 -0000)
* AdCreatedEventArgsTest.cs, BaseCompareValidatorTest.cs,
CompositeControlTest.cs, DataListTest.cs, DropDownListTest.cs,
EditCommandColumnTest.cs, FontNamesConverterTest.cs, FormViewTest.cs,
ListControlTest.cs, MonthChangedEventArgsTest.cs,
RadioButtonListTest.cs, StyleTest.cs, TableCellTest.cs,
TextBoxTest.cs, TreeViewTest.cs, ValidatedControlConverterTest.cs:
Fixed tests results under 2.0 Release Candidate (for NET_2_0).

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

17 files changed:
mcs/class/System.Web/Test/System.Web.UI.WebControls/AdCreatedEventArgsTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseCompareValidatorTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
mcs/class/System.Web/Test/System.Web.UI.WebControls/CompositeControlTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/DropDownListTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/EditCommandColumnTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/FontNamesConverterTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/ListControlTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/MonthChangedEventArgsTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/RadioButtonListTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/StyleTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/TableCellTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
mcs/class/System.Web/Test/System.Web.UI.WebControls/ValidatedControlConverterTest.cs

index e5e2f4a3e319aa45cc849e5529b15e982046636c..1abe70e6e9bc6f6dc69a2ac3fb2125ec31759e07 100644 (file)
@@ -33,7 +33,7 @@ using System.Web.UI.WebControls;
 
 using NUnit.Framework;
 
-namespace MonoTests.System.Web.UI {
+namespace MonoTests.System.Web.UI.WebControls {
 
        [TestFixture]
        public class AdCreatedEventArgsTest {
index 8e688749c2bc6a13d208cf5f0be7cec8a2c780bb..eeea5699989dab142dab32389c5bedd909d96a39 100644 (file)
@@ -435,11 +435,7 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        BaseCompareValidatorPoker p = new BaseCompareValidatorPoker ();
 
-#if NET_2_0
-                       Assert.AreEqual (p.GetCutoffYear(), 29, "E1");
-#else
                        Assert.AreEqual (p.GetCutoffYear(), 2029, "E1");
-#endif
                        Assert.AreEqual (p.GetFullYear (29), 2029, "E2");
 #if NET_2_0
                        Assert.AreEqual (p.GetFullYear (30), 1930, "E3");
index da1ceec997533ca36d6a801d3080a8bc51aef13a..f92d876bfb440d4af02e9c4b999a78567f9ede1a 100644 (file)
@@ -1,3 +1,13 @@
+2005-09-20  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AdCreatedEventArgsTest.cs, BaseCompareValidatorTest.cs, 
+       CompositeControlTest.cs, DataListTest.cs, DropDownListTest.cs,
+       EditCommandColumnTest.cs, FontNamesConverterTest.cs, FormViewTest.cs,
+       ListControlTest.cs, MonthChangedEventArgsTest.cs, 
+       RadioButtonListTest.cs, StyleTest.cs, TableCellTest.cs, 
+       TextBoxTest.cs, TreeViewTest.cs, ValidatedControlConverterTest.cs:
+       Fixed tests results under 2.0 Release Candidate (for NET_2_0).
+
 2005-09-19 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * DataGridTest.cs: fix expected/actual order. Added test for HeaderText
index 18693dfc832ce1de9438f74c08f609ee2fcb7416..001f76c5d3a9a89ad5e758eb8fab9d72998cd4ea 100644 (file)
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if NET_2_0
+
 using System;
 using NUnit.Framework;
 using System.Web.UI;
@@ -35,7 +37,6 @@ using System.Web.UI.WebControls;
 
 namespace MonoTests.System.Web.UI.WebControls {
 
-#if NET_2_0
   [TestFixture]
   public class CompositeControlTest {
        class Poker : CompositeControl {
@@ -60,7 +61,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                Assert.AreEqual (col.Count, 1, "Controls accessor causes child control creation.");
        }
   }
+}
 
 #endif
-
-}
index de9750d467bc89e53903183f2a95bff7d63cf2f2..f7751703157e04fec4a168f8b49f8ffe42a12178 100644 (file)
@@ -86,17 +86,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                {
                        return SaveViewState ();
                }
-#if NET_2_0
-               public void LoadControl (object state)
-               {
-                       LoadControlState (state);
-               }
 
-               public object SaveControl ()
-               {
-                       return SaveControlState ();
-               }
-#endif
                public void DoCancelCommand (DataListCommandEventArgs e)
                {
                        OnCancelCommand (e);
@@ -252,9 +242,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        Assert.AreEqual (0, dl.Attributes.Count, "Attributes.Count-2");
                        Assert.AreEqual (0, dl.StateBag.Count, "ViewState.Count-2");
-#if NET_2_0
-                       Assert.IsNull (dl.SaveControl (), "SaveControl");
-#endif
                }
 
                [Test]
@@ -307,14 +294,10 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.IsNull (dl.SeparatorTemplate, "SeparatorTemplate");
                        dl.EditItemIndex = -1;
                        Assert.AreEqual (-1, dl.EditItemIndex, "EditItemIndex");
-#if ONLY_1_1
                        Assert.AreEqual (sc++, dl.StateBag.Count, "ViewState.Count-2b");
-#endif
                        dl.SelectedIndex = -1;
                        Assert.AreEqual (-1, dl.SelectedIndex, "SelectedIndex");
-#if ONLY_1_1
                        Assert.AreEqual (sc++, dl.StateBag.Count, "ViewState.Count-2c");
-#endif
                        dl.ExtractTemplateRows = false;
                        Assert.IsFalse (dl.ExtractTemplateRows, "ExtractTemplateRows");
                        Assert.AreEqual (sc++, dl.StateBag.Count, "ViewState.Count-3");
@@ -338,9 +321,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                        CheckIRepeatInfoUser (dl);
 
                        Assert.AreEqual (0, dl.Attributes.Count, "Attributes.Count-2");
-#if NET_2_0
-                       Assert.IsNull (dl.SaveControl (), "SaveControl");
-#endif
                }
 
                [Test]
@@ -403,19 +383,15 @@ namespace MonoTests.System.Web.UI.WebControls {
                        dl.EditItemIndex = 0;
                        Assert.AreEqual (0, dl.EditItemIndex, "EditItemIndex");
 #if NET_2_0
-                       Assert.IsNotNull (dl.SaveControl (), "SaveControl-EditItemIndex");
                        dl.EditItemIndex = -1;
-#else
-                       Assert.AreEqual (sc++, dl.StateBag.Count, "ViewState.Count-2b");
 #endif
+                       Assert.AreEqual (sc++, dl.StateBag.Count, "ViewState.Count-2b");
                        dl.SelectedIndex = 0;
                        Assert.AreEqual (0, dl.SelectedIndex, "SelectedIndex");
 #if NET_2_0
-                       Assert.IsNotNull (dl.SaveControl (), "SaveControl-SelectedIndex");
                        dl.SelectedIndex = -1;
-#else
-                       Assert.AreEqual (sc++, dl.StateBag.Count, "ViewState.Count-2c");
 #endif
+                       Assert.AreEqual (sc++, dl.StateBag.Count, "ViewState.Count-2c");
                        dl.ExtractTemplateRows = true;
                        Assert.IsTrue (dl.ExtractTemplateRows, "ExtractTemplateRows");
                        Assert.AreEqual (sc++, dl.StateBag.Count, "ViewState.Count-3");
@@ -498,9 +474,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                        CheckIRepeatInfoUser (dl);
 
                        Assert.AreEqual (0, dl.Attributes.Count, "Attributes.Count-2");
-#if NET_2_0
-                       Assert.IsNull (dl.SaveControl (), "SaveControl");
-#endif
                }
 
                [Test]
@@ -685,86 +658,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                        dl.DataKeyField = "mono";
                        Assert.IsNull (dl.SelectedValue, "SelectedValue");
                }
-
-               [Test]
-               public void LoadControlState ()
-               {
-                       TestDataList dl = new TestDataList ();
-                       dl.LoadControl (null);
-                       Assert.AreEqual (-1, dl.EditItemIndex, "null-EditItemIndex");
-                       Assert.AreEqual (-1, dl.SelectedIndex, "null-SelectedIndex");
-                       dl.LoadControl (new Triplet (1, 2, 3));
-                       Assert.AreEqual (2, dl.EditItemIndex, "Triplet-EditItemIndex");
-                       Assert.AreEqual (3, dl.SelectedIndex, "Triplet-SelectedIndex");
-                       dl.LoadControl (null);
-                       Assert.AreEqual (-1, dl.EditItemIndex, "null-EditItemIndex-2");
-                       Assert.AreEqual (-1, dl.SelectedIndex, "null-SelectedIndex-2");
-               }
-
-               [Test]
-               public void LoadControlState_FirstTripletObject ()
-               {
-                       TestDataList dl = new TestDataList ();
-                       // first item seems ignored
-                       dl.LoadControl (new Triplet (this, 2, 3));
-                       Assert.AreEqual (2, dl.EditItemIndex, "Triplet-EditItemIndex");
-                       Assert.AreEqual (3, dl.SelectedIndex, "Triplet-SelectedIndex");
-
-                       dl.LoadControl (new Triplet (dl, null, 3));
-                       Assert.AreEqual (-1, dl.EditItemIndex, "Triplet-EditItemIndex-2");
-                       Assert.AreEqual (3, dl.SelectedIndex, "Triplet-SelectedIndex-2");
-
-                       dl.LoadControl (new Triplet (null, 2, null));
-                       Assert.AreEqual (2, dl.EditItemIndex, "Triplet-EditItemIndex-3");
-                       Assert.AreEqual (-1, dl.SelectedIndex, "Triplet-SelectedIndex-3");
-               }
-
-               [Test]
-               [ExpectedException (typeof (InvalidCastException))]
-               public void LoadControlState_SecondTripletObject ()
-               {
-                       TestDataList dl = new TestDataList ();
-                       dl.LoadControl (new Triplet (1, this, 3));
-               }
-
-               [Test]
-               [ExpectedException (typeof (InvalidCastException))]
-               public void LoadControlState_ThirdTripletObject ()
-               {
-                       TestDataList dl = new TestDataList ();
-                       dl.LoadControl (new Triplet (1, 2, this));
-               }
-
-               [Test]
-               [ExpectedException (typeof (InvalidCastException))]
-               public void LoadControlState_BadType ()
-               {
-                       TestDataList dl = new TestDataList ();
-                       dl.LoadControl (this);
-               }
-
-               [Test]
-               public void SaveControlState ()
-               {
-                       TestDataList dl = new TestDataList ();
-                       Assert.IsNull (dl.SaveControl (), "Empty");
-                       dl.EditItemIndex = 0;
-                       Triplet state = (Triplet) dl.SaveControl ();
-                       Assert.IsNull (state.First, "EditItemIndex-First");
-                       Assert.AreEqual (0, (int)state.Second, "EditItemIndex-Second");
-                       Assert.IsNull (state.Third, "EditItemIndex-Third");
-
-                       dl.SelectedIndex = 1;
-                       state = (Triplet) dl.SaveControl ();
-                       Assert.IsNull (state.First, "SelectedIndex-First");
-                       Assert.AreEqual (0, (int)state.Second, "SelectedIndex-Second");
-                       Assert.AreEqual (1, (int)state.Third, "SelectedIndex-Third");
-
-                       dl.EditItemIndex = -1;
-                       state = (Triplet) dl.SaveControl ();
-                       dl.SelectedIndex = -1;
-                       Assert.IsNull (dl.SaveControl (), "Cleaned");
-               }
 #endif
                private bool cancelCommandEvent;
                private bool deleteCommandEvent;
index c61f80c684a6343b7f8dcf7a5c6c65f78e1bd5f9..da62d2d479e40c1fc7a2fd9a47a9f879f76f2a33 100644 (file)
@@ -183,9 +183,11 @@ namespace MonoTests.System.Web.UI.WebControls
                [Test]
                public void DropDownListBasic () {
                        DropDownListTestClass d = new DropDownListTestClass ();
-
+#if NET_2_0
+                       Assert.AreEqual ("<select>\n\n</select>", d.Render (), "B1");
+#else
                        Assert.AreEqual("<select name>\n\n</select>", d.Render(), "B1");
-
+#endif
                        d.ID = "blah";
                        Assert.AreEqual("<select name=\"blah\" id=\"blah\">\n\n</select>", d.Render(), "B2");
 
@@ -269,7 +271,9 @@ namespace MonoTests.System.Web.UI.WebControls
                }
 
                [Test]
+#if ONLY_1_1
                [ExpectedException(typeof(NullReferenceException))]
+#endif
                public void DropDownNullWriterTest () {
                        DropDownListTestClass   d;
 
@@ -307,17 +311,26 @@ namespace MonoTests.System.Web.UI.WebControls
                public void DropDownNamingTest () {
                        NamingContainer container = new NamingContainer ();
                        DropDownListTestClass child = new DropDownListTestClass ();
-
+#if NET_2_0
+                       Assert.AreEqual ("<select>\n\n</select>", child.Render (), "N1");
+#else
                        Assert.AreEqual ("<select name>\n\n</select>", child.Render (), "N1");
-
+#endif
                        container.Controls.Add (child);
-                       Assert.AreEqual ("<select name=\"_ctl0\">\n\n</select>", child.Render (), "N2");
+                       // don't assume the generated id
+                       string s = child.Render ();
+                       Assert.IsTrue (s.StartsWith ("<select name=\""), "N2a");
+                       Assert.IsTrue (s.EndsWith ("\">\n\n</select>"),  "N2b");
 
                        container.ID = "naming";
-                       Assert.AreEqual ("<select name=\"naming:_ctl0\">\n\n</select>", child.Render (), "N3");
+                       s = child.Render ();
+                       Assert.IsTrue (s.StartsWith ("<select name=\"naming"), "N3a");
+                       Assert.IsTrue (s.EndsWith ("\">\n\n</select>"), "N3b");
 
                        child.ID = "fooid";
-                       Assert.AreEqual ("<select name=\"naming:fooid\" id=\"naming_fooid\">\n\n</select>", child.Render (), "N4");
+                       s = child.Render ();
+                       Assert.IsTrue (s.StartsWith ("<select name=\"naming"), "N4a");
+                       Assert.IsTrue (s.EndsWith ("fooid\" id=\"naming_fooid\">\n\n</select>"), "N4b");
                }
 
                [Test]
@@ -353,12 +366,21 @@ namespace MonoTests.System.Web.UI.WebControls
                        ddl.DataValueField = "Company";
                        ddl.DataTextFormatString = "This shouldn't show up = {0}";
                        ddl.DataBind ();
+#if NET_2_0
+                       string exp = @"<select>
+       <option value=""Novell Inc."">Novell Inc.</option>
+       <option value=""Microsoft Corp."">Microsoft Corp.</option>
+       <option value=""Google"">Google</option>
+
+</select>";
+#else
                        string exp = @"<select name>
        <option value=""Novell Inc."">Novell Inc.</option>
        <option value=""Microsoft Corp."">Microsoft Corp.</option>
        <option value=""Google"">Google</option>
 
 </select>";
+#endif
                        Assert.AreEqual (exp, ddl.Render ());
                }
        }
index 9c5efbbd0af6e3fd944ea73f623a2e61d5353730..b77c737f570ba91780d2d3be1c7a6d6425471b8e 100644 (file)
@@ -32,7 +32,6 @@ using NUnit.Framework;
 using System;
 using System.Collections;
 using System.Data;
-using System.Drawing;
 using System.IO;
 using System.Globalization;
 using System.Web;
@@ -149,12 +148,19 @@ namespace MonoTests.System.Web.UI.WebControls
                        markup = markup.Replace ("\r", "");
                        markup = markup.Replace ("\n", "");
 
+#if NET_2_0
+                       Assert.AreEqual (
+                               "<table border=\"0\"><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td>" +
+                               "</tr><tr><td><a>Edit</a></td><td><input name=\"sucker$ctl02$ctl00\" type=\"submit\" value=\"Bearbeiten\" /></td><td>1</td><td>2</td><td>3</td>" +
+                               "</tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>" +
+                               "</tr></table>", markup, "I2");
+#else
                        Assert.AreEqual (
                                "<table border=\"0\" id=\"sucker\"><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td>" +
                                "</tr><tr><td><a>Edit</a></td><td><input name type=\"submit\" value=\"Bearbeiten\" /></td><td>1</td><td>2</td><td>3</td>" + 
                                "</tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>" +
                                "</tr></table>", markup, "I2");
-
+#endif
                        //ShowControlsRecursive (p.Controls [0], 1);
                }
 
@@ -201,6 +207,17 @@ namespace MonoTests.System.Web.UI.WebControls
 //Console.WriteLine("Markup:>{0}<", markup);
                        Assert.AreEqual (2, p.Columns.Count, "I1");
 
+#if NET_2_0
+                       Assert.AreEqual (
+                               "<table border=\"0\"><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td>" + 
+                               "</tr><tr><td><a>Update</a>&nbsp;<a>Cancel</a></td><td><input name=\"sucker$ctl02$ctl00\" type=\"submit\" value=\"Refresh\" />&nbsp;" + 
+                               "<input name=\"sucker$ctl02$ctl01\" type=\"submit\" value=\"Abbrechen\" /></td>" + 
+                               "<td><input name=\"sucker$ctl02$ctl02\" type=\"text\" value=\"1\" /></td>" + 
+                               "<td><input name=\"sucker$ctl02$ctl03\" type=\"text\" value=\"2\" /></td>" + 
+                               "<td><input name=\"sucker$ctl02$ctl04\" type=\"text\" value=\"3\" /></td>" + 
+                               "</tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>" +
+                               "</tr></table>", markup, "I2");
+#else
                        Assert.AreEqual (
                                "<table border=\"0\" id=\"sucker\"><tr><td>&nbsp;</td><td>&nbsp;</td><td>one</td><td>two</td><td>three</td>" +
                                "</tr><tr><td><a>Update</a>&nbsp;<a>Cancel</a></td><td><input name type=\"submit\" value=\"Refresh\" />&nbsp;" +
@@ -210,6 +227,7 @@ namespace MonoTests.System.Web.UI.WebControls
                                "<td><input name=\"sucker:_ctl2:_ctl2\" type=\"text\" value=\"3\" /></td>" + 
                                "</tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>" +
                                "</tr></table>", markup, "I2");
+#endif
                }
 
                [Test]
index 5236f4e290106173c8d5f8a18ae877a02c6db01a..be9b5b5ef383a6bff01fc5ee3bf904099a7835cb 100644 (file)
@@ -66,14 +66,16 @@ namespace MonoTests.System.Web.UI.WebControls
                        // list of font names separated by comma.
                        // Why does the CanConvertFrom() and CanConvertTo() then indicate that it cannot handle string[]???
                        // It obviously works:
+#if ONLY_1_1
                        Assert.AreEqual (name_array, conv.ConvertFrom(null, null, name_list), "B7");
                        Assert.AreEqual (name_list, conv.ConvertTo(null, null, name_array, typeof(string)), "B8");
 
                        // Special cases
                        Assert.AreEqual ("", conv.ConvertTo(null, null, new string[0], typeof(string)), "B9");
+#endif
                        Assert.AreEqual ("", conv.ConvertTo(null, null, null, typeof(string)), "B10");
                        Assert.AreEqual (new string[0], conv.ConvertFrom(null, null, ""), "B11");
-
+#if ONLY_1_1
                        // Roundtrip
                        Assert.AreEqual (name_list, conv.ConvertTo(null, null, conv.ConvertFrom(null, null, name_list), typeof(string)), "B12");
 
@@ -86,6 +88,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        // This is stupid behaviour and prevents roundtripping; why trim in ConvertFrom and not in ConvertTo?
                        Assert.AreEqual ("Arial\n,Courier\n", conv.ConvertTo(null, null, new string[] { "Arial\n", "Courier\n" }, typeof(string)), "B17");
                        Assert.AreEqual ("Arial,\n,Courier\n", conv.ConvertTo(null, null, new string[] { "Arial,\n", "Courier\n" }, typeof(string)), "B18");
+#endif
                }
        }
 }
index 0950f3e1b5dc6f5030b4a1a6bbc1791bd985d4f7..95d670c6f4424846cf5288405fc4561bd78607b5 100644 (file)
@@ -75,33 +75,33 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual (0, p.DataKey.Values.Count, "A11.1");
                        Assert.IsNull (p.EditItemTemplate, "A12");
                        Assert.IsNotNull (p.EditRowStyle, "A13");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.EditRowStyle), "A13.1");
+
                        Assert.IsNotNull (p.EmptyDataRowStyle, "A14");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.EmptyDataRowStyle), "A14.1");
+
                        Assert.IsNull (p.EmptyDataTemplate, "A15");
                        Assert.AreEqual ("", p.EmptyDataText, "A16");
                        Assert.IsNull (p.FooterRow, "A17");
                        Assert.IsNull (p.FooterTemplate, "A18");
                        Assert.AreEqual ("", p.FooterText, "A19");
                        Assert.IsNotNull (p.FooterStyle, "A20");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.FooterStyle), "A20.1");
+
                        Assert.AreEqual (GridLines.None, p.GridLines, "A21");
                        Assert.IsNull (p.HeaderRow, "A22");
                        Assert.IsNotNull (p.HeaderStyle, "A23");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.HeaderStyle), "A23.1");
+
                        Assert.IsNull (p.HeaderTemplate, "A24");
                        Assert.AreEqual ("", p.HeaderText, "A25");
                        Assert.AreEqual (HorizontalAlign.NotSet, p.HorizontalAlign, "A26");
                        Assert.IsNull (p.InsertItemTemplate, "A27");
                        Assert.IsNotNull (p.InsertRowStyle, "A28");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.InsertRowStyle), "A28.1");
+
                        Assert.IsNull (p.ItemTemplate, "A29");
                        Assert.AreEqual (0, p.PageCount, "A30");
                        Assert.AreEqual (0, p.PageIndex, "A31");
                        Assert.IsNull (p.PagerTemplate, "A32");
                        Assert.IsNull (p.Row, "A33");
                        Assert.IsNotNull (p.RowStyle, "A34");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.RowStyle), "A34.1");
+
                        Assert.IsNull (p.SelectedValue, "A35");
                        Assert.IsNull (p.TopPagerRow, "A36");
                        Assert.IsNull (p.DataItem, "A37");
index adef1a989f6eef5b23c12efb6a361f373f504bc2..38d85a272dcad35c09988a2d668584ef96140c25 100644 (file)
@@ -31,7 +31,6 @@
 using NUnit.Framework;
 using System;
 using System.IO;
-using System.Drawing;
 using System.Collections;
 using System.Globalization;
 using System.Web;
@@ -66,17 +65,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                        return ViewState [name];
                }
 
-#if NET_2_0
-               public void LoadControl (object state)
-               {
-                       LoadControlState (state);
-               }
-
-               public object SaveControl ()
-               {
-                       return SaveControlState ();
-               }
-#endif
                public string Render ()
                {
                        StringWriter sw = new StringWriter ();
@@ -225,10 +213,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        b.Items.Add ("b");
                        b.Items.Add ("c");
 
-                       object state = a.SaveControl();
-                       b.LoadControl (state);
-
-                       Assert.AreEqual (b.SelectedIndex, 2, "A1");
+                       Assert.AreEqual (-1, b.SelectedIndex, "A1");
                }
 #endif
 
@@ -252,11 +237,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        object state = a.SaveState ();
                        b.LoadState (state);
 
-#if NET_2_0
-                       Assert.AreEqual (b.SelectedIndex, -1, "A1");
-#else
-                       Assert.AreEqual (b.SelectedIndex, 2, "A1");
-#endif
+                       Assert.AreEqual (2, b.SelectedIndex, "A1");
                        Assert.AreEqual (b.Items.Count, 3, "A2");
 
                        Assert.AreEqual (b.Items [0].Value, "a", "A3");
index abd1016a2bce6bb9065e8bf1adaff448b61e300d..590380dd5457fddef22e461b9c264ce37755c5d8 100644 (file)
@@ -47,7 +47,7 @@ namespace MonoTests.System.Web.UI.WebControls {
 
                        MonthChangedEventArgs e = new MonthChangedEventArgs (now, later);
                        Assert.AreEqual (e.NewDate, now, "A1");
-                       Assert.AreEqual (e.PreviousData, later, "A2");
+                       Assert.AreEqual (e.PreviousDate, later, "A2");
                }
        }
 }
index 85d6ed2457a6f7b93c03f863ab454bd8e24082fe..a183f46a0efc669df3c2ab7273f7d03ca6968d5a 100644 (file)
@@ -33,7 +33,6 @@ using System.Web.UI.WebControls;
 using NUnit.Framework;
 using System;
 using System.Collections.Specialized;
-using System.Drawing;
 using System.IO;
 using System.Web;
 using System.Web.UI;
@@ -82,7 +81,12 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual (5, r.CellPadding, "setting");
 
                        string s = r.Render (); 
+#if NET_2_0
+                       // FIXME: missing some info to start rendering ?
+                       Assert.AreEqual (String.Empty, s, "htmloutput");
+#else
                        Assert.IsTrue (s.ToLower ().IndexOf ("cellpadding=\"5\"") !=  -1, "htmloutput");
+#endif
                }       
 
                [Test]
@@ -93,10 +97,19 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual (5, r.CellSpacing, "setting");
 
                        string s = r.Render (); 
+#if NET_2_0
+                       // FIXME: missing some info to start rendering ?
+                       Assert.AreEqual (String.Empty, s, "htmloutput");
+#else
                        Assert.IsTrue (s.ToLower ().IndexOf ("cellspacing=\"5\"") !=  -1, "htmloutput");
+#endif
                }       
 
                [Test]
+#if NET_2_0
+               // FIXME: missing some info to start rendering ?
+               [ExpectedException (typeof (NullReferenceException))]
+#endif
                public void Render ()
                {
                        TestRadioButtonList c = new TestRadioButtonList ();
@@ -154,12 +167,20 @@ namespace MonoTests.System.Web.UI.WebControls {
                        nvc ["XXX"] = "3";
 
                        IPostBackDataHandler handler = (IPostBackDataHandler) rbl;
-                       Assert.AreEqual (true, handler.LoadPostData ("XXX", nvc), "#01");
+#if NET_2_0
+                       Assert.IsFalse (handler.LoadPostData ("XXX", nvc), "#01");
+#else
+                       Assert.IsTrue (handler.LoadPostData ("XXX", nvc), "#01");
+#endif
                        rbl.SelectedIndexChanged += new EventHandler (OnSelected);
                        event_called = false;
                        handler.RaisePostDataChangedEvent ();
+#if NET_2_0
+                       Assert.IsTrue (event_called, "#02");
+#else
                        // Not called. Value is the same as the selected previously
-                       Assert.AreEqual (false, event_called, "#02");
+                       Assert.IsFalse (event_called, "#02");
+#endif
                        Assert.AreEqual ("3", rbl.SelectedValue, "#03");
                }
 
index 69d780eafea1dfeefb4e896787ca5774cd8f3fb5..8cb2eb508b325414f3a923e4fb3c4a1c5af518f0 100644 (file)
@@ -312,10 +312,13 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        StyleTestClass s = new StyleTestClass ();
 
-                       Assert.AreEqual (null, s.RegisteredCssClass, "Css1");
+                       Assert.AreEqual (String.Empty, s.RegisteredCssClass, "Css1");
 
-                       s.SetCssClass("blah");
-                       Assert.AreEqual ("blah", s.RegisteredCssClass, "Css2");
+                       s.SetCssClass ("blah");
+                       Assert.AreEqual (String.Empty, s.RegisteredCssClass, "Css2");
+
+                       s.BackColor = Color.AliceBlue;
+                       Assert.AreEqual (String.Empty, s.RegisteredCssClass, "Css3");
                }
 #endif
 
@@ -453,13 +456,5 @@ namespace MonoTests.System.Web.UI.WebControls
                        s.AddAttributesToRender(writer);
                        // Figure out an order-independent way to verify rendered results
                }
-#if NET_2_0
-               [Test]
-               public void IsStyleEmpty ()
-               {
-                       Assert.IsTrue (Style.IsStyleEmpty (null), "null");
-                       Assert.IsTrue (Style.IsStyleEmpty (new Style ()), "new");
-               }
-#endif
        }
 }
index 1c52b84fdd6160b48c25ce07213b9cb4dfa1afb4..0117f78e52ad09025698ba3387e7ffd265c16b63 100644 (file)
@@ -241,7 +241,11 @@ namespace MonoTests.System.Web.UI.WebControls {
                        // this replace the current Text property
                        td.Add (new LiteralControl ("Go Mono"));
                        Assert.IsFalse (td.HasControls (), "!HasControls-2");
+#if NET_2_0
+                       Assert.AreEqual ("MonoGo Mono", td.Text, "Text-2");
+#else
                        Assert.AreEqual ("Go Mono", td.Text, "Text-2");
+#endif
                }
 
                [Test]
@@ -281,7 +285,11 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual ("Mono", td.Text, "Text");
                        td.Add (new LiteralControl ("Mono2"));
                        Assert.IsFalse (td.HasControls (), "HasControls-2");
+#if NET_2_0
+                       Assert.AreEqual ("MonoMono2", td.Text, "Text");
+#else
                        Assert.AreEqual ("Mono2", td.Text, "Text");
+#endif
                        Assert.AreEqual (0, td.Controls.Count, "NControls");
                }
 
index 7ffa2381a8b811b9df615a632b7969753ceaee7e..715357e750ad8cf818c3cdf8c203cadfe37d391b 100644 (file)
@@ -81,7 +81,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.TextMode = TextBoxMode.MultiLine;
                        t.Text = "</textarea>";
 #if NET_2_0
-                       string exp = "<textarea rows=\"0\" cols=\"0\">&lt;/textarea&gt;</textarea>";
+                       string exp = "<textarea rows=\"2\" cols=\"20\">&lt;/textarea&gt;</textarea>";
 #else
                        string exp = "<textarea name>&lt;/textarea&gt;</textarea>";
 #endif
@@ -141,7 +141,7 @@ namespace MonoTests.System.Web.UI.WebControls {
                        t.CausesValidation = true;
                        t.TextMode = TextBoxMode.MultiLine;
 
-                       string exp = "<textarea rows=\"0\" cols=\"0\"></textarea>";
+                       string exp = "<textarea rows=\"2\" cols=\"20\"></textarea>";
                        Assert.AreEqual (exp, t.Render ());
                }
 #endif
index 87c9f24ecf2de2c87c578c0fd672c35cd6b7a1d1..e53be0cd9768ecccb79399e9dd47f6b17c4a6f8a 100644 (file)
@@ -84,20 +84,6 @@ namespace MonoTests.System.Web.UI.WebControls {
                        Assert.AreEqual ("", p.Target, "A30");
                        Assert.IsTrue (p.Visible, "A31");
                }
-
-               [Test]
-               public void DefaultStyles()
-               {
-                       TreeViewPoker p = new TreeViewPoker ();
-
-                       Assert.IsTrue (Style.IsStyleEmpty (p.HoverNodeStyle), "A1");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.LeafNodeStyle), "A2");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.NodeStyle), "A3");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.ParentNodeStyle), "A4");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.RootNodeStyle), "A5");
-                       Assert.IsTrue (Style.IsStyleEmpty (p.SelectedNodeStyle), "A6");
-               }
-
        }
 
 }
index d4187b25a5535ee3dcc8de37b5463774492d5e03..339e5bdc3bcea1bed53ad350474984411ba56ee6 100644 (file)
@@ -32,7 +32,6 @@ using NUnit.Framework;
 using System;
 using System.Collections;
 using System.ComponentModel;
-using System.Drawing;
 using System.IO;
 using System.Globalization;
 using System.Web;
@@ -129,6 +128,9 @@ namespace MonoTests.System.Web.UI.WebControls
                        conv = new ValidatedControlConverter();
 
                        values = conv.GetStandardValues(context);
+#if NET_2_0
+                       Assert.IsNull (values, "B1");
+#else
                        Assert.AreEqual(3, values.Count, "B1");
 
                        result = new string[values.Count];
@@ -141,6 +143,7 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual(false, conv.GetStandardValuesExclusive(null), "B3");
                        Assert.AreEqual(true, conv.GetStandardValuesSupported(null), "B4");
                        Assert.AreEqual(null, conv.GetStandardValues(null), "B5");
+#endif
                }
        }
 }