Fisheye: Tag 275811c8e133cba03f636224f40a9536a733fb1f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/ForeShoresContextTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -0,0 +1,84 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Core.Common.Controls.PresentationObjects;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Forms.PresentationObjects;
+
+namespace Ringtoets.Common.Forms.Test.PresentationObjects
+{
+ [TestFixture]
+ public class ForeshoreProfilesContextTest
+ {
+ [Test]
+ public void Constructor_ValidValues_ExpectedValues()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ mocks.ReplayAll();
+
+ var foreshoresList = new ObservableList();
+
+ // Call
+ var context = new ForeshoreProfilesContext(foreshoresList, assessmentSection);
+
+ // Assert
+ Assert.IsInstanceOf>>(context);
+ Assert.AreSame(foreshoresList, context.WrappedData);
+ Assert.AreSame(assessmentSection, context.ParentAssessmentSection);
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void Constructor_ObservableListIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ mocks.ReplayAll();
+
+ // Call
+ TestDelegate call = () => new ForeshoreProfilesContext(null, assessmentSection);
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("wrappedData", paramName);
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void Constructor_AssessmentSectionIsNull_ThrowArgumentNullException()
+ {
+ // Call
+ TestDelegate call = () => new ForeshoreProfilesContext(new ObservableList(), null);
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("parentAssessmentSection", paramName);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r3e5a3e2990566fe86caaaa87136d0f57543a9666 -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 3e5a3e2990566fe86caaaa87136d0f57543a9666)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -72,7 +72,7 @@
-
+
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs
===================================================================
diff -u -rf37230ff653580eb90dd878e6ecc4f15511a11d6 -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision f37230ff653580eb90dd878e6ecc4f15511a11d6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -78,14 +78,14 @@
LogNormalDistribution originalCriticalFlowRate = input.CriticalFlowRate;
HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation;
- var foreShoreGeometry = new List
+ var foreshoreGeometry = new List
{
new Point2D(2.2, 3.3)
};
if (withValidForeshore)
{
- foreShoreGeometry.Add(new Point2D(4.4, 5.5));
+ foreshoreGeometry.Add(new Point2D(4.4, 5.5));
}
BreakWater breakWater = null;
@@ -105,7 +105,7 @@
new[]
{
new RoughnessPoint(new Point2D(6.6, 7.7), 0.8)
- }, foreShoreGeometry.ToArray(), breakWater,
+ }, foreshoreGeometry.ToArray(), breakWater,
new DikeProfile.ConstructionProperties
{
Orientation = 1.1, DikeHeight = 4.4
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -173,14 +173,14 @@
Assert.AreEqual(3, chartData.Collection.Count());
var dikeGeometryData = (ChartLineData) chartData.Collection.ElementAt(dikeProfileIndex);
- var foreShoreData = (ChartLineData) chartData.Collection.ElementAt(foreshoreIndex);
+ var foreshoreData = (ChartLineData) chartData.Collection.ElementAt(foreshoreIndex);
var dikeHeightData = (ChartLineData) chartData.Collection.ElementAt(dikeHeightIndex);
CollectionAssert.IsEmpty(dikeGeometryData.Points);
- CollectionAssert.IsEmpty(foreShoreData.Points);
+ CollectionAssert.IsEmpty(foreshoreData.Points);
CollectionAssert.IsEmpty(dikeHeightData.Points);
Assert.AreEqual(Resources.DikeProfile_DisplayName, dikeGeometryData.Name);
- Assert.AreEqual(Resources.Foreshore_DisplayName, foreShoreData.Name);
+ Assert.AreEqual(Resources.Foreshore_DisplayName, foreshoreData.Name);
Assert.AreEqual(Resources.DikeHeight_ChartName, dikeHeightData.Name);
}
}
@@ -212,11 +212,11 @@
Assert.AreEqual(3, chartData.Collection.Count());
var dikeGeometryData = (ChartLineData) chartData.Collection.ElementAt(dikeProfileIndex);
- var foreShoreData = (ChartLineData) chartData.Collection.ElementAt(foreshoreIndex);
+ var foreshoreData = (ChartLineData) chartData.Collection.ElementAt(foreshoreIndex);
var dikeHeightData = (ChartLineData) chartData.Collection.ElementAt(dikeHeightIndex);
- CollectionAssert.IsEmpty(foreShoreData.Points);
- Assert.AreEqual(Resources.Foreshore_DisplayName, foreShoreData.Name);
+ CollectionAssert.IsEmpty(foreshoreData.Points);
+ Assert.AreEqual(Resources.Foreshore_DisplayName, foreshoreData.Name);
AssertDikeProfileChartData(dikeProfile, dikeGeometryData);
AssertDikeHeightChartData(dikeProfile, dikeHeightData);
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r832fae2b215f8d6165628111b344a0dc03b1f669 -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 832fae2b215f8d6165628111b344a0dc03b1f669)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -267,11 +267,11 @@
Assert.IsNull(waveHeightLocationContextProperties.GetObjectPropertiesData);
Assert.IsNull(waveHeightLocationContextProperties.AfterCreate);
- PropertyInfo forshoreProfileProperties = PluginTestHelper.AssertPropertyInfoDefined
+ PropertyInfo foreshoreProfileProperties = PluginTestHelper.AssertPropertyInfoDefined
(propertyInfos);
- Assert.IsNull(forshoreProfileProperties.AdditionalDataCheck);
- Assert.IsNull(forshoreProfileProperties.GetObjectPropertiesData);
- Assert.IsNull(forshoreProfileProperties.AfterCreate);
+ Assert.IsNull(foreshoreProfileProperties.AdditionalDataCheck);
+ Assert.IsNull(foreshoreProfileProperties.GetObjectPropertiesData);
+ Assert.IsNull(foreshoreProfileProperties.AfterCreate);
}
}
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs
===================================================================
diff -u -rc0cbfb8da75e870ea078c4bbbf48a2f04e8f7d0a -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision c0cbfb8da75e870ea078c4bbbf48a2f04e8f7d0a)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -39,7 +39,7 @@
{
private const double designWaterLevelSubstraction = 0.01;
- private DikeProfile dikeProfile;
+ private ForeshoreProfile foreshoreProfile;
private RoundedDouble upperBoundaryRevetment;
private RoundedDouble lowerBoundaryRevetment;
private RoundedDouble stepSize;
@@ -57,7 +57,7 @@
upperBoundaryWaterLevels = new RoundedDouble(2, double.NaN);
lowerBoundaryWaterLevels = new RoundedDouble(2, double.NaN);
- UpdateDikeProfileParameters();
+ UpdateForeshoreProfileParameters();
}
///
@@ -66,18 +66,18 @@
public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; }
///
- /// Gets or sets the dike profile.
+ /// Gets or sets the foreshore profile.
///
- public DikeProfile DikeProfile
+ public ForeshoreProfile ForeshoreProfile
{
get
{
- return dikeProfile;
+ return foreshoreProfile;
}
set
{
- dikeProfile = value;
- UpdateDikeProfileParameters();
+ foreshoreProfile = value;
+ UpdateForeshoreProfileParameters();
}
}
@@ -103,8 +103,8 @@
{
get
{
- return dikeProfile != null
- ? dikeProfile.ForeshoreGeometry
+ return foreshoreProfile != null
+ ? foreshoreProfile.ForeshoreGeometry
: new RoundedPoint2DCollection(2, Enumerable.Empty());
}
}
@@ -295,20 +295,20 @@
return waterLevels;
}
- private void UpdateDikeProfileParameters()
+ private void UpdateForeshoreProfileParameters()
{
- if (dikeProfile == null)
+ if (foreshoreProfile == null)
{
UseForeshore = false;
UseBreakWater = false;
BreakWater = GetDefaultBreakWater();
}
else
{
- UseForeshore = dikeProfile.ForeshoreGeometry.Count() > 1;
- UseBreakWater = dikeProfile.HasBreakWater;
- BreakWater = dikeProfile.HasBreakWater
- ? new BreakWater(dikeProfile.BreakWater.Type, dikeProfile.BreakWater.Height)
+ UseForeshore = foreshoreProfile.ForeshoreGeometry.Count() > 1;
+ UseBreakWater = foreshoreProfile.HasBreakWater;
+ BreakWater = foreshoreProfile.HasBreakWater
+ ? new BreakWater(foreshoreProfile.BreakWater.Type, foreshoreProfile.BreakWater.Height)
: GetDefaultBreakWater();
}
}
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs
===================================================================
diff -u -r667ee7506c654e80ba413a4cf170852ecf52a6f8 -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision 667ee7506c654e80ba413a4cf170852ecf52a6f8)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -108,7 +108,7 @@
Assert.IsInstanceOf(input);
Assert.IsInstanceOf(input);
Assert.IsNull(input.HydraulicBoundaryLocation);
- Assert.IsNull(input.DikeProfile);
+ Assert.IsNull(input.ForeshoreProfile);
Assert.IsFalse(input.UseBreakWater);
Assert.AreEqual(BreakWaterType.Dam, input.BreakWater.Type);
Assert.AreEqual(new RoundedDouble(2), input.BreakWater.Height);
@@ -124,7 +124,7 @@
[Test]
[Combinatorial]
- public void DikeProfile_SetNewValue_InputSyncedAccordingly(
+ public void ForeshoreProfile_SetNewValue_InputSyncedAccordingly(
[Values(true, false)] bool withBreakWater,
[Values(true, false)] bool withValidForeshore)
{
@@ -134,14 +134,14 @@
RoundedDouble originalBreakWaterHeight = input.BreakWater.Height;
HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation;
- var foreShoreGeometry = new List
+ var foreshoreGeometry = new List
{
new Point2D(2.2, 3.3)
};
if (withValidForeshore)
{
- foreShoreGeometry.Add(new Point2D(4.4, 5.5));
+ foreshoreGeometry.Add(new Point2D(4.4, 5.5));
}
BreakWater breakWater = null;
@@ -157,59 +157,46 @@
breakWater = new BreakWater(nonDefaultBreakWaterType, nonDefaultBreakWaterHeight);
}
- var dikeProfile = new DikeProfile(new Point2D(0, 0),
- new[]
- {
- new RoughnessPoint(new Point2D(6.6, 7.7), 0.8)
- }, foreShoreGeometry.ToArray(), breakWater,
- new DikeProfile.ConstructionProperties
- {
- Orientation = 1.1,
- DikeHeight = 4.4
- });
+ var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ foreshoreGeometry.ToArray(),
+ breakWater,
+ new ForeshoreProfile.ConstructionProperties());
// Call
- input.DikeProfile = dikeProfile;
+ input.ForeshoreProfile = foreshoreProfile;
// Assert
- Assert.AreSame(dikeProfile, input.DikeProfile);
+ Assert.AreSame(foreshoreProfile, input.ForeshoreProfile);
Assert.AreEqual(withBreakWater, input.UseBreakWater);
- Assert.AreEqual(withBreakWater ? dikeProfile.BreakWater.Type : originalBreakWaterType, input.BreakWater.Type);
- Assert.AreEqual(withBreakWater ? dikeProfile.BreakWater.Height : originalBreakWaterHeight, input.BreakWater.Height);
+ Assert.AreEqual(withBreakWater ? foreshoreProfile.BreakWater.Type : originalBreakWaterType, input.BreakWater.Type);
+ Assert.AreEqual(withBreakWater ? foreshoreProfile.BreakWater.Height : originalBreakWaterHeight, input.BreakWater.Height);
Assert.AreEqual(withValidForeshore, input.UseForeshore);
- CollectionAssert.AreEqual(dikeProfile.ForeshoreGeometry, input.ForeshoreGeometry);
+ CollectionAssert.AreEqual(foreshoreProfile.ForeshoreGeometry, input.ForeshoreGeometry);
Assert.AreEqual(originalHydraulicBoundaryLocation, input.HydraulicBoundaryLocation);
}
[Test]
- public void DikeProfile_SetNullValue_InputSyncedToDefaults()
+ public void Foreshore_SetNullValue_InputSyncedToDefaults()
{
// Setup
var input = new WaveConditionsInput();
BreakWaterType originalBreakWaterType = input.BreakWater.Type;
RoundedDouble originalBreakWaterHeight = input.BreakWater.Height;
HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation;
- var dikeProfile = new DikeProfile(new Point2D(0, 0),
- new[]
- {
- new RoughnessPoint(new Point2D(7.7, 8.8), 0.6)
- }, new[]
- {
- new Point2D(3.3, 4.4),
- new Point2D(5.5, 6.6)
- },
- new BreakWater(BreakWaterType.Caisson, 2.2),
- new DikeProfile.ConstructionProperties
- {
- Orientation = 1.1,
- DikeHeight = 9.9
- });
+ var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ new[]
+ {
+ new Point2D(3.3, 4.4),
+ new Point2D(5.5, 6.6)
+ },
+ new BreakWater(BreakWaterType.Caisson, 2.2),
+ new ForeshoreProfile.ConstructionProperties());
- input.DikeProfile = dikeProfile;
+ input.ForeshoreProfile = foreshoreProfile;
// Precondition
- Assert.AreSame(dikeProfile, input.DikeProfile);
+ Assert.AreSame(foreshoreProfile, input.ForeshoreProfile);
Assert.IsTrue(input.UseBreakWater);
Assert.AreNotEqual(originalBreakWaterType, input.BreakWater.Type);
Assert.AreNotEqual(originalBreakWaterHeight, input.BreakWater.Height);
@@ -218,7 +205,7 @@
Assert.AreEqual(originalHydraulicBoundaryLocation, input.HydraulicBoundaryLocation);
// Call
- input.DikeProfile = null;
+ input.ForeshoreProfile = null;
// Assert
Assert.IsFalse(input.UseBreakWater);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r5b3041efe0fd2d334984d6c730815242b30229aa -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs (.../WaveConditionsCalculationServiceTest.cs) (revision 5b3041efe0fd2d334984d6c730815242b30229aa)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs (.../WaveConditionsCalculationServiceTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -55,7 +55,7 @@
var input = new WaveConditionsInput
{
HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0),
- DikeProfile = CreateDikeProfile(),
+ ForeshoreProfile = CreateForeshoreProfile(),
UseBreakWater = useBreakWater,
UseForeshore = useForeshore
};
@@ -95,7 +95,7 @@
var input = new WaveConditionsInput
{
HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0),
- DikeProfile = CreateDikeProfile()
+ ForeshoreProfile = CreateForeshoreProfile()
};
string hlcdDirectory = "C:/temp";
@@ -117,23 +117,16 @@
}
}
- private static DikeProfile CreateDikeProfile()
+ private static ForeshoreProfile CreateForeshoreProfile()
{
- return new DikeProfile(new Point2D(0, 0),
- new[]
- {
- new RoughnessPoint(new Point2D(6.6, 7.7), 0.8)
- }, new[]
- {
- new Point2D(2.2, 3.3),
- new Point2D(4.4, 5.5),
- },
- new BreakWater(BreakWaterType.Wall, 5.5),
- new DikeProfile.ConstructionProperties
- {
- Orientation = 1.1,
- DikeHeight = 4.4
- });
+ return new ForeshoreProfile(new Point2D(0, 0),
+ new[]
+ {
+ new Point2D(2.2, 3.3),
+ new Point2D(4.4, 5.5)
+ },
+ new BreakWater(BreakWaterType.Wall, 5.5),
+ new ForeshoreProfile.ConstructionProperties());
}
private static WaveConditionsCosineCalculationInput CreateInput(double waterLevel, double a, double b, double c, double norm, WaveConditionsInput input, bool useForeshore, bool useBreakWater)
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -r413528dc8e69a34dea738f813daada7d0bda4461 -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationTest.cs) (revision 413528dc8e69a34dea738f813daada7d0bda4461)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -46,7 +46,7 @@
Assert.IsFalse(calculation.HasOutput);
Assert.IsNull(calculation.Comments);
Assert.IsNull(calculation.Output);
- Assert.IsNull(calculation.InputParameters.DikeProfile);
+ Assert.IsNull(calculation.InputParameters.ForeshoreProfile);
}
[Test]
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -ree645c4a2244442fb58ccf2b11ed1c5796248d1b -r275811c8e133cba03f636224f40a9536a733fb1f
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision ee645c4a2244442fb58ccf2b11ed1c5796248d1b)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
@@ -57,7 +57,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
- DikeProfile = CreateDikeProfile(),
+ ForeshoreProfile = CreateForeshoreProfile(),
UseForeshore = true,
UseBreakWater = true,
StepSize = (RoundedDouble) 0.5,
@@ -101,7 +101,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
- DikeProfile = CreateDikeProfile(),
+ ForeshoreProfile = CreateForeshoreProfile(),
UseForeshore = true,
UseBreakWater = true,
StepSize = (RoundedDouble) 0.5,
@@ -157,7 +157,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
- DikeProfile = CreateDikeProfile(),
+ ForeshoreProfile = CreateForeshoreProfile(),
UseForeshore = true,
UseBreakWater = true,
StepSize = (RoundedDouble) 0.5,
@@ -214,7 +214,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
- DikeProfile = CreateDikeProfile(),
+ ForeshoreProfile = CreateForeshoreProfile(),
UseForeshore = true,
UseBreakWater = true,
StepSize = (RoundedDouble) 0.5,
@@ -231,10 +231,7 @@
using (new HydraRingCalculationServiceConfig())
{
List progessTexts = new List();
- activity.ProgressChanged += (sender, args) =>
- {
- progessTexts.Add(activity.ProgressText);
- };
+ activity.ProgressChanged += (sender, args) => { progessTexts.Add(activity.ProgressText); };
// Call
activity.Run();
@@ -260,24 +257,16 @@
}
}
- private static DikeProfile CreateDikeProfile()
+ private static ForeshoreProfile CreateForeshoreProfile()
{
- return new DikeProfile(new Point2D(0, 0),
- new[]
- {
- new RoughnessPoint(new Point2D(1.1, 2.2), 0.6),
- new RoughnessPoint(new Point2D(3.3, 4.4), 0.7)
- }, new[]
- {
- new Point2D(3.3, 4.4),
- new Point2D(5.5, 6.6)
- },
- new BreakWater(BreakWaterType.Dam, 10.0),
- new DikeProfile.ConstructionProperties
- {
- Orientation = 5.5,
- DikeHeight = 10
- });
+ return new ForeshoreProfile(new Point2D(0, 0),
+ new[]
+ {
+ new Point2D(3.3, 4.4),
+ new Point2D(5.5, 6.6)
+ },
+ new BreakWater(BreakWaterType.Dam, 10.0),
+ new ForeshoreProfile.ConstructionProperties());
}
}
}
\ No newline at end of file