oh right, testing frameworks suck
tests work but only if you run one at a time. because Configurator is static.
This commit is contained in:
parent
dd7efe9155
commit
bd56ed025e
@ -1,34 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Dynamic;
|
|
||||||
using System.Reflection;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
[assembly: InternalsVisibleTo("deployment.tests")]
|
|
||||||
namespace greyn.Deployment
|
|
||||||
{
|
|
||||||
public static class ConfigurationBootstrapper
|
|
||||||
{
|
|
||||||
private const string confpath = "appsettings.json";
|
|
||||||
|
|
||||||
public static T Load<T>() where T : new()
|
|
||||||
{
|
|
||||||
if (File.Exists("appsettings.json"))
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* if the configuration expects new values we write them in.
|
|
||||||
* if you left other junk for whatever reason, get rekt
|
|
||||||
*/
|
|
||||||
var toReturn = JsonConvert.DeserializeObject<T>(File.ReadAllText(confpath)) ?? new T();
|
|
||||||
File.WriteAllText(confpath, JsonConvert.SerializeObject(toReturn, Formatting.Indented));
|
|
||||||
return toReturn;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var toReturn = new T();
|
|
||||||
File.WriteAllText(confpath, JsonConvert.SerializeObject(toReturn));
|
|
||||||
return toReturn;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
71
Deployment/Configurator.cs
Normal file
71
Deployment/Configurator.cs
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
using System;
|
||||||
|
using System.Dynamic;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
[assembly: InternalsVisibleTo("deployment.tests")]
|
||||||
|
namespace greyn.Deployment
|
||||||
|
{
|
||||||
|
public static class Configurator<T> where T : new()
|
||||||
|
{
|
||||||
|
private const string confpath = "appsettings.json";
|
||||||
|
private static FileSystemWatcher appsettingsWatcher = new FileSystemWatcher(".");
|
||||||
|
|
||||||
|
public static event EventHandler Changed;
|
||||||
|
public static event System.IO.ErrorEventHandler Error;
|
||||||
|
|
||||||
|
private static T config;
|
||||||
|
|
||||||
|
public static T Load()
|
||||||
|
{
|
||||||
|
if (File.Exists(confpath))
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* if the configuration expects new values we write them in.
|
||||||
|
* if you left other junk for whatever reason, get rekt
|
||||||
|
*/
|
||||||
|
config = JsonConvert.DeserializeObject<T>(File.ReadAllText(confpath)) ?? new T();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
config = new T();
|
||||||
|
}
|
||||||
|
File.WriteAllText(confpath, JsonConvert.SerializeObject(config, Formatting.Indented));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
appsettingsWatcher.Filter = confpath;
|
||||||
|
|
||||||
|
appsettingsWatcher.NotifyFilter = NotifyFilters.LastWrite
|
||||||
|
| NotifyFilters.Security
|
||||||
|
| NotifyFilters.Size;
|
||||||
|
|
||||||
|
appsettingsWatcher.Changed += internalOnChanged;
|
||||||
|
appsettingsWatcher.Created += internalOnChanged;
|
||||||
|
appsettingsWatcher.Deleted += internalOnChanged;
|
||||||
|
appsettingsWatcher.Renamed += internalOnChanged;
|
||||||
|
appsettingsWatcher.Error += Error;
|
||||||
|
|
||||||
|
appsettingsWatcher.EnableRaisingEvents = true;
|
||||||
|
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static void internalOnChanged(object sender, FileSystemEventArgs e)
|
||||||
|
{
|
||||||
|
appsettingsWatcher.EnableRaisingEvents = false;
|
||||||
|
|
||||||
|
Load();
|
||||||
|
Changed(sender, new ConfigChangedEventArgs(){NewConfig = config});
|
||||||
|
}
|
||||||
|
|
||||||
|
//I would like to just pudate the values on our held reference, but we'd have to update each value by reflection.
|
||||||
|
//2lazy.
|
||||||
|
public class ConfigChangedEventArgs : EventArgs
|
||||||
|
{
|
||||||
|
public T NewConfig;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -57,41 +57,38 @@ public class ConfigTests
|
|||||||
}";
|
}";
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void vibecheck()
|
|
||||||
{
|
|
||||||
Assert.AreEqual(0, new Random().Next(0, 2));
|
|
||||||
}
|
|
||||||
|
|
||||||
[TearDown]
|
[TearDown]
|
||||||
public void TearDown()
|
public void TearDown()
|
||||||
{
|
{
|
||||||
if(File.Exists("appsettings.json"))
|
if(File.Exists("appsettings.json"))
|
||||||
File.Delete("appsettings.json");
|
File.Delete("appsettings.json");
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void load_doesnt_explode()
|
public void load_doesnt_explode()
|
||||||
{
|
{
|
||||||
File.WriteAllText("appsettings.json", PerfectConfiguration);
|
File.WriteAllText("appsettings.json", PerfectConfiguration);
|
||||||
var conf = greyn.Deployment.ConfigurationBootstrapper.Load<AConfigurationType>();
|
var conf = greyn.Deployment.Configurator<AConfigurationType>.Load();
|
||||||
Assert.Pass();
|
Assert.Pass();
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
[Test]
|
[Test]
|
||||||
public void load_loads()
|
public void load_loads()
|
||||||
{
|
{
|
||||||
File.WriteAllText("appsettings.json", PerfectConfiguration);
|
File.WriteAllText("appsettings.json", PerfectConfiguration);
|
||||||
var conf = greyn.Deployment.ConfigurationBootstrapper.Load<AConfigurationType>();
|
var conf = greyn.Deployment.Configurator<AConfigurationType>.Load();
|
||||||
|
|
||||||
Assert.AreEqual(conf.aValueTypeButNotAField, 796.651f);
|
Assert.AreEqual(796.651f, conf.aValueTypeButNotAField);
|
||||||
Assert.AreEqual(conf.aField, "I've decided");
|
Assert.AreEqual("I've decided", conf.aField);
|
||||||
Assert.AreEqual(conf.subtyped.aValueType, 94.298);
|
Assert.AreEqual(94.298, conf.subtyped.aValueType);
|
||||||
Assert.AreEqual(conf.subtyped.aValueTypeButNotAField, 9241);
|
Assert.AreEqual(9241, conf.subtyped.aValueTypeButNotAField);
|
||||||
Assert.IsNotNull(conf.subtyped.anEnumerableType);
|
Assert.IsNotNull(conf.subtyped.anEnumerableType);
|
||||||
Assert.AreEqual(conf.subtyped.anEnumerableType["test3"], 420.71);
|
Assert.AreEqual( 420.71, conf.subtyped.anEnumerableType["test3"]);
|
||||||
Assert.AreEqual(conf.subtyped.anEnumerableType["test4"], 420.72);
|
Assert.AreEqual( 420.72, conf.subtyped.anEnumerableType["test4"]);
|
||||||
Assert.IsNotNull(conf.subtyped2);
|
Assert.IsNotNull(conf.subtyped2);
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
[Test]
|
[Test]
|
||||||
public void load_acceptsnullasvalue()
|
public void load_acceptsnullasvalue()
|
||||||
{
|
{
|
||||||
@ -116,23 +113,24 @@ public class ConfigTests
|
|||||||
}
|
}
|
||||||
}");
|
}");
|
||||||
|
|
||||||
var conf = greyn.Deployment.ConfigurationBootstrapper.Load<AConfigurationType>();
|
var conf = greyn.Deployment.Configurator<AConfigurationType>.Load();
|
||||||
|
System.Threading.Thread.Sleep(1000);
|
||||||
|
|
||||||
|
|
||||||
Assert.AreEqual(conf.aValueTypeButNotAField, 796.651f);
|
Assert.AreEqual(796.651f, conf.aValueTypeButNotAField);
|
||||||
Assert.AreEqual(conf.aField, "I've decided");
|
Assert.AreEqual("I've decided", conf.aField);
|
||||||
Assert.AreEqual(conf.subtyped.aValueType, 94.298);
|
Assert.AreEqual(94.298, conf.subtyped.aValueType);
|
||||||
Assert.AreEqual(conf.subtyped.aValueTypeButNotAField, 9241);
|
Assert.AreEqual(9241, conf.subtyped.aValueTypeButNotAField);
|
||||||
Assert.IsNotNull(conf.subtyped);
|
Assert.IsNotNull(conf.subtyped);
|
||||||
|
|
||||||
Assert.IsNull(conf.subtyped.anEnumerableType);
|
Assert.IsNull(conf.subtyped.anEnumerableType);
|
||||||
|
|
||||||
Assert.IsNotNull(conf.subtyped2);
|
Assert.IsNotNull(conf.subtyped2);
|
||||||
Assert.AreEqual(conf.subtyped2.aValueType, 95.298);
|
Assert.AreEqual(95.298, conf.subtyped2.aValueType);
|
||||||
Assert.AreEqual(conf.subtyped2.aValueTypeButNotAField, 9242);
|
Assert.AreEqual(9242, conf.subtyped2.aValueTypeButNotAField);
|
||||||
Assert.IsNotNull(conf.subtyped2.anEnumerableType);
|
Assert.IsNotNull(conf.subtyped2.anEnumerableType);
|
||||||
Assert.AreEqual(conf.subtyped2.anEnumerableType["test5"], 420.73);
|
Assert.AreEqual( 420.73, conf.subtyped2.anEnumerableType["test5"]);
|
||||||
Assert.AreEqual(conf.subtyped2.anEnumerableType["test6"], 420.74);
|
Assert.AreEqual( 420.74, conf.subtyped2.anEnumerableType["test6"]);
|
||||||
}
|
}
|
||||||
[Test]
|
[Test]
|
||||||
public void load_acceptsnull_forparenttype()
|
public void load_acceptsnull_forparenttype()
|
||||||
@ -152,19 +150,20 @@ public class ConfigTests
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}");
|
}");
|
||||||
var conf = greyn.Deployment.ConfigurationBootstrapper.Load<AConfigurationType>();
|
var conf = greyn.Deployment.Configurator<AConfigurationType>.Load();
|
||||||
|
System.Threading.Thread.Sleep(1000);
|
||||||
|
|
||||||
Assert.AreEqual(conf.aValueTypeButNotAField, 796.651f);
|
Assert.AreEqual(796.651f, conf.aValueTypeButNotAField);
|
||||||
Assert.AreEqual(conf.aField, "I've decided");
|
Assert.AreEqual("I've decided", conf.aField);
|
||||||
|
|
||||||
Assert.IsNull(conf.subtyped);
|
Assert.IsNull(conf.subtyped);
|
||||||
|
|
||||||
Assert.IsNotNull(conf.subtyped2);
|
Assert.IsNotNull(conf.subtyped2);
|
||||||
Assert.AreEqual(conf.subtyped2.aValueType, 95.298);
|
Assert.AreEqual(95.298, conf.subtyped2.aValueType);
|
||||||
Assert.AreEqual(conf.subtyped2.aValueTypeButNotAField, 9242);
|
Assert.AreEqual(9242, conf.subtyped2.aValueTypeButNotAField);
|
||||||
Assert.IsNotNull(conf.subtyped2.anEnumerableType);
|
Assert.IsNotNull(conf.subtyped2.anEnumerableType);
|
||||||
Assert.AreEqual(conf.subtyped2.anEnumerableType["test5"], 420.73);
|
Assert.AreEqual( 420.73, conf.subtyped2.anEnumerableType["test5"]);
|
||||||
Assert.AreEqual(conf.subtyped2.anEnumerableType["test6"], 420.74);
|
Assert.AreEqual( 420.74, conf.subtyped2.anEnumerableType["test6"]);
|
||||||
}
|
}
|
||||||
[Test]
|
[Test]
|
||||||
public void load_usesdefaultfornullablemissing()
|
public void load_usesdefaultfornullablemissing()
|
||||||
@ -193,15 +192,16 @@ public class ConfigTests
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}");
|
}");
|
||||||
var conf = greyn.Deployment.ConfigurationBootstrapper.Load<AConfigurationType>();
|
var conf = greyn.Deployment.Configurator<AConfigurationType>.Load();
|
||||||
|
System.Threading.Thread.Sleep(1000);
|
||||||
|
|
||||||
Assert.AreEqual(conf.aValueTypeButNotAField, 796.651f);
|
Assert.AreEqual(796.651f, conf.aValueTypeButNotAField);
|
||||||
Assert.AreEqual(conf.aField, "hi there, hello");
|
Assert.AreEqual("hi there, hello", conf.aField);
|
||||||
Assert.AreEqual(conf.subtyped.aValueType, 94.298);
|
Assert.AreEqual(94.298, conf.subtyped.aValueType);
|
||||||
Assert.AreEqual(conf.subtyped.aValueTypeButNotAField, 9241);
|
Assert.AreEqual(9241, conf.subtyped.aValueTypeButNotAField);
|
||||||
Assert.IsNotNull(conf.subtyped.anEnumerableType);
|
Assert.IsNotNull(conf.subtyped.anEnumerableType);
|
||||||
Assert.AreEqual(conf.subtyped.anEnumerableType["test3"], 420.71);
|
Assert.AreEqual( 420.71, conf.subtyped.anEnumerableType["test3"]);
|
||||||
Assert.AreEqual(conf.subtyped.anEnumerableType["test4"], 420.72);
|
Assert.AreEqual( 420.72, conf.subtyped.anEnumerableType["test4"]);
|
||||||
Assert.IsNotNull(conf.subtyped2);
|
Assert.IsNotNull(conf.subtyped2);
|
||||||
}
|
}
|
||||||
[Test]
|
[Test]
|
||||||
@ -231,15 +231,87 @@ public class ConfigTests
|
|||||||
}
|
}
|
||||||
}");
|
}");
|
||||||
|
|
||||||
var conf = greyn.Deployment.ConfigurationBootstrapper.Load<AConfigurationType>();
|
var conf = greyn.Deployment.Configurator<AConfigurationType>.Load();
|
||||||
|
System.Threading.Thread.Sleep(1000);
|
||||||
|
|
||||||
Assert.AreEqual(conf.aValueTypeButNotAField, 156.697f);
|
Assert.AreEqual(156.697f, conf.aValueTypeButNotAField);
|
||||||
Assert.AreEqual(conf.aField, "I've decided");
|
Assert.AreEqual("I've decided", conf.aField);
|
||||||
Assert.AreEqual(conf.subtyped.aValueType, 94.298);
|
Assert.AreEqual(94.298, conf.subtyped.aValueType);
|
||||||
Assert.AreEqual(conf.subtyped.aValueTypeButNotAField, 9241);
|
Assert.AreEqual(9241, conf.subtyped.aValueTypeButNotAField);
|
||||||
Assert.IsNotNull(conf.subtyped.anEnumerableType);
|
Assert.IsNotNull(conf.subtyped.anEnumerableType);
|
||||||
Assert.AreEqual(conf.subtyped.anEnumerableType["test3"], 420.71);
|
Assert.AreEqual( 420.71, conf.subtyped.anEnumerableType["test3"]);
|
||||||
Assert.AreEqual(conf.subtyped.anEnumerableType["test4"], 420.72);
|
Assert.AreEqual( 420.72, conf.subtyped.anEnumerableType["test4"]);
|
||||||
Assert.IsNotNull(conf.subtyped2);
|
Assert.IsNotNull(conf.subtyped2);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void live_reload()
|
||||||
|
{
|
||||||
|
File.WriteAllText("appsettings.json", @"{
|
||||||
|
aField: ""I've decided"",
|
||||||
|
subtyped:
|
||||||
|
{
|
||||||
|
aValueType: 94.298,
|
||||||
|
aValueTypeButNotAField: 9241,
|
||||||
|
anEnumerableType:
|
||||||
|
{
|
||||||
|
""test3"": 420.71,
|
||||||
|
""test4"": 420.72
|
||||||
|
}
|
||||||
|
},
|
||||||
|
subtyped2:
|
||||||
|
{
|
||||||
|
aValueType: 95.298,
|
||||||
|
aValueTypeButNotAField: 9242,
|
||||||
|
anEnumerableType:
|
||||||
|
{
|
||||||
|
""test5"": 420.73,
|
||||||
|
""test6"": 420.74
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}");
|
||||||
|
|
||||||
|
var conf = greyn.Deployment.Configurator<AConfigurationType>.Load();
|
||||||
|
System.Threading.Thread.Sleep(1000);
|
||||||
|
|
||||||
|
Assert.AreEqual(94.298, conf.subtyped.aValueType);
|
||||||
|
|
||||||
|
var wait= true;
|
||||||
|
greyn.Deployment.Configurator<AConfigurationType>.Changed += (sender, e) => {
|
||||||
|
conf = (e as Configurator<AConfigurationType>.ConfigChangedEventArgs).NewConfig;
|
||||||
|
wait = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
File.WriteAllText("appsettings.json", @"{
|
||||||
|
aField: ""I've decided"",
|
||||||
|
subtyped:
|
||||||
|
{
|
||||||
|
aValueType: 94.301,
|
||||||
|
aValueTypeButNotAField: 9241,
|
||||||
|
anEnumerableType:
|
||||||
|
{
|
||||||
|
""test3"": 420.71,
|
||||||
|
""test4"": 420.72
|
||||||
|
}
|
||||||
|
},
|
||||||
|
subtyped2:
|
||||||
|
{
|
||||||
|
aValueType: 95.298,
|
||||||
|
aValueTypeButNotAField: 9242,
|
||||||
|
anEnumerableType:
|
||||||
|
{
|
||||||
|
""test5"": 420.73,
|
||||||
|
""test6"": 420.74
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}");
|
||||||
|
|
||||||
|
while(wait)
|
||||||
|
{
|
||||||
|
System.Threading.Thread.Sleep(1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
Assert.AreEqual(94.301, conf.subtyped.aValueType);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user