Author: lpage
Date: 2008-02-03 09:12:47 -0500 (Sun, 03 Feb 2008)
New Revision: 94688

Modified:
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/RichTextBoxTest.cs
Log:
2008-02-03  Luke Page   <[EMAIL PROTECTED]>

        * RichTextBoxTest.cs: Restored property test with failing tests
        commented so that it tests the fix to bug 358379 that AutoSize
        defaults to false.

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog   
2008-02-03 14:06:30 UTC (rev 94687)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog   
2008-02-03 14:12:47 UTC (rev 94688)
@@ -1,5 +1,11 @@
 2008-02-03  Luke Page   <[EMAIL PROTECTED]>
 
+       * RichTextBoxTest.cs: Restored property test with failing tests
+       commented so that it tests the fix to bug 358379 that AutoSize
+       defaults to false.
+
+2008-02-03  Luke Page   <[EMAIL PROTECTED]>
+
        * TextBoxTest.cs: Added test from James Purcell for bug #358229 to
        test FixedHeight control style when multiline changed.
 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/RichTextBoxTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/RichTextBoxTest.cs
  2008-02-03 14:06:30 UTC (rev 94687)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/RichTextBoxTest.cs
  2008-02-03 14:12:47 UTC (rev 94688)
@@ -20,7 +20,6 @@
        [TestFixture]
        public class RichTextBoxTest
        {
-#if not
                [Test]
                public void RichTextBoxPropertyTest ()
                {
@@ -45,11 +44,11 @@
                        Assert.AreEqual (0, rTBox.BulletIndent, "#B3");
                        
                        // C
-                       Assert.AreEqual (false, rTBox.CanRedo, "#C1");
-                       rTBox.Paste ();
-                       Assert.AreEqual (false, rTBox.CanRedo, "#C2");
-                       rTBox.ClearUndo ();
-                       Assert.AreEqual (false, rTBox.CanRedo, "#C3");
+                       //Assert.AreEqual (false, rTBox.CanRedo, "#C1");
+                       //rTBox.Paste ();
+                       //Assert.AreEqual (false, rTBox.CanRedo, "#C2");
+                       //rTBox.ClearUndo ();
+                       //Assert.AreEqual (false, rTBox.CanRedo, "#C3");
 
                        // D
                        Assert.AreEqual (true, rTBox.DetectUrls, "#D1");
@@ -71,18 +70,21 @@
                        // [MonoTODO ("Assert.AreEqual (false, rTBox.Rtf, 
"#R3");") ]
 
                        // S
-       
+#if ONLY_1_1   
+                       Assert.AreEqual (null, rTBox.SelectedText, "#S3");
+#else
                        Assert.AreEqual ("", rTBox.SelectedText, "#S3");
+#endif
                        rTBox.Text = "sample TextBox";
                        Assert.AreEqual (HorizontalAlignment.Left, 
rTBox.SelectionAlignment, "#S5");
                        Assert.AreEqual (false, rTBox.SelectionBullet, "#S6");
                        Assert.AreEqual (0, rTBox.SelectionCharOffset, "#S7");
                        //Assert.AreEqual (Color.Black, rTBox.SelectionColor, 
"#S8"); // Random color
-                       Assert.AreEqual ("Courier New", 
rTBox.SelectionFont.Name, "#S9a");
+                       //Assert.AreEqual ("Courier New", 
rTBox.SelectionFont.Name, "#S9a");
                        Assert.AreEqual (FontStyle.Regular, 
rTBox.SelectionFont.Style, "#S9b");
                        Assert.AreEqual (0, rTBox.SelectionHangingIndent, 
"#S10");
                        Assert.AreEqual (0, rTBox.SelectionIndent, "#S11");
-                       Assert.AreEqual (0, rTBox.SelectionLength, "#S12");
+                       //Assert.AreEqual (0, rTBox.SelectionLength, "#S12");
                        Assert.AreEqual (false, rTBox.SelectionProtected, 
"#S13");
                        Assert.AreEqual (0, rTBox.SelectionRightIndent, "#S14");
                        Assert.AreEqual (false, rTBox.ShowSelectionMargin, 
"#S15");
@@ -100,6 +102,7 @@
                        Assert.AreEqual (1, rTBox.ZoomFactor, "#Z1");
                }
 
+#if not
                [Test]
                public void CanPasteTest ()
                {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to