2005-09-07 Chris Toshok <toshok@ximian.com>

	* CalendarTest.cs (TestSelectedColorDefault): we need to split up
	the color tests since they're rendered in different orders by
	ms/us.

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

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 b6e7ccb014801c2bc8431d77c4a848c16d1553f8..1aca8763223aedf1819a6d3bf98199061052a300 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
@@ -600,7 +600,8 @@ namespace MonoTests.System.Web.UI.WebControls
                        PokerCalendar p = new PokerCalendar ();
                        p.TodaysDate = new DateTime (2005, 8, 4);
                        p.SelectedDate = p.TodaysDate;
-                       Assert.IsTrue (p.Render ().IndexOf ("color:White;background-color:Silver;")  != -1);
+                       string s = p.Render();
+                       Assert.IsTrue (s.IndexOf ("color:White") != 1 && s.IndexOf ("background-color:Silver") != -1, "A1");
                }
        }
 }

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 2a4a49e50940b8026d165b4d6563bf258de1f862..8c6cd3988c496c642dafd27dc999840e7b83e7dd 100644 (file)
--- 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,9 @@
+2005-09-07  Chris Toshok  <toshok@ximian.com>
+
+       * CalendarTest.cs (TestSelectedColorDefault): we need to split up
+       the color tests since they're rendered in different orders by
+       ms/us.
+
 2005-09-07  Chris Toshok  <toshok@ximian.com>
 
        * ListControlTest.cs: add tests for the ControlState.