ConfigServiceFixture shouldn't be touching the DB.

src/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs

@@ -1,110 +1,59 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
+using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.Configuration
 {
     [TestFixture]
-    public class ConfigServiceFixture : DbTest<ConfigService, Config>
+    public class ConfigServiceFixture : TestBase<ConfigService>
     {
         [SetUp]
         public void SetUp()
         {
-            Mocker.SetConstant<IConfigRepository>(Mocker.Resolve<ConfigRepository>());
-
-            Db.All<Config>().ForEach(Db.Delete);
         }
 
         [Test]
         public void Add_new_value_to_database()
         {
-            const string key = "MY_KEY";
+            const string key = "RssSyncInterval";
-            const string value = "MY_VALUE";
+            const int value = 12;
 
-            Subject.SetValue(key, value);
+            Subject.RssSyncInterval = value;
-            Subject.GetValue(key, "").Should().Be(value);
-        }
 
-        [Test]
+            AssertUpsert(key, value);
-        public void Get_value_from_database()
-        {
-            const string key = "MY_KEY";
-            const string value = "MY_VALUE";
-
-
-            Db.Insert(new Config { Key = key, Value = value });
-            Db.Insert(new Config { Key = "Other Key", Value = "OtherValue" });
-
-            var result = Subject.GetValue(key, "");
-
-            result.Should().Be(value);
         }
 
 
         [Test]
         public void Get_value_should_return_default_when_no_value()
         {
-            const string key = "MY_KEY";
+            Subject.RssSyncInterval.Should().Be(15);
-            const string value = "MY_VALUE";
-
-            var result = Subject.GetValue(key, value);
-
-            result.Should().Be(value);
-        }
-
-        [Test]
-        public void New_value_should_update_old_value_new_value()
-        {
-            const string key = "MY_KEY";
-            const string originalValue = "OLD_VALUE";
-            const string newValue = "NEW_VALUE";
-
-            Db.Insert(new Config { Key = key, Value = originalValue });
-
-            Subject.SetValue(key, newValue);
-            var result = Subject.GetValue(key, "");
-
-
-            result.Should().Be(newValue);
-            AllStoredModels.Should().HaveCount(1);
-        }
-
-        [Test]
-        public void New_value_should_update_old_value_same_value()
-        {
-            const string key = "MY_KEY";
-            const string value = "OLD_VALUE";
-
-            Subject.SetValue(key, value);
-            Subject.SetValue(key, value);
-            var result = Subject.GetValue(key, "");
-
-            result.Should().Be(value);
-            AllStoredModels.Should().HaveCount(1);
         }
 
         [Test]
         public void get_value_with_persist_should_store_default_value()
         {
-            const string key = "MY_KEY";
+            var salt = Subject.HmacSalt;
-            string value = Guid.NewGuid().ToString();
+            salt.Should().NotBeNullOrWhiteSpace();
-
+            AssertUpsert("HmacSalt", salt);
-            Subject.GetValue(key, value, persist: true).Should().Be(value);
-            Subject.GetValue(key, string.Empty).Should().Be(value);
         }
 
         [Test]
         public void get_value_with_out_persist_should_not_store_default_value()
         {
-            const string key = "MY_KEY";
+            var interval = Subject.RssSyncInterval;
-            string value1 = Guid.NewGuid().ToString();
+            interval.Should().Be(15);
-            string value2 = Guid.NewGuid().ToString();
+            Mocker.GetMock<IConfigRepository>().Verify(c => c.Insert(It.IsAny<Config>()), Times.Never());
+        }
 
-            Subject.GetValue(key, value1).Should().Be(value1);
+        private void AssertUpsert(string key, object value)
-            Subject.GetValue(key, value2).Should().Be(value2);
+        {
+            Mocker.GetMock<IConfigRepository>().Verify(c => c.Upsert(It.Is<Config>(v => v.Key == key.ToLowerInvariant() && v.Value == value.ToString())));
         }
 
         [Test]
@@ -114,6 +63,17 @@ public void config_properties_should_write_and_read_using_same_key()
             var configProvider = Subject;
             var allProperties = typeof(ConfigService).GetProperties().Where(p => p.GetSetMethod() != null).ToList();
 
+            var keys = new List<string>();
+            var values = new List<Config>();
+
+            Mocker.GetMock<IConfigRepository>().Setup(c => c.Upsert(It.IsAny<Config>())).Callback<Config>(config =>
+            {
+                keys.Add(config.Key);
+                values.Add(config);
+            });
+
+
+            Mocker.GetMock<IConfigRepository>().Setup(c => c.All()).Returns(values);
 
 
             foreach (var propertyInfo in allProperties)
@@ -148,8 +108,7 @@ public void config_properties_should_write_and_read_using_same_key()
                 returnValue.Should().Be(value, propertyInfo.Name);
             }
 
-            AllStoredModels.Should()
+            keys.Should().OnlyHaveUniqueItems();
-                .HaveSameCount(allProperties, "two different properties are writing to the same key in db. Copy/Past fail.");
         }
     }
 }

src/NzbDrone.Core/Configuration/ConfigService.cs

@@ -30,12 +30,7 @@ public ConfigService(IConfigRepository repository, IEventAggregator eventAggrega
             _cache = new Dictionary<string, string>();
         }
 
-        public IEnumerable<Config> All()
+        private Dictionary<string, object> AllWithDefaults()
-        {
-            return _repository.All();
-        }
-
-        public Dictionary<string, object> AllWithDefaults()
         {
             var dict = new Dictionary<string, object>(StringComparer.InvariantCultureIgnoreCase);
 
@@ -45,7 +40,6 @@ public Dictionary<string, object> AllWithDefaults()
             foreach (var propertyInfo in properties)
             {
                 var value = propertyInfo.GetValue(this, null);
-
                 dict.Add(propertyInfo.Name, value);
             }
 
@@ -65,7 +59,9 @@ public void SaveConfigDictionary(Dictionary<string, object> configValues)
                 var equal = configValue.Value.ToString().Equals(currentValue.ToString());
 
                 if (!equal)
+                {
                     SetValue(configValue.Key, configValue.Value.ToString());
+                }
             }
 
             _eventAggregator.PublishEvent(new ConfigSavedEvent());
@@ -331,7 +327,7 @@ private int GetValueInt(string key, int defaultValue = 0)
             return Convert.ToInt32(GetValue(key, defaultValue));
         }
 
-        public T GetValueEnum<T>(string key, T defaultValue)
+        private T GetValueEnum<T>(string key, T defaultValue)
         {
             return (T)Enum.Parse(typeof(T), GetValue(key, defaultValue), true);
         }
@@ -346,7 +342,9 @@ public string GetValue(string key, object defaultValue, bool persist = false)
             string dbValue;
 
             if (_cache.TryGetValue(key, out dbValue) && dbValue != null && !string.IsNullOrEmpty(dbValue))
+            {
                 return dbValue;
+            }
 
             _logger.Trace("Using default config value for '{0}' defaultValue:'{1}'", key, defaultValue);
 
@@ -354,6 +352,7 @@ public string GetValue(string key, object defaultValue, bool persist = false)
             {
                 SetValue(key, defaultValue.ToString());
             }
+
             return defaultValue.ToString();
         }
 
@@ -367,44 +366,34 @@ private void SetValue(string key, int value)
             SetValue(key, value.ToString());
         }
 
-        public void SetValue(string key, string value)
+        private void SetValue(string key, Enum value)
+        {
+            SetValue(key, value.ToString().ToLower());
+        }
+
+        private void SetValue(string key, string value)
         {
             key = key.ToLowerInvariant();
 
             _logger.Trace("Writing Setting to database. Key:'{0}' Value:'{1}'", key, value);
-
+            _repository.Upsert(new Config {Key = key, Value = value});
-            var dbValue = _repository.Get(key);
-
-            if (dbValue == null)
-            {
-                _repository.Insert(new Config { Key = key, Value = value });
-            }
-            else
-            {
-                dbValue.Value = value;
-                _repository.Update(dbValue);
-            }
 
             ClearCache();
         }
 
-        public void SetValue(string key, Enum value)
-        {
-            SetValue(key, value.ToString().ToLower());
-        }
-
         private void EnsureCache()
         {
             lock (_cache)
             {
                 if (!_cache.Any())
                 {
-                    _cache = All().ToDictionary(c => c.Key.ToLower(), c => c.Value);
+                    var all = _repository.All();
+                    _cache = all.ToDictionary(c => c.Key.ToLower(), c => c.Value);
                 }
             }
         }
 
-        public static void ClearCache()
+        private static void ClearCache()
         {
             lock (_cache)
             {

src/NzbDrone.Core/Configuration/IConfigService.cs

@@ -6,8 +6,6 @@ namespace NzbDrone.Core.Configuration
 {
     public interface IConfigService
     {
-        IEnumerable<Config> All();
-        Dictionary<string, object> AllWithDefaults();
         void SaveConfigDictionary(Dictionary<string, object> configValues);
 
         bool IsDefined(string key);