Skip to content

Commit 1f4e076

Browse files
committed
Address FeedBacks
1 parent 57adf22 commit 1f4e076

File tree

1 file changed

+29
-63
lines changed

1 file changed

+29
-63
lines changed

src/test/unit/System.Windows.Forms/System/Windows/Forms/DataGridViewComboBoxColumnTests.cs

Lines changed: 29 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -324,69 +324,35 @@ public void ComboBoxColumnAllProperties_ThrowInvalidOperationException_IfCellTem
324324
{
325325
_dataGridViewComboBoxColumn.CellTemplate = null;
326326

327-
Action getAutoComplete = () => { bool _ = _dataGridViewComboBoxColumn.AutoComplete; };
328-
Action setAutoComplete = () => _dataGridViewComboBoxColumn.AutoComplete = false;
329-
330-
Action getDataSource = () => { object? _ = _dataGridViewComboBoxColumn.DataSource; };
331-
Action setDataSource = () => _dataGridViewComboBoxColumn.DataSource = new[] { "A" };
332-
333-
Action getDisplayMember = () => { string _ = _dataGridViewComboBoxColumn.DisplayMember; };
334-
Action setDisplayMember = () => _dataGridViewComboBoxColumn.DisplayMember = "Name";
335-
336-
Action getValueMember = () => { string _ = _dataGridViewComboBoxColumn.ValueMember; };
337-
Action setValueMember = () => _dataGridViewComboBoxColumn.ValueMember = "Id";
338-
339-
Action getItems = () => { var _ = _dataGridViewComboBoxColumn.Items; };
340-
341-
Action getDisplayStyle = () => { DataGridViewComboBoxDisplayStyle _ = _dataGridViewComboBoxColumn.DisplayStyle; };
342-
Action setDisplayStyle = () => _dataGridViewComboBoxColumn.DisplayStyle = DataGridViewComboBoxDisplayStyle.ComboBox;
343-
344-
Action getDisplayStyleForCurrentCellOnly = () => { bool _ = _dataGridViewComboBoxColumn.DisplayStyleForCurrentCellOnly; };
345-
Action setDisplayStyleForCurrentCellOnly = () => _dataGridViewComboBoxColumn.DisplayStyleForCurrentCellOnly = true;
346-
347-
Action getDropDownWidth = () => { int _ = _dataGridViewComboBoxColumn.DropDownWidth; };
348-
Action setDropDownWidth = () => _dataGridViewComboBoxColumn.DropDownWidth = 5;
349-
350-
Action getMaxDropDownItems = () => { int _ = _dataGridViewComboBoxColumn.MaxDropDownItems; };
351-
Action setMaxDropDownItems = () => _dataGridViewComboBoxColumn.MaxDropDownItems = 5;
352-
353-
Action getSorted = () => { bool _ = _dataGridViewComboBoxColumn.Sorted; };
354-
Action setSorted = () => _dataGridViewComboBoxColumn.Sorted = true;
355-
356-
Action getFlatStyle = () => { FlatStyle _ = _dataGridViewComboBoxColumn.FlatStyle; };
357-
Action setFlatStyle = () => _dataGridViewComboBoxColumn.FlatStyle = FlatStyle.Flat;
358-
359-
getAutoComplete.Should().Throw<InvalidOperationException>();
360-
setAutoComplete.Should().Throw<InvalidOperationException>();
361-
362-
getDataSource.Should().Throw<InvalidOperationException>();
363-
setDataSource.Should().Throw<InvalidOperationException>();
364-
365-
getDisplayMember.Should().Throw<InvalidOperationException>();
366-
setDisplayMember.Should().Throw<InvalidOperationException>();
367-
368-
getValueMember.Should().Throw<InvalidOperationException>();
369-
setValueMember.Should().Throw<InvalidOperationException>();
370-
371-
getItems.Should().Throw<InvalidOperationException>();
372-
373-
getDisplayStyle.Should().Throw<InvalidOperationException>();
374-
setDisplayStyle.Should().Throw<InvalidOperationException>();
375-
376-
getDisplayStyleForCurrentCellOnly.Should().Throw<InvalidOperationException>();
377-
setDisplayStyleForCurrentCellOnly.Should().Throw<InvalidOperationException>();
378-
379-
getDropDownWidth.Should().Throw<InvalidOperationException>();
380-
setDropDownWidth.Should().Throw<InvalidOperationException>();
381-
382-
getMaxDropDownItems.Should().Throw<InvalidOperationException>();
383-
setMaxDropDownItems.Should().Throw<InvalidOperationException>();
384-
385-
getSorted.Should().Throw<InvalidOperationException>();
386-
setSorted.Should().Throw<InvalidOperationException>();
387-
388-
getFlatStyle.Should().Throw<InvalidOperationException>();
389-
setFlatStyle.Should().Throw<InvalidOperationException>();
327+
var actions = new List<Action>
328+
{
329+
() => { var _ = _dataGridViewComboBoxColumn.AutoComplete; },
330+
() => _dataGridViewComboBoxColumn.AutoComplete = false,
331+
() => { var _ = _dataGridViewComboBoxColumn.DataSource; },
332+
() => _dataGridViewComboBoxColumn.DataSource = new[] { "A" },
333+
() => { var _ = _dataGridViewComboBoxColumn.DisplayMember; },
334+
() => _dataGridViewComboBoxColumn.DisplayMember = "Name",
335+
() => { var _ = _dataGridViewComboBoxColumn.ValueMember; },
336+
() => _dataGridViewComboBoxColumn.ValueMember = "Id",
337+
() => { var _ = _dataGridViewComboBoxColumn.Items; },
338+
() => { var _ = _dataGridViewComboBoxColumn.DisplayStyle; },
339+
() => _dataGridViewComboBoxColumn.DisplayStyle = DataGridViewComboBoxDisplayStyle.ComboBox,
340+
() => { var _ = _dataGridViewComboBoxColumn.DisplayStyleForCurrentCellOnly; },
341+
() => _dataGridViewComboBoxColumn.DisplayStyleForCurrentCellOnly = true,
342+
() => { var _ = _dataGridViewComboBoxColumn.DropDownWidth; },
343+
() => _dataGridViewComboBoxColumn.DropDownWidth = 5,
344+
() => { var _ = _dataGridViewComboBoxColumn.MaxDropDownItems; },
345+
() => _dataGridViewComboBoxColumn.MaxDropDownItems = 5,
346+
() => { var _ = _dataGridViewComboBoxColumn.Sorted; },
347+
() => _dataGridViewComboBoxColumn.Sorted = true,
348+
() => { var _ = _dataGridViewComboBoxColumn.FlatStyle; },
349+
() => _dataGridViewComboBoxColumn.FlatStyle = FlatStyle.Flat
350+
};
351+
352+
foreach (var action in actions)
353+
{
354+
action.Should().Throw<InvalidOperationException>();
355+
}
390356
}
391357

392358
[WinFormsFact]

0 commit comments

Comments
 (0)