Skip to content

Commit bcb824f

Browse files
committed
Clean up GridViewSort, add broken test
1 parent e997184 commit bcb824f

File tree

2 files changed

+29
-10
lines changed

2 files changed

+29
-10
lines changed

RetailCoder.VBE/UI/GridViewSort.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,24 @@ public class GridViewSort<T>
88
private bool _sortedAscending;
99
private string _columnName;
1010

11-
public GridViewSort(string ColumnName, bool SortedAscending)
11+
public GridViewSort(string columnName, bool sortedAscending)
1212
{
13-
_columnName = ColumnName;
14-
_sortedAscending = SortedAscending;
13+
_columnName = columnName;
14+
_sortedAscending = sortedAscending;
1515
}
1616

17-
public IEnumerable<T> Sort(IEnumerable<T> Items, string ColumnName)
17+
public IEnumerable<T> Sort(IEnumerable<T> items, string columnName)
1818
{
19-
if (ColumnName == _columnName && _sortedAscending)
19+
if (columnName == _columnName && _sortedAscending)
2020
{
2121
_sortedAscending = false;
22-
var test = Items.Select(x => x.GetType().GetProperty(ColumnName).GetValue(x));
23-
return Items.OrderByDescending(x => x.GetType().GetProperty(ColumnName).GetValue(x));
22+
return items.OrderByDescending(x => x.GetType().GetProperty(columnName).GetValue(x));
2423
}
2524
else
2625
{
27-
_columnName = ColumnName;
26+
_columnName = columnName;
2827
_sortedAscending = true;
29-
return Items.OrderBy(x => x.GetType().GetProperty(ColumnName).GetValue(x));
28+
return items.OrderBy(x => x.GetType().GetProperty(columnName).GetValue(x));
3029
}
3130
}
3231
}

RubberduckTests/TodoControllerTests.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using Microsoft.VisualStudio.TestTools.UnitTesting;
34
using Moq;
45
using Rubberduck.Settings;
@@ -109,5 +110,24 @@ public void MarkerChangeSavedOnPriorityChanged()
109110

110111
Assert.AreEqual(view.ActiveMarkerPriority, view.TodoMarkers[0].Priority);
111112
}
113+
114+
[TestMethod]
115+
public void RemoveReallyDoesRemoveSelectedItem()
116+
{
117+
var markers = GetTestMarkers();
118+
119+
var view = new TodoListSettingsUserControl(markers, new Mock<GridViewSort<ToDoMarker>>("", false).Object);
120+
view.RemoveMarker += RemoveParam;
121+
view.SelectedIndex = 2;
122+
123+
RemoveParam(null, EventArgs.Empty);
124+
125+
Assert.AreEqual(2, view.TodoMarkers.Count);
126+
}
127+
128+
private void RemoveParam(object sender, EventArgs e)
129+
{
130+
131+
}
112132
}
113133
}

0 commit comments

Comments
 (0)