Moved unit test settings to .settings file

rkapka · rkapka · commit 7bee7f91f9d7 · 2018-01-13T23:22:42.000+01:00
diff --git a/RetailCoder.VBE/Properties/Settings.Designer.cs b/RetailCoder.VBE/Properties/Settings.Designer.cs
diff --git a/RetailCoder.VBE/Properties/Settings.settings b/RetailCoder.VBE/Properties/Settings.settings
@@ -170,5 +170,15 @@
   &lt;CodeExplorer_GroupByType&gt;false&lt;/CodeExplorer_GroupByType&gt;
 &lt;/WindowSettings&gt;</Value>
     </Setting>
+    <Setting Name="UnitTestSettings" Type="Rubberduck.Settings.UnitTestSettings" Scope="Application">
+      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;UnitTestSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;BindingMode&gt;LateBinding&lt;/BindingMode&gt;
+  &lt;AssertMode&gt;StrictAssert&lt;/AssertMode&gt;
+  &lt;ModuleInit&gt;true&lt;/ModuleInit&gt;
+  &lt;MethodInit&gt;true&lt;/MethodInit&gt;
+  &lt;DefaultTestStubInNewModule&gt;false&lt;/DefaultTestStubInNewModule&gt;
+&lt;/UnitTestSettings&gt;</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/RetailCoder.VBE/Settings/UnitTestConfigProvider.cs b/RetailCoder.VBE/Settings/UnitTestConfigProvider.cs
@@ -5,21 +5,22 @@ namespace Rubberduck.Settings
     public class UnitTestConfigProvider : IConfigProvider<UnitTestSettings>
     {
         private readonly IPersistanceService<UnitTestSettings> _persister;
+        private readonly UnitTestSettings _defaultSettings;
 
         public UnitTestConfigProvider(IPersistanceService<UnitTestSettings> persister)
         {
             _persister = persister;
+            _defaultSettings = new DefaultSettings<UnitTestSettings>().Default;
         }
 
         public UnitTestSettings Create()
         {
-            var prototype = new UnitTestSettings();
-            return _persister.Load(prototype) ?? prototype;
+            return _persister.Load(_defaultSettings) ?? _defaultSettings;
         }
 
         public UnitTestSettings CreateDefaults()
         {
-            return new UnitTestSettings();
+            return _defaultSettings;
         }
 
         public void Save(UnitTestSettings settings)
diff --git a/RetailCoder.VBE/Settings/UnitTestSettings.cs b/RetailCoder.VBE/Settings/UnitTestSettings.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Configuration;
 using System.Xml.Serialization;
 
 namespace Rubberduck.Settings
@@ -25,13 +26,15 @@ public interface IUnitTestSettings
         bool DefaultTestStubInNewModule { get; set; }
     }
 
+    [SettingsSerializeAs(SettingsSerializeAs.Xml)]
     [XmlType(AnonymousType = true)]
     public class UnitTestSettings : IUnitTestSettings, IEquatable<UnitTestSettings>
     {
+        /// <Summary>
+        /// Default constructor required for XML serialization.
+        /// </Summary>
         public UnitTestSettings()
-            : this(BindingMode.LateBinding, AssertMode.StrictAssert, true, true, false)
         {
-            //empty constructor needed for serialization
         }
 
         public UnitTestSettings(BindingMode bindingMode, AssertMode assertMode, bool moduleInit, bool methodInit, bool defaultTestStub)
diff --git a/RetailCoder.VBE/UI/Settings/UnitTestSettingsViewModel.cs b/RetailCoder.VBE/UI/Settings/UnitTestSettingsViewModel.cs
@@ -142,14 +142,7 @@ private void ExportSettings()
                 dialog.ShowDialog();
                 if (string.IsNullOrEmpty(dialog.FileName)) return;
                 var service = new XmlPersistanceService<Rubberduck.Settings.UnitTestSettings> { FilePath = dialog.FileName };
-                service.Save(new Rubberduck.Settings.UnitTestSettings
-                {
-                    BindingMode = BindingMode,
-                    AssertMode = AssertMode,
-                    ModuleInit = ModuleInit,
-                    MethodInit = MethodInit,
-                    DefaultTestStubInNewModule = DefaultTestStubInNewModule
-                });
+                service.Save(new Rubberduck.Settings.UnitTestSettings(BindingMode, AssertMode, ModuleInit, MethodInit, DefaultTestStubInNewModule));
             }
         }
     }
diff --git a/RetailCoder.VBE/app.config b/RetailCoder.VBE/app.config
@@ -219,6 +219,18 @@
           </WindowSettings>
         </value>
       </setting>
+      <setting name="UnitTestSettings" serializeAs="Xml">
+        <value>
+          <UnitTestSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <BindingMode>LateBinding</BindingMode>
+            <AssertMode>StrictAssert</AssertMode>
+            <ModuleInit>true</ModuleInit>
+            <MethodInit>true</MethodInit>
+            <DefaultTestStubInNewModule>false</DefaultTestStubInNewModule>
+          </UnitTestSettings>
+        </value>
+      </setting>
     </Rubberduck.Properties.Settings>
   </applicationSettings>
 </configuration>
diff --git a/RubberduckTests/CodeExplorer/CodeExplorerTests.cs b/RubberduckTests/CodeExplorer/CodeExplorerTests.cs
@@ -2112,14 +2112,7 @@ public void CompareByNodeType_FoldersAreSortedByName()
         #region Helpers
         private Configuration GetDefaultUnitTestConfig()
         {
-            var unitTestSettings = new UnitTestSettings
-            {
-                BindingMode = BindingMode.LateBinding,
-                AssertMode = AssertMode.StrictAssert,
-                ModuleInit = true,
-                MethodInit = true,
-                DefaultTestStubInNewModule = false
-            };
+            var unitTestSettings = new UnitTestSettings(BindingMode.LateBinding, AssertMode.StrictAssert, true, true, false);
 
             var generalSettings = new GeneralSettings
             {
diff --git a/RubberduckTests/Commands/UnitTestCommandTests.cs b/RubberduckTests/Commands/UnitTestCommandTests.cs
@@ -340,14 +340,7 @@ Private Property Set PrivateProperty(s As String)
 
         private Configuration GetUnitTestConfig()
         {
-            var unitTestSettings = new UnitTestSettings
-            {
-                BindingMode = BindingMode.EarlyBinding,
-                AssertMode = AssertMode.StrictAssert,
-                ModuleInit = false,
-                MethodInit = false,
-                DefaultTestStubInNewModule = false
-            };
+            var unitTestSettings = new UnitTestSettings(BindingMode.EarlyBinding, AssertMode.StrictAssert, false, false, false);
 
             var userSettings = new UserSettings(null, null, null, null, unitTestSettings, null, null);
             return new Configuration(userSettings);
diff --git a/RubberduckTests/Settings/UnitTestSettingsTests.cs b/RubberduckTests/Settings/UnitTestSettingsTests.cs
@@ -10,29 +10,15 @@ public class UnitTestSettingsTests
     {
         private Configuration GetDefaultConfig()
         {
-            var unitTestSettings = new UnitTestSettings
-            {
-                BindingMode = BindingMode.LateBinding,
-                AssertMode = AssertMode.StrictAssert,
-                ModuleInit = true,
-                MethodInit = true,
-                DefaultTestStubInNewModule = false
-            };
+            var unitTestSettings = new UnitTestSettings(BindingMode.LateBinding, AssertMode.StrictAssert, true, true, false);
 
             var userSettings = new UserSettings(null, null, null, null, unitTestSettings, null, null);
             return new Configuration(userSettings);
         }
 
         private Configuration GetNondefaultConfig()
         {
-            var unitTestSettings = new UnitTestSettings
-            {
-                BindingMode = BindingMode.EarlyBinding,
-                AssertMode = AssertMode.PermissiveAssert,
-                ModuleInit = false,
-                MethodInit = false,
-                DefaultTestStubInNewModule = true
-            };
+            var unitTestSettings = new UnitTestSettings(BindingMode.EarlyBinding, AssertMode.PermissiveAssert, false, false, true);
 
             var userSettings = new UserSettings(null, null, null, null, unitTestSettings, null, null);
             return new Configuration(userSettings);

Original file line number	Diff line number	Diff line change
`@@ -5,21 +5,22 @@ namespace Rubberduck.Settings`
`5`	`5`	`public class UnitTestConfigProvider : IConfigProvider<UnitTestSettings>`
`6`	`6`	`{`
`7`	`7`	`private readonly IPersistanceService<UnitTestSettings> _persister;`
	`8`	`+ private readonly UnitTestSettings _defaultSettings;`
`8`	`9`
`9`	`10`	`public UnitTestConfigProvider(IPersistanceService<UnitTestSettings> persister)`
`10`	`11`	`{`
`11`	`12`	`_persister = persister;`
	`13`	`+ _defaultSettings = new DefaultSettings<UnitTestSettings>().Default;`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`public UnitTestSettings Create()`
`15`	`17`	`{`
`16`		`- var prototype = new UnitTestSettings();`
`17`		`- return _persister.Load(prototype) ?? prototype;`
	`18`	`+ return _persister.Load(_defaultSettings) ?? _defaultSettings;`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`public UnitTestSettings CreateDefaults()`
`21`	`22`	`{`
`22`		`- return new UnitTestSettings();`
	`23`	`+ return _defaultSettings;`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`public void Save(UnitTestSettings settings)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Configuration;`
`2`	`3`	`using System.Xml.Serialization;`
`3`	`4`
`4`	`5`	`namespace Rubberduck.Settings`
`@@ -25,13 +26,15 @@ public interface IUnitTestSettings`
`25`	`26`	`bool DefaultTestStubInNewModule { get; set; }`
`26`	`27`	`}`
`27`	`28`
	`29`	`+ [SettingsSerializeAs(SettingsSerializeAs.Xml)]`
`28`	`30`	`[XmlType(AnonymousType = true)]`
`29`	`31`	`public class UnitTestSettings : IUnitTestSettings, IEquatable<UnitTestSettings>`
`30`	`32`	`{`
	`33`	`+ /// <Summary>`
	`34`	`+ /// Default constructor required for XML serialization.`
	`35`	`+ /// </Summary>`
`31`	`36`	`public UnitTestSettings()`
`32`		`- : this(BindingMode.LateBinding, AssertMode.StrictAssert, true, true, false)`
`33`	`37`	`{`
`34`		`- //empty constructor needed for serialization`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`public UnitTestSettings(BindingMode bindingMode, AssertMode assertMode, bool moduleInit, bool methodInit, bool defaultTestStub)`
Original file line number	Diff line number	Diff line change
`@@ -142,14 +142,7 @@ private void ExportSettings()`
`142`	`142`	`dialog.ShowDialog();`
`143`	`143`	`if (string.IsNullOrEmpty(dialog.FileName)) return;`
`144`	`144`	`var service = new XmlPersistanceService<Rubberduck.Settings.UnitTestSettings> { FilePath = dialog.FileName };`
`145`		`- service.Save(new Rubberduck.Settings.UnitTestSettings`
`146`		`- {`
`147`		`- BindingMode = BindingMode,`
`148`		`- AssertMode = AssertMode,`
`149`		`- ModuleInit = ModuleInit,`
`150`		`- MethodInit = MethodInit,`
`151`		`- DefaultTestStubInNewModule = DefaultTestStubInNewModule`
`152`		`- });`
	`145`	`+ service.Save(new Rubberduck.Settings.UnitTestSettings(BindingMode, AssertMode, ModuleInit, MethodInit, DefaultTestStubInNewModule));`
`153`	`146`	`}`
`154`	`147`	`}`
`155`	`148`	`}`