Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs =================================================================== diff -u -ree40d119c47d69ff02bc3c07da1922dbe16829ca -r41ae2ae5761506a2e5e51266b382c3c73354f3cb --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs (.../MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs) (revision ee40d119c47d69ff02bc3c07da1922dbe16829ca) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs (.../MacroStabilityInwardsStochasticSoilModelPropertyInfoTest.cs) (revision 41ae2ae5761506a2e5e51266b382c3c73354f3cb) @@ -26,7 +26,6 @@ using Rhino.Mocks; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; -using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Plugin.Test.PropertyInfos { @@ -40,7 +39,7 @@ public void SetUp() { plugin = new MacroStabilityInwardsPlugin(); - info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(StochasticSoilProfileProperties)); + info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(StochasticSoilModelProperties)); } [TearDown] @@ -53,8 +52,8 @@ public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual(typeof(MacroStabilityInwardsStochasticSoilProfile), info.DataType); - Assert.AreEqual(typeof(StochasticSoilProfileProperties), info.PropertyObjectType); + Assert.AreEqual(typeof(MacroStabilityInwardsStochasticSoilModel), info.DataType); + Assert.AreEqual(typeof(StochasticSoilModelProperties), info.PropertyObjectType); } [Test] @@ -64,13 +63,13 @@ var mocks = new MockRepository(); mocks.ReplayAll(); - var context = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1234L); + var context = new MacroStabilityInwardsStochasticSoilModel(""); // Call IObjectProperties objectProperties = info.CreateInstance(context); // Assert - Assert.IsInstanceOf(objectProperties); + Assert.IsInstanceOf(objectProperties); Assert.AreSame(context, objectProperties.Data); mocks.VerifyAll(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs =================================================================== diff -u -ree40d119c47d69ff02bc3c07da1922dbe16829ca -r41ae2ae5761506a2e5e51266b382c3c73354f3cb --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs (.../MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs) (revision ee40d119c47d69ff02bc3c07da1922dbe16829ca) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs (.../MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs) (revision 41ae2ae5761506a2e5e51266b382c3c73354f3cb) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; +using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Plugin.Test.PropertyInfos { @@ -39,7 +40,7 @@ public void SetUp() { plugin = new MacroStabilityInwardsPlugin(); - info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(StochasticSoilModelProperties)); + info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(StochasticSoilProfileProperties)); } [TearDown] @@ -52,8 +53,8 @@ public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.AreEqual(typeof(MacroStabilityInwardsStochasticSoilModel), info.DataType); - Assert.AreEqual(typeof(StochasticSoilModelProperties), info.PropertyObjectType); + Assert.AreEqual(typeof(MacroStabilityInwardsStochasticSoilProfile), info.DataType); + Assert.AreEqual(typeof(StochasticSoilProfileProperties), info.PropertyObjectType); } [Test] @@ -63,13 +64,13 @@ var mocks = new MockRepository(); mocks.ReplayAll(); - var context = new MacroStabilityInwardsStochasticSoilModel(""); + var context = new MacroStabilityInwardsStochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1234L); // Call IObjectProperties objectProperties = info.CreateInstance(context); // Assert - Assert.IsInstanceOf(objectProperties); + Assert.IsInstanceOf(objectProperties); Assert.AreSame(context, objectProperties.Data); mocks.VerifyAll(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj =================================================================== diff -u -ree40d119c47d69ff02bc3c07da1922dbe16829ca -r41ae2ae5761506a2e5e51266b382c3c73354f3cb --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj (.../Ringtoets.MacroStabilityInwards.Plugin.Test.csproj) (revision ee40d119c47d69ff02bc3c07da1922dbe16829ca) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj (.../Ringtoets.MacroStabilityInwards.Plugin.Test.csproj) (revision 41ae2ae5761506a2e5e51266b382c3c73354f3cb) @@ -78,9 +78,9 @@ - - + +