Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs
===================================================================
diff -u -r1c01b600a1d6fb51fea1a5b888ceff0706c70b1d -r3faf4e513cd3a662427ce5aed527bb994f740c18
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision 1c01b600a1d6fb51fea1a5b888ceff0706c70b1d)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision 3faf4e513cd3a662427ce5aed527bb994f740c18)
@@ -154,7 +154,7 @@
};
// Call
- TestDelegate test = () => distribution.Mean = (RoundedDouble)5;
+ TestDelegate test = () => distribution.Mean = (RoundedDouble) 5;
// Assert
const string expectedMessage = "De verschuiving mag niet groter zijn dan de verwachtingswaarde.";
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayerDataTest.cs
===================================================================
diff -u -r3ccf9060ac18a68862898c4c509a41b1bc2f3ea7 -r3faf4e513cd3a662427ce5aed527bb994f740c18
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayerDataTest.cs (.../MacroStabilityInwardsSoilLayerDataTest.cs) (revision 3ccf9060ac18a68862898c4c509a41b1bc2f3ea7)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayerDataTest.cs (.../MacroStabilityInwardsSoilLayerDataTest.cs) (revision 3faf4e513cd3a662427ce5aed527bb994f740c18)
@@ -39,59 +39,59 @@
public void DefaultConstructor_DefaultValuesSet()
{
// Call
- var properties = new MacroStabilityInwardsSoilLayerData();
+ var data = new MacroStabilityInwardsSoilLayerData();
// Assert
- Assert.IsFalse(properties.IsAquifer);
- Assert.IsEmpty(properties.MaterialName);
- Assert.AreEqual(Color.Empty, properties.Color);
+ Assert.IsFalse(data.IsAquifer);
+ Assert.IsEmpty(data.MaterialName);
+ Assert.AreEqual(Color.Empty, data.Color);
- Assert.IsFalse(properties.UsePop);
- Assert.AreEqual(MacroStabilityInwardsShearStrengthModel.CPhi, properties.ShearStrengthModel);
+ Assert.IsFalse(data.UsePop);
+ Assert.AreEqual(MacroStabilityInwardsShearStrengthModel.CPhi, data.ShearStrengthModel);
DistributionAssert.AreEqual(new VariationCoefficientLogNormalDistribution(2)
{
Mean = RoundedDouble.NaN,
CoefficientOfVariation = RoundedDouble.NaN,
Shift = RoundedDouble.NaN
- }, properties.AbovePhreaticLevel);
+ }, data.AbovePhreaticLevel);
DistributionAssert.AreEqual(new VariationCoefficientLogNormalDistribution(2)
{
Mean = RoundedDouble.NaN,
CoefficientOfVariation = RoundedDouble.NaN,
Shift = RoundedDouble.NaN
- }, properties.BelowPhreaticLevel);
+ }, data.BelowPhreaticLevel);
DistributionAssert.AreEqual(new VariationCoefficientLogNormalDistribution(2)
{
Mean = RoundedDouble.NaN,
CoefficientOfVariation = RoundedDouble.NaN
- }, properties.Cohesion);
+ }, data.Cohesion);
DistributionAssert.AreEqual(new VariationCoefficientLogNormalDistribution(2)
{
Mean = RoundedDouble.NaN,
CoefficientOfVariation = RoundedDouble.NaN
- }, properties.FrictionAngle);
+ }, data.FrictionAngle);
DistributionAssert.AreEqual(new VariationCoefficientLogNormalDistribution(2)
{
Mean = RoundedDouble.NaN,
CoefficientOfVariation = RoundedDouble.NaN
- }, properties.ShearStrengthRatio);
+ }, data.ShearStrengthRatio);
DistributionAssert.AreEqual(new VariationCoefficientLogNormalDistribution(2)
{
Mean = RoundedDouble.NaN,
CoefficientOfVariation = RoundedDouble.NaN
- }, properties.StrengthIncreaseExponent);
+ }, data.StrengthIncreaseExponent);
DistributionAssert.AreEqual(new VariationCoefficientLogNormalDistribution(2)
{
Mean = RoundedDouble.NaN,
CoefficientOfVariation = RoundedDouble.NaN
- }, properties.Pop);
+ }, data.Pop);
}
[Test]
@@ -233,27 +233,27 @@
{
new TestCaseData(dataA, dataA, true)
{
- TestName = "Equals_LayerALayerA_True"
+ TestName = "Equals_DataADataA_True"
},
new TestCaseData(dataA, dataB, true)
{
- TestName = "Equals_LayerALayerB_True"
+ TestName = "Equals_DataADataB_True"
},
new TestCaseData(dataB, dataD, true)
{
- TestName = "Equals_LayerBLayerD_True"
+ TestName = "Equals_DataBDataD_True"
},
new TestCaseData(dataA, dataD, true)
{
- TestName = "Equals_LayerALayerD_True"
+ TestName = "Equals_DataADataD_True"
},
new TestCaseData(dataB, dataC, false)
{
- TestName = "Equals_LayerBLayerC_False"
+ TestName = "Equals_DataBDataC_False"
},
new TestCaseData(dataA, dataC, false)
{
- TestName = "Equals_LayerALayerC_False"
+ TestName = "Equals_DataADataC_False"
}
};
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSoilProfileTest.cs
===================================================================
diff -u -rd56fff713d02928e02bb69121919908419c0c8cc -r3faf4e513cd3a662427ce5aed527bb994f740c18
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSoilProfileTest.cs (.../UpliftVanSoilProfileTest.cs) (revision d56fff713d02928e02bb69121919908419c0c8cc)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSoilProfileTest.cs (.../UpliftVanSoilProfileTest.cs) (revision 3faf4e513cd3a662427ce5aed527bb994f740c18)
@@ -68,8 +68,8 @@
var profile = new UpliftVanSoilProfile(layers, preconsolidationStresses);
// Assert
- CollectionAssert.AreEqual(layers, profile.Layers);
- CollectionAssert.AreEqual(preconsolidationStresses, profile.PreconsolidationStresses);
+ Assert.AreSame(layers, profile.Layers);
+ Assert.AreSame(preconsolidationStresses, profile.PreconsolidationStresses);
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj
===================================================================
diff -u -r0972b795d89686b6ae07a1b256fc2db51f524c9f -r3faf4e513cd3a662427ce5aed527bb994f740c18
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj (.../Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj) (revision 0972b795d89686b6ae07a1b256fc2db51f524c9f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj (.../Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj) (revision 3faf4e513cd3a662427ce5aed527bb994f740c18)
@@ -44,7 +44,6 @@
-