Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r8220105e2d57f8d8473d4896582d6bde3ee658ff --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 8220105e2d57f8d8473d4896582d6bde3ee658ff) @@ -37,13 +37,11 @@ using Ringtoets.ClosingStructures.Forms.PresentationObjects; using Ringtoets.ClosingStructures.Forms.PropertyClasses; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PropertyClasses; -using Ringtoets.HydraRing.Data; namespace Ringtoets.ClosingStructures.Forms.Test.PropertyClasses { @@ -139,77 +137,66 @@ } [Test] - public void Data_SetNewInputContextInstanceWithData_ReturnCorrectPropertyValues() + public void GetAvailableForeshoreProfiles_SetInputContextInstanceWithForeshoreProfiles_ReturnForeshoreProfiles() { // Setup - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase - { - Locations = - { - new HydraulicBoundaryLocation(0, "", 0, 0) - } - }; var assessmentSectionStub = mockRepository.Stub(); - assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; mockRepository.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism { ForeshoreProfiles = { new TestForeshoreProfile() - }, - ClosingStructures = - { - new TestClosingStructure() } }; - var calculation = new StructuresCalculation + var calculation = new StructuresCalculation(); + var inputContext = new ClosingStructuresInputContext(calculation.InputParameters, + calculation, + failureMechanism, + assessmentSectionStub); + var properties = new ClosingStructuresInputContextProperties { - InputParameters = + Data = inputContext + }; + + // Call + var availableForeshoreProfiles = properties.GetAvailableForeshoreProfiles(); + + // Assert + CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, availableForeshoreProfiles); + mockRepository.VerifyAll(); + } + + [Test] + public void GetAvailableStructures_SetInputContextInstanceWithStructures_ReturnStructures() + { + // Setup + var assessmentSectionStub = mockRepository.Stub(); + mockRepository.ReplayAll(); + + var failureMechanism = new ClosingStructuresFailureMechanism + { + ClosingStructures = { - Structure = new TestClosingStructure(), - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "name", 0.0, 1.1), - ForeshoreProfile = new TestForeshoreProfile() + new TestClosingStructure() } }; - + var calculation = new StructuresCalculation(); var inputContext = new ClosingStructuresInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSectionStub); - var properties = new ClosingStructuresInputContextProperties(); + var properties = new ClosingStructuresInputContextProperties + { + Data = inputContext + }; // Call - properties.Data = inputContext; + var availableStructures = properties.GetAvailableStructures(); // Assert - ClosingStructuresInput input = calculation.InputParameters; - var expectedProbabilityOpenStructureBeforeFlooding = ProbabilityFormattingHelper.Format(input.ProbabilityOpenStructureBeforeFlooding); - var expectedFailureProbabilityOpenStructure = ProbabilityFormattingHelper.Format(input.FailureProbabilityOpenStructure); - var expectedFailureProbabilityReparation = ProbabilityFormattingHelper.Format(input.FailureProbabilityReparation); - - Assert.AreEqual(input.DeviationWaveDirection, properties.DeviationWaveDirection); - Assert.AreSame(input.InsideWaterLevel, properties.InsideWaterLevel.Data); - Assert.AreEqual(input.InflowModelType, properties.InflowModelType); - Assert.AreSame(input.AreaFlowApertures, properties.AreaFlowApertures.Data); - Assert.AreEqual(input.IdenticalApertures, properties.IdenticalApertures); - Assert.AreSame(input.LevelCrestStructureNotClosing, properties.LevelCrestStructureNotClosing.Data); - Assert.AreSame(input.ThresholdHeightOpenWeir, properties.ThresholdHeightOpenWeir.Data); - Assert.AreEqual(expectedProbabilityOpenStructureBeforeFlooding, properties.ProbabilityOpenStructureBeforeFlooding); - Assert.AreEqual(expectedFailureProbabilityOpenStructure, properties.FailureProbabilityOpenStructure); - Assert.AreEqual(expectedFailureProbabilityReparation, properties.FailureProbabilityReparation); - Assert.AreSame(input.DrainCoefficient, properties.DrainCoefficient.Data); - Assert.AreEqual(input.FactorStormDurationOpenStructure, properties.FactorStormDurationOpenStructure); - - var availableForeshoreProfiles = properties.GetAvailableForeshoreProfiles().ToArray(); - Assert.AreEqual(1, availableForeshoreProfiles.Length); - CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, availableForeshoreProfiles); - - var availableStructures = properties.GetAvailableStructures().ToArray(); - Assert.AreEqual(1, availableStructures.Length); CollectionAssert.AreEqual(failureMechanism.ClosingStructures, availableStructures); - mockRepository.VerifyAll(); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs =================================================================== diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r8220105e2d57f8d8473d4896582d6bde3ee658ff --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs (.../StructuresInputBasePropertiesTest.cs) (revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs (.../StructuresInputBasePropertiesTest.cs) (revision 8220105e2d57f8d8473d4896582d6bde3ee658ff) @@ -125,7 +125,7 @@ } [Test] - public void Data_SetNewInputContextInstanceWithData_ReturnCorrectPropertyValues() + public void GetAvailableHydraulicBoundaryLocations_SetInputContextInstanceWithHydraulicBoundaryLocations_ReturnHydraulicBoundaryLocations() { // Setup var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase @@ -142,47 +142,21 @@ mockRepository.ReplayAll(); - var calculation = new StructuresCalculation - { - InputParameters = - { - Structure = new SimpleStructure() - } - }; - var properties = new SimpleStructuresInputProperties(new StructuresInputBaseProperties, IFailureMechanism>.ConstructionProperties()); + var calculation = new StructuresCalculation(); var inputContext = new SimpleInputContext(calculation.InputParameters, calculation, failureMechanismStub, assessmentSectionStub); + var properties = new SimpleStructuresInputProperties(new StructuresInputBaseProperties, IFailureMechanism>.ConstructionProperties()) + { + Data = inputContext + }; // Call - properties.Data = inputContext; - - // Assert - SimpleStructureInput input = calculation.InputParameters; - var expectedStructureLocation = new Point2D(new RoundedDouble(0, input.Structure.Location.X), new RoundedDouble(0, input.Structure.Location.Y)); - var expectedFailureProbabilityStructureWithErosion = ProbabilityFormattingHelper.Format(input.FailureProbabilityStructureWithErosion); - - Assert.AreSame(input.Structure, properties.Structure); - Assert.AreEqual(expectedStructureLocation, properties.StructureLocation); - Assert.AreSame(input.ModelFactorSuperCriticalFlow, properties.ModelFactorSuperCriticalFlow.Data); - Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation); - Assert.AreSame(input.AllowedLevelIncreaseStorage, properties.AllowedLevelIncreaseStorage.Data); - Assert.AreSame(input.StorageStructureArea, properties.StorageStructureArea.Data); - Assert.AreSame(input.FlowWidthAtBottomProtection, properties.FlowWidthAtBottomProtection.Data); - Assert.AreSame(input.WidthFlowApertures, properties.WidthFlowApertures.Data); - Assert.AreSame(input.CriticalOvertoppingDischarge, properties.CriticalOvertoppingDischarge.Data); - Assert.AreSame(input.ForeshoreProfile, properties.ForeshoreProfile); - Assert.IsInstanceOf(properties.UseBreakWater); - Assert.IsInstanceOf(properties.UseForeshore); - Assert.AreEqual(expectedFailureProbabilityStructureWithErosion, properties.FailureProbabilityStructureWithErosion); - Assert.AreSame(input.HydraulicBoundaryLocation, properties.HydraulicBoundaryLocation); - Assert.AreSame(input.StormDuration, properties.StormDuration.Data); - var availableHydraulicBoundaryLocations = properties.GetAvailableHydraulicBoundaryLocations().ToArray(); - Assert.AreEqual(1, availableHydraulicBoundaryLocations.Length); - CollectionAssert.AreEqual(inputContext.AvailableHydraulicBoundaryLocations, availableHydraulicBoundaryLocations); + // Assert + CollectionAssert.AreEqual(hydraulicBoundaryDatabase.Locations, availableHydraulicBoundaryLocations); mockRepository.VerifyAll(); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r8220105e2d57f8d8473d4896582d6bde3ee658ff --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 8220105e2d57f8d8473d4896582d6bde3ee658ff) @@ -112,63 +112,66 @@ } [Test] - public void Data_SetNewInputContextInstanceWithData_ReturnCorrectPropertyValues() + public void GetAvailableForeshoreProfiles_SetInputContextInstanceWithForeshoreProfiles_ReturnForeshoreProfiles() { // Setup - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + var assessmentSectionStub = mockRepository.Stub(); + mockRepository.ReplayAll(); + + var failureMechanism = new HeightStructuresFailureMechanism { - Locations = + ForeshoreProfiles = { - new HydraulicBoundaryLocation(0, "", 0, 0) + new TestForeshoreProfile() } }; + var calculation = new StructuresCalculation(); + var inputContext = new HeightStructuresInputContext(calculation.InputParameters, + calculation, + failureMechanism, + assessmentSectionStub); + var properties = new HeightStructuresInputContextProperties + { + Data = inputContext + }; + + // Call + var availableForeshoreProfiles = properties.GetAvailableForeshoreProfiles(); + + // Assert + CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, availableForeshoreProfiles); + mockRepository.VerifyAll(); + } + + [Test] + public void GetAvailableStructures_SetInputContextInstanceWithStructures_ReturnStructures() + { + // Setup var assessmentSectionStub = mockRepository.Stub(); - assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; mockRepository.ReplayAll(); var failureMechanism = new HeightStructuresFailureMechanism { - ForeshoreProfiles = - { - new TestForeshoreProfile() - }, HeightStructures = { new TestHeightStructure() } }; - var calculation = new StructuresCalculation - { - InputParameters = - { - Structure = new TestHeightStructure(), - HydraulicBoundaryLocation = CreateHydraulicBoundaryLocation(), - ForeshoreProfile = new TestForeshoreProfile() - } - }; - + var calculation = new StructuresCalculation(); var inputContext = new HeightStructuresInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSectionStub); - var properties = new HeightStructuresInputContextProperties(); + var properties = new HeightStructuresInputContextProperties + { + Data = inputContext + }; // Call - properties.Data = inputContext; + var availableStructures = properties.GetAvailableStructures(); // Assert - HeightStructuresInput input = calculation.InputParameters; - Assert.AreSame(input.LevelCrestStructure, properties.LevelCrestStructure.Data); - Assert.AreEqual(input.DeviationWaveDirection, properties.DeviationWaveDirection); - - var availableForeshoreProfiles = properties.GetAvailableForeshoreProfiles().ToArray(); - Assert.AreEqual(1, availableForeshoreProfiles.Length); - CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, availableForeshoreProfiles); - - var availableStructures = properties.GetAvailableStructures().ToArray(); - Assert.AreEqual(1, availableStructures.Length); CollectionAssert.AreEqual(failureMechanism.HeightStructures, availableStructures); - mockRepository.VerifyAll(); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r8220105e2d57f8d8473d4896582d6bde3ee658ff --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 8220105e2d57f8d8473d4896582d6bde3ee658ff) @@ -38,7 +38,6 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PropertyClasses; -using Ringtoets.HydraRing.Data; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Data.TestUtil; using Ringtoets.StabilityPointStructures.Forms.PresentationObjects; @@ -49,8 +48,6 @@ [TestFixture] public class StabilityPointStructuresInputContextPropertiesTest { - private MockRepository mockRepository; - private const int hydraulicBoundaryLocationPropertyIndex = 0; private const int volumicWeightWaterPropertyIndex = 1; private const int stormDurationPropertyIndex = 2; @@ -90,6 +87,7 @@ private const int foreshoreProfilePropertyIndex = 36; private const int useBreakWaterPropertyIndex = 37; private const int useForeshorePropertyIndex = 38; + private MockRepository mockRepository; [SetUp] public void SetUp() @@ -161,88 +159,66 @@ } [Test] - public void Data_SetNewInputContextInstanceWithData_ReturnCorrectPropertyValues() + public void GetAvailableForeshoreProfiles_SetInputContextInstanceWithForeshoreProfiles_ReturnForeshoreProfiles() { // Setup - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + var assessmentSectionStub = mockRepository.Stub(); + mockRepository.ReplayAll(); + + var failureMechanism = new StabilityPointStructuresFailureMechanism { - Locations = + ForeshoreProfiles = { - new HydraulicBoundaryLocation(0, "", 0, 0) + new TestForeshoreProfile() } }; + var calculation = new StructuresCalculation(); + var inputContext = new StabilityPointStructuresInputContext(calculation.InputParameters, + calculation, + failureMechanism, + assessmentSectionStub); + var properties = new StabilityPointStructuresInputContextProperties + { + Data = inputContext + }; + + // Call + var availableForeshoreProfiles = properties.GetAvailableForeshoreProfiles(); + + // Assert + CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, availableForeshoreProfiles); + mockRepository.VerifyAll(); + } + + [Test] + public void GetAvailableStructures_SetInputContextInstanceWithStructures_ReturnStructures() + { + // Setup var assessmentSectionStub = mockRepository.Stub(); - assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; mockRepository.ReplayAll(); var failureMechanism = new StabilityPointStructuresFailureMechanism { - ForeshoreProfiles = - { - new TestForeshoreProfile() - }, StabilityPointStructures = { new TestStabilityPointStructure() } }; - var calculation = new StructuresCalculation - { - InputParameters = - { - Structure = new TestStabilityPointStructure(), - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "name", 0.0, 1.1), - ForeshoreProfile = new TestForeshoreProfile() - } - }; - + var calculation = new StructuresCalculation(); var inputContext = new StabilityPointStructuresInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSectionStub); - var properties = new StabilityPointStructuresInputContextProperties(); + var properties = new StabilityPointStructuresInputContextProperties + { + Data = inputContext + }; // Call - properties.Data = inputContext; + var availableStructures = properties.GetAvailableStructures(); // Assert - StabilityPointStructuresInput input = calculation.InputParameters; - var expectedFailureProbabilityRepairClosure = ProbabilityFormattingHelper.Format(input.FailureProbabilityRepairClosure); - var expectedProbabilityCollisionSecondaryStructure = ProbabilityFormattingHelper.Format(input.ProbabilityCollisionSecondaryStructure); - - Assert.AreEqual(input.VolumicWeightWater, properties.VolumicWeightWater); - Assert.AreSame(input.InsideWaterLevelFailureConstruction, properties.InsideWaterLevelFailureConstruction.Data); - Assert.AreSame(input.InsideWaterLevel, properties.InsideWaterLevel.Data); - Assert.AreSame(input.DrainCoefficient, properties.DrainCoefficient.Data); - Assert.AreEqual(input.FactorStormDurationOpenStructure, properties.FactorStormDurationOpenStructure); - Assert.AreSame(input.FlowVelocityStructureClosable, properties.FlowVelocityStructureClosable.Data); - Assert.AreEqual(input.InflowModelType, properties.InflowModelType); - Assert.AreEqual(input.LoadSchematizationType, properties.LoadSchematizationType); - Assert.AreSame(input.LevelCrestStructure, properties.LevelCrestStructure.Data); - Assert.AreSame(input.ThresholdHeightOpenWeir, properties.ThresholdHeightOpenWeir.Data); - Assert.AreSame(input.AreaFlowApertures, properties.AreaFlowApertures.Data); - Assert.AreSame(input.ConstructiveStrengthLinearLoadModel, properties.ConstructiveStrengthLinearLoadModel.Data); - Assert.AreSame(input.ConstructiveStrengthQuadraticLoadModel, properties.ConstructiveStrengthQuadraticLoadModel.Data); - Assert.AreSame(input.StabilityLinearLoadModel, properties.StabilityLinearLoadModel.Data); - Assert.AreSame(input.StabilityQuadraticLoadModel, properties.StabilityQuadraticLoadModel.Data); - Assert.AreEqual(expectedFailureProbabilityRepairClosure, properties.FailureProbabilityRepairClosure); - Assert.AreSame(input.FailureCollisionEnergy, properties.FailureCollisionEnergy.Data); - Assert.AreSame(input.ShipMass, properties.ShipMass.Data); - Assert.AreSame(input.ShipVelocity, properties.ShipVelocity.Data); - Assert.AreEqual(input.LevellingCount, properties.LevellingCount); - Assert.AreEqual(expectedProbabilityCollisionSecondaryStructure, properties.ProbabilityCollisionSecondaryStructure); - Assert.AreSame(input.BankWidth, properties.BankWidth.Data); - Assert.AreEqual(input.EvaluationLevel, properties.EvaluationLevel); - Assert.AreEqual(input.VerticalDistance, properties.VerticalDistance); - - var availableForeshoreProfiles = properties.GetAvailableForeshoreProfiles().ToArray(); - Assert.AreEqual(1, availableForeshoreProfiles.Length); - CollectionAssert.AreEqual(failureMechanism.ForeshoreProfiles, availableForeshoreProfiles); - - var availableStructures = properties.GetAvailableStructures().ToArray(); - Assert.AreEqual(1, availableStructures.Length); CollectionAssert.AreEqual(failureMechanism.StabilityPointStructures, availableStructures); - mockRepository.VerifyAll(); } @@ -501,9 +477,9 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation(); var inputContext = new StabilityPointStructuresInputContext(calculation.InputParameters, - calculation, - failureMechanism, - assessmentSectionStub); + calculation, + failureMechanism, + assessmentSectionStub); // Call var properties = new StabilityPointStructuresInputContextProperties