Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs =================================================================== diff -u -rcb6877f670bacc7a6a896ab132d592eeef1107b5 -r223528aec31c0f78f0f8ff67991e43f781075931 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs (.../SoilProfile2DReaderTest.cs) (revision cb6877f670bacc7a6a896ab132d592eeef1107b5) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs (.../SoilProfile2DReaderTest.cs) (revision 223528aec31c0f78f0f8ff67991e43f781075931) @@ -138,7 +138,7 @@ const string path = "A"; reader.Expect(r => r.Path).Return(path); - SetExpectations(0, name, 0.0, 1.0, string.Empty, 0, new byte[0], 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + SetExpectations(0, name, 0.0, 1.0, string.Empty, 0, new byte[0], 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); mocks.ReplayAll(); @@ -161,7 +161,7 @@ const string path = "A"; reader.Expect(r => r.Path).Return(path); - SetExpectations(1, name, 0.0, 1.0, string.Empty, 0, null, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + SetExpectations(1, name, 0.0, 1.0, string.Empty, 0, null, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); mocks.ReplayAll(); @@ -183,7 +183,7 @@ const string name = "cool name"; const string path = "A"; - SetExpectations(1, name, 0.0, 1.0, string.Empty, 0, new byte[0], 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + SetExpectations(1, name, 0.0, 1.0, string.Empty, 0, new byte[0], 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); reader.Expect(r => r.Path).Return(path); mocks.ReplayAll(); @@ -227,7 +227,7 @@ public void ReadFrom_NullValuesForLayer_ReturnsProfileWithNullValuesAndDefaultsOnLayer() { // Setup - SetExpectations(1, "", 0.0, null, null, null, someGeometry, 0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0); + SetExpectations(1, "", 0.0, null, null, null, someGeometry,0.0,0.0,0.0,0.0,0.0,0.0); mocks.ReplayAll(); @@ -256,8 +256,6 @@ { // Setup var random = new Random(22); - var abovePhreaticLevel = random.NextDouble(); - var dryUnitWeight = random.NextDouble(); var intersectionX = 0.5; var materialName = "material"; var color = Color.FromArgb(Color.AliceBlue.ToArgb()); @@ -277,8 +275,6 @@ materialName, color.ToArgb(), someGeometry, - abovePhreaticLevel, - dryUnitWeight, belowPhreaticLevelMean, belowPhreaticLevelDeviation, diameterD70Mean, @@ -298,8 +294,6 @@ var pipingSoilLayer = profile.Layers.First(); Assert.AreEqual(1.1, pipingSoilLayer.Top); - Assert.AreEqual(abovePhreaticLevel, pipingSoilLayer.AbovePhreaticLevel); - Assert.AreEqual(dryUnitWeight, pipingSoilLayer.DryUnitWeight); Assert.IsTrue(pipingSoilLayer.IsAquifer); Assert.AreEqual(materialName, pipingSoilLayer.MaterialName); Assert.AreEqual(color, pipingSoilLayer.Color); @@ -314,7 +308,7 @@ mocks.VerifyAll(); } - private void SetExpectations(int layerCount, string profileName, double intersectionX, double? isAquifer, string materialName, double? color, byte[] geometry, double abovePhreaticLevel, double dryUnitWeight, double belowPhreaticLevelMean, double belowPhreaticLevelDeviation, double diameterD70Mean, double diameterD70Deviation, double permeabilityMean, double permeabilityDeviation) + private void SetExpectations(int layerCount, string profileName, double intersectionX, double? isAquifer, string materialName, double? color, byte[] geometry, double? belowPhreaticLevelMean, double? belowPhreaticLevelDeviation, double? diameterD70Mean, double? diameterD70Deviation, double? permeabilityMean, double? permeabilityDeviation) { reader.Expect(r => r.Read(SoilProfileDatabaseColumns.LayerCount)).Return(layerCount).Repeat.Any(); reader.Expect(r => r.Read(SoilProfileDatabaseColumns.ProfileName)).Return(profileName).Repeat.Any(); @@ -324,9 +318,6 @@ reader.Expect(r => r.ReadOrDefault(SoilProfileDatabaseColumns.MaterialName)).Return(materialName).Repeat.Any(); reader.Expect(r => r.ReadOrDefault(SoilProfileDatabaseColumns.Color)).Return(color).Repeat.Any(); - reader.Expect(r => r.ReadOrDefault(SoilProfileDatabaseColumns.AbovePhreaticLevel)).Return(abovePhreaticLevel).Repeat.Any(); - reader.Expect(r => r.ReadOrDefault(SoilProfileDatabaseColumns.DryUnitWeight)).Return(dryUnitWeight).Repeat.Any(); - var logNormalDistribution = 3; var logNormalShift = 0; reader.Expect(r => r.ReadOrDefault(SoilProfileDatabaseColumns.BelowPhreaticLevelDistribution)).Return(logNormalDistribution).Repeat.Any();