Kill TaskPriority

Hosch250 · Hosch250 · commit e02451cd44fa · 2015-06-17T20:34:47.000-05:00
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -473,7 +473,7 @@
     <Compile Include="Inspections\OptionExplicitInspectionResult.cs" />
     <Compile Include="Inspections\VariableTypeNotDeclaredInspection.cs" />
     <Compile Include="Inspections\VariableTypeNotDeclaredInspectionResult.cs" />
-    <Compile Include="ToDoItems\TaskPriority.cs" />
+    <Compile Include="ToDoItems\TodoPriority.cs" />
     <Compile Include="UI\AboutWindow.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/RetailCoder.VBE/Settings/ConfigurationLoader.cs b/RetailCoder.VBE/Settings/ConfigurationLoader.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Windows.Forms;
 using Rubberduck.Inspections;
+using Rubberduck.ToDoItems;
 using Rubberduck.UI;
 
 namespace Rubberduck.Settings
diff --git a/RetailCoder.VBE/Settings/ToDoMarkers.cs b/RetailCoder.VBE/Settings/ToDoMarkers.cs
@@ -1,16 +1,10 @@
 ﻿using System;
 using System.Xml.Serialization;
+using Rubberduck.ToDoItems;
 using Rubberduck.UI;
 
 namespace Rubberduck.Settings
 {
-    public enum TodoPriority
-    {
-        Low, 
-        Medium,
-        High
-    }
-
     public interface IToDoMarker
     {
         TodoPriority Priority { get; set; }
@@ -62,5 +56,19 @@ public override string ToString()
         {
             return this.Text;
         }
+
+        public override bool Equals(object obj)
+        {
+            var other = (ToDoMarker)obj;
+
+            // no need to check PriorityLabel as it soley relies on Priority - if one is wrong, the other has to be too
+            return Text == other.Text &&
+                   Priority == other.Priority;
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
     }
 }
diff --git a/RetailCoder.VBE/ToDoItems/ToDoItem.cs b/RetailCoder.VBE/ToDoItems/ToDoItem.cs
@@ -10,8 +10,8 @@ namespace Rubberduck.ToDoItems
     /// </summary>
     public class ToDoItem
     {
-        private readonly TaskPriority _priority;
-        public TaskPriority Priority{ get { return _priority; } }
+        private readonly TodoPriority _priority;
+        public TodoPriority Priority { get { return _priority; } }
 
         public string PriorityLabel { get { return RubberduckUI.ResourceManager.GetString("ToDoPriority_" + Priority, RubberduckUI.Culture); } }
 
@@ -30,12 +30,12 @@ public class ToDoItem
         private readonly QualifiedSelection _selection;
         public QualifiedSelection GetSelection() { return _selection; }
 
-        public ToDoItem(TaskPriority priority, CommentNode comment)
+        public ToDoItem(TodoPriority priority, CommentNode comment)
             : this(priority, comment.CommentText, comment.QualifiedSelection)
         {
         }
 
-        public ToDoItem(TaskPriority priority, string description, QualifiedSelection qualifiedSelection)
+        public ToDoItem(TodoPriority priority, string description, QualifiedSelection qualifiedSelection)
         {
             _priority = priority;
             _description = description;
diff --git a/RetailCoder.VBE/ToDoItems/TodoPriority.cs b/RetailCoder.VBE/ToDoItems/TodoPriority.cs
@@ -1,6 +1,6 @@
 ﻿namespace Rubberduck.ToDoItems
 {
-    public enum TaskPriority
+    public enum TodoPriority
     {
         Low,
         Medium,
diff --git a/RetailCoder.VBE/UI/Settings/AddMarkerForm.cs b/RetailCoder.VBE/UI/Settings/AddMarkerForm.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Rubberduck.Settings;
+using Rubberduck.ToDoItems;
 
 namespace Rubberduck.UI.Settings
 {
diff --git a/RetailCoder.VBE/UI/Settings/IAddTodoSettingsView.cs b/RetailCoder.VBE/UI/Settings/IAddTodoSettingsView.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using Rubberduck.Settings;
+using Rubberduck.ToDoItems;
 
 namespace Rubberduck.UI.Settings
 {
diff --git a/RetailCoder.VBE/UI/Settings/ITodoSettingsView.cs b/RetailCoder.VBE/UI/Settings/ITodoSettingsView.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.ComponentModel;
 using Rubberduck.Settings;
+using Rubberduck.ToDoItems;
 
 namespace Rubberduck.UI.Settings
 {
diff --git a/RetailCoder.VBE/UI/Settings/TodoListSettingsUserControl.cs b/RetailCoder.VBE/UI/Settings/TodoListSettingsUserControl.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Rubberduck.Settings;
+using Rubberduck.ToDoItems;
 
 namespace Rubberduck.UI.Settings
 {
diff --git a/RetailCoder.VBE/UI/Settings/TodoSettingPresenter.cs b/RetailCoder.VBE/UI/Settings/TodoSettingPresenter.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Linq;
 using Rubberduck.Settings;
+using Rubberduck.ToDoItems;
 
 namespace Rubberduck.UI.Settings
 {
@@ -50,7 +51,7 @@ private void AddMarker(object sender, EventArgs e)
 
         private void AddMarkerTextChanged(object sender, EventArgs e)
         {
-            _addTodoMarkerView.IsValidMarker = _view.TodoMarkers.All(t => t.Text.Equals(_addTodoMarkerView.MarkerText, StringComparison.CurrentCultureIgnoreCase) && 
+            _addTodoMarkerView.IsValidMarker = _view.TodoMarkers.All(t => !t.Text.Equals(_addTodoMarkerView.MarkerText, StringComparison.CurrentCultureIgnoreCase) && 
                                                _addTodoMarkerView.MarkerText != string.Empty);
         }
 
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs
@@ -98,7 +98,7 @@ private IEnumerable<ToDoItem> GetToDoMarkers(CommentNode comment)
         {
             return _markers.Where(marker => comment.Comment.ToLowerInvariant()
                                                    .Contains(marker.Text.ToLowerInvariant()))
-                           .Select(marker => new ToDoItem((TaskPriority)marker.Priority, comment));
+                           .Select(marker => new ToDoItem(marker.Priority, comment));
         }
 
         private void NavigateToDoItem(object sender, ToDoItemClickEventArgs e)
diff --git a/RubberduckTests/ConfigurationTests.cs b/RubberduckTests/ConfigurationTests.cs
@@ -1,6 +1,7 @@
 ﻿using System.Runtime.InteropServices;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Rubberduck.Settings;
+using Rubberduck.ToDoItems;
 
 namespace RubberduckTests
 {
diff --git a/RubberduckTests/TodoControllerTests.cs b/RubberduckTests/TodoControllerTests.cs
@@ -4,6 +4,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Rubberduck.Settings;
+using Rubberduck.ToDoItems;
 using Rubberduck.UI;
 using Rubberduck.UI.Settings;
 
@@ -125,7 +126,7 @@ public void RemoveReallyDoesRemoveSelectedItem()
 
             view.Raise(v => v.RemoveMarker += null, EventArgs.Empty);
 
-            Assert.AreEqual(2, view.Object.TodoMarkers.Count);
+            Assert.AreEqual(markers.Count - 1, view.Object.TodoMarkers.Count);
         }
 
         [TestMethod]
@@ -148,7 +149,7 @@ public void AddReallyDoesDisplayAddMarkerWindow()
         }
 
         [TestMethod]
-        public void AddReallyDoesBlockExistingNames()
+        public void AddMarkerReallyDoesBlockExistingNames()
         {
             var markers = GetTestMarkers();
 
@@ -165,7 +166,70 @@ public void AddReallyDoesBlockExistingNames()
 
             addView.Raise(a => a.TextChanged += null, EventArgs.Empty);
 
-            Assert.AreEqual(false, addView.Object.IsValidMarker);
+            Assert.IsFalse(addView.Object.IsValidMarker);
+        }
+
+        [TestMethod]
+        public void AddMarkerReallyDoesBlockEmptyNames()
+        {
+            var markers = GetTestMarkers();
+
+            var addView = new Mock<IAddTodoMarkerView>();
+            addView.SetupProperty(a => a.MarkerText, "");
+            addView.SetupProperty(a => a.IsValidMarker);
+
+            var view = new Mock<ITodoSettingsView>();
+            view.SetupProperty(v => v.TodoMarkers, new BindingList<ToDoMarker>(markers));
+
+            // Shut up R#, I need that to process the event
+            // ReSharper disable once UnusedVariable
+            var presenter = new TodoSettingPresenter(view.Object, addView.Object);
+
+            addView.Raise(a => a.TextChanged += null, EventArgs.Empty);
+
+            Assert.IsFalse(addView.Object.IsValidMarker);
+        }
+
+        [TestMethod]
+        public void AddMarkerReallyDoesAllowExistingNames()
+        {
+            var markers = GetTestMarkers();
+
+            var addView = new Mock<IAddTodoMarkerView>();
+            addView.SetupProperty(a => a.MarkerText, "Hi, guys:");
+            addView.SetupProperty(a => a.IsValidMarker);
+
+            var view = new Mock<ITodoSettingsView>();
+            view.SetupProperty(v => v.TodoMarkers, new BindingList<ToDoMarker>(markers));
+
+            // Shut up R#, I need that to process the event
+            // ReSharper disable once UnusedVariable
+            var presenter = new TodoSettingPresenter(view.Object, addView.Object);
+
+            addView.Raise(a => a.TextChanged += null, EventArgs.Empty);
+
+            Assert.IsTrue(addView.Object.IsValidMarker);
+        }
+
+        [TestMethod]
+        public void AddMarkerReallyDoesAddNewMarker()
+        {
+            var markers = GetTestMarkers();
+
+            var addView = new Mock<IAddTodoMarkerView>();
+            addView.SetupProperty(a => a.MarkerText, "Hi, guys:");
+            addView.SetupProperty(a => a.MarkerPriority, TodoPriority.High);
+
+            var view = new Mock<ITodoSettingsView>();
+            view.SetupProperty(v => v.TodoMarkers, new BindingList<ToDoMarker>(markers));
+
+            // Shut up R#, I need that to process the event
+            // ReSharper disable once UnusedVariable
+            var presenter = new TodoSettingPresenter(view.Object, addView.Object);
+
+            addView.Raise(a => a.AddMarker += null, EventArgs.Empty);
+
+            Assert.IsTrue(view.Object.TodoMarkers.Contains(new ToDoMarker(addView.Object.MarkerText, addView.Object.MarkerPriority)));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ namespace Rubberduck.ToDoItems`
`10`	`10`	`/// </summary>`
`11`	`11`	`public class ToDoItem`
`12`	`12`	`{`
`13`		`- private readonly TaskPriority _priority;`
`14`		`- public TaskPriority Priority{ get { return _priority; } }`
	`13`	`+ private readonly TodoPriority _priority;`
	`14`	`+ public TodoPriority Priority { get { return _priority; } }`
`15`	`15`
`16`	`16`	`public string PriorityLabel { get { return RubberduckUI.ResourceManager.GetString("ToDoPriority_" + Priority, RubberduckUI.Culture); } }`
`17`	`17`
`@@ -30,12 +30,12 @@ public class ToDoItem`
`30`	`30`	`private readonly QualifiedSelection _selection;`
`31`	`31`	`public QualifiedSelection GetSelection() { return _selection; }`
`32`	`32`
`33`		`- public ToDoItem(TaskPriority priority, CommentNode comment)`
	`33`	`+ public ToDoItem(TodoPriority priority, CommentNode comment)`
`34`	`34`	`: this(priority, comment.CommentText, comment.QualifiedSelection)`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
`38`		`- public ToDoItem(TaskPriority priority, string description, QualifiedSelection qualifiedSelection)`
	`38`	`+ public ToDoItem(TodoPriority priority, string description, QualifiedSelection qualifiedSelection)`
`39`	`39`	`{`
`40`	`40`	`_priority = priority;`
`41`	`41`	`_description = description;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace Rubberduck.ToDoItems`
`2`	`2`	`{`
`3`		`- public enum TaskPriority`
	`3`	`+ public enum TodoPriority`
`4`	`4`	`{`
`5`	`5`	`Low,`
`6`	`6`	`Medium,`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Windows.Forms;`
`5`	`5`	`using Rubberduck.Settings;`
	`6`	`+using Rubberduck.ToDoItems;`
`6`	`7`
`7`	`8`	`namespace Rubberduck.UI.Settings`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using Rubberduck.Settings;`
	`4`	`+using Rubberduck.ToDoItems;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.UI.Settings`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.ComponentModel;`
`3`	`3`	`using Rubberduck.Settings;`
	`4`	`+using Rubberduck.ToDoItems;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.UI.Settings`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using System.Windows.Forms;`
`7`	`7`	`using Rubberduck.Settings;`
	`8`	`+using Rubberduck.ToDoItems;`
`8`	`9`
`9`	`10`	`namespace Rubberduck.UI.Settings`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.ComponentModel;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using Rubberduck.Settings;`
	`5`	`+using Rubberduck.ToDoItems;`
`5`	`6`
`6`	`7`	`namespace Rubberduck.UI.Settings`
`7`	`8`	`{`
`@@ -50,7 +51,7 @@ private void AddMarker(object sender, EventArgs e)`
`50`	`51`
`51`	`52`	`private void AddMarkerTextChanged(object sender, EventArgs e)`
`52`	`53`	`{`
`53`		`- _addTodoMarkerView.IsValidMarker = _view.TodoMarkers.All(t => t.Text.Equals(_addTodoMarkerView.MarkerText, StringComparison.CurrentCultureIgnoreCase) &&`
	`54`	`+ _addTodoMarkerView.IsValidMarker = _view.TodoMarkers.All(t => !t.Text.Equals(_addTodoMarkerView.MarkerText, StringComparison.CurrentCultureIgnoreCase) &&`
`54`	`55`	`_addTodoMarkerView.MarkerText != string.Empty);`
`55`	`56`	`}`
`56`	`57`