Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra14d1309ecf82ff5b0385a2f6e3b2c4a216a4184 -r7fa4481428458d47cc3ec2fe6e75b12a1c539c8d --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision a14d1309ecf82ff5b0385a2f6e3b2c4a216a4184) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 7fa4481428458d47cc3ec2fe6e75b12a1c539c8d) @@ -29,10 +29,8 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions; @@ -70,10 +68,10 @@ UseForeshore = true, UseBreakWater = true, StepSize = WaveConditionsInputStepSize.Half, - LowerBoundaryRevetment = (RoundedDouble)5.3, - UpperBoundaryRevetment = (RoundedDouble)10, - UpperBoundaryWaterLevels = (RoundedDouble)5.4, - LowerBoundaryWaterLevels = (RoundedDouble)5 + LowerBoundaryRevetment = (RoundedDouble) 5.3, + UpperBoundaryRevetment = (RoundedDouble) 10, + UpperBoundaryWaterLevels = (RoundedDouble) 5.4, + LowerBoundaryWaterLevels = (RoundedDouble) 5 } }; @@ -82,7 +80,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, testFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -118,17 +117,18 @@ UseForeshore = true, UseBreakWater = true, StepSize = WaveConditionsInputStepSize.Half, - LowerBoundaryRevetment = (RoundedDouble)5.3, - UpperBoundaryRevetment = (RoundedDouble)10, - UpperBoundaryWaterLevels = (RoundedDouble)5.4, - LowerBoundaryWaterLevels = (RoundedDouble)5 + LowerBoundaryRevetment = (RoundedDouble) 5.3, + UpperBoundaryRevetment = (RoundedDouble) 10, + UpperBoundaryWaterLevels = (RoundedDouble) 5.4, + LowerBoundaryWaterLevels = (RoundedDouble) 5 } }; var testFilePath = Path.Combine(testDataPath, "corruptschema.sqlite"); var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, testFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -163,18 +163,19 @@ UseForeshore = true, UseBreakWater = true, StepSize = WaveConditionsInputStepSize.Half, - LowerBoundaryRevetment = (RoundedDouble)5.3, - UpperBoundaryRevetment = (RoundedDouble)10, - UpperBoundaryWaterLevels = (RoundedDouble)5.4, - LowerBoundaryWaterLevels = (RoundedDouble)5 + LowerBoundaryRevetment = (RoundedDouble) 5.3, + UpperBoundaryRevetment = (RoundedDouble) 10, + UpperBoundaryWaterLevels = (RoundedDouble) 5.4, + LowerBoundaryWaterLevels = (RoundedDouble) 5 } }; StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism(); var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -210,18 +211,19 @@ UseForeshore = true, UseBreakWater = true, StepSize = WaveConditionsInputStepSize.Half, - LowerBoundaryRevetment = (RoundedDouble)5.3, - UpperBoundaryRevetment = (RoundedDouble)10, - UpperBoundaryWaterLevels = (RoundedDouble)5.4, - LowerBoundaryWaterLevels = (RoundedDouble)5 + LowerBoundaryRevetment = (RoundedDouble) 5.3, + UpperBoundaryRevetment = (RoundedDouble) 10, + UpperBoundaryWaterLevels = (RoundedDouble) 5.4, + LowerBoundaryWaterLevels = (RoundedDouble) 5 } }; StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism(); var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -256,24 +258,25 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(13001, string.Empty, 0, 0) { - DesignWaterLevel = (RoundedDouble)12.0 + DesignWaterLevel = (RoundedDouble) 12.0 }, ForeshoreProfile = CreateForeshoreProfile(), UseForeshore = true, UseBreakWater = true, StepSize = WaveConditionsInputStepSize.Half, - LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment, - UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment, - UpperBoundaryWaterLevels = (RoundedDouble)5.4, - LowerBoundaryWaterLevels = (RoundedDouble)5 + LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, + UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment, + UpperBoundaryWaterLevels = (RoundedDouble) 5.4, + LowerBoundaryWaterLevels = (RoundedDouble) 5 } }; StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism(); var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -312,7 +315,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -376,7 +380,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -412,7 +417,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); switch (calculationType) @@ -486,7 +492,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -499,10 +506,10 @@ // Assert var waterLevels = calculation.InputParameters.WaterLevels.ToArray(); - var totalSteps = waterLevels.Length * 2; + var totalSteps = waterLevels.Length*2; for (var i = 0; i < totalSteps; i++) { - var text = string.Format("Stap {0} van {1} | Waterstand '{2}' berekenen.", i + 1, totalSteps, waterLevels[i % waterLevels.Length]); + var text = string.Format("Stap {0} van {1} | Waterstand '{2}' berekenen.", i + 1, totalSteps, waterLevels[i%waterLevels.Length]); Assert.AreEqual(text, progessTexts[i]); } } @@ -517,7 +524,8 @@ StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(); StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism(); - var assessmentSectionStub = CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository); + var assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository); var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, @@ -526,7 +534,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; + var testWaveConditionsCosineCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; // Call activity.Run(); @@ -543,14 +551,14 @@ Assert.AreEqual(assessmentSectionStub.Id, testWaveConditionsCosineCalculator.RingId); int waterLevelIndex = 0; - for (int i = 0; i < testWaveConditionsInputs.Length / 2; i++) + for (int i = 0; i < testWaveConditionsInputs.Length/2; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, input.HydraulicBoundaryLocation.Id, assessmentSectionStub.FailureMechanismContribution.Norm, input.ForeshoreProfile.Geometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)), - new HydraRingBreakWater((int)input.BreakWater.Type, input.BreakWater.Height), + new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height), input.WaterLevels.ElementAt(waterLevelIndex++), generalInput.GeneralBlocksWaveConditionsInput.A, generalInput.GeneralBlocksWaveConditionsInput.B, @@ -560,14 +568,14 @@ } waterLevelIndex = 0; - for (int i = testWaveConditionsInputs.Length / 2; i < testWaveConditionsInputs.Length; i++) + for (int i = testWaveConditionsInputs.Length/2; i < testWaveConditionsInputs.Length; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, input.HydraulicBoundaryLocation.Id, assessmentSectionStub.FailureMechanismContribution.Norm, input.ForeshoreProfile.Geometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)), - new HydraRingBreakWater((int)input.BreakWater.Type, input.BreakWater.Height), + new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height), input.WaterLevels.ElementAt(waterLevelIndex++), generalInput.GeneralColumnsWaveConditionsInput.A, generalInput.GeneralColumnsWaveConditionsInput.B, @@ -589,7 +597,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -638,7 +647,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -697,7 +707,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -733,7 +744,8 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) @@ -760,12 +772,13 @@ var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, validFilePath, stabilityStoneCoverFailureMechanism, - CreateAssessmentSectionStub(stabilityStoneCoverFailureMechanism, mockRepository)); + AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + stabilityStoneCoverFailureMechanism, mockRepository)); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; + var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; calculator.EndInFailure = true; // Call @@ -777,17 +790,6 @@ mockRepository.VerifyAll(); } - private static IAssessmentSection CreateAssessmentSectionStub(IFailureMechanism failureMechanism, MockRepository mockRepository) - { - var assessmentSectionStub = mockRepository.Stub(); - assessmentSectionStub.Stub(a => a.Id).Return("21"); - assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new[] - { - failureMechanism - }, 1, 2)); - return assessmentSectionStub; - } - public enum CalculationType { NoForeshore, @@ -803,16 +805,16 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, "locationName", 0, 0) { - DesignWaterLevel = (RoundedDouble)9.3 + DesignWaterLevel = (RoundedDouble) 9.3 }, ForeshoreProfile = CreateForeshoreProfile(), UseForeshore = true, UseBreakWater = true, StepSize = WaveConditionsInputStepSize.Half, - LowerBoundaryRevetment = (RoundedDouble)4, - UpperBoundaryRevetment = (RoundedDouble)10, - UpperBoundaryWaterLevels = (RoundedDouble)8, - LowerBoundaryWaterLevels = (RoundedDouble)7.1 + LowerBoundaryRevetment = (RoundedDouble) 4, + UpperBoundaryRevetment = (RoundedDouble) 10, + UpperBoundaryWaterLevels = (RoundedDouble) 8, + LowerBoundaryWaterLevels = (RoundedDouble) 7.1 } }; return calculation; @@ -821,8 +823,8 @@ private static StabilityStoneCoverWaveConditionsCalculation GetDefaultCalculation() { StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(); - calculation.InputParameters.LowerBoundaryWaterLevels = (RoundedDouble)5; - calculation.InputParameters.UpperBoundaryWaterLevels = (RoundedDouble)5.4; + calculation.InputParameters.LowerBoundaryWaterLevels = (RoundedDouble) 5; + calculation.InputParameters.UpperBoundaryWaterLevels = (RoundedDouble) 5.4; return calculation; }