diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
index 28913569921..a904a9890a5 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
@@ -1984,7 +1984,7 @@ private void ChildWndProc(ref Message m)
// Forward context menu messages to the parent control
if (ContextMenuStrip != null)
{
- UnsafeNativeMethods.SendMessage(new HandleRef(this, Handle), WindowMessages.WM_CONTEXTMENU, m.WParam, m.LParam);
+ SendMessageW(this, WindowMessage.WM_CONTEXTMENU, m.WParam, m.LParam);
}
else
{
@@ -3584,7 +3584,7 @@ private void UpdateText()
{
if (childEdit != null && childEdit.Handle != IntPtr.Zero)
{
- UnsafeNativeMethods.SendMessage(new HandleRef(this, childEdit.Handle), WindowMessages.WM_SETTEXT, IntPtr.Zero, s);
+ SendMessageW(new HandleRef(this, childEdit.Handle), WindowMessage.WM_SETTEXT, IntPtr.Zero, s);
}
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.cs
index 20b4bd95b41..f04033d8f03 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.cs
@@ -300,7 +300,7 @@ public int ColumnWidth
}
else if (IsHandleCreated)
{
- SendMessage((int)LB.SETCOLUMNWIDTH, columnWidth, 0);
+ SendMessageW(this, (WindowMessage)LB.SETCOLUMNWIDTH, (IntPtr)columnWidth);
}
}
}
@@ -469,7 +469,7 @@ internal int FocusedIndex
{
if (IsHandleCreated)
{
- return unchecked((int)(long)SendMessage((int)LB.GETCARETINDEX, 0, 0));
+ return unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETCARETINDEX));
}
return -1;
@@ -667,7 +667,7 @@ public virtual int ItemHeight
if (drawMode == DrawMode.OwnerDrawFixed && IsHandleCreated)
{
BeginUpdate();
- SendMessage((int)LB.SETITEMHEIGHT, 0, value);
+ SendMessageW(this, (WindowMessage)LB.SETITEMHEIGHT, IntPtr.Zero, (IntPtr)value);
// Changing the item height might require a resize for IntegralHeight list boxes
//
@@ -913,7 +913,7 @@ public override int SelectedIndex
if (current == SelectionMode.One && IsHandleCreated)
{
- return unchecked((int)(long)SendMessage((int)LB.GETCURSEL, 0, 0));
+ return unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETCURSEL));
}
if (itemsCollection != null && SelectedItems.Count > 0)
@@ -1216,7 +1216,7 @@ public int TopIndex
{
if (IsHandleCreated)
{
- return unchecked((int)(long)SendMessage((int)LB.GETTOPINDEX, 0, 0));
+ return unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETTOPINDEX));
}
else
{
@@ -1227,7 +1227,7 @@ public int TopIndex
{
if (IsHandleCreated)
{
- SendMessage((int)LB.SETTOPINDEX, value, 0);
+ SendMessageW(this, (WindowMessage)LB.SETTOPINDEX, (IntPtr)value);
}
else
{
@@ -1531,7 +1531,7 @@ public int GetItemHeight(int index)
if (IsHandleCreated)
{
- int h = unchecked((int)(long)SendMessage((int)LB.GETITEMHEIGHT, index, 0));
+ int h = unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETITEMHEIGHT, (IntPtr)index));
if (h == -1)
{
throw new Win32Exception();
@@ -1587,7 +1587,7 @@ private bool GetSelectedInternal(int index)
{
if (IsHandleCreated)
{
- int sel = unchecked((int)(long)SendMessage((int)LB.GETSEL, index, 0));
+ int sel = unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETSEL, (IntPtr)index));
if (sel == -1)
{
throw new Win32Exception();
@@ -1624,7 +1624,7 @@ public int IndexFromPoint(int x, int y)
GetClientRect(new HandleRef(this, Handle), ref r);
if (r.left <= x && x < r.right && r.top <= y && y < r.bottom)
{
- int index = unchecked((int)(long)SendMessage((int)LB.ITEMFROMPOINT, 0, unchecked((int)(long)PARAM.FromLowHigh(x, y))));
+ int index = unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.ITEMFROMPOINT, IntPtr.Zero, PARAM.FromLowHigh(x, y)));
if (PARAM.HIWORD(index) == 0)
{
// Inside ListBox client area
@@ -1642,8 +1642,7 @@ public int IndexFromPoint(int x, int y)
private int NativeAdd(object item)
{
Debug.Assert(IsHandleCreated, "Shouldn't be calling Native methods before the handle is created.");
- int insertIndex = unchecked((int)(long)SendMessage((int)LB.ADDSTRING, 0, GetItemText(item)));
-
+ int insertIndex = unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.ADDSTRING, IntPtr.Zero, GetItemText(item)));
if (insertIndex == LB_ERRSPACE)
{
throw new OutOfMemoryException();
@@ -1667,7 +1666,7 @@ private int NativeAdd(object item)
private void NativeClear()
{
Debug.Assert(IsHandleCreated, "Shouldn't be calling Native methods before the handle is created.");
- SendMessage((int)LB.RESETCONTENT, 0, 0);
+ SendMessageW(this, (WindowMessage)LB.RESETCONTENT);
}
///
@@ -1675,7 +1674,7 @@ private void NativeClear()
///
internal string NativeGetItemText(int index)
{
- int len = unchecked((int)(long)SendMessage((int)LB.GETTEXTLEN, index, 0));
+ int len = unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETTEXTLEN, (IntPtr)index));
StringBuilder sb = new StringBuilder(len + 1);
UnsafeNativeMethods.SendMessage(new HandleRef(this, Handle), (int)LB.GETTEXT, index, sb);
return sb.ToString();
@@ -1688,7 +1687,7 @@ internal string NativeGetItemText(int index)
private int NativeInsert(int index, object item)
{
Debug.Assert(IsHandleCreated, "Shouldn't be calling Native methods before the handle is created.");
- int insertIndex = unchecked((int)(long)SendMessage((int)LB.INSERTSTRING, index, GetItemText(item)));
+ int insertIndex = unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.INSERTSTRING, (IntPtr)index, GetItemText(item)));
if (insertIndex == LB_ERRSPACE)
{
@@ -1715,8 +1714,8 @@ private void NativeRemoveAt(int index)
{
Debug.Assert(IsHandleCreated, "Shouldn't be calling Native methods before the handle is created.");
- bool selected = (unchecked((int)(long)SendMessage((int)LB.GETSEL, (IntPtr)index, IntPtr.Zero)) > 0);
- SendMessage((int)LB.DELETESTRING, index, 0);
+ bool selected = (unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETSEL, (IntPtr)index, IntPtr.Zero)) > 0);
+ SendMessageW(this, (WindowMessage)LB.DELETESTRING, (IntPtr)index);
//If the item currently selected is removed then we should fire a Selectionchanged event...
//as the next time selected index returns -1...
@@ -1738,11 +1737,11 @@ private void NativeSetSelected(int index, bool value)
if (selectionMode == SelectionMode.One)
{
- SendMessage((int)LB.SETCURSEL, (value ? index : -1), 0);
+ SendMessageW(this, (WindowMessage)LB.SETCURSEL, (IntPtr)(value ? index : -1));
}
else
{
- SendMessage((int)LB.SETSEL, value ? -1 : 0, index);
+ SendMessageW(this, (WindowMessage)LB.SETSEL, PARAM.FromBool(value), (IntPtr)index);
}
}
@@ -1751,7 +1750,7 @@ private void NativeSetSelected(int index, bool value)
/// query on that collection after we have called Dirty(). Dirty() is called
/// when we receive a LBN_SELCHANGE message.
///
- private void NativeUpdateSelection()
+ private unsafe void NativeUpdateSelection()
{
Debug.Assert(IsHandleCreated, "Should only call native methods if handle is created");
@@ -1768,7 +1767,7 @@ private void NativeUpdateSelection()
switch (selectionMode)
{
case SelectionMode.One:
- int index = unchecked((int)(long)SendMessage((int)LB.GETCURSEL, 0, 0));
+ int index = unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETCURSEL));
if (index >= 0)
{
result = new int[] { index };
@@ -1778,11 +1777,14 @@ private void NativeUpdateSelection()
case SelectionMode.MultiSimple:
case SelectionMode.MultiExtended:
- int count = unchecked((int)(long)SendMessage((int)LB.GETSELCOUNT, 0, 0));
+ int count = unchecked((int)(long)SendMessageW(this, (WindowMessage)LB.GETSELCOUNT));
if (count > 0)
{
result = new int[count];
- UnsafeNativeMethods.SendMessage(new HandleRef(this, Handle), (int)LB.GETSELITEMS, count, result);
+ fixed (int* pResult = result)
+ {
+ SendMessageW(this, (WindowMessage)LB.GETSELITEMS, (IntPtr)count, (IntPtr)pResult);
+ }
}
break;
}
@@ -1814,17 +1816,20 @@ protected override void OnChangeUICues(UICuesEventArgs e)
protected override void OnGotFocus(EventArgs e)
{
- AccessibleObject item = AccessibilityObject.GetFocused();
-
- if (item != null)
- {
- HasKeyboardFocus = false;
- item.RaiseAutomationEvent(UiaCore.UIA.AutomationFocusChangedEventId);
- }
- else
+ if (IsHandleCreated)
{
- HasKeyboardFocus = true;
- AccessibilityObject.RaiseAutomationEvent(UiaCore.UIA.AutomationFocusChangedEventId);
+ AccessibleObject item = AccessibilityObject.GetFocused();
+
+ if (item != null)
+ {
+ HasKeyboardFocus = false;
+ item.RaiseAutomationEvent(UiaCore.UIA.AutomationFocusChangedEventId);
+ }
+ else
+ {
+ HasKeyboardFocus = true;
+ AccessibilityObject.RaiseAutomationEvent(UiaCore.UIA.AutomationFocusChangedEventId);
+ }
}
base.OnGotFocus(e);
@@ -1847,26 +1852,26 @@ protected virtual void OnDrawItem(DrawItemEventArgs e)
/// set up a few things, like column width, etc! Inheriting classes should
/// not forget to call base.OnHandleCreated().
///
- protected override void OnHandleCreated(EventArgs e)
+ protected unsafe override void OnHandleCreated(EventArgs e)
{
base.OnHandleCreated(e);
//for getting the current Locale to set the Scrollbars...
//
- SendMessage((int)LB.SETLOCALE, CultureInfo.CurrentCulture.LCID, 0);
+ SendMessageW(this, (WindowMessage)LB.SETLOCALE, (IntPtr)CultureInfo.CurrentCulture.LCID);
if (columnWidth != 0)
{
- SendMessage((int)LB.SETCOLUMNWIDTH, columnWidth, 0);
+ SendMessageW(this, (WindowMessage)LB.SETCOLUMNWIDTH, (IntPtr)columnWidth);
}
if (drawMode == DrawMode.OwnerDrawFixed)
{
- SendMessage((int)LB.SETITEMHEIGHT, 0, ItemHeight);
+ SendMessageW(this, (WindowMessage)LB.SETITEMHEIGHT, IntPtr.Zero, (IntPtr)ItemHeight);
}
if (topIndex != 0)
{
- SendMessage((int)LB.SETTOPINDEX, topIndex, 0);
+ SendMessageW(this, (WindowMessage)LB.SETTOPINDEX, (IntPtr)topIndex);
}
if (UseCustomTabOffsets && CustomTabOffsets != null)
@@ -1874,7 +1879,11 @@ protected override void OnHandleCreated(EventArgs e)
int wpar = CustomTabOffsets.Count;
int[] offsets = new int[wpar];
CustomTabOffsets.CopyTo(offsets, 0);
- UnsafeNativeMethods.SendMessage(new HandleRef(this, Handle), (int)LB.SETTABSTOPS, wpar, offsets);
+
+ fixed (int* pOffsets = offsets)
+ {
+ SendMessageW(this, (WindowMessage)LB.SETTABSTOPS, (IntPtr)wpar, (IntPtr)pOffsets);
+ }
}
if (itemsCollection != null)
@@ -1972,18 +1981,21 @@ protected override void OnResize(EventArgs e)
///
protected override void OnSelectedIndexChanged(EventArgs e)
{
- if (Focused && FocusedItemIsChanged())
+ if (IsHandleCreated)
{
- var focused = AccessibilityObject.GetFocused();
- if (focused == AccessibilityObject.GetSelected())
+ if (Focused && FocusedItemIsChanged())
{
- focused?.RaiseAutomationEvent(UiaCore.UIA.SelectionItem_ElementSelectedEventId);
+ var focused = AccessibilityObject.GetFocused();
+ if (focused == AccessibilityObject.GetSelected())
+ {
+ focused?.RaiseAutomationEvent(UiaCore.UIA.SelectionItem_ElementSelectedEventId);
+ }
+ focused?.RaiseAutomationEvent(UiaCore.UIA.AutomationFocusChangedEventId);
+ }
+ else if (ItemsCountIsChanged())
+ {
+ AccessibilityObject?.GetChild(Items.Count - 1)?.RaiseAutomationEvent(UiaCore.UIA.AutomationFocusChangedEventId);
}
- focused?.RaiseAutomationEvent(UiaCore.UIA.AutomationFocusChangedEventId);
- }
- else if (ItemsCountIsChanged())
- {
- AccessibilityObject?.GetChild(Items.Count - 1)?.RaiseAutomationEvent(UiaCore.UIA.AutomationFocusChangedEventId);
}
base.OnSelectedIndexChanged(e);
@@ -2211,7 +2223,7 @@ protected override void SetItemsCore(IList value)
if (IsHandleCreated)
{
- SendMessage((int)LB.SETCURSEL, DataManager.Position, 0);
+ SendMessageW(this, (WindowMessage)LB.SETCURSEL, (IntPtr)DataManager.Position);
}
// if the list changed and we still did not fire the
@@ -2337,7 +2349,7 @@ private void UpdateHorizontalExtent()
{
width = MaxItemWidth;
}
- SendMessage((int)LB.SETHORIZONTALEXTENT, width, 0);
+ SendMessageW(this, (WindowMessage)LB.SETHORIZONTALEXTENT, (IntPtr)width);
}
}
@@ -2388,17 +2400,17 @@ private void UpdateMaxItemWidth(object item, bool removing)
}
}
- // Updates the Custom TabOffsets
- //
-
- private void UpdateCustomTabOffsets()
+ private unsafe void UpdateCustomTabOffsets()
{
if (IsHandleCreated && UseCustomTabOffsets && CustomTabOffsets != null)
{
int wpar = CustomTabOffsets.Count;
int[] offsets = new int[wpar];
CustomTabOffsets.CopyTo(offsets, 0);
- UnsafeNativeMethods.SendMessage(new HandleRef(this, Handle), (int)LB.SETTABSTOPS, wpar, offsets);
+ fixed (int* pOffsets = offsets)
+ {
+ SendMessageW(this, (WindowMessage)LB.SETTABSTOPS, (IntPtr)wpar, (IntPtr)pOffsets);
+ }
Invalidate();
}
}
@@ -4282,7 +4294,7 @@ public int Count
case SelectionMode.MultiSimple:
case SelectionMode.MultiExtended:
- return unchecked((int)(long)owner.SendMessage((int)LB.GETSELCOUNT, 0, 0));
+ return unchecked((int)(long)SendMessageW(owner, (WindowMessage)LB.GETSELCOUNT));
}
return 0;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs
index bb13b52f753..d50abb22ccd 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs
@@ -106,6 +106,7 @@ public void ComboBox_Ctor_Default()
Assert.Equal(Padding.Empty, control.Padding);
Assert.Null(control.Parent);
Assert.Equal("Microsoft\u00AE .NET", control.ProductName);
+ Assert.True(control.PreferredHeight > 0);
Assert.Equal(new Size(121, control.PreferredHeight), control.PreferredSize);
Assert.False(control.RecreatingHandle);
Assert.Null(control.Region);
@@ -153,17 +154,25 @@ public void ComboBox_CreateParams_GetDefault_ReturnsExpected()
Assert.False(control.IsHandleCreated);
}
+ [WinFormsTheory]
+ [CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryDataInvalid), typeof(AutoCompleteMode))]
+ public void ComboBox_AutoCompleteMode_SetInvalidValue_ThrowsInvalidEnumArgumentException(AutoCompleteMode value)
+ {
+ using var control = new ComboBox();
+ Assert.Throws("value", () => control.AutoCompleteMode = value);
+ }
+
public static IEnumerable BackColor_Set_TestData()
{
yield return new object[] { Color.Empty, SystemColors.Window };
yield return new object[] { Color.Red, Color.Red };
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(BackColor_Set_TestData))]
public void ComboBox_BackColor_Set_GetReturnsExpected(Color value, Color expected)
{
- var control = new ComboBox
+ using var control = new ComboBox
{
BackColor = value
};
@@ -182,11 +191,11 @@ public static IEnumerable BackColor_SetWithHandle_TestData()
yield return new object[] { Color.Red, Color.Red, 1 };
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(BackColor_SetWithHandle_TestData))]
public void ComboBox_BackColor_SetWithHandle_GetReturnsExpected(Color value, Color expected, int expectedInvalidatedCallCount)
{
- var control = new ComboBox();
+ using var control = new ComboBox();
Assert.NotEqual(IntPtr.Zero, control.Handle);
int invalidatedCallCount = 0;
control.Invalidated += (sender, e) => invalidatedCallCount++;
@@ -211,10 +220,10 @@ public void ComboBox_BackColor_SetWithHandle_GetReturnsExpected(Color value, Col
Assert.Equal(0, createdCallCount);
}
- [Fact]
+ [WinFormsFact]
public void ComboBox_BackColor_SetWithHandler_CallsBackColorChanged()
{
- var control = new ComboBox();
+ using var control = new ComboBox();
int callCount = 0;
EventHandler handler = (sender, e) =>
{
@@ -246,25 +255,59 @@ public void ComboBox_BackColor_SetWithHandler_CallsBackColorChanged()
Assert.Equal(2, callCount);
}
- [Theory]
+ [WinFormsFact]
+ public void ComboBox_BackColor_ResetValue_Success()
+ {
+ PropertyDescriptor property = TypeDescriptor.GetProperties(typeof(ComboBox))[nameof(ComboBox.BackColor)];
+ using var control = new ComboBox();
+ Assert.False(property.CanResetValue(control));
+
+ control.BackColor = Color.Red;
+ Assert.Equal(Color.Red, control.BackColor);
+ Assert.True(property.CanResetValue(control));
+
+ property.ResetValue(control);
+ Assert.Equal(SystemColors.Window, control.BackColor);
+ Assert.False(property.CanResetValue(control));
+ }
+
+ [WinFormsFact]
+ public void ComboBox_BackColor_ShouldSerializeValue_Success()
+ {
+ PropertyDescriptor property = TypeDescriptor.GetProperties(typeof(ComboBox))[nameof(ComboBox.BackColor)];
+ using var control = new ComboBox();
+ Assert.False(property.ShouldSerializeValue(control));
+
+ control.BackColor = Color.Red;
+ Assert.Equal(Color.Red, control.BackColor);
+ Assert.True(property.ShouldSerializeValue(control));
+
+ property.ResetValue(control);
+ Assert.Equal(SystemColors.Window, control.BackColor);
+ Assert.False(property.ShouldSerializeValue(control));
+ }
+
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetImageTheoryData))]
- public void BackgroundImage_Set_GetReturnsExpected(Image value)
+ public void ComboBox_BackgroundImage_Set_GetReturnsExpected(Image value)
{
- var control = new ComboBox
+ using var control = new ComboBox
{
BackgroundImage = value
};
Assert.Equal(value, control.BackgroundImage);
+ Assert.False(control.IsHandleCreated);
// Set same.
control.BackgroundImage = value;
Assert.Equal(value, control.BackgroundImage);
+ Assert.False(control.IsHandleCreated);
}
- [Fact]
- public void BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
+ [WinFormsFact]
+ public void ComboBox_BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
{
- var control = new ComboBox();
+ using var control = new ComboBox();
int callCount = 0;
EventHandler handler = (sender, e) =>
{
@@ -275,7 +318,7 @@ public void BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
control.BackgroundImageChanged += handler;
// Set different.
- var image1 = new Bitmap(10, 10);
+ using var image1 = new Bitmap(10, 10);
control.BackgroundImage = image1;
Assert.Same(image1, control.BackgroundImage);
Assert.Equal(1, callCount);
@@ -286,7 +329,7 @@ public void BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
Assert.Equal(1, callCount);
// Set different.
- var image2 = new Bitmap(10, 10);
+ using var image2 = new Bitmap(10, 10);
control.BackgroundImage = image2;
Assert.Same(image2, control.BackgroundImage);
Assert.Equal(2, callCount);
@@ -303,25 +346,27 @@ public void BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
Assert.Equal(3, callCount);
}
- [Theory]
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryData), typeof(ImageLayout))]
- public void BackgroundImageLayout_Set_GetReturnsExpected(ImageLayout value)
+ public void ComboBox_BackgroundImageLayout_Set_GetReturnsExpected(ImageLayout value)
{
- var control = new ComboBox
+ using var control = new ComboBox
{
BackgroundImageLayout = value
};
Assert.Equal(value, control.BackgroundImageLayout);
+ Assert.False(control.IsHandleCreated);
// Set same.
control.BackgroundImageLayout = value;
Assert.Equal(value, control.BackgroundImageLayout);
+ Assert.False(control.IsHandleCreated);
}
- [Fact]
- public void BackgroundImageLayout_SetWithHandler_CallsBackgroundImageLayoutChanged()
+ [WinFormsFact]
+ public void ComboBox_BackgroundImageLayout_SetWithHandler_CallsBackgroundImageLayoutChanged()
{
- var control = new ComboBox();
+ using var control = new ComboBox();
int callCount = 0;
EventHandler handler = (sender, e) =>
{
@@ -353,11 +398,11 @@ public void BackgroundImageLayout_SetWithHandler_CallsBackgroundImageLayoutChang
Assert.Equal(2, callCount);
}
- [Theory]
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryDataInvalid), typeof(ImageLayout))]
- public void BackgroundImageLayout_SetInvalid_ThrowsInvalidEnumArgumentException(ImageLayout value)
+ public void ComboBox_BackgroundImageLayout_SetInvalid_ThrowsInvalidEnumArgumentException(ImageLayout value)
{
- var control = new ComboBox();
+ using var control = new ComboBox();
Assert.Throws("value", () => control.BackgroundImageLayout = value);
}
@@ -374,29 +419,31 @@ public static IEnumerable DataSource_Set_TestData()
yield return new object[] { mockSource.Object };
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(DataSource_Set_TestData))]
- public void DataSource_Set_GetReturnsExpected(object value)
+ public void ComBox_DataSource_Set_GetReturnsExpected(object value)
{
- var control = new SubComboBox
+ using var control = new SubComboBox
{
DataSource = value
};
Assert.Same(value, control.DataSource);
Assert.Empty(control.DisplayMember);
Assert.Null(control.DataManager);
+ Assert.False(control.IsHandleCreated);
// Set same.
control.DataSource = value;
Assert.Same(value, control.DataSource);
Assert.Empty(control.DisplayMember);
Assert.Null(control.DataManager);
+ Assert.False(control.IsHandleCreated);
}
- [Fact]
- public void DataSource_SetWithHandler_CallsDataSourceChanged()
+ [WinFormsFact]
+ public void ComBox_DataSource_SetWithHandler_CallsDataSourceChanged()
{
- var control = new ComboBox();
+ using var control = new ComboBox();
int dataSourceCallCount = 0;
int displayMemberCallCount = 0;
EventHandler dataSourceHandler = (sender, e) =>
@@ -449,6 +496,153 @@ public void DataSource_SetWithHandler_CallsDataSourceChanged()
Assert.Equal(0, displayMemberCallCount);
}
+ [WinFormsTheory]
+ [CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryData), typeof(ComboBoxStyle))]
+ public void ComboBox_DropDownStyle_Set_GetReturnsExpected(ComboBoxStyle value)
+ {
+ using var control = new ComboBox
+ {
+ DropDownStyle = value
+ };
+ Assert.Equal(value, control.DropDownStyle);
+ Assert.False(control.IsHandleCreated);
+
+ // Set same.
+ control.DropDownStyle = value;
+ Assert.Equal(value, control.DropDownStyle);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ public static IEnumerable DropDownStyle_Set_TestData()
+ {
+ foreach (AutoCompleteSource source in Enum.GetValues(typeof(AutoCompleteSource)))
+ {
+ foreach (AutoCompleteMode mode in Enum.GetValues(typeof(AutoCompleteMode)))
+ {
+ yield return new object[] { source, mode, ComboBoxStyle.Simple, mode };
+ yield return new object[] { source, mode, ComboBoxStyle.DropDown, mode };
+ yield return new object[] { source, mode, ComboBoxStyle.DropDownList, source != AutoCompleteSource.ListItems ? AutoCompleteMode.None : mode };
+ }
+ }
+ }
+
+ [WinFormsTheory]
+ [MemberData(nameof(DropDownStyle_Set_TestData))]
+ public void ComboBox_DropDownStyle_SetWithSourceAndMode_GetReturnsExpected(AutoCompleteSource source, AutoCompleteMode mode, ComboBoxStyle value, AutoCompleteMode expectedMode)
+ {
+ using var control = new ComboBox
+ {
+ AutoCompleteSource = source,
+ AutoCompleteMode = mode,
+ DropDownStyle = value
+ };
+ Assert.Equal(value, control.DropDownStyle);
+ Assert.Equal(source, control.AutoCompleteSource);
+ Assert.Equal(expectedMode, control.AutoCompleteMode);
+ Assert.False(control.IsHandleCreated);
+
+ // Set same.
+ control.DropDownStyle = value;
+ Assert.Equal(value, control.DropDownStyle);
+ Assert.Equal(source, control.AutoCompleteSource);
+ Assert.Equal(expectedMode, control.AutoCompleteMode);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsFact]
+ public void ComboBox_DropDownStyle_SetWithPreferredHeight_ResetsPreferredHeight()
+ {
+ using var control = new ComboBox
+ {
+ FormattingEnabled = true
+ };
+ int height1 = control.PreferredHeight;
+
+ control.DropDownStyle = ComboBoxStyle.DropDownList;
+ Assert.Equal(height1, control.PreferredHeight);
+
+ control.DropDownStyle = ComboBoxStyle.Simple;
+ int height2 = control.PreferredHeight;
+ Assert.True(height2 > height1);
+
+ control.DropDownStyle = ComboBoxStyle.DropDownList;
+ Assert.Equal(height1, control.PreferredHeight);
+ }
+
+ [WinFormsTheory]
+ [InlineData(ComboBoxStyle.Simple, 1)]
+ [InlineData(ComboBoxStyle.DropDown, 0)]
+ [InlineData(ComboBoxStyle.DropDownList, 1)]
+ public void ComboBox_DropDownStyle_SetWithHandle_GetReturnsExpected(ComboBoxStyle value, int expectedCreatedCallCount)
+ {
+ using var control = new ComboBox();
+ Assert.NotEqual(IntPtr.Zero, control.Handle);
+ int invalidatedCallCount = 0;
+ control.Invalidated += (sender, e) => invalidatedCallCount++;
+ int styleChangedCallCount = 0;
+ control.StyleChanged += (sender, e) => styleChangedCallCount++;
+ int createdCallCount = 0;
+ control.HandleCreated += (sender, e) => createdCallCount++;
+
+ control.DropDownStyle = value;
+ Assert.Equal(value, control.DropDownStyle);
+ Assert.True(control.IsHandleCreated);
+ Assert.Equal(0, invalidatedCallCount);
+ Assert.Equal(0, styleChangedCallCount);
+ Assert.Equal(expectedCreatedCallCount, createdCallCount);
+
+ // Set same.
+ control.DropDownStyle = value;
+ Assert.Equal(value, control.DropDownStyle);
+ Assert.True(control.IsHandleCreated);
+ Assert.Equal(0, invalidatedCallCount);
+ Assert.Equal(0, styleChangedCallCount);
+ Assert.Equal(expectedCreatedCallCount, createdCallCount);
+ }
+
+ [WinFormsFact]
+ public void ComboBox_DropDownStyle_SetWithHandler_CallsDropDownStyleChanged()
+ {
+ using var control = new ComboBox();
+ int callCount = 0;
+ EventHandler handler = (sender, e) =>
+ {
+ Assert.Same(control, sender);
+ Assert.Same(EventArgs.Empty, e);
+ callCount++;
+ };
+ control.DropDownStyleChanged += handler;
+
+ // Set different.
+ control.DropDownStyle = ComboBoxStyle.DropDownList;
+ Assert.Equal(ComboBoxStyle.DropDownList, control.DropDownStyle);
+ Assert.Equal(1, callCount);
+
+ // Set same.
+ control.DropDownStyle = ComboBoxStyle.DropDownList;
+ Assert.Equal(ComboBoxStyle.DropDownList, control.DropDownStyle);
+ Assert.Equal(1, callCount);
+
+ // Set different.
+ control.DropDownStyle = ComboBoxStyle.Simple;
+ Assert.Equal(ComboBoxStyle.Simple, control.DropDownStyle);
+ Assert.Equal(2, callCount);
+
+ // Remove handler.
+ control.DropDownStyleChanged -= handler;
+ control.DropDownStyle = ComboBoxStyle.DropDownList;
+ Assert.Equal(ComboBoxStyle.DropDownList, control.DropDownStyle);
+ Assert.Equal(2, callCount);
+ }
+
+ [WinFormsTheory]
+ [CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryDataInvalid), typeof(ComboBoxStyle))]
+ public void ComboBox_DropDownStyle_SetInvalidValue_ThrowsInvalidEnumArgumentException(ComboBoxStyle value)
+ {
+ using var control = new ComboBox();
+ Assert.Throws("value", () => control.DropDownStyle = value);
+ }
+
[WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetFontTheoryData))]
public void ComboBox_Font_Set_GetReturnsExpected(Font value)
@@ -519,11 +713,11 @@ public static IEnumerable ForeColor_Set_TestData()
yield return new object[] { Color.Red, Color.Red };
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(ForeColor_Set_TestData))]
public void ComboBox_ForeColor_Set_GetReturnsExpected(Color value, Color expected)
{
- var control = new ComboBox
+ using var control = new ComboBox
{
ForeColor = value
};
@@ -545,11 +739,11 @@ public static IEnumerable ForeColor_SetWithHandle_TestData()
yield return new object[] { Color.Red, Color.Red, 1 };
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(ForeColor_SetWithHandle_TestData))]
public void ComboBox_ForeColor_SetWithHandle_GetReturnsExpected(Color value, Color expected, int expectedInvalidatedCallCount)
{
- var control = new ComboBox();
+ using var control = new ComboBox();
Assert.NotEqual(IntPtr.Zero, control.Handle);
int invalidatedCallCount = 0;
control.Invalidated += (sender, e) => invalidatedCallCount++;
@@ -574,10 +768,10 @@ public void ComboBox_ForeColor_SetWithHandle_GetReturnsExpected(Color value, Col
Assert.Equal(0, createdCallCount);
}
- [Fact]
+ [WinFormsFact]
public void ComboBox_ForeColor_SetWithHandler_CallsForeColorChanged()
{
- var control = new ComboBox();
+ using var control = new ComboBox();
int callCount = 0;
EventHandler handler = (sender, e) =>
{
@@ -609,6 +803,38 @@ public void ComboBox_ForeColor_SetWithHandler_CallsForeColorChanged()
Assert.Equal(2, callCount);
}
+ [WinFormsFact]
+ public void ComboBox_ForeColor_ResetValue_Success()
+ {
+ PropertyDescriptor property = TypeDescriptor.GetProperties(typeof(ComboBox))[nameof(ComboBox.ForeColor)];
+ using var control = new ComboBox();
+ Assert.False(property.CanResetValue(control));
+
+ control.ForeColor = Color.Red;
+ Assert.Equal(Color.Red, control.ForeColor);
+ Assert.True(property.CanResetValue(control));
+
+ property.ResetValue(control);
+ Assert.Equal(SystemColors.WindowText, control.ForeColor);
+ Assert.False(property.CanResetValue(control));
+ }
+
+ [WinFormsFact]
+ public void ComboBox_ForeColor_ShouldSerializeValue_Success()
+ {
+ PropertyDescriptor property = TypeDescriptor.GetProperties(typeof(ComboBox))[nameof(ComboBox.ForeColor)];
+ using var control = new ComboBox();
+ Assert.False(property.ShouldSerializeValue(control));
+
+ control.ForeColor = Color.Red;
+ Assert.Equal(Color.Red, control.ForeColor);
+ Assert.True(property.ShouldSerializeValue(control));
+
+ property.ResetValue(control);
+ Assert.Equal(SystemColors.WindowText, control.ForeColor);
+ Assert.False(property.ShouldSerializeValue(control));
+ }
+
[WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetPaddingNormalizedTheoryData))]
public void ComboBox_Padding_Set_GetReturnsExpected(Padding value, Padding expected)
@@ -692,11 +918,11 @@ public void ComboBox_Padding_SetWithHandler_CallsPaddingChanged()
Assert.Equal(2, callCount);
}
- [Theory]
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetRightToLeftTheoryData))]
- public void RightToLeft_Set_GetReturnsExpected(RightToLeft value, RightToLeft expected)
+ public void ComboBox_RightToLeft_Set_GetReturnsExpected(RightToLeft value, RightToLeft expected)
{
- var control = new ComboBox
+ using var control = new ComboBox
{
RightToLeft = value
};
@@ -707,10 +933,10 @@ public void RightToLeft_Set_GetReturnsExpected(RightToLeft value, RightToLeft ex
Assert.Equal(expected, control.RightToLeft);
}
- [Fact]
- public void RightToLeft_SetWithHandler_CallsRightToLeftChanged()
+ [WinFormsFact]
+ public void ComboBox_RightToLeft_SetWithHandler_CallsRightToLeftChanged()
{
- var control = new ComboBox();
+ using var control = new ComboBox();
int callCount = 0;
EventHandler handler = (sender, e) =>
{
@@ -742,21 +968,21 @@ public void RightToLeft_SetWithHandler_CallsRightToLeftChanged()
Assert.Equal(2, callCount);
}
- [Theory]
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryDataInvalid), typeof(RightToLeft))]
- public void RightToLeft_SetInvalid_ThrowsInvalidEnumArgumentException(RightToLeft value)
+ public void ComboBox_RightToLeft_SetInvalid_ThrowsInvalidEnumArgumentException(RightToLeft value)
{
- var control = new ComboBox();
+ using var control = new ComboBox();
Assert.Throws("value", () => control.RightToLeft = value);
}
- [Theory]
+ [WinFormsTheory]
[InlineData(-1, "")]
[InlineData(0, "System.Windows.Forms.Tests.ComboBoxTests+DataClass")]
[InlineData(1, "System.Windows.Forms.Tests.ComboBoxTests+DataClass")]
- public void SelectedIndex_SetWithoutDisplayMember_GetReturnsExpected(int value, string expectedText)
+ public void ComboBox_SelectedIndex_SetWithoutDisplayMember_GetReturnsExpected(int value, string expectedText)
{
- var control = new ComboBox();
+ using var control = new ComboBox();
control.Items.Add(new DataClass { Value = "Value1" });
control.Items.Add(new DataClass { Value = "Value2" });
@@ -772,13 +998,13 @@ public void SelectedIndex_SetWithoutDisplayMember_GetReturnsExpected(int value,
Assert.Equal(expectedText, control.Text);
}
- [Theory]
+ [WinFormsTheory]
[InlineData(-1, "")]
[InlineData(0, "Value1")]
[InlineData(1, "Value2")]
- public void SelectedIndex_SetWithDisplayMember_GetReturnsExpected(int value, string expectedText)
+ public void ComboBox_SelectedIndex_SetWithDisplayMember_GetReturnsExpected(int value, string expectedText)
{
- var control = new ComboBox
+ using var control = new ComboBox
{
DisplayMember = "Value"
};
@@ -920,14 +1146,14 @@ public static IEnumerable FindString_TestData()
yield return new object[] { new ComboBox(), string.Empty, startIndex, -1 };
yield return new object[] { new ComboBox(), "s", startIndex, -1 };
- var controlWithNoItems = new ComboBox();
+ using var controlWithNoItems = new ComboBox();
Assert.Empty(controlWithNoItems.Items);
yield return new object[] { new ComboBox(), null, startIndex, -1 };
yield return new object[] { new ComboBox(), string.Empty, startIndex, -1 };
yield return new object[] { new ComboBox(), "s", startIndex, -1 };
}
- var controlWithItems = new ComboBox
+ using var controlWithItems = new ComboBox
{
DisplayMember = "Value"
};
@@ -993,9 +1219,9 @@ public static IEnumerable FindString_TestData()
yield return new object[] { controlWithItems, "NoSuchItem", 5, -1 };
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(FindString_TestData))]
- public void FindString_Invoke_ReturnsExpected(ComboBox control, string s, int startIndex, int expected)
+ public void ComboBox_FindString_Invoke_ReturnsExpected(ComboBox control, string s, int startIndex, int expected)
{
if (startIndex == -1)
{
@@ -1005,13 +1231,13 @@ public void FindString_Invoke_ReturnsExpected(ComboBox control, string s, int st
Assert.Equal(expected, control.FindString(s, startIndex));
}
- [Theory]
+ [WinFormsTheory]
[InlineData(-2)]
[InlineData(1)]
[InlineData(2)]
- public void FindString_InvalidStartIndex_ThrowsArgumentOutOfRangeException(int startIndex)
+ public void ComboBox_FindString_InvalidStartIndex_ThrowsArgumentOutOfRangeException(int startIndex)
{
- var control = new ComboBox();
+ using var control = new ComboBox();
control.Items.Add("item");
Assert.Throws("startIndex", () => control.FindString("s", startIndex));
}
@@ -1026,7 +1252,7 @@ public static IEnumerable FindStringExact_TestData()
yield return new object[] { new ComboBox(), string.Empty, startIndex, ignoreCase, -1 };
yield return new object[] { new ComboBox(), "s", startIndex, ignoreCase, -1 };
- var controlWithNoItems = new ComboBox();
+ using var controlWithNoItems = new ComboBox();
Assert.Empty(controlWithNoItems.Items);
yield return new object[] { new ComboBox(), null, startIndex, ignoreCase, -1 };
yield return new object[] { new ComboBox(), string.Empty, startIndex, ignoreCase, -1 };
@@ -1034,7 +1260,7 @@ public static IEnumerable FindStringExact_TestData()
}
}
- var controlWithItems = new ComboBox
+ using var controlWithItems = new ComboBox
{
DisplayMember = "Value"
};
@@ -1112,9 +1338,9 @@ public static IEnumerable FindStringExact_TestData()
}
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(FindStringExact_TestData))]
- public void FindStringExact_Invoke_ReturnsExpected(ComboBox control, string s, int startIndex, bool ignoreCase, int expected)
+ public void ComboBox_FindStringExact_Invoke_ReturnsExpected(ComboBox control, string s, int startIndex, bool ignoreCase, int expected)
{
if (ignoreCase)
{
@@ -1129,13 +1355,13 @@ public void FindStringExact_Invoke_ReturnsExpected(ComboBox control, string s, i
Assert.Equal(expected, control.FindStringExact(s, startIndex, ignoreCase));
}
- [Theory]
+ [WinFormsTheory]
[InlineData(-2)]
[InlineData(1)]
[InlineData(2)]
- public void FindStringExact_InvalidStartIndex_ThrowsArgumentOutOfRangeException(int startIndex)
+ public void ComboBox_FindStringExact_InvalidStartIndex_ThrowsArgumentOutOfRangeException(int startIndex)
{
- var control = new ComboBox();
+ using var control = new ComboBox();
control.Items.Add("item");
Assert.Throws("startIndex", () => control.FindStringExact("s", startIndex));
Assert.Throws("startIndex", () => control.FindStringExact("s", startIndex, ignoreCase: true));
@@ -1160,7 +1386,7 @@ private void SendCtrlBackspace(SubComboBox tb)
tb.ProcessCmdKey(ref message, Keys.Control | Keys.Back);
}
- [Fact]
+ [WinFormsFact]
public void CtrlBackspaceTextRemainsEmpty()
{
SubComboBox control = CreateControlForCtrlBackspace();
@@ -1168,7 +1394,7 @@ public void CtrlBackspaceTextRemainsEmpty()
Assert.Equal("", control.Text);
}
- [Theory]
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetCtrlBackspaceData))]
public void CtrlBackspaceTextChanged(string value, string expected, int cursorRelativeToEnd)
{
@@ -1177,7 +1403,7 @@ public void CtrlBackspaceTextChanged(string value, string expected, int cursorRe
Assert.Equal(expected, control.Text);
}
- [Theory]
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetCtrlBackspaceRepeatedData))]
public void CtrlBackspaceRepeatedTextChanged(string value, string expected, int repeats)
{
@@ -1189,7 +1415,7 @@ public void CtrlBackspaceRepeatedTextChanged(string value, string expected, int
Assert.Equal(expected, control.Text);
}
- [Fact]
+ [WinFormsFact]
public void CtrlBackspaceDeletesSelection()
{
SubComboBox control = CreateControlForCtrlBackspace("123-5-7-9");
@@ -1637,12 +1863,58 @@ public new bool ResizeRedraw
public new bool ShowKeyboardCues => base.ShowKeyboardCues;
+#pragma warning disable 0618
+ public new void AddItemsCore(object[] value) => base.AddItemsCore(value);
+#pragma warning restore 0618
+
+ public new AccessibleObject CreateAccessibilityInstance() => base.CreateAccessibilityInstance();
+
+ public new void CreateHandle() => base.CreateHandle();
+
+ public new void Dispose(bool disposing) => base.Dispose(disposing);
+
public new AutoSizeMode GetAutoSizeMode() => base.GetAutoSizeMode();
public new bool GetStyle(ControlStyles flag) => base.GetStyle(flag);
+ public new bool IsInputKey(Keys keyData) => base.IsInputKey(keyData);
+
+ public new void OnDrawItem(DrawItemEventArgs e) => base.OnDrawItem(e);
+
+ public new void OnDropDown(EventArgs e) => base.OnDropDown(e);
+
+ public new void OnDropDownStyleChanged(EventArgs e) => base.OnDropDownStyleChanged(e);
+
+ public new void OnFontChanged(EventArgs e) => base.OnFontChanged(e);
+
+ public new void OnHandleCreated(EventArgs e) => base.OnHandleCreated(e);
+
+ public new void OnHandleDestroyed(EventArgs e) => base.OnHandleDestroyed(e);
+
+ public new void OnKeyDown(KeyEventArgs e) => base.OnKeyDown(e);
+
+ public new void OnKeyPress(KeyPressEventArgs e) => base.OnKeyPress(e);
+
+ public new void OnMeasureItem(MeasureItemEventArgs e) => base.OnMeasureItem(e);
+
+ public new void OnMouseEnter(EventArgs e) => base.OnMouseEnter(e);
+
+ public new void OnMouseLeave(EventArgs e) => base.OnMouseLeave(e);
+
+ public new void OnParentBackColorChanged(EventArgs e) => base.OnParentBackColorChanged(e);
+
+ public new void OnSelectedIndexChanged(EventArgs e) => base.OnSelectedIndexChanged(e);
+
+ public new void OnSelectedItemChanged(EventArgs e) => base.OnSelectedItemChanged(e);
+
+ public new void OnSelectedValueChanged(EventArgs e) => base.OnSelectedValueChanged(e);
+
+ public new void OnSelectionChangeCommitted(EventArgs e) => base.OnSelectionChangeCommitted(e);
+
public new bool ProcessCmdKey(ref Message msg, Keys keyData) => base.ProcessCmdKey(ref msg, keyData);
+ public new void ScaleControl(SizeF factor, BoundsSpecified specified) => base.ScaleControl(factor, specified);
+
public new void SetStyle(ControlStyles flag, bool value) => base.SetStyle(flag, value);
public new void WndProc(ref Message m) => base.WndProc(ref m);
@@ -1653,10 +1925,10 @@ private class DataClass
public string Value { get; set; }
}
- [Fact]
+ [WinFormsFact]
public void GettingComboBoxItemAccessibleObject_Not_ThrowsException()
{
- var control = new ComboBox();
+ using var control = new ComboBox();
var h1 = new HashNotImplementedObject();
var h2 = new HashNotImplementedObject();
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs
index e8d1a4feae5..102cf2020b3 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs
@@ -2,13 +2,16 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
+using System.Linq;
using Moq;
using WinForms.Common.Tests;
using Xunit;
using static Interop;
+using static Interop.User32;
namespace System.Windows.Forms.Tests
{
@@ -102,6 +105,7 @@ public void ListBox_Ctor_Default()
Assert.Equal(Padding.Empty, control.Padding);
Assert.Null(control.Parent);
Assert.Equal("Microsoft\u00AE .NET", control.ProductName);
+ Assert.Equal(13 + SystemInformation.BorderSize.Height * 4 + 3, control.PreferredHeight);
Assert.Equal(new Size(120, 96), control.PreferredSize);
Assert.False(control.RecreatingHandle);
Assert.Null(control.Region);
@@ -111,6 +115,7 @@ public void ListBox_Ctor_Default()
Assert.False(control.ScrollAlwaysVisible);
Assert.Null(control.SelectedValue);
Assert.Equal(-1, control.SelectedIndex);
+ Assert.Null(control.SelectedItem);
Assert.Empty(control.SelectedIndices);
Assert.Same(control.SelectedIndices, control.SelectedIndices);
Assert.Null(control.SelectedItem);
@@ -158,17 +163,206 @@ public void ListBox_CreateParams_GetDefault_ReturnsExpected()
Assert.False(control.IsHandleCreated);
}
+ [WinFormsTheory]
+ [InlineData(true, 0x562110C1)]
+ [InlineData(false, 0x562100C1)]
+ public void ListBox_CreateParams_GetScrolAlwaysVisible_ReturnsExpected(bool scrollAlwaysVisible, int expectedStyle)
+ {
+ using var control = new SubListBox
+ {
+ ScrollAlwaysVisible = scrollAlwaysVisible
+ };
+
+ CreateParams createParams = control.CreateParams;
+ Assert.Null(createParams.Caption);
+ Assert.Equal("ListBox", createParams.ClassName);
+ Assert.Equal(0x8, createParams.ClassStyle);
+ Assert.Equal(0x200, createParams.ExStyle);
+ Assert.Equal(96, createParams.Height);
+ Assert.Equal(IntPtr.Zero, createParams.Parent);
+ Assert.Null(createParams.Param);
+ Assert.Equal(expectedStyle, createParams.Style);
+ Assert.Equal(120, createParams.Width);
+ Assert.Equal(0, createParams.X);
+ Assert.Equal(0, createParams.Y);
+ Assert.Same(createParams, control.CreateParams);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsTheory]
+ [InlineData(true, 0x562100C1)]
+ [InlineData(false, 0x562101C1)]
+ public void ListBox_CreateParams_GetIntegralHeight_ReturnsExpected(bool integralHeight, int expectedStyle)
+ {
+ using var control = new SubListBox
+ {
+ IntegralHeight = integralHeight
+ };
+
+ CreateParams createParams = control.CreateParams;
+ Assert.Null(createParams.Caption);
+ Assert.Equal("ListBox", createParams.ClassName);
+ Assert.Equal(0x8, createParams.ClassStyle);
+ Assert.Equal(0x200, createParams.ExStyle);
+ Assert.Equal(96, createParams.Height);
+ Assert.Equal(IntPtr.Zero, createParams.Parent);
+ Assert.Null(createParams.Param);
+ Assert.Equal(expectedStyle, createParams.Style);
+ Assert.Equal(120, createParams.Width);
+ Assert.Equal(0, createParams.X);
+ Assert.Equal(0, createParams.Y);
+ Assert.Same(createParams, control.CreateParams);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsTheory]
+ [InlineData(true, 0x562100C1)]
+ [InlineData(false, 0x56210041)]
+ public void ListBox_CreateParams_GetUseTabStops_ReturnsExpected(bool useTabStops, int expectedStyle)
+ {
+ using var control = new SubListBox
+ {
+ UseTabStops = useTabStops
+ };
+
+ CreateParams createParams = control.CreateParams;
+ Assert.Null(createParams.Caption);
+ Assert.Equal("ListBox", createParams.ClassName);
+ Assert.Equal(0x8, createParams.ClassStyle);
+ Assert.Equal(0x200, createParams.ExStyle);
+ Assert.Equal(96, createParams.Height);
+ Assert.Equal(IntPtr.Zero, createParams.Parent);
+ Assert.Null(createParams.Param);
+ Assert.Equal(expectedStyle, createParams.Style);
+ Assert.Equal(120, createParams.Width);
+ Assert.Equal(0, createParams.X);
+ Assert.Equal(0, createParams.Y);
+ Assert.Same(createParams, control.CreateParams);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsTheory]
+ [InlineData(BorderStyle.None, 0x562100C1, 0)]
+ [InlineData(BorderStyle.Fixed3D, 0x562100C1, 0x200)]
+ [InlineData(BorderStyle.FixedSingle, 0x56A100C1, 0)]
+ public void ListBox_CreateParams_GetBorderStyle_ReturnsExpected(BorderStyle borderStyle, int expectedStyle, int expectedExStyle)
+ {
+ using var control = new SubListBox
+ {
+ BorderStyle = borderStyle
+ };
+
+ CreateParams createParams = control.CreateParams;
+ Assert.Null(createParams.Caption);
+ Assert.Equal("ListBox", createParams.ClassName);
+ Assert.Equal(0x8, createParams.ClassStyle);
+ Assert.Equal(expectedExStyle, createParams.ExStyle);
+ Assert.Equal(96, createParams.Height);
+ Assert.Equal(IntPtr.Zero, createParams.Parent);
+ Assert.Null(createParams.Param);
+ Assert.Equal(expectedStyle, createParams.Style);
+ Assert.Equal(120, createParams.Width);
+ Assert.Equal(0, createParams.X);
+ Assert.Equal(0, createParams.Y);
+ Assert.Same(createParams, control.CreateParams);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsTheory]
+ [InlineData(true, true, 0x563102C1)]
+ [InlineData(true, false, 0x563102C1)]
+ [InlineData(false, true, 0x563100C1)]
+ [InlineData(false, false, 0x562100C1)]
+ public void ListBox_CreateParams_GetMultiColumn_ReturnsExpected(bool multiColumn, bool horizontalScrollBar, int expectedStyle)
+ {
+ using var control = new SubListBox
+ {
+ MultiColumn = multiColumn,
+ HorizontalScrollbar = horizontalScrollBar
+ };
+
+ CreateParams createParams = control.CreateParams;
+ Assert.Null(createParams.Caption);
+ Assert.Equal("ListBox", createParams.ClassName);
+ Assert.Equal(0x8, createParams.ClassStyle);
+ Assert.Equal(0x200, createParams.ExStyle);
+ Assert.Equal(96, createParams.Height);
+ Assert.Equal(IntPtr.Zero, createParams.Parent);
+ Assert.Null(createParams.Param);
+ Assert.Equal(expectedStyle, createParams.Style);
+ Assert.Equal(120, createParams.Width);
+ Assert.Equal(0, createParams.X);
+ Assert.Equal(0, createParams.Y);
+ Assert.Same(createParams, control.CreateParams);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsTheory]
+ [InlineData(SelectionMode.MultiExtended, 0x562108C1)]
+ [InlineData(SelectionMode.MultiSimple, 0x562100C9)]
+ [InlineData(SelectionMode.None, 0x562140C1)]
+ [InlineData(SelectionMode.One, 0x562100C1)]
+ public void ListBox_CreateParams_GetSelectionMode_ReturnsExpected(SelectionMode selectionMode, int expectedStyle)
+ {
+ using var control = new SubListBox
+ {
+ SelectionMode = selectionMode
+ };
+
+ CreateParams createParams = control.CreateParams;
+ Assert.Null(createParams.Caption);
+ Assert.Equal("ListBox", createParams.ClassName);
+ Assert.Equal(0x8, createParams.ClassStyle);
+ Assert.Equal(0x200, createParams.ExStyle);
+ Assert.Equal(96, createParams.Height);
+ Assert.Equal(IntPtr.Zero, createParams.Parent);
+ Assert.Null(createParams.Param);
+ Assert.Equal(expectedStyle, createParams.Style);
+ Assert.Equal(120, createParams.Width);
+ Assert.Equal(0, createParams.X);
+ Assert.Equal(0, createParams.Y);
+ Assert.Same(createParams, control.CreateParams);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsTheory]
+ [InlineData(DrawMode.Normal, 0x562100C1)]
+ [InlineData(DrawMode.OwnerDrawFixed, 0x562100D1)]
+ [InlineData(DrawMode.OwnerDrawVariable, 0x562100E1)]
+ public void ListBox_CreateParams_GetDrawMode_ReturnsExpected(DrawMode drawMode, int expectedStyle)
+ {
+ using var control = new SubListBox
+ {
+ DrawMode = drawMode
+ };
+
+ CreateParams createParams = control.CreateParams;
+ Assert.Null(createParams.Caption);
+ Assert.Equal("ListBox", createParams.ClassName);
+ Assert.Equal(0x8, createParams.ClassStyle);
+ Assert.Equal(0x200, createParams.ExStyle);
+ Assert.Equal(96, createParams.Height);
+ Assert.Equal(IntPtr.Zero, createParams.Parent);
+ Assert.Null(createParams.Param);
+ Assert.Equal(expectedStyle, createParams.Style);
+ Assert.Equal(120, createParams.Width);
+ Assert.Equal(0, createParams.X);
+ Assert.Equal(0, createParams.Y);
+ Assert.Same(createParams, control.CreateParams);
+ Assert.False(control.IsHandleCreated);
+ }
+
public static IEnumerable BackColor_Set_TestData()
{
yield return new object[] { Color.Empty, SystemColors.Window };
yield return new object[] { Color.Red, Color.Red };
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(BackColor_Set_TestData))]
public void ListBox_BackColor_Set_GetReturnsExpected(Color value, Color expected)
{
- var control = new ListBox
+ using var control = new ListBox
{
BackColor = value
};
@@ -187,11 +381,11 @@ public static IEnumerable BackColor_SetWithHandle_TestData()
yield return new object[] { Color.Red, Color.Red, 1 };
}
- [Theory]
+ [WinFormsTheory]
[MemberData(nameof(BackColor_SetWithHandle_TestData))]
public void ListBox_BackColor_SetWithHandle_GetReturnsExpected(Color value, Color expected, int expectedInvalidatedCallCount)
{
- var control = new ListBox();
+ using var control = new ListBox();
Assert.NotEqual(IntPtr.Zero, control.Handle);
int invalidatedCallCount = 0;
control.Invalidated += (sender, e) => invalidatedCallCount++;
@@ -216,10 +410,10 @@ public void ListBox_BackColor_SetWithHandle_GetReturnsExpected(Color value, Colo
Assert.Equal(0, createdCallCount);
}
- [Fact]
+ [WinFormsFact]
public void ListBox_BackColor_SetWithHandler_CallsBackColorChanged()
{
- var control = new ListBox();
+ using var control = new ListBox();
int callCount = 0;
EventHandler handler = (sender, e) =>
{
@@ -251,25 +445,60 @@ public void ListBox_BackColor_SetWithHandler_CallsBackColorChanged()
Assert.Equal(2, callCount);
}
- [Theory]
+ [WinFormsFact]
+ public void ListBox_BackColor_ResetValue_Success()
+ {
+ PropertyDescriptor property = TypeDescriptor.GetProperties(typeof(ListBox))[nameof(ListBox.BackColor)];
+ using var control = new ListBox();
+ Assert.False(property.CanResetValue(control));
+
+ control.BackColor = Color.Red;
+ Assert.Equal(Color.Red, control.BackColor);
+ Assert.True(property.CanResetValue(control));
+
+ property.ResetValue(control);
+ Assert.Equal(SystemColors.Window, control.BackColor);
+ Assert.False(property.CanResetValue(control));
+ }
+
+ [WinFormsFact]
+ public void ListBox_BackColor_ShouldSerializeValue_Success()
+ {
+ PropertyDescriptor property = TypeDescriptor.GetProperties(typeof(ListBox))[nameof(ListBox.BackColor)];
+ using var control = new ListBox();
+ Assert.False(property.ShouldSerializeValue(control));
+
+ control.BackColor = Color.Red;
+ Assert.Equal(Color.Red, control.BackColor);
+ Assert.True(property.ShouldSerializeValue(control));
+
+ property.ResetValue(control);
+ Assert.Equal(SystemColors.Window, control.BackColor);
+ Assert.False(property.ShouldSerializeValue(control));
+ }
+
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetImageTheoryData))]
- public void BackgroundImage_Set_GetReturnsExpected(Image value)
+ public void ListBox_BackgroundImage_Set_GetReturnsExpected(Image value)
{
- var control = new ListBox
+ using var control = new ListBox
{
BackgroundImage = value
};
Assert.Equal(value, control.BackgroundImage);
+ Assert.False(control.IsHandleCreated);
// Set same.
control.BackgroundImage = value;
Assert.Equal(value, control.BackgroundImage);
+ Assert.False(control.IsHandleCreated);
+ Assert.False(control.IsHandleCreated);
}
- [Fact]
- public void BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
+ [WinFormsFact]
+ public void ListBox_BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
{
- var control = new ListBox();
+ using var control = new ListBox();
int callCount = 0;
EventHandler handler = (sender, e) =>
{
@@ -280,7 +509,7 @@ public void BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
control.BackgroundImageChanged += handler;
// Set different.
- var image1 = new Bitmap(10, 10);
+ using var image1 = new Bitmap(10, 10);
control.BackgroundImage = image1;
Assert.Same(image1, control.BackgroundImage);
Assert.Equal(1, callCount);
@@ -291,7 +520,7 @@ public void BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
Assert.Equal(1, callCount);
// Set different.
- var image2 = new Bitmap(10, 10);
+ using var image2 = new Bitmap(10, 10);
control.BackgroundImage = image2;
Assert.Same(image2, control.BackgroundImage);
Assert.Equal(2, callCount);
@@ -308,25 +537,27 @@ public void BackgroundImage_SetWithHandler_CallsBackgroundImageChanged()
Assert.Equal(3, callCount);
}
- [Theory]
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryData), typeof(ImageLayout))]
- public void BackgroundImageLayout_Set_GetReturnsExpected(ImageLayout value)
+ public void ListBox_BackgroundImageLayout_Set_GetReturnsExpected(ImageLayout value)
{
- var control = new ListBox
+ using var control = new ListBox
{
BackgroundImageLayout = value
};
Assert.Equal(value, control.BackgroundImageLayout);
+ Assert.False(control.IsHandleCreated);
// Set same.
control.BackgroundImageLayout = value;
Assert.Equal(value, control.BackgroundImageLayout);
+ Assert.False(control.IsHandleCreated);
}
- [Fact]
- public void BackgroundImageLayout_SetWithHandler_CallsBackgroundImageLayoutChanged()
+ [WinFormsFact]
+ public void ListBox_BackgroundImageLayout_SetWithHandler_CallsBackgroundImageLayoutChanged()
{
- var control = new ListBox();
+ using var control = new ListBox();
int callCount = 0;
EventHandler handler = (sender, e) =>
{
@@ -358,68 +589,259 @@ public void BackgroundImageLayout_SetWithHandler_CallsBackgroundImageLayoutChang
Assert.Equal(2, callCount);
}
- [Theory]
+ [WinFormsTheory]
[CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryDataInvalid), typeof(ImageLayout))]
- public void BackgroundImageLayout_SetInvalid_ThrowsInvalidEnumArgumentException(ImageLayout value)
+ public void ListBox_BackgroundImageLayout_SetInvalid_ThrowsInvalidEnumArgumentException(ImageLayout value)
{
- var control = new ListBox();
+ using var control = new ListBox();
Assert.Throws("value", () => control.BackgroundImageLayout = value);
}
- public static IEnumerable DataSource_Set_TestData()
+ [WinFormsTheory]
+ [CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryData), typeof(BorderStyle))]
+ public void ListBox_BorderStyle_Set_GetReturnsExpected(BorderStyle value)
{
- yield return new object[] { null };
- yield return new object[] { new List() };
- yield return new object[] { Array.Empty() };
+ using var control = new ListBox()
+ {
+ BorderStyle = value
+ };
+ Assert.Equal(value, control.BorderStyle);
+ Assert.Equal(96, control.Height);
+ Assert.False(control.IsHandleCreated);
- var mockSource = new Mock(MockBehavior.Strict);
- mockSource
- .Setup(s => s.GetList())
- .Returns(new int[] { 1 });
- yield return new object[] { mockSource.Object };
+ // Set same.
+ control.BorderStyle = value;
+ Assert.Equal(value, control.BorderStyle);
+ Assert.Equal(96, control.Height);
+ Assert.False(control.IsHandleCreated);
}
- [Theory]
- [MemberData(nameof(DataSource_Set_TestData))]
- public void DataSource_Set_GetReturnsExpected(object value)
+ [WinFormsTheory]
+ [InlineData(BorderStyle.Fixed3D, 0)]
+ [InlineData(BorderStyle.FixedSingle, 1)]
+ [InlineData(BorderStyle.None, 1)]
+ public void ListBox_BorderStyle_SetWithHandle_GetReturnsExpected(BorderStyle value, int expectedCreatedCallCount)
{
- var control = new SubListBox
- {
- DataSource = value
- };
- Assert.Same(value, control.DataSource);
- Assert.Empty(control.DisplayMember);
- Assert.Null(control.DataManager);
+ using var control = new ListBox();
+ Assert.NotEqual(IntPtr.Zero, control.Handle);
+ int invalidatedCallCount = 0;
+ control.Invalidated += (sender, e) => invalidatedCallCount++;
+ int styleChangedCallCount = 0;
+ control.StyleChanged += (sender, e) => styleChangedCallCount++;
+ int createdCallCount = 0;
+ control.HandleCreated += (sender, e) => createdCallCount++;
+
+ control.BorderStyle = value;
+ Assert.Equal(value, control.BorderStyle);
+ Assert.True(control.Height > 0);
+ Assert.True(control.IsHandleCreated);
+ Assert.Equal(0, invalidatedCallCount);
+ Assert.Equal(0, styleChangedCallCount);
+ Assert.Equal(expectedCreatedCallCount, createdCallCount);
// Set same.
- control.DataSource = value;
- Assert.Same(value, control.DataSource);
- Assert.Empty(control.DisplayMember);
- Assert.Null(control.DataManager);
+ control.BorderStyle = value;
+ Assert.Equal(value, control.BorderStyle);
+ Assert.True(control.Height > 0);
+ Assert.True(control.IsHandleCreated);
+ Assert.Equal(0, invalidatedCallCount);
+ Assert.Equal(0, styleChangedCallCount);
+ Assert.Equal(expectedCreatedCallCount, createdCallCount);
}
- [Fact]
- public void DataSource_SetWithHandler_CallsDataSourceChanged()
+ [WinFormsTheory]
+ [CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryDataInvalid), typeof(BorderStyle))]
+ public void ListBox_BorderStyle_SetInvalid_ThrowsInvalidEnumArgumentException(BorderStyle value)
{
- var control = new ListBox();
- int dataSourceCallCount = 0;
- int displayMemberCallCount = 0;
- EventHandler dataSourceHandler = (sender, e) =>
- {
- Assert.Same(control, sender);
- Assert.Same(EventArgs.Empty, e);
- dataSourceCallCount++;
- };
- EventHandler displayMemberHandler = (sender, e) =>
+ using var control = new ListBox();
+ Assert.Throws("value", () => control.BorderStyle = value);
+ }
+
+ [WinFormsTheory]
+ [InlineData(0)]
+ [InlineData(1)]
+ [InlineData(60)]
+ [InlineData(int.MaxValue)]
+ public void ListBox_ColumnWidth_Set_GetReturnsExpected(int value)
+ {
+ using var control = new ListBox
{
- Assert.Same(control, sender);
- Assert.Same(EventArgs.Empty, e);
- displayMemberCallCount++;
+ ColumnWidth = value
};
- control.DataSourceChanged += dataSourceHandler;
- control.DisplayMemberChanged += displayMemberHandler;
+ Assert.Equal(value, control.ColumnWidth);
+ Assert.False(control.IsHandleCreated);
- // Set different.
+ control.ColumnWidth = value;
+ Assert.Equal(value, control.ColumnWidth);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsTheory]
+ [InlineData(0)]
+ [InlineData(1)]
+ [InlineData(60)]
+ [InlineData(int.MaxValue)]
+ public void ListBox_ColumnWidth_SetWithCustomOldValue_GetReturnsExpected(int value)
+ {
+ using var control = new ListBox
+ {
+ ColumnWidth = 10
+ };
+
+ control.ColumnWidth = value;
+ Assert.Equal(value, control.ColumnWidth);
+ Assert.False(control.IsHandleCreated);
+
+ control.ColumnWidth = value;
+ Assert.Equal(value, control.ColumnWidth);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsTheory]
+ [InlineData(0)]
+ [InlineData(1)]
+ [InlineData(60)]
+ [InlineData(int.MaxValue)]
+ public void ListBox_ColumnWidth_SetWithHandle_GetReturnsExpected(int value)
+ {
+ using var control = new ListBox();
+ Assert.NotEqual(IntPtr.Zero, control.Handle);
+ int invalidatedCallCount = 0;
+ control.Invalidated += (sender, e) => invalidatedCallCount++;
+ int styleChangedCallCount = 0;
+ control.StyleChanged += (sender, e) => styleChangedCallCount++;
+ int createdCallCount = 0;
+ control.HandleCreated += (sender, e) => createdCallCount++;
+
+ control.ColumnWidth = value;
+ Assert.Equal(value, control.ColumnWidth);
+ Assert.True(control.IsHandleCreated);
+ Assert.Equal(0, invalidatedCallCount);
+ Assert.Equal(0, styleChangedCallCount);
+ Assert.Equal(0, createdCallCount);
+
+ control.ColumnWidth = value;
+ Assert.Equal(value, control.ColumnWidth);
+ Assert.True(control.IsHandleCreated);
+ Assert.Equal(0, invalidatedCallCount);
+ Assert.Equal(0, styleChangedCallCount);
+ Assert.Equal(0, createdCallCount);
+ }
+
+ [WinFormsTheory]
+ [InlineData(0, 1)]
+ [InlineData(1, 0)]
+ [InlineData(60, 0)]
+ [InlineData(int.MaxValue, 0)]
+ public void ListBox_ColumnWidth_SetWithCustomOldValueWithHandle_GetReturnsExpected(int value, int expectedCreatedCallCount)
+ {
+ using var control = new ListBox
+ {
+ ColumnWidth = 10
+ };
+ Assert.NotEqual(IntPtr.Zero, control.Handle);
+ int invalidatedCallCount = 0;
+ control.Invalidated += (sender, e) => invalidatedCallCount++;
+ int styleChangedCallCount = 0;
+ control.StyleChanged += (sender, e) => styleChangedCallCount++;
+ int createdCallCount = 0;
+ control.HandleCreated += (sender, e) => createdCallCount++;
+
+ control.ColumnWidth = value;
+ Assert.Equal(value, control.ColumnWidth);
+ Assert.True(control.IsHandleCreated);
+ Assert.Equal(0, invalidatedCallCount);
+ Assert.Equal(0, styleChangedCallCount);
+ Assert.Equal(expectedCreatedCallCount, createdCallCount);
+
+ control.ColumnWidth = value;
+ Assert.Equal(value, control.ColumnWidth);
+ Assert.True(control.IsHandleCreated);
+ Assert.Equal(0, invalidatedCallCount);
+ Assert.Equal(0, styleChangedCallCount);
+ Assert.Equal(expectedCreatedCallCount, createdCallCount);
+ }
+
+ [WinFormsFact]
+ public void ListBox_ColumnWidth_GetItemRect_ReturnsExpected()
+ {
+ using var control = new ListBox
+ {
+ MultiColumn = true
+ };
+ control.Items.Add("Value");
+
+ Assert.NotEqual(IntPtr.Zero, control.Handle);
+ control.ColumnWidth = 123;
+
+ RECT rc = default;
+ Assert.Equal((IntPtr)1, SendMessageW(control.Handle, (WindowMessage)LB.GETITEMRECT, (IntPtr)0, ref rc));
+ Assert.Equal(123, ((Rectangle)rc).Width);
+ }
+
+ [WinFormsFact]
+ public void ListBox_ColumnWidth_SetNegative_ThrowsArgumentOutOfRangeException()
+ {
+ using var control = new ListBox();
+ Assert.Throws("value", () => control.ColumnWidth = -1);
+ }
+
+ public static IEnumerable DataSource_Set_TestData()
+ {
+ yield return new object[] { null };
+ yield return new object[] { new List() };
+ yield return new object[] { Array.Empty() };
+
+ var mockSource = new Mock(MockBehavior.Strict);
+ mockSource
+ .Setup(s => s.GetList())
+ .Returns(new int[] { 1 });
+ yield return new object[] { mockSource.Object };
+ }
+
+ [WinFormsTheory]
+ [MemberData(nameof(DataSource_Set_TestData))]
+ public void ListBox_DataSource_Set_GetReturnsExpected(object value)
+ {
+ using var control = new SubListBox
+ {
+ DataSource = value
+ };
+ Assert.Same(value, control.DataSource);
+ Assert.Empty(control.DisplayMember);
+ Assert.Null(control.DataManager);
+ Assert.False(control.IsHandleCreated);
+
+ // Set same.
+ control.DataSource = value;
+ Assert.Same(value, control.DataSource);
+ Assert.Empty(control.DisplayMember);
+ Assert.Null(control.DataManager);
+ Assert.False(control.IsHandleCreated);
+ }
+
+ [WinFormsFact]
+ public void ListBox_DataSource_SetWithHandler_CallsDataSourceChanged()
+ {
+ using var control = new ListBox();
+ int dataSourceCallCount = 0;
+ int displayMemberCallCount = 0;
+ EventHandler dataSourceHandler = (sender, e) =>
+ {
+ Assert.Same(control, sender);
+ Assert.Same(EventArgs.Empty, e);
+ dataSourceCallCount++;
+ };
+ EventHandler displayMemberHandler = (sender, e) =>
+ {
+ Assert.Same(control, sender);
+ Assert.Same(EventArgs.Empty, e);
+ displayMemberCallCount++;
+ };
+ control.DataSourceChanged += dataSourceHandler;
+ control.DisplayMemberChanged += displayMemberHandler;
+
+ // Set different.
var dataSource1 = new List();
control.DataSource = dataSource1;
Assert.Same(dataSource1, control.DataSource);
@@ -454,107 +876,129 @@ public void DataSource_SetWithHandler_CallsDataSourceChanged()
Assert.Equal(0, displayMemberCallCount);
}
- [WinFormsTheory]
- [CommonMemberData(nameof(CommonTestHelper.GetFontTheoryData))]
- public void Font_Set_GetReturnsExpected(Font value)
+ public static IEnumerable DrawMode_Set_TestData()
{
- using var control = new SubListBox
+ foreach (bool autoSize in new bool[] { true, false })
{
- Font = value
- };
- Assert.Equal(value ?? Control.DefaultFont, control.Font);
- Assert.Equal(control.Font.Height, control.FontHeight);
- Assert.False(control.IsHandleCreated);
+ yield return new object[] { autoSize, true, DrawMode.Normal };
+ yield return new object[] { autoSize, false, DrawMode.Normal };
- // Set same.
- control.Font = value;
- Assert.Equal(value ?? Control.DefaultFont, control.Font);
- Assert.Equal(control.Font.Height, control.FontHeight);
- Assert.False(control.IsHandleCreated);
+ yield return new object[] { autoSize, true, DrawMode.OwnerDrawFixed };
+ yield return new object[] { autoSize, false, DrawMode.OwnerDrawFixed };
+
+ yield return new object[] { autoSize, false, DrawMode.OwnerDrawVariable };
+ }
}
- [WinFormsFact]
- public void ListBox_Font_SetWithHandler_CallsFontChanged()
+ [WinFormsTheory]
+ [MemberData(nameof(DrawMode_Set_TestData))]
+ public void ListBox_DrawMode_Set_GetReturnsExpected(bool autoSize, bool multiColumn, DrawMode value)
{
- using var control = new ListBox();
- int callCount = 0;
- EventHandler handler = (sender, e) =>
+ using var control = new ListBox
{
- Assert.Same(control, sender);
- Assert.Same(EventArgs.Empty, e);
- callCount++;
+ AutoSize = autoSize,
+ MultiColumn = multiColumn
};
- control.FontChanged += handler;
+ int layoutCallCount = 0;
+ control.Layout += (sender, e) => layoutCallCount++;
- // Set different.
- using var font1 = new Font("Arial", 8.25f);
- control.Font = font1;
- Assert.Same(font1, control.Font);
- Assert.Equal(1, callCount);
+ control.DrawMode = value;
+ Assert.Equal(value, control.DrawMode);
+ Assert.Equal(0, layoutCallCount);
+ Assert.False(control.IsHandleCreated);
// Set same.
- control.Font = font1;
- Assert.Same(font1, control.Font);
- Assert.Equal(1, callCount);
-
- // Set different.
- using var font2 = SystemFonts.DialogFont;
- control.Font = font2;
- Assert.Same(font2, control.Font);
- Assert.Equal(2, callCount);
-
- // Set null.
- control.Font = null;
- Assert.Equal(Control.DefaultFont, control.Font);
- Assert.Equal(3, callCount);
-
- // Remove handler.
- control.FontChanged -= handler;
- control.Font = font1;
- Assert.Same(font1, control.Font);
- Assert.Equal(3, callCount);
+ control.DrawMode = value;
+ Assert.Equal(value, control.DrawMode);
+ Assert.Equal(0, layoutCallCount);
+ Assert.False(control.IsHandleCreated);
}
- public static IEnumerable ForeColor_Set_TestData()
+ public static IEnumerable DrawMode_SetWithParent_TestData()
{
- yield return new object[] { Color.Empty, SystemColors.WindowText };
- yield return new object[] { Color.FromArgb(254, 1, 2, 3), Color.FromArgb(254, 1, 2, 3) };
- yield return new object[] { Color.White, Color.White };
- yield return new object[] { Color.Black, Color.Black };
- yield return new object[] { Color.Red, Color.Red };
+ yield return new object[] { true, true, DrawMode.Normal, 0 };
+ yield return new object[] { true, false, DrawMode.Normal, 0 };
+ yield return new object[] { false, true, DrawMode.Normal, 0 };
+ yield return new object[] { false, false, DrawMode.Normal, 0 };
+
+ yield return new object[] { true, true, DrawMode.OwnerDrawFixed, 0 };
+ yield return new object[] { true, false, DrawMode.OwnerDrawFixed, 0 };
+ yield return new object[] { false, true, DrawMode.OwnerDrawFixed, 0 };
+ yield return new object[] { false, false, DrawMode.OwnerDrawFixed, 0 };
+
+ yield return new object[] { true, false, DrawMode.OwnerDrawVariable, 1 };
+ yield return new object[] { false, false, DrawMode.OwnerDrawVariable, 0 };
}
- [Theory]
- [MemberData(nameof(ForeColor_Set_TestData))]
- public void ListBox_ForeColor_Set_GetReturnsExpected(Color value, Color expected)
+ [WinFormsTheory]
+ [MemberData(nameof(DrawMode_SetWithParent_TestData))]
+ public void ListBox_DrawMode_SetWithParent_GetReturnsExpected(bool autoSize, bool multiColumn, DrawMode value, int expectedParentLayoutCallCount)
{
- var control = new ListBox
+ using var parent = new Control();
+ using var control = new ListBox
{
- ForeColor = value
+ AutoSize = autoSize,
+ MultiColumn = multiColumn,
+ Parent = parent
};
- Assert.Equal(expected, control.ForeColor);
- Assert.False(control.IsHandleCreated);
+ int layoutCallCount = 0;
+ control.Layout += (sender, e) => layoutCallCount++;
+ int parentLayoutCallCount = 0;
+ void parentHandler(object sender, LayoutEventArgs e)
+ {
+ Assert.Same(parent, sender);
+ Assert.Same(control, e.AffectedControl);
+ Assert.Equal("DrawMode", e.AffectedProperty);
+ parentLayoutCallCount++;
+ };
+ parent.Layout += parentHandler;
- // Set same.
- control.ForeColor = value;
- Assert.Equal(expected, control.ForeColor);
- Assert.False(control.IsHandleCreated);
+ try
+ {
+ control.DrawMode = value;
+ Assert.Equal(value, control.DrawMode);
+ Assert.Equal(0, layoutCallCount);
+ Assert.Equal(expectedParentLayoutCallCount, parentLayoutCallCount);
+ Assert.False(control.IsHandleCreated);
+ Assert.False(parent.IsHandleCreated);
+
+ // Set same.
+ control.DrawMode = value;
+ Assert.Equal(value, control.DrawMode);
+ Assert.Equal(0, layoutCallCount);
+ Assert.Equal(expectedParentLayoutCallCount, parentLayoutCallCount);
+ Assert.False(control.IsHandleCreated);
+ Assert.False(parent.IsHandleCreated);
+ }
+ finally
+ {
+ parent.Layout -= parentHandler;
+ }
}
- public static IEnumerable ForeColor_SetWithHandle_TestData()
+ public static IEnumerable DrawMode_SetWithHandle_TestData()
{
- yield return new object[] { Color.Empty, SystemColors.WindowText, 0 };
- yield return new object[] { Color.FromArgb(254, 1, 2, 3), Color.FromArgb(254, 1, 2, 3), 1 };
- yield return new object[] { Color.White, Color.White, 1 };
- yield return new object[] { Color.Black, Color.Black, 1 };
- yield return new object[] { Color.Red, Color.Red, 1 };
+ foreach (bool autoSize in new bool[] { true, false })
+ {
+ yield return new object[] { autoSize, true, DrawMode.Normal, 0 };
+ yield return new object[] { autoSize, false, DrawMode.Normal, 0 };
+
+ yield return new object[] { autoSize, true, DrawMode.OwnerDrawFixed, 1 };
+ yield return new object[] { autoSize, false, DrawMode.OwnerDrawFixed, 1 };
+
+ yield return new object[] { autoSize, false, DrawMode.OwnerDrawVariable, 1 };
+ }
}
- [Theory]
- [MemberData(nameof(ForeColor_SetWithHandle_TestData))]
- public void ListBox_ForeColor_SetWithHandle_GetReturnsExpected(Color value, Color expected, int expectedInvalidatedCallCount)
+ [WinFormsTheory]
+ [MemberData(nameof(DrawMode_SetWithHandle_TestData))]
+ public void ListBox_DrawMode_SetWithHandle_GetReturnsExpected(bool autoSize, bool multiColumn, DrawMode value, int expectedCreatedCallCount)
{
- var control = new ListBox();
+ using var control = new ListBox
+ {
+ AutoSize = autoSize,
+ MultiColumn = multiColumn
+ };
Assert.NotEqual(IntPtr.Zero, control.Handle);
int invalidatedCallCount = 0;
control.Invalidated += (sender, e) => invalidatedCallCount++;
@@ -562,80 +1006,122 @@ public void ListBox_ForeColor_SetWithHandle_GetReturnsExpected(Color value, Colo
control.StyleChanged += (sender, e) => styleChangedCallCount++;
int createdCallCount = 0;
control.HandleCreated += (sender, e) => createdCallCount++;
+ int layoutCallCount = 0;
+ control.Layout += (sender, e) => layoutCallCount++;
- control.ForeColor = value;
- Assert.Equal(expected, control.ForeColor);
+ control.DrawMode = value;
+ Assert.Equal(value, control.DrawMode);
+ Assert.Equal(expectedCreatedCallCount * 2, layoutCallCount);
Assert.True(control.IsHandleCreated);
- Assert.Equal(expectedInvalidatedCallCount, invalidatedCallCount);
+ Assert.Equal(0, invalidatedCallCount);
Assert.Equal(0, styleChangedCallCount);
- Assert.Equal(0, createdCallCount);
+ Assert.Equal(expectedCreatedCallCount, createdCallCount);
// Set same.
- control.ForeColor = value;
- Assert.Equal(expected, control.ForeColor);
+ control.DrawMode = value;
+ Assert.Equal(value, control.DrawMode);
+ Assert.Equal(expectedCreatedCallCount * 2, layoutCallCount);
Assert.True(control.IsHandleCreated);
- Assert.Equal(expectedInvalidatedCallCount, invalidatedCallCount);
+ Assert.Equal(0, invalidatedCallCount);
Assert.Equal(0, styleChangedCallCount);
- Assert.Equal(0, createdCallCount);
+ Assert.Equal(expectedCreatedCallCount, createdCallCount);
}
- [Fact]
- public void ListBox_ForeColor_SetWithHandler_CallsForeColorChanged()
+ [WinFormsTheory]
+ [CommonMemberData(nameof(CommonTestHelper.GetEnumTypeTheoryDataInvalid), typeof(DrawMode))]
+ public void ListBox_DrawMode_SetInvalidValue_ThrowsInvalidEnumArgumentException(DrawMode value)
{
- var control = new ListBox();
- int callCount = 0;
- EventHandler handler = (sender, e) =>
+ using var control = new ListBox();
+ Assert.Throws("value", () => control.DrawMode = value);
+ }
+
+ [WinFormsFact]
+ public void ListBox_DrawMode_SetMultiColumnOwnerDrawVariable_ThrowsArgumentException()
+ {
+ using var control = new ListBox
{
- Assert.Same(control, sender);
- Assert.Same(EventArgs.Empty, e);
- callCount++;
+ MultiColumn = true
};
- control.ForeColorChanged += handler;
+ Assert.Throws("value", () => control.DrawMode = DrawMode.OwnerDrawVariable);
+ }
- // Set different.
- control.ForeColor = Color.Red;
- Assert.Equal(Color.Red, control.ForeColor);
- Assert.Equal(1, callCount);
+ public static IEnumerable Font_Set_TestData()
+ {
+ foreach (bool integralHeight in new bool[] { true, false })
+ {
+ yield return new object[] { integralHeight, null };
+ yield return new object[] { integralHeight, new Font("Arial", 8.25f) };
+ }
+ }
- // Set same.
- control.ForeColor = Color.Red;
- Assert.Equal(Color.Red, control.ForeColor);
- Assert.Equal(1, callCount);
-
- // Set different.
- control.ForeColor = Color.Empty;
- Assert.Equal(SystemColors.WindowText, control.ForeColor);
- Assert.Equal(2, callCount);
+ [WinFormsTheory]
+ [MemberData(nameof(Font_Set_TestData))]
+ public void ListBox_Font_Set_GetReturnsExpected(bool integralHeight, Font value)
+ {
+ using var control = new SubListBox
+ {
+ IntegralHeight = integralHeight,
+ Font = value
+ };
+ Assert.Equal(value ?? Control.DefaultFont, control.Font);
+ Assert.Equal(control.Font.Height, control.FontHeight);
+ Assert.Equal(96, control.Height);
+ Assert.Empty(control.Items);
+ Assert.False(control.IsHandleCreated);
- // Remove handler.
- control.ForeColorChanged -= handler;
- control.ForeColor = Color.Red;
- Assert.Equal(Color.Red, control.ForeColor);
- Assert.Equal(2, callCount);
+ // Set same.
+ control.Font = value;
+ Assert.Equal(value ?? Control.DefaultFont, control.Font);
+ Assert.Equal(control.Font.Height, control.FontHeight);
+ Assert.Equal(96, control.Height);
+ Assert.Empty(control.Items);
+ Assert.False(control.IsHandleCreated);
}
[WinFormsTheory]
- [CommonMemberData(nameof(CommonTestHelper.GetPaddingNormalizedTheoryData))]
- public void ListBox_Padding_Set_GetReturnsExpected(Padding value, Padding expected)
+ [MemberData(nameof(Font_Set_TestData))]
+ public void ListBox_Font_SetWithItems_GetReturnsExpected(bool integralHeight, Font value)
{
- using var control = new ListBox
+ using var control = new SubListBox
{
- Padding = value
+ IntegralHeight = integralHeight
};
- Assert.Equal(expected, control.Padding);
+ control.Items.Add("item1");
+ control.Items.Add("item2");
+ control.Items.Add("item1");
+
+ control.Font = value;
+ Assert.Equal(value ?? Control.DefaultFont, control.Font);
+ Assert.Equal(control.Font.Height, control.FontHeight);
+ Assert.Equal(96, control.Height);
+ Assert.Equal(new string[] { "item1", "item2", "item1" }, control.Items.Cast