Merge pull request #193 from TimeWarpEngineering/Cramer/2019-10-16/bug/InitializeAfterConstructor

Initialize is called by the Store after construction complete.

Author: StevenTCramer

Source/BlazorState/Features/Routing/State/RouteState.cs

@@ -9,6 +9,6 @@ public partial class RouteState : State<RouteState>
   {
     public string Route { get; private set; }
 
-    protected override void Initialize() { }
+    public override void Initialize() { }
   }
 }

Source/BlazorState/State/IState.cs

@@ -6,6 +6,7 @@
   public interface IState
   {
     Guid Guid { get; }
+    void Initialize();
   }
 
   public interface IState<TState> : IState

Source/BlazorState/State/State.cs

@@ -7,10 +7,6 @@
 
   public abstract class State<TState> : IState<TState>
   {
-    public State()
-    {
-      Initialize();
-    }
 
     [IgnoreDataMember]
     public Guid Guid { get; protected set; } = Guid.NewGuid();
@@ -40,7 +36,6 @@ public void ThrowIfNotTestAssembly(Assembly aAssembly)
     /// <summary>
     /// Override this to Set the initial state
     /// </summary>
-    protected abstract void Initialize();
-
+    public abstract void Initialize();
   }
 }

Source/BlazorState/Store/Store.cs

@@ -76,7 +76,7 @@ public object GetState(Type aType)
           Logger.LogDebug($"{GetType().Name}: Creating State of type: {typeName}");
           state = (IState)ServiceProvider.GetService(aType);
           if (state == null) throw new NullReferenceException("state is null");
-          //state = (IState)Activator.CreateInstance(aType);
+          state.Initialize();
           States.Add(typeName, state);
         }
         else

Tests/Client.Integration.Tests/Store/StoreTests.cs

@@ -49,5 +49,14 @@ public void ShouldLoadStatesFromJson()
       weatherForecastsState.WeatherForecasts[0].Date.Minute.ShouldBe(29);
       weatherForecastsState.WeatherForecasts[0].Date.Second.ShouldBe(54);
     }
+
+    /// <summary>
+    /// WeatherForecatesState will throw an exception if items initialized in the constructor are null.
+    /// </summary>
+    public void ShouldInitializeStateAfterConstruction()
+    {
+      WeatherForecastsState state = Store.GetState<WeatherForecastsState>();
+      state.ShouldNotBeNull();
+    }
   }
 }

Tests/TestApp/Client/Features/Application/ApplicationState.cs

@@ -10,6 +10,6 @@ internal partial class ApplicationState : State<ApplicationState>
 
     public ApplicationState() { }
 
-    protected override void Initialize() => Name = "Blazor State Demo Application";
+    public override void Initialize() => Name = "Blazor State Demo Application";
   }
 }

Tests/TestApp/Client/Features/CloneTest/CloneTestState.cs

@@ -13,7 +13,7 @@ public CloneTestState() { }
     /// <summary>
     /// Set the Initial State
     /// </summary>
-    protected override void Initialize() => Count = 3;
+    public override void Initialize() => Count = 3;
     public object Clone() => new CloneTestState { Count = 42 };
   }
 }

Tests/TestApp/Client/Features/Counter/CounterState.cs

@@ -12,6 +12,6 @@ public CounterState() { }
     /// <summary>
     /// Set the Initial State
     /// </summary>
-    protected override void Initialize() => Count = 3;
+    public override void Initialize() => Count = 3;
   }
 }

Tests/TestApp/Client/Features/EventStream/EventStreamState.cs

@@ -13,6 +13,6 @@ public EventStreamState()
       _Events = new List<string>();
     }
 
-    protected override void Initialize() { }
+    public override void Initialize() { }
   }
 }

Tests/TestApp/Client/Features/WeatherForecast/WeatherForecastState.cs

@@ -15,6 +15,18 @@ public WeatherForecastsState()
       _WeatherForecasts = new List<WeatherForecastDto>();
     }
 
-    protected override void Initialize() { }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <remarks>used to test that constructor is complete before Initialize is called</remarks>
+    public override void Initialize() 
+    {
+      if (_WeatherForecasts is null)
+      {
+        throw new System.ArgumentNullException(nameof(_WeatherForecasts));
+      }
+
+    }
   }
 }