Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -rf7a5d22408a43c70b20a9eb5ee79cb336bacdf9e -r85fcfb3e47d742a46200fcfb93f7cd4b155b9a94 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision f7a5d22408a43c70b20a9eb5ee79cb336bacdf9e) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 85fcfb3e47d742a46200fcfb93f7cd4b155b9a94) @@ -389,15 +389,15 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(nrOfCalculators); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call Action call = () => new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, - assessmentSectionStub, + assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); @@ -452,7 +452,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(nrOfCalculators); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -475,7 +475,7 @@ { // Call Action call = () => new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, - assessmentSectionStub, + assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); @@ -527,7 +527,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(nrOfCalculators); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -546,7 +546,7 @@ // Call stabilityStoneCoverWaveConditionsCalculationService.Calculate(calculation, - assessmentSectionStub, + assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); } @@ -566,15 +566,15 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculator).Repeat.Times(nrOfCalculators); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, - assessmentSectionStub, + assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); @@ -592,7 +592,7 @@ var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, input.HydraulicBoundaryLocation.Id, - assessmentSectionStub.FailureMechanismContribution.Norm, + assessmentSection.FailureMechanismContribution.Norm, input.ForeshoreProfile.Geometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)), new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height), input.WaterLevels.ElementAt(waterLevelIndex++), @@ -609,7 +609,7 @@ var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, input.HydraulicBoundaryLocation.Id, - assessmentSectionStub.FailureMechanismContribution.Norm, + assessmentSection.FailureMechanismContribution.Norm, input.ForeshoreProfile.Geometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)), new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height), input.WaterLevels.ElementAt(waterLevelIndex++), @@ -633,7 +633,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -644,7 +644,7 @@ // Call stabilityStoneCoverWaveConditionsCalculationService.Calculate(calculation, - assessmentSectionStub, + assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); @@ -665,7 +665,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculator); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -676,7 +676,7 @@ // Call stabilityStoneCoverWaveConditionsCalculationService.Calculate(calculation, - assessmentSectionStub, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); + assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); // Assert Assert.IsNull(calculation.Output); @@ -696,15 +696,15 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(nrOfCalculators); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, - assessmentSectionStub, + assessmentSection, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); @@ -739,8 +739,8 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails).Repeat.Times(3); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, - mockRepository); + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, + mockRepository); mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(); @@ -755,7 +755,7 @@ try { new StabilityStoneCoverWaveConditionsCalculationService().Calculate(calculation, - assessmentSectionStub, + assessmentSection, failureMechanism.GeneralInput, validFilePath); } @@ -833,7 +833,7 @@ .Repeat .Times(5); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( failureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -845,7 +845,7 @@ // Call Action call = () => service.Calculate(calculation, - assessmentSectionStub, + assessmentSection, failureMechanism.GeneralInput, validFilePath); @@ -894,7 +894,7 @@ WaveConditionsOutput[] blocksWaveConditionsOutputs = calculation.Output.BlocksOutput.ToArray(); Assert.AreEqual(3, blocksWaveConditionsOutputs.Length); - double targetNorm = assessmentSectionStub.FailureMechanismContribution.Norm; + double targetNorm = assessmentSection.FailureMechanismContribution.Norm; WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment, targetNorm, blocksWaveConditionsOutputs[0]); @@ -938,7 +938,7 @@ .Repeat .Twice(); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( failureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -950,7 +950,7 @@ // Call Action call = () => service.Calculate(calculation, - assessmentSectionStub, + assessmentSection, failureMechanism.GeneralInput, validFilePath); @@ -1002,7 +1002,7 @@ WaveConditionsOutput[] columnsWaveConditionsOutputs = calculation.Output.ColumnsOutput.ToArray(); Assert.AreEqual(3, columnsWaveConditionsOutputs.Length); - double targetNorm = assessmentSectionStub.FailureMechanismContribution.Norm; + double targetNorm = assessmentSection.FailureMechanismContribution.Norm; WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment, targetNorm, columnsWaveConditionsOutputs[0]);