Author: gert
Date: 2007-12-05 06:34:39 -0500 (Wed, 05 Dec 2007)
New Revision: 90751
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LinkLabelTest.cs
Log:
* LinkLabelTest.cs: Added tests for bug #344012, bug #346154 and
bug #346156.
* LinkLabel.cs: Fixed paramname of ArgumentNullException in ctor of
LinkCollection. Spaces to tabs, and removed extra tabs.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-12-05 10:42:53 UTC (rev 90750)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-12-05 11:34:39 UTC (rev 90751)
@@ -1,3 +1,8 @@
+2007-12-05 Gert Driesen <[EMAIL PROTECTED]>
+
+ * LinkLabel.cs: Fixed paramname of ArgumentNullException in ctor of
+ LinkCollection. Spaces to tabs, and removed extra tabs.
+
2007-12-04 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* XplatUIX11.cs: Make toolwindows' decorations show up without causing
any
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
2007-12-05 10:42:53 UTC (rev 90750)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
2007-12-05 11:34:39 UTC (rev 90751)
@@ -219,11 +219,10 @@
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
public LinkLabel.LinkCollection Links {
get {
- if (link_collection == null)
- link_collection = new LinkCollection
(this);
-
- return link_collection;
- }
+ if (link_collection == null)
+ link_collection = new LinkCollection
(this);
+ return link_collection;
+ }
}
[DefaultValue (false)]
@@ -249,13 +248,13 @@
[RefreshProperties(RefreshProperties.Repaint)]
public override string Text {
- get { return base.Text; }
+ get { return base.Text; }
set {
if (base.Text == value)
return;
base.Text = value;
- CreateLinkPieces ();
+ CreateLinkPieces ();
}
}
@@ -309,7 +308,7 @@
protected override void CreateHandle ()
{
base.CreateHandle ();
- CreateLinkPieces ();
+ CreateLinkPieces ();
}
#if NET_2_0
@@ -333,7 +332,7 @@
protected override void OnGotFocus (EventArgs e)
{
- base.OnGotFocus (e);
+ base.OnGotFocus (e);
// Set focus to the first enabled link piece
if (focused_index == -1) {
@@ -381,7 +380,7 @@
protected override void OnLostFocus (EventArgs e)
{
- base.OnLostFocus (e);
+ base.OnLostFocus (e);
// Clean focus in link pieces
if (focused_index != -1)
@@ -493,7 +492,7 @@
protected override void OnTextAlignChanged (EventArgs e)
{
- CreateLinkPieces ();
+ CreateLinkPieces ();
base.OnTextAlignChanged (e);
}
@@ -536,8 +535,7 @@
return;
}
}
- }
- else {
+ } else {
if (focused_index == -1)
focused_index =
sorted_links.Length;
@@ -719,7 +717,7 @@
internal int length;
private object linkData;
private int start;
- private bool visited;
+ private bool visited;
private LinkLabel owner;
private bool hovered;
internal ArrayList pieces;
@@ -917,8 +915,8 @@
public LinkCollection (LinkLabel owner)
{
- if (owner==null)
- throw new ArgumentNullException ();
+ if (owner == null)
+ throw new ArgumentNullException
("owner");
this.owner = owner;
}
@@ -932,7 +930,7 @@
get { return false; }
}
- public virtual LinkLabel.Link this[int index] {
+ public virtual LinkLabel.Link this[int index] {
get {
if (index < 0 || index >= Count)
throw new
ArgumentOutOfRangeException();
@@ -1136,7 +1134,6 @@
get {
return use_compatible_text_rendering;
}
-
set {
use_compatible_text_rendering = value;
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-12-05 10:42:53 UTC (rev 90750)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-12-05 11:34:39 UTC (rev 90751)
@@ -1,3 +1,8 @@
+2007-12-05 Gert Driesen <[EMAIL PROTECTED]>
+
+ * LinkLabelTest.cs: Added tests for bug #344012, bug #346154 and
+ bug #346156.
+
2007-11-23 Gert Driesen <[EMAIL PROTECTED]>
* MenuStripTest.cs: Added test for bug #342358.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LinkLabelTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LinkLabelTest.cs
2007-12-05 10:42:53 UTC (rev 90750)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LinkLabelTest.cs
2007-12-05 11:34:39 UTC (rev 90751)
@@ -51,6 +51,27 @@
Assert.AreEqual (0, l.LinkArea.Start, "#5");
Assert.AreEqual (0, l.LinkArea.Length, "#6");
}
+
+ [Test] // bug #344012
+ public void InvalidateManualLinks ()
+ {
+ Form form = new Form ();
+ form.ShowInTaskbar = false;
+
+ LinkLabel l = new LinkLabel ();
+ l.Text = "linkLabel1";
+ form.Controls.Add (l);
+
+#if NET_2_0
+ LinkLabel.Link link = new LinkLabel.Link (2, 5);
+ l.Links.Add (link);
+#else
+ l.Links.Add (2, 5);
+#endif
+
+ form.Show ();
+ form.Dispose ();
+ }
#if NET_2_0
[TestFixture]
@@ -94,5 +115,291 @@
}
}
#endif
+
+ [TestFixture]
+ public class LinkCollectionTest
+ {
+ [Test] // ctor (LinkLabel)
+ [Category ("NotWorking")]
+ public void Constructor1 ()
+ {
+ LinkLabel l = new LinkLabel ();
+ l.Text = "Managed Windows Forms";
+
+ LinkLabel.LinkCollection links1 = new
LinkLabel.LinkCollection (
+ l);
+ LinkLabel.LinkCollection links2 = new
LinkLabel.LinkCollection (
+ l);
+
+ Assert.AreEqual (1, links1.Count, "#A1");
+ Assert.IsFalse (links1.IsReadOnly, "#A2");
+#if NET_2_0
+ Assert.IsFalse (links1.LinksAdded, "#A3");
+#endif
+
+ LinkLabel.Link link = links1 [0];
+#if NET_2_0
+ Assert.IsNull (link.Description, "#B1");
+#endif
+ Assert.IsTrue (link.Enabled, "#B2");
+ Assert.AreEqual (21, link.Length, "#B3");
+ Assert.IsNull (link.LinkData, "#B4");
+#if NET_2_0
+ Assert.IsNotNull (link.Name, "#B5");
+ Assert.AreEqual (string.Empty, link.Name,
"#B6");
+#endif
+ Assert.AreEqual (0, link.Start, "#B7");
+#if NET_2_0
+ Assert.IsNull (link.Tag, "#B8");
+#endif
+ Assert.IsFalse (link.Visited, "#B9");
+
+ Assert.AreEqual (1, links2.Count, "#C1");
+ Assert.IsFalse (links2.IsReadOnly, "#C2");
+#if NET_2_0
+ Assert.IsFalse (links2.LinksAdded, "#C3");
+#endif
+ Assert.AreSame (link, links2 [0], "#C4");
+ }
+
+ [Test] // ctor (LinkLabel)
+ public void Constructor1_Owner_Null ()
+ {
+ try {
+ new LinkLabel.LinkCollection
((LinkLabel) null);
+ Assert.Fail ("#1");
+ } catch (ArgumentNullException ex) {
+ Assert.AreEqual (typeof
(ArgumentNullException), ex.GetType (), "#2");
+ Assert.IsNull (ex.InnerException, "#3");
+ Assert.IsNotNull (ex.Message, "#4");
+ Assert.IsNotNull (ex.ParamName, "#5");
+ Assert.AreEqual ("owner", ex.ParamName,
"#6");
+ }
+ }
+
+#if NET_2_0
+ [Test] // Add (LinkLabel.Link)
+ [Category ("NotWorking")] // bug #346154
+ public void Add1 ()
+ {
+ LinkLabel l = new LinkLabel ();
+ l.Text = "Managed Windows Forms";
+
+ LinkLabel.LinkCollection links1 = new
LinkLabel.LinkCollection (
+ l);
+ LinkLabel.LinkCollection links2 = new
LinkLabel.LinkCollection (
+ l);
+
+ LinkLabel.Link linkA = new LinkLabel.Link (0,
7);
+ Assert.AreEqual (0, links1.Add (linkA), "#A1");
+ Assert.AreEqual (1, links1.Count, "#A2");
+ Assert.AreEqual (1, links2.Count, "#A3");
+ Assert.IsTrue (links1.LinksAdded, "#A4");
+ Assert.IsFalse (links2.LinksAdded, "#A5");
+ Assert.AreSame (linkA, links1 [0], "#A6");
+ Assert.AreSame (linkA, links2 [0], "#A7");
+
+ LinkLabel.Link linkB = new LinkLabel.Link (8,
7);
+ Assert.AreEqual (1, links1.Add (linkB), "#B1");
+ Assert.AreEqual (2, links1.Count, "#B2");
+ Assert.AreEqual (2, links2.Count, "#B3");
+ Assert.IsTrue (links1.LinksAdded, "#B4");
+ Assert.IsFalse (links2.LinksAdded, "#B5");
+ Assert.AreSame (linkA, links1 [0], "#B6");
+ Assert.AreSame (linkA, links2 [0], "#B7");
+ Assert.AreSame (linkB, links1 [1], "#B8");
+ Assert.AreSame (linkB, links2 [1], "#B9");
+
+ LinkLabel.LinkCollection links3 = new
LinkLabel.LinkCollection (
+ l);
+ Assert.AreEqual (2, links3.Count, "#C1");
+ Assert.IsFalse (links3.LinksAdded, "#C2");
+ Assert.AreSame (linkA, links3 [0], "#C3");
+ Assert.AreSame (linkB, links3 [1], "#C4");
+ }
+
+ [Test] // Add (LinkLabel.Link)
+ [Category ("NotWorking")] // bug #346156
+ public void Add1_Overlap ()
+ {
+ LinkLabel l = new LinkLabel ();
+ l.Text = "Managed Windows Forms";
+
+ LinkLabel.LinkCollection links = new
LinkLabel.LinkCollection (
+ l);
+
+ LinkLabel.Link linkA = new LinkLabel.Link (0,
7);
+ links.Add (linkA);
+ Assert.AreEqual (1, links.Count, "#A1");
+ Assert.IsTrue (links.LinksAdded, "#A2");
+ Assert.AreSame (linkA, links [0], "#A3");
+
+ LinkLabel.Link linkB = new LinkLabel.Link (5,
4);
+ try {
+ links.Add (linkB);
+ Assert.Fail ("#B1");
+ } catch (InvalidOperationException ex) {
+ // Overlapping link regions
+ Assert.AreEqual (typeof
(InvalidOperationException), ex.GetType (), "#B2");
+ Assert.IsNull (ex.InnerException,
"#B3");
+ Assert.IsNotNull (ex.Message, "#B4");
+ }
+
+ Assert.AreEqual (2, links.Count, "#B5");
+ Assert.IsTrue (links.LinksAdded, "#B6");
+ Assert.AreSame (linkA, links [0], "#B7");
+ Assert.AreSame (linkB, links [1], "#B8");
+ Assert.AreEqual (0, linkA.Start, "#B9");
+ Assert.AreEqual (7, linkA.Length, "#B10");
+ Assert.AreEqual (5, linkB.Start, "#B11");
+ Assert.AreEqual (4, linkB.Length, "#B12");
+
+ LinkLabel.Link linkC = new LinkLabel.Link (14,
3);
+ try {
+ links.Add (linkC);
+ Assert.Fail ("#C1");
+ } catch (InvalidOperationException ex) {
+ // Overlapping link regions
+ Assert.AreEqual (typeof
(InvalidOperationException), ex.GetType (), "#C2");
+ Assert.IsNull (ex.InnerException,
"#C3");
+ Assert.IsNotNull (ex.Message, "#C4");
+ }
+
+ Assert.AreEqual (3, links.Count, "#C5");
+ Assert.IsTrue (links.LinksAdded, "#C6");
+ Assert.AreSame (linkA, links [0], "#C7");
+ Assert.AreSame (linkB, links [1], "#C8");
+ Assert.AreSame (linkC, links [2], "#C9");
+ Assert.AreEqual (0, linkA.Start, "#C10");
+ Assert.AreEqual (7, linkA.Length, "#C11");
+ Assert.AreEqual (5, linkB.Start, "#C12");
+ Assert.AreEqual (4, linkB.Length, "#C13");
+ Assert.AreEqual (14, linkC.Start, "#C14");
+ Assert.AreEqual (3, linkC.Length, "#C15");
+ }
+
+ [Test] // Add (LinkLabel.Link)
+ public void Add1_Value_Null ()
+ {
+ LinkLabel l = new LinkLabel ();
+ l.Text = "Managed Windows Forms";
+
+ LinkLabel.LinkCollection links = new
LinkLabel.LinkCollection (
+ l);
+ try {
+ links.Add ((LinkLabel.Link) null);
+ Assert.Fail ("#1");
+ } catch (NullReferenceException) {
+ }
+ }
+#endif
+
+ [Test] // Add (int, int)
+ [Category ("NotWorking")] // bug #346154
+ public void Add2 ()
+ {
+ LinkLabel l = new LinkLabel ();
+ l.Text = "Managed Windows Forms";
+
+ LinkLabel.LinkCollection links1 = new
LinkLabel.LinkCollection (
+ l);
+ LinkLabel.LinkCollection links2 = new
LinkLabel.LinkCollection (
+ l);
+
+ LinkLabel.Link linkA = links1.Add (0, 7);
+ Assert.AreEqual (1, links1.Count, "#A1");
+ Assert.AreEqual (1, links2.Count, "#A2");
+#if NET_2_0
+ Assert.IsTrue (links1.LinksAdded, "#A3");
+ Assert.IsFalse (links2.LinksAdded, "#A4");
+#endif
+ Assert.AreSame (linkA, links1 [0], "#A5");
+ Assert.AreSame (linkA, links2 [0], "#A6");
+
+ LinkLabel.Link linkB = links1.Add (8, 7);
+ Assert.AreEqual (2, links1.Count, "#B1");
+ Assert.AreEqual (2, links2.Count, "#B2");
+#if NET_2_0
+ Assert.IsTrue (links1.LinksAdded, "#B3");
+ Assert.IsFalse (links2.LinksAdded, "#B4");
+#endif
+ Assert.AreSame (linkA, links1 [0], "#B5");
+ Assert.AreSame (linkA, links2 [0], "#B6");
+ Assert.AreSame (linkB, links1 [1], "#B7");
+ Assert.AreSame (linkB, links2 [1], "#B8");
+
+ LinkLabel.LinkCollection links3 = new
LinkLabel.LinkCollection (
+ l);
+ Assert.AreEqual (2, links3.Count, "#C1");
+#if NET_2_0
+ Assert.IsFalse (links3.LinksAdded, "#C2");
+#endif
+ Assert.AreSame (linkA, links3 [0], "#C3");
+ Assert.AreSame (linkB, links3 [1], "#C4");
+ }
+
+ [Test] // Add (int, int)
+ [Category ("NotWorking")] // bug #346156
+ public void Add2_Overlap ()
+ {
+ LinkLabel l = new LinkLabel ();
+ l.Text = "Managed Windows Forms";
+
+ LinkLabel.LinkCollection links = new
LinkLabel.LinkCollection (
+ l);
+
+ LinkLabel.Link linkA = links.Add (0, 7);
+ Assert.AreEqual (1, links.Count, "#A1");
+#if NET_2_0
+ Assert.IsTrue (links.LinksAdded, "#A2");
+#endif
+ Assert.AreSame (linkA, links [0], "#A3");
+
+ try {
+ links.Add (5, 4);
+ Assert.Fail ("#B1");
+ } catch (InvalidOperationException ex) {
+ // Overlapping link regions
+ Assert.AreEqual (typeof
(InvalidOperationException), ex.GetType (), "#B2");
+ Assert.IsNull (ex.InnerException,
"#B3");
+ Assert.IsNotNull (ex.Message, "#B4");
+ }
+
+ Assert.AreEqual (2, links.Count, "#B5");
+#if NET_2_0
+ Assert.IsTrue (links.LinksAdded, "#B6");
+#endif
+ Assert.AreSame (linkA, links [0], "#B7");
+ Assert.IsNotNull (links [1], "#B8");
+ Assert.AreEqual (0, linkA.Start, "#B9");
+ Assert.AreEqual (7, linkA.Length, "#B10");
+ Assert.AreEqual (5, links [1].Start, "#B11");
+ Assert.AreEqual (4, links [1].Length, "#B12");
+
+ try {
+ links.Add (14, 3);
+ Assert.Fail ("#C1");
+ } catch (InvalidOperationException ex) {
+ // Overlapping link regions
+ Assert.AreEqual (typeof
(InvalidOperationException), ex.GetType (), "#C2");
+ Assert.IsNull (ex.InnerException,
"#C3");
+ Assert.IsNotNull (ex.Message, "#C4");
+ }
+
+ Assert.AreEqual (3, links.Count, "#C5");
+#if NET_2_0
+ Assert.IsTrue (links.LinksAdded, "#C6");
+#endif
+ Assert.AreSame (linkA, links [0], "#C7");
+ Assert.IsNotNull (links [1], "#C8");
+ Assert.IsNotNull (links [2], "#C9");
+ Assert.AreEqual (0, linkA.Start, "#C10");
+ Assert.AreEqual (7, linkA.Length, "#C11");
+ Assert.AreEqual (5, links [1].Start, "#C12");
+ Assert.AreEqual (4, links [1].Length, "#C13");
+ Assert.AreEqual (14, links [2].Start, "#C14");
+ Assert.AreEqual (3, links [2].Length, "#C15");
+ }
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches