From 642776e8ec33814be386536c2d02c291d65937e8 Mon Sep 17 00:00:00 2001 From: "Zheng Li (BEYONDSOFT CONSULTING INC)" Date: Mon, 6 Jan 2025 10:51:50 +0800 Subject: [PATCH 1/2] Add code coverage for ToolStripPanelControlCollection_XYComparer --- ...pPanelControlCollection.XYComparerTests.cs | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanel.ToolStripPanelControlCollection.XYComparerTests.cs diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanel.ToolStripPanelControlCollection.XYComparerTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanel.ToolStripPanelControlCollection.XYComparerTests.cs new file mode 100644 index 00000000000..5965215eaff --- /dev/null +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanel.ToolStripPanelControlCollection.XYComparerTests.cs @@ -0,0 +1,46 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#nullable enable + +using System.Drawing; + +namespace System.Windows.Forms.Tests; + +public class ToolStripPanel_ToolStripPanelControlCollection_XYComparerTests +{ + private readonly ToolStripPanel.ToolStripPanelControlCollection.XYComparer _comparer = new(); + private readonly Control _control1 = new() { Bounds = new Rectangle(10, 20, 100, 100) }; + private readonly Control _control2 = new() { Bounds = new Rectangle(10, 10, 100, 100) }; + + [WinFormsFact] + public void Compare_FirstControlNull_ReturnsNegativeOne() + { + _comparer.Compare(null, _control1).Should().Be(-1); + } + + [WinFormsFact] + public void Compare_SecondControlNull_ReturnsOne() + { + _comparer.Compare(_control1, null).Should().Be(1); + } + + [WinFormsFact] + public void Compare_BothControlsNull_ReturnsZero() + { + _comparer.Compare(null, null).Should().Be(0); + } + + [WinFormsTheory] + [InlineData(10, 10, 20, 10, -1)] + [InlineData(10, 10, 10, 20, -1)] + [InlineData(10, 20, 10, 10, 1)] + [InlineData(20, 10, 10, 10, 1)] + public void Compare_VariousBounds_ReturnsExpected(int x1, int y1, int x2, int y2, int expected) + { + _control1.Bounds = new Rectangle(x1, y1, 100, 100); + _control2.Bounds = new Rectangle(x2, y2, 100, 100); + + _comparer.Compare(_control1, _control2).Should().Be(expected); + } +} From 21373c66f99c13ccbb15426628ea4d50bde44ecc Mon Sep 17 00:00:00 2001 From: "Zheng Li (BEYONDSOFT CONSULTING INC)" Date: Tue, 7 Jan 2025 09:16:25 +0800 Subject: [PATCH 2/2] Handle FeedBacks --- ...ipPanelControlCollection.XYComparerTests.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanel.ToolStripPanelControlCollection.XYComparerTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanel.ToolStripPanelControlCollection.XYComparerTests.cs index 5965215eaff..33a4f3b3399 100644 --- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanel.ToolStripPanelControlCollection.XYComparerTests.cs +++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanel.ToolStripPanelControlCollection.XYComparerTests.cs @@ -13,23 +13,23 @@ public class ToolStripPanel_ToolStripPanelControlCollection_XYComparerTests private readonly Control _control1 = new() { Bounds = new Rectangle(10, 20, 100, 100) }; private readonly Control _control2 = new() { Bounds = new Rectangle(10, 10, 100, 100) }; - [WinFormsFact] - public void Compare_FirstControlNull_ReturnsNegativeOne() + public void Dispose() { - _comparer.Compare(null, _control1).Should().Be(-1); + _control1.Dispose(); + _control2.Dispose(); } [WinFormsFact] - public void Compare_SecondControlNull_ReturnsOne() - { + public void Compare_FirstControlNull_ReturnsNegativeOne() => + _comparer.Compare(null, _control1).Should().Be(-1); + + [WinFormsFact] + public void Compare_SecondControlNull_ReturnsOne() => _comparer.Compare(_control1, null).Should().Be(1); - } [WinFormsFact] - public void Compare_BothControlsNull_ReturnsZero() - { + public void Compare_BothControlsNull_ReturnsZero() => _comparer.Compare(null, null).Should().Be(0); - } [WinFormsTheory] [InlineData(10, 10, 20, 10, -1)]