Merge pull request #1109 from Hosch250/BugBlipper

Hosch250 · Hosch250 · commit 34b37ed9e832 · 2016-02-17T20:56:18.000-06:00
Add new tests, correct a couple tests, fix bug in grouping grid
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -582,6 +582,7 @@
       <DependentUpon>SettingsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Settings\SettingsControlViewModel.cs" />
+    <Compile Include="UI\Settings\SettingsView.cs" />
     <Compile Include="UI\Settings\SettingsViews.cs" />
     <Compile Include="UI\Settings\Converters\SettingsViewToPageConverter.cs" />
     <Compile Include="UI\Settings\TodoSettings.xaml.cs">
diff --git a/RetailCoder.VBE/Settings/CodeInspectionSettings.cs b/RetailCoder.VBE/Settings/CodeInspectionSettings.cs
@@ -91,5 +91,26 @@ public CodeInspectionSetting(string name, string description, CodeInspectionType
         public CodeInspectionSetting(IInspectionModel inspection)
             : this(inspection.Name, inspection.Description, inspection.InspectionType, inspection.DefaultSeverity, inspection.Severity)
         { }
+
+        public override bool Equals(object obj)
+        {
+            var inspectionSetting = obj as CodeInspectionSetting;
+
+            return inspectionSetting != null &&
+                   inspectionSetting.InspectionType == InspectionType &&
+                   inspectionSetting.Name == Name &&
+                   inspectionSetting.Severity == Severity;
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = (Name != null ? Name.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (int) Severity;
+                hashCode = (hashCode * 397) ^ (int) InspectionType;
+                return hashCode;
+            }
+        }
     }
 }
diff --git a/RetailCoder.VBE/Settings/Hotkey.cs b/RetailCoder.VBE/Settings/Hotkey.cs
@@ -14,5 +14,26 @@ public string Prompt
         {
             get { return RubberduckUI.ResourceManager.GetString(Name + "Hotkey_Description"); } 
         }
+
+        public override bool Equals(object obj)
+        {
+            var hotkey = obj as Hotkey;
+
+            return hotkey != null &&
+                   hotkey.Name == Name &&
+                   hotkey.KeyDisplaySymbol == KeyDisplaySymbol &&
+                   hotkey.IsEnabled == IsEnabled;
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = (Name != null ? Name.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (KeyDisplaySymbol != null ? KeyDisplaySymbol.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ IsEnabled.GetHashCode();
+                return hashCode;
+            }
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/Controls/GroupingGrid.xaml b/RetailCoder.VBE/UI/Controls/GroupingGrid.xaml
@@ -107,6 +107,7 @@
             <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
             <Setter Property="ItemContainerStyle" Value="{StaticResource PrettifyRow}" />
             <Setter Property="ColumnHeaderHeight" Value="22" />
+            <Setter Property="SelectionMode" Value="Single" />
         </Style>
     </DataGrid.Style>
     <DataGrid.CellStyle>
diff --git a/RetailCoder.VBE/UI/Settings/SettingsControl.xaml b/RetailCoder.VBE/UI/Settings/SettingsControl.xaml
@@ -69,7 +69,7 @@
         <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Height="40" VerticalAlignment="Bottom" BorderBrush="Black" BorderThickness="0, 1, 0, 0">
             <DockPanel VerticalAlignment="Center" Height="40" Background="{x:Static SystemColors.ControlDarkBrush}">
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Settings_ResetSettings}" MinWidth="75" Height="20"  HorizontalAlignment="Right" Margin="20,0" Command="{Binding RefreshButtonCommand}" />
+                    <Button Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Settings_ResetSettings}" MinWidth="75" Height="20"  HorizontalAlignment="Right" Margin="20,0" Command="{Binding ResetButtonCommand}" />
                     <Button Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=OK}" MinWidth="75" Height="20" HorizontalAlignment="Left" Margin="5, 0" Command="{Binding OKButtonCommand}" />
                     <Button Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CancelButtonText}" MinWidth="75" Height="20" HorizontalAlignment="Right" Margin="5, 0, 10, 0" Command="{Binding CancelButtonCommand}" />
                 </StackPanel>
diff --git a/RetailCoder.VBE/UI/Settings/SettingsControlViewModel.cs b/RetailCoder.VBE/UI/Settings/SettingsControlViewModel.cs
@@ -7,60 +7,29 @@
 
 namespace Rubberduck.UI.Settings
 {
-    public class SettingsView
-    {
-        public string Label { get { return RubberduckUI.ResourceManager.GetString("SettingsCaption_" + View); } }
-        public string Instructions
-        { 
-            get
-            {
-                return RubberduckUI.ResourceManager.GetString("SettingsInstructions_" + View);
-            } 
-        }
-        public ISettingsView Control { get; set; }
-        public SettingsViews View { get; set; }
-    }
-
     public class SettingsControlViewModel : ViewModelBase
     {
         private readonly IGeneralConfigService _configService;
         private readonly Configuration _config;
 
-        public SettingsControlViewModel(IGeneralConfigService configService, SettingsViews view = Settings.SettingsViews.GeneralSettings)
+        public SettingsControlViewModel(IGeneralConfigService configService,
+            Configuration config,
+            SettingsView generalSettings,
+            SettingsView todoSettings,
+            SettingsView inspectionSettings,
+            SettingsView unitTestSettings,
+            SettingsView indenterSettings,
+            SettingsViews activeView = Settings.SettingsViews.GeneralSettings)
         {
             _configService = configService;
-            _config = configService.LoadConfiguration();
+            _config = config;
 
             SettingsViews = new ObservableCollection<SettingsView>
             {
-                new SettingsView
-                {
-                    Control = new GeneralSettings(new GeneralSettingsViewModel(_config)),
-                    View = Settings.SettingsViews.GeneralSettings
-                },
-                new SettingsView
-                {
-                    Control = new TodoSettings(new TodoSettingsViewModel(_config)),
-                    View = Settings.SettingsViews.TodoSettings
-                },
-                new SettingsView
-                {
-                    Control = new InspectionSettings(new InspectionSettingsViewModel(_config)),
-                    View = Settings.SettingsViews.InspectionSettings
-                },
-                new SettingsView
-                {
-                    Control = new UnitTestSettings(new UnitTestSettingsViewModel(_config)),
-                    View = Settings.SettingsViews.UnitTestSettings
-                },
-                new SettingsView
-                {
-                    Control = new IndenterSettings(new IndenterSettingsViewModel(_config)),
-                    View = Settings.SettingsViews.IndenterSettings
-                }
+                generalSettings, todoSettings, inspectionSettings, unitTestSettings, indenterSettings
             };
 
-            SelectedSettingsView = SettingsViews.First(v => v.View == view);
+            SelectedSettingsView = SettingsViews.First(v => v.View == activeView);
         }
 
         private ObservableCollection<SettingsView> _settingsViews;
@@ -153,16 +122,16 @@ public ICommand CancelButtonCommand
             }
         }
 
-        private ICommand _refreshButtonCommand;
-        public ICommand RefreshButtonCommand
+        private ICommand _resetButtonCommand;
+        public ICommand ResetButtonCommand
         {
             get
             {
-                if (_refreshButtonCommand != null)
+                if (_resetButtonCommand != null)
                 {
-                    return _refreshButtonCommand;
+                    return _resetButtonCommand;
                 }
-                return _refreshButtonCommand = new DelegateCommand(_ =>
+                return _resetButtonCommand = new DelegateCommand(_ =>
                 {
                     var defaultConfig = _configService.GetDefaultConfiguration();
                     foreach (var vm in SettingsViews.Select(v => v.Control.ViewModel))
diff --git a/RetailCoder.VBE/UI/Settings/SettingsForm.cs b/RetailCoder.VBE/UI/Settings/SettingsForm.cs
@@ -5,18 +5,42 @@ namespace Rubberduck.UI.Settings
 {
     public partial class SettingsForm : Form
     {
-        private readonly IGeneralConfigService _configService;
-
         public SettingsForm()
         {
             InitializeComponent();
         }
 
         public SettingsForm(IGeneralConfigService configService) : this()
         {
-            _configService = configService;
+            var config = configService.LoadConfiguration();
 
-            ViewModel = new SettingsControlViewModel(_configService);
+            ViewModel = new SettingsControlViewModel(configService,
+                config,
+                new SettingsView
+                {
+                    Control = new GeneralSettings(new GeneralSettingsViewModel(config)),
+                    View = SettingsViews.GeneralSettings
+                },
+                new SettingsView
+                {
+                    Control = new TodoSettings(new TodoSettingsViewModel(config)),
+                    View = SettingsViews.TodoSettings
+                },
+                new SettingsView
+                {
+                    Control = new InspectionSettings(new InspectionSettingsViewModel(config)),
+                    View = SettingsViews.InspectionSettings
+                },
+                new SettingsView
+                {
+                    Control = new UnitTestSettings(new UnitTestSettingsViewModel(config)),
+                    View = SettingsViews.UnitTestSettings
+                },
+                new SettingsView
+                {
+                    Control = new IndenterSettings(new IndenterSettingsViewModel(config)),
+                    View = SettingsViews.IndenterSettings
+                });
 
             ViewModel.OnOKButtonClicked += ViewModel_OnOKButtonClicked;
             ViewModel.OnCancelButtonClicked += ViewModel_OnCancelButtonClicked;
diff --git a/RetailCoder.VBE/UI/Settings/SettingsView.cs b/RetailCoder.VBE/UI/Settings/SettingsView.cs
@@ -0,0 +1,16 @@
+﻿namespace Rubberduck.UI.Settings
+{
+    public class SettingsView
+    {
+        public string Label { get { return RubberduckUI.ResourceManager.GetString("SettingsCaption_" + View); } }
+        public string Instructions
+        {
+            get
+            {
+                return RubberduckUI.ResourceManager.GetString("SettingsInstructions_" + View);
+            }
+        }
+        public ISettingsView Control { get; set; }
+        public SettingsViews View { get; set; }
+    }
+}
diff --git a/RubberduckTests/RubberduckTests.csproj b/RubberduckTests/RubberduckTests.csproj
@@ -57,9 +57,11 @@
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <Choose>
@@ -119,7 +121,7 @@
     <Compile Include="Refactoring\RenameTests.cs" />
     <Compile Include="Refactoring\ReorderParametersTests.cs" />
     <Compile Include="RubberduckParserTests.cs" />
-    <Compile Include="Settings\CodeInspectionSettingsTests.cs" />
+    <Compile Include="Settings\InspectionSettingsTests.cs" />
     <Compile Include="Settings\GeneralSettingsTests.cs" />
     <Compile Include="Settings\IndenterSettingsTests.cs" />
     <Compile Include="Settings\SettingsControlTests.cs" />
diff --git a/RubberduckTests/Settings/InspectionSettingsTests.cs b/RubberduckTests/Settings/InspectionSettingsTests.cs
@@ -7,7 +7,7 @@
 namespace RubberduckTests.Settings
 {
     [TestClass]
-    public class CodeInspectionSettingsTests
+    public class InspectionSettingsTests
     {
         private Configuration GetDefaultConfig()
         {
diff --git a/RubberduckTests/Settings/SettingsControlTests.cs b/RubberduckTests/Settings/SettingsControlTests.cs
diff --git a/RubberduckTests/Settings/TodoSettingsTests.cs b/RubberduckTests/Settings/TodoSettingsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace RubberduckTests.Settings`
`8`	`8`	`{`
`9`	`9`	`[TestClass]`
`10`		`- public class CodeInspectionSettingsTests`
	`10`	`+ public class InspectionSettingsTests`
`11`	`11`	`{`
`12`	`12`	`private Configuration GetDefaultConfig()`
`13`	`13`	`{`