Skip to content

Commit

Permalink
Add ListViewGroup items to ListView when adding group
Browse files Browse the repository at this point in the history
  • Loading branch information
@hughbe
hughbe committed Sep 25, 2020
1 parent 9485739 commit 9865e5e
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 42 deletions.
6 changes: 5 additions & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroupCollection.cs
View file
Expand Up @@ -191,7 +191,11 @@ private void CheckListViewItems(ListViewGroup group)
for (int i = 0; i < group.Items.Count; i++)
{
ListViewItem item = group.Items[i];
if (item.ListView != null && item.ListView != _listView)
if (item.ListView == null)
{
_listView.Items.Add(item);
}
else if (item.ListView != _listView)
{
throw new ArgumentException(string.Format(SR.OnlyOneControl, item.Text));
}
Expand Down
6 changes: 0 additions & 6 deletions ...dows.Forms/tests/UnitTests/System/Windows/Forms/ListVIew.ListViewAccessibleObjectTests.cs
View file
Expand Up @@ -109,8 +109,6 @@ public void ListViewAccessibleObject_ListWithTwoGroups_GetChildCount_ReturnsCorr
item2.Group = group;
item.Group = group;
listView.Groups.Add(group);
listView.Items.Add(item);
listView.Items.Add(item2);

AccessibleObject accessibleObject = listView.AccessibilityObject;
Assert.Equal(expectedChildCount, accessibleObject.GetChildCount()); // Default group and one specified group
Expand All @@ -129,8 +127,6 @@ public void ListViewAccessibleObject_ListWithTwoGroups_FragmentNavigateWorkCorre
item2.Group = group;
item.Group = group;
listView.Groups.Add(group);
listView.Items.Add(item);
listView.Items.Add(item2);

AccessibleObject accessibleObject = listView.AccessibilityObject;

Expand All @@ -153,8 +149,6 @@ public void ListViewAccessibleObject_ListWithTwoGroups_FragmentNavigateWorkCorre
item2.Group = group;
item.Group = group;
listView.Groups.Add(group);
listView.Items.Add(item);
listView.Items.Add(item2);

AccessibleObject accessibleObject = listView.AccessibilityObject;

Expand Down
168 changes: 133 additions & 35 deletions ...System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupCollectionTests.cs
View file
Expand Up @@ -373,75 +373,173 @@ public void ListViewGroupCollection_Item_SetStringNullValue_ThrowsArgumentNullEx
[WinFormsFact]
public void ListViewGroupCollection_Add_ListViewGroup_Success()
{
using var listView = new ListView();
ListViewGroupCollection collection = listView.Groups;
using var control = new ListView();
ListViewGroupCollection collection = control.Groups;
var group1 = new ListViewGroup();
Assert.Equal(0, collection.Add(group1));
Assert.Same(group1, Assert.Single(collection));
Assert.Same(listView, group1.ListView);
Assert.Same(control, group1.ListView);
Assert.Empty(control.Items);
Assert.False(control.IsHandleCreated);

// Add another.
var group2 = new ListViewGroup();
Assert.Equal(1, collection.Add(group2));
Assert.Equal(new ListViewGroup[] { group1, group2 }, collection.Cast<ListViewGroup>());
Assert.Same(listView, group2.ListView);
Assert.Same(control, group2.ListView);
Assert.Empty(control.Items);
Assert.False(control.IsHandleCreated);
}

[WinFormsFact]
public void ListViewGroupCollection_Add_ListViewGroupWithItems_Success()
{
var item1 = new ListViewItem();
var item2 = new ListViewItem();
var group = new ListViewGroup();
group.Items.Add(item1);
group.Items.Add(item2);

using var control = new ListView();
ListViewGroupCollection collection = control.Groups;

Assert.Equal(0, collection.Add(group));
Assert.Same(group, Assert.Single(collection));
Assert.Same(control, group.ListView);
Assert.Same(control, item1.ListView);
Assert.Same(group, item1.Group);
Assert.Same(control, item2.ListView);
Assert.Same(group, item2.Group);
Assert.Equal(new ListViewItem[] { item1, item2 }, control.Items.Cast<ListViewItem>());
Assert.False(control.IsHandleCreated);
}

[WinFormsFact]
public void ListViewGroupCollection_Add_ListViewGroupWithItemAlreadyAdded_Success()
{
var item1 = new ListViewItem();
var item2 = new ListViewItem();
var group = new ListViewGroup();
group.Items.Add(item1);
group.Items.Add(item2);

using var control = new ListView();
ListViewGroupCollection collection = control.Groups;
control.Items.Add(item1);
control.Items.Add(item2);

Assert.Equal(0, collection.Add(group));
Assert.Same(group, Assert.Single(collection));
Assert.Same(control, group.ListView);
Assert.Same(control, item1.ListView);
Assert.Same(group, item1.Group);
Assert.Same(control, item2.ListView);
Assert.Same(group, item2.Group);
Assert.Equal(new ListViewItem[] { item1, item2 }, control.Items.Cast<ListViewItem>());
Assert.False(control.IsHandleCreated);
}

[WinFormsFact]
public void ListViewGroupCollection_Add_ListViewGroupWithHandle_Success()
{
using var listView = new ListView();
Assert.NotEqual(IntPtr.Zero, listView.Handle);
using var control = new ListView();
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++;

ListViewGroupCollection collection = listView.Groups;
ListViewGroupCollection collection = control.Groups;
var group1 = new ListViewGroup();
Assert.Equal(0, collection.Add(group1));
Assert.Same(group1, Assert.Single(collection));
Assert.Same(listView, group1.ListView);
Assert.Same(control, group1.ListView);
Assert.Empty(control.Items);
Assert.True(control.IsHandleCreated);
Assert.Equal(0, invalidatedCallCount);
Assert.Equal(0, styleChangedCallCount);
Assert.Equal(0, createdCallCount);

// Add another.
var group2 = new ListViewGroup();
Assert.Equal(1, collection.Add(group2));
Assert.Equal(new ListViewGroup[] { group1, group2 }, collection.Cast<ListViewGroup>());
Assert.Same(listView, group2.ListView);
Assert.Same(control, group2.ListView);
Assert.Empty(control.Items);
Assert.True(control.IsHandleCreated);
Assert.Equal(0, invalidatedCallCount);
Assert.Equal(0, styleChangedCallCount);
Assert.Equal(0, createdCallCount);
}

[WinFormsFact]
public void ListViewGroupCollection_Add_ListViewGroupWithItems_Success()
public void ListViewGroupCollection_Add_ListViewGroupWithItemsWithHandle_Success()
{
using var listView = new ListView();
var item = new ListViewItem();

ListViewGroupCollection collection = listView.Groups;
var item1 = new ListViewItem();
var item2 = new ListViewItem();
var group = new ListViewGroup();
group.Items.Add(new ListViewItem());
group.Items.Add(item);
listView.Items.Add(item);

group.Items.Add(item1);
group.Items.Add(item2);

using var control = new ListView();
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++;

ListViewGroupCollection collection = control.Groups;
Assert.Equal(0, collection.Add(group));
Assert.Same(group, Assert.Single(collection));
Assert.Same(listView, group.ListView);
Assert.Same(control, group.ListView);
Assert.Same(control, item1.ListView);
Assert.Same(group, item1.Group);
Assert.Same(control, item2.ListView);
Assert.Same(group, item2.Group);
Assert.Equal(new ListViewItem[] { item1, item2 }, control.Items.Cast<ListViewItem>());
Assert.True(control.IsHandleCreated);
Assert.Equal(2, invalidatedCallCount);
Assert.Equal(0, styleChangedCallCount);
Assert.Equal(0, createdCallCount);
}

[WinFormsFact]
public void ListViewGroupCollection_Add_ListViewGroupWithItemsWithHandle_Success()
public void ListViewGroupCollection_Add_ListViewGroupWithItemAlreadyAddedWithHandle_Success()
{
using var listView = new ListView();
Assert.NotEqual(IntPtr.Zero, listView.Handle);

var item = new ListViewItem();

ListViewGroupCollection collection = listView.Groups;
var group1 = new ListViewGroup();
group1.Items.Add(new ListViewItem());
group1.Items.Add(item);
listView.Items.Add(item);

Assert.Equal(0, collection.Add(group1));
Assert.Same(group1, Assert.Single(collection));
Assert.Same(listView, group1.ListView);
var item1 = new ListViewItem();
var item2 = new ListViewItem();
var group = new ListViewGroup();
group.Items.Add(item1);
group.Items.Add(item2);

using var control = new ListView();
ListViewGroupCollection collection = control.Groups;
control.Items.Add(item1);
control.Items.Add(item2);
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++;

var group2 = new ListViewGroup();
Assert.Equal(0, collection.Add(group));
Assert.Same(group, Assert.Single(collection));
Assert.Same(control, group.ListView);
Assert.Same(control, item1.ListView);
Assert.Same(group, item1.Group);
Assert.Same(control, item2.ListView);
Assert.Same(group, item2.Group);
Assert.Equal(new ListViewItem[] { item1, item2 }, control.Items.Cast<ListViewItem>());
Assert.True(control.IsHandleCreated);
Assert.Equal(0, invalidatedCallCount);
Assert.Equal(0, styleChangedCallCount);
Assert.Equal(0, createdCallCount);
}

[WinFormsFact]
Expand Down

0 comments on commit 9865e5e

Please sign in to comment.