Sort todo grid, new test(s)

Author: Hosch250

RetailCoder.VBE/UI/Settings/SettingsDialog.cs

@@ -81,7 +81,8 @@ private void LoadWindow()
             _generalSettingsView = new GeneralSettingsControl(_config.UserSettings.LanguageSetting, _configService);
 
             var markers = _config.UserSettings.ToDoListSettings.ToDoMarkers;
-            _todoView = new TodoListSettingsUserControl(markers);
+            var gridViewSort = new GridViewSort<ToDoMarker>("Priority", true);
+            _todoView = new TodoListSettingsUserControl(markers, gridViewSort);
             _todoController = new TodoSettingPresenter(_todoView, new AddMarkerForm());
 
             ActivateControl(_generalSettingsView);

RetailCoder.VBE/UI/Settings/TodoListSettingsUserControl.cs

@@ -5,21 +5,24 @@
 using System.Linq;
 using System.Windows.Forms;
 using Rubberduck.Settings;
-using Rubberduck.ToDoItems;
 
 namespace Rubberduck.UI.Settings
 {
     public partial class TodoListSettingsUserControl : UserControl, ITodoSettingsView
     {
+        private GridViewSort<ToDoMarker> _gridViewSort;
+
         /// <summary>   Parameterless Constructor is to enable design view only. DO NOT USE. </summary>
         public TodoListSettingsUserControl()
         {
             InitializeComponent();
         }
 
-        public TodoListSettingsUserControl(IList<ToDoMarker> markers)
+        public TodoListSettingsUserControl(IList<ToDoMarker> markers, GridViewSort<ToDoMarker> gridViewSort)
             : this()
         {
+            _gridViewSort = gridViewSort;
+
             InitTodoMarkersGridView(markers);
             SelectedIndex = 0;
         }
@@ -32,6 +35,7 @@ private void InitTodoMarkersGridView(IList<ToDoMarker> markers)
             TodoMarkersGridView.AlternatingRowsDefaultCellStyle.BackColor = Color.Lavender;
             TodoMarkersGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
             TodoMarkersGridView.CellValueChanged += SelectedPriorityChanged;
+            TodoMarkersGridView.ColumnHeaderMouseClick += SortColumn;
 
             var markerTextColumn = new DataGridViewTextBoxColumn
             {
@@ -61,6 +65,12 @@ private List<string> TodoLabels()
                     .ToList();
         }
 
+        private void SortColumn(object sender, DataGridViewCellMouseEventArgs e)
+        {
+            var columnName = TodoMarkersGridView.Columns[e.ColumnIndex].Name;
+            TodoMarkers = new BindingList<ToDoMarker>(_gridViewSort.Sort(TodoMarkers.AsEnumerable(), columnName).ToList());
+        }
+
         public int SelectedIndex
         {
             get { return TodoMarkersGridView.SelectedRows[0].Index; }
@@ -70,7 +80,10 @@ public int SelectedIndex
         public TodoPriority ActiveMarkerPriority
         {
             get { return TodoMarkers[SelectedIndex].Priority; }
-            set { TodoMarkersGridView.SelectedRows[0].Cells[1].Value = (int)value; }
+            set
+            {
+                TodoMarkersGridView.SelectedRows[0].Cells[1].Value = new ToDoMarker(ActiveMarkerText, value).PriorityLabel;
+            }
         }
 
         public string ActiveMarkerText 

RetailCoder.VBE/UI/Settings/TodoSettingPresenter.cs

@@ -73,10 +73,5 @@ private void HideAddMarkerForm()
             _addTodoMarkerView.MarkerText = string.Empty;
             _addTodoMarkerView.MarkerPriority = default(TodoPriority);
         }
-
-        public void SetActiveItem(int index)
-        {
-            _view.SelectedIndex = index;
-        }
     }
 }

RubberduckTests/TodoControllerTests.cs

@@ -57,12 +57,9 @@ public void SetActiveItemChangesViewSelectedIndex()
             var markers = GetTestMarkers();
 
             var view = new TodoListSettingsUserControl(markers);
-            var addTodoMarkerView = new Mock<IAddTodoMarkerView>().Object;
-
-            var controller = new TodoSettingPresenter(view, addTodoMarkerView);
 
             //act
-            controller.SetActiveItem(1);
+            view.SelectedIndex = 1;
 
             Assert.AreEqual(1, view.SelectedIndex);
 
@@ -79,11 +76,9 @@ public void ViewPriorityMatchesAfterSelectionChange()
             };
 
             var view = new TodoListSettingsUserControl(markers);
-            var addTodoMarkerView = new Mock<IAddTodoMarkerView>().Object;
-            var controller = new TodoSettingPresenter(view, addTodoMarkerView);
 
             //act
-            controller.SetActiveItem(2);
+            view.SelectedIndex = 2;
 
             Assert.AreEqual(TodoPriority.High, view.ActiveMarkerPriority);
         }
@@ -98,13 +93,23 @@ public void ViewTextMatchesAfterSelectionChange()
             };
 
             var view = new TodoListSettingsUserControl(markers);
-            var addTodoMarkerView = new Mock<IAddTodoMarkerView>().Object;
-            var controller = new TodoSettingPresenter(view, addTodoMarkerView);
 
             //act
-            controller.SetActiveItem(1);
+            view.SelectedIndex = 1;
 
             Assert.AreEqual("Note:", view.ActiveMarkerText);
         }
+
+        [TestMethod]
+        public void MarkerChangeSavedOnPriorityChanged()
+        {
+            var markers = GetTestMarkers();
+
+            var view = new TodoListSettingsUserControl(markers);
+
+            view.ActiveMarkerPriority = TodoPriority.High;
+
+            Assert.AreEqual(view.ActiveMarkerPriority, view.TodoMarkers[0].Priority);
+        }
     }
 }