Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -91,7 +91,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) .Return(new TestStructuresClosureCalculator()); mockRepository.ReplayAll(); @@ -148,16 +148,16 @@ public void Run_InvalidCalculationAndRan_PerformValidationAndCalculationAndActivityStateFailed(bool endInFailure, string lastErrorFileContent) { // Setup - var testStructuresClosureCalculator = new TestStructuresClosureCalculator + var calculator = new TestStructuresClosureCalculator { EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -204,7 +204,7 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) .Return(new TestStructuresClosureCalculator()); mockRepository.ReplayAll(); @@ -256,13 +256,13 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var testStructuresClosureCalculator = new TestStructuresClosureCalculator + var calculator = new TestStructuresClosureCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -555,7 +555,7 @@ var mockRepository = new MockRepository(); var assessmentSectionStub = mockRepository.Stub(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); var calculation = new TestClosingStructuresCalculation @@ -598,10 +598,10 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(closingStructuresFailureMechanism, mockRepository); - var testStructuresClosureCalculator = new TestStructuresClosureCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresClosureCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestClosingStructuresCalculation @@ -626,7 +626,7 @@ validFilePath); // Assert - StructuresClosureCalculationInput[] calculationInputs = testStructuresClosureCalculator.ReceivedInputs.ToArray(); + StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); GeneralClosingStructuresInput generalInput = closingStructuresFailureMechanism.GeneralInput; @@ -659,7 +659,7 @@ var actualInput = (StructuresClosureVerticalWallCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); - Assert.IsFalse(testStructuresClosureCalculator.IsCanceled); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -677,10 +677,10 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(closingStructuresFailureMechanism, mockRepository); - var testStructuresClosureCalculator = new TestStructuresClosureCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresClosureCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestClosingStructuresCalculation @@ -706,7 +706,7 @@ validFilePath); // Assert - StructuresClosureCalculationInput[] calculationInputs = testStructuresClosureCalculator.ReceivedInputs.ToArray(); + StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); GeneralClosingStructuresInput generalInput = closingStructuresFailureMechanism.GeneralInput; @@ -738,7 +738,7 @@ var actualInput = (StructuresClosureLowSillCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); - Assert.IsFalse(testStructuresClosureCalculator.IsCanceled); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -755,10 +755,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(closingStructuresFailureMechanism, mockRepository); - var testStructuresClosureCalculator = new TestStructuresClosureCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresClosureCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestClosingStructuresCalculation @@ -784,7 +784,7 @@ validFilePath); // Assert - StructuresClosureCalculationInput[] calculationInputs = testStructuresClosureCalculator.ReceivedInputs.ToArray(); + StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); GeneralClosingStructuresInput generalInput = closingStructuresFailureMechanism.GeneralInput; @@ -814,7 +814,7 @@ var actualInput = (StructuresClosureFloodedCulvertCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); - Assert.IsFalse(testStructuresClosureCalculator.IsCanceled); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -836,7 +836,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(closingStructuresFailureMechanism, mockRepository); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) .Return(new TestStructuresClosureCalculator()); mockRepository.ReplayAll(); @@ -905,10 +905,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(closingStructuresFailureMechanism, mockRepository); - var testStructuresClosureCalculator = new TestStructuresClosureCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresClosureCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestClosingStructuresCalculation @@ -922,7 +922,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var service = new ClosingStructuresCalculationService(); - testStructuresClosureCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.Calculate(calculation, @@ -932,7 +932,7 @@ // Assert Assert.IsNull(calculation.Output); - Assert.IsTrue(testStructuresClosureCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -951,14 +951,14 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresClosureCalculator = new TestStructuresClosureCalculator + var calculator = new TestStructuresClosureCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestClosingStructuresCalculation @@ -1019,13 +1019,13 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresClosureCalculator = new TestStructuresClosureCalculator + var calculator = new TestStructuresClosureCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestClosingStructuresCalculation @@ -1086,14 +1086,14 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresClosureCalculator = new TestStructuresClosureCalculator + var calculator = new TestStructuresClosureCalculator { EndInFailure = false, LastErrorFileContent = "An error occurred" }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresClosureCalculator(testDataPath)) - .Return(testStructuresClosureCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestClosingStructuresCalculation Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -78,7 +78,7 @@ public void CalculateDesignWaterLevels_NullCalculationServiceMessageProvider_ThrowsArgumentNullException() { // Setup - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); using (var viewParent = new Form()) @@ -101,7 +101,7 @@ public void CalculateDesignWaterLevels_NullLocations_ThrowsArgumentNullException() { // Setup - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); const string databasePath = "Does not exist"; @@ -126,7 +126,7 @@ public void CalculateDesignWaterLevels_HydraulicDatabaseDoesNotExist_LogsError() { // Setup - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); @@ -154,7 +154,7 @@ public void CalculateDesignWaterLevels_HydraulicDatabaseDoesNotExist_SuccessfulCalculationFalse() { // Setup - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); @@ -206,7 +206,7 @@ // Setup string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); @@ -238,7 +238,7 @@ const string notConvergedMessage = "not converged"; string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(new TestDesignWaterLevelCalculator()); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Expect(calc => calc.GetActivityDescription(hydraulicLocationName)).Return("activityDescription"); @@ -289,7 +289,7 @@ const string calculationName = "calculationName"; string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(new TestDesignWaterLevelCalculator()); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Expect(calc => calc.GetActivityDescription(hydraulicLocationName)).Return("activityDescription"); @@ -325,7 +325,7 @@ public void CalculateWaveHeights_NullCalculationServiceMessageProvider_ThrowsArgumentNullException() { // Setup - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); using (var viewParent = new Form()) @@ -348,7 +348,7 @@ public void CalculateWaveHeights_NullLocations_ThrowsArgumentNullException() { // Setup - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); const string databasePath = "Does not exist"; @@ -373,7 +373,7 @@ public void CalculateWaveHeights_HydraulicDatabaseDoesNotExist_LogsError() { // Setup - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); @@ -401,7 +401,7 @@ public void CalculateWaveHeights_HydraulicDatabaseDoesNotExist_SuccessfulCalculationFalse() { // Setup - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); @@ -426,7 +426,7 @@ // Setup string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); @@ -455,7 +455,7 @@ // Setup string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); @@ -487,7 +487,7 @@ const string notConvergedMessage = "not converged"; string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(new TestWaveHeightCalculator()); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Expect(calc => calc.GetActivityDescription(hydraulicLocationName)).Return("activityDescription"); @@ -538,7 +538,7 @@ const string calculationName = "calculationName"; string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); var calculationMessageProviderMock = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(new TestWaveHeightCalculator()); calculationMessageProviderMock.Expect(calc => calc.GetActivityDescription(hydraulicLocationName)).Return("activityDescription"); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -168,13 +168,13 @@ const double norm = 1.0 / 30; var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0); - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { Converged = true }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(activityDescription); calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); @@ -202,7 +202,7 @@ Assert.AreEqual($"Berekening van '{calculationName}' beëindigd.", messages[4]); }); - AssessmentLevelCalculationInput designWaterLevelCalculationInput = testDesignWaterLevelCalculator.ReceivedInputs.First(); + AssessmentLevelCalculationInput designWaterLevelCalculationInput = calculator.ReceivedInputs.First(); Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId); Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), designWaterLevelCalculationInput.Beta); @@ -255,14 +255,14 @@ const double expectedDesignWaterLevel = 3.5; var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0); - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { DesignWaterLevel = expectedDesignWaterLevel, Converged = true }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.StrictMock(); calculationMessageProvider.Expect(calc => calc.GetActivityDescription(locationName)).Return(string.Empty); calculationMessageProvider.Expect(calc => calc.GetCalculationName(locationName)).Return(string.Empty).Repeat.AtLeastOnce(); @@ -294,14 +294,14 @@ const string locationName = "locationName"; const string calculationFailedMessage = "Something went wrong"; - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { EndInFailure = true, LastErrorFileContent = calculationFailedMessage }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(string.Empty); calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(string.Empty); @@ -342,13 +342,13 @@ const string activityDescription = "activityDescription"; const string calculationNotConvergedMessage = "GetCalculatedNotConvergedMessage"; - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { Converged = false }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.StrictMock(); calculationMessageProvider.Expect(calc => calc.GetActivityDescription(locationName)).Return(activityDescription); calculationMessageProvider.Expect(calc => calc.GetCalculationName(locationName)).Return("GetCalculationName").Repeat.AtLeastOnce(); @@ -401,14 +401,14 @@ double.NaN, CalculationConvergence.NotCalculated) }; - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.StrictMock(); calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(locationName); calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(locationName); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -154,11 +154,11 @@ const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; const double norm = 1.0 / 30; - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator(); + var calculator = new TestDesignWaterLevelCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProviderStub = mockRepository.Stub(); calculationMessageProviderStub.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderStub.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(calculationNotConvergedMessage); @@ -176,8 +176,8 @@ // Assert AssessmentLevelCalculationInput expectedInput = CreateInput(hydraulicBoundaryLocation, norm); - AssertInput(expectedInput, testDesignWaterLevelCalculator.ReceivedInputs.First()); - Assert.IsFalse(testDesignWaterLevelCalculator.IsCanceled); + AssertInput(expectedInput, calculator.ReceivedInputs.First()); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -188,11 +188,11 @@ // Setup string validFilePath = Path.Combine(testDataPath, validFile); - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator(); + var calculator = new TestDesignWaterLevelCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProviderStub = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -203,7 +203,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var service = new DesignWaterLevelCalculationService(); - testDesignWaterLevelCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.Calculate(hydraulicBoundaryLocation, @@ -212,7 +212,7 @@ calculationMessageProviderStub); // Assert - Assert.IsTrue(testDesignWaterLevelCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -228,15 +228,15 @@ const string calculationFailedMessage = "calculationFailedMessage"; const double norm = 1.0 / 30; - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); @@ -291,14 +291,14 @@ const string calculationFailedMessage = "calculationFailedUnexplainedMessage"; const double norm = 1.0 / 30; - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { EndInFailure = true }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedUnexplainedMessage(locationName)).Return(calculationFailedMessage); @@ -353,15 +353,15 @@ const string calculationFailedMessage = "calculationFailedMessage"; const double norm = 1.0 / 30; - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { EndInFailure = false, LastErrorFileContent = "An error occurred" }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); @@ -403,7 +403,7 @@ }); Assert.IsTrue(exceptionThrown); Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); - Assert.AreEqual(testDesignWaterLevelCalculator.LastErrorFileContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } mockRepository.VerifyAll(); } Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -154,13 +154,13 @@ const double norm = 1.0 / 30; var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0); - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { Converged = true }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(activityDescription); calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); @@ -186,7 +186,7 @@ StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie", messages[3]); Assert.AreEqual($"Berekening van '{calculationName}' beëindigd.", messages[4]); }); - WaveHeightCalculationInput waveHeightCalculationInput = testWaveHeightCalculator.ReceivedInputs.First(); + WaveHeightCalculationInput waveHeightCalculationInput = calculator.ReceivedInputs.First(); Assert.AreEqual(hydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId); Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), waveHeightCalculationInput.Beta); @@ -238,14 +238,14 @@ const double norm = 1.0 / 30; const double expectedWaveHeight = 3.5; - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { Converged = true, WaveHeight = expectedWaveHeight }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(string.Empty); calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(string.Empty).Repeat.AtLeastOnce(); @@ -279,14 +279,14 @@ const string locationName = "locationName"; const string calculationFailedMessage = "Something went wrong"; - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { EndInFailure = true, LastErrorFileContent = calculationFailedMessage }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(string.Empty); calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(string.Empty); @@ -328,13 +328,13 @@ const string activityDescription = "activityDescription"; const string calculationNotConvergedMessage = "GetCalculatedNotConvergedMessage"; - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { Converged = false }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(activityDescription); calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return("GetCalculationName").Repeat.AtLeastOnce(); @@ -387,14 +387,14 @@ double.NaN, CalculationConvergence.NotCalculated) }; - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProvider = mockRepository.StrictMock(); calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(locationName); calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(locationName); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -154,11 +154,11 @@ const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; const double norm = 1.0 / 30; - var testWaveHeightCalculator = new TestWaveHeightCalculator(); + var calculator = new TestWaveHeightCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(calculationNotConvergedMessage); @@ -175,8 +175,8 @@ // Assert AssessmentLevelCalculationInput expectedInput = CreateInput(hydraulicBoundaryLocation, norm); - AssertInput(expectedInput, testWaveHeightCalculator.ReceivedInputs.First()); - Assert.IsFalse(testWaveHeightCalculator.IsCanceled); + AssertInput(expectedInput, calculator.ReceivedInputs.First()); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -186,11 +186,11 @@ { // Setup string validFilePath = Path.Combine(testDataPath, validFile); - var testWaveHeightCalculator = new TestWaveHeightCalculator(); + var calculator = new TestWaveHeightCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProviderStub = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -200,7 +200,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var service = new WaveHeightCalculationService(); - testWaveHeightCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.Calculate(hydraulicBoundaryLocation, @@ -209,7 +209,7 @@ calculationMessageProviderStub); // Assert - Assert.IsTrue(testWaveHeightCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -225,15 +225,15 @@ const string calculationFailedMessage = "calculationFailedMessage"; const double norm = 1.0 / 30; - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); @@ -288,14 +288,14 @@ const string calculationFailedMessage = "calculationFailedUnexplainedMessage"; const double norm = 1.0 / 30; - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { EndInFailure = true }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedUnexplainedMessage(locationName)).Return(calculationFailedMessage); @@ -350,15 +350,15 @@ const string calculationFailedMessage = "calculationFailedMessage"; const double norm = 1.0 / 30; - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { LastErrorFileContent = "An error occurred", EndInFailure = false }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs =================================================================== diff -u -rc99108016d70ba90860c383f57b5e1bd8e93eb49 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs (.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs) (revision c99108016d70ba90860c383f57b5e1bd8e93eb49) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs (.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -97,7 +97,7 @@ public void Run_InvalidCalculationAndRan_PerformCalculationAndActivityStateFailed(bool endInFailure, string lastErrorFileContent) { // Setup - var testDunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator + var calculator = new TestDunesBoundaryConditionsCalculator { EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent @@ -106,7 +106,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath)) - .Return(testDunesBoundaryConditionsCalculator); + .Return(calculator); mockRepository.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism(); Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs =================================================================== diff -u -rc99108016d70ba90860c383f57b5e1bd8e93eb49 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision c99108016d70ba90860c383f57b5e1bd8e93eb49) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -77,12 +77,12 @@ public void Calculate_ValidData_CalculationStartedWithRightParameters() { // Setup - var testDunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator(); + var calculator = new TestDunesBoundaryConditionsCalculator(); var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath)) - .Return(testDunesBoundaryConditionsCalculator); + .Return(calculator); mockRepository.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism @@ -111,8 +111,8 @@ // Assert DunesBoundaryConditionsCalculationInput expectedInput = CreateInput(duneLocation, mechanismSpecificNorm); - AssertInput(expectedInput, testDunesBoundaryConditionsCalculator.ReceivedInputs.First()); - Assert.IsFalse(testDunesBoundaryConditionsCalculator.IsCanceled); + AssertInput(expectedInput, calculator.ReceivedInputs.First()); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); @@ -122,7 +122,7 @@ public void Calculate_CalculationRan_SetOutput() { // Setup - var testDunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator + var calculator = new TestDunesBoundaryConditionsCalculator { ReliabilityIndex = 3.27052, WaterLevel = 4.82912, @@ -134,7 +134,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath)) - .Return(testDunesBoundaryConditionsCalculator); + .Return(calculator); mockRepository.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism @@ -176,16 +176,16 @@ Assert.AreEqual($"Berekening van '{duneLocation.Name}' beëindigd.", msgs[2]); }); double targetReliability = StatisticsConverter.ProbabilityToReliability(mechanismSpecificNorm); - double calculatedProbability = StatisticsConverter.ReliabilityToProbability(testDunesBoundaryConditionsCalculator.ReliabilityIndex); + double calculatedProbability = StatisticsConverter.ReliabilityToProbability(calculator.ReliabilityIndex); Assert.IsNotNull(duneLocation.Output); - Assert.AreEqual(testDunesBoundaryConditionsCalculator.ReliabilityIndex, duneLocation.Output.CalculatedReliability.Value); + Assert.AreEqual(calculator.ReliabilityIndex, duneLocation.Output.CalculatedReliability.Value); Assert.AreEqual(calculatedProbability, duneLocation.Output.CalculatedProbability); Assert.AreEqual(mechanismSpecificNorm, duneLocation.Output.TargetProbability); Assert.AreEqual(targetReliability, duneLocation.Output.TargetReliability, duneLocation.Output.TargetReliability.GetAccuracy()); - Assert.AreEqual(testDunesBoundaryConditionsCalculator.WaterLevel, duneLocation.Output.WaterLevel, duneLocation.Output.WaterLevel.GetAccuracy()); - Assert.AreEqual(testDunesBoundaryConditionsCalculator.WaveHeight, duneLocation.Output.WaveHeight, duneLocation.Output.WaveHeight.GetAccuracy()); - Assert.AreEqual(testDunesBoundaryConditionsCalculator.WavePeriod, duneLocation.Output.WavePeriod, duneLocation.Output.WavePeriod.GetAccuracy()); + Assert.AreEqual(calculator.WaterLevel, duneLocation.Output.WaterLevel, duneLocation.Output.WaterLevel.GetAccuracy()); + Assert.AreEqual(calculator.WaveHeight, duneLocation.Output.WaveHeight, duneLocation.Output.WaveHeight.GetAccuracy()); + Assert.AreEqual(calculator.WavePeriod, duneLocation.Output.WavePeriod, duneLocation.Output.WavePeriod.GetAccuracy()); } mockRepository.VerifyAll(); @@ -195,15 +195,15 @@ public void Calculate_CalculationRanNotConverged_LogMessage() { // Setup - var testDunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator + var calculator = new TestDunesBoundaryConditionsCalculator { ReliabilityIndex = 0.01 }; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath)) - .Return(testDunesBoundaryConditionsCalculator); + .Return(calculator); mockRepository.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism @@ -250,12 +250,12 @@ public void Calculate_CancelCalculationWithValidInput_CancelsCalculator() { // Setup - var testDunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator(); + var calculator = new TestDunesBoundaryConditionsCalculator(); var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath)) - .Return(testDunesBoundaryConditionsCalculator); + .Return(calculator); mockRepository.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism @@ -275,7 +275,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var service = new DuneErosionBoundaryCalculationService(); - testDunesBoundaryConditionsCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.Calculate( @@ -285,7 +285,7 @@ validFilePath); // Assert - Assert.IsTrue(testDunesBoundaryConditionsCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); @@ -295,7 +295,7 @@ public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException() { // Setup - var testDunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator + var calculator = new TestDunesBoundaryConditionsCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true @@ -304,7 +304,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath)) - .Return(testDunesBoundaryConditionsCalculator); + .Return(calculator); mockRepository.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism @@ -365,15 +365,15 @@ public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException() { // Setup - var testDunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator + var calculator = new TestDunesBoundaryConditionsCalculator { EndInFailure = true }; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath)) - .Return(testDunesBoundaryConditionsCalculator); + .Return(calculator); mockRepository.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism @@ -434,7 +434,7 @@ public void Calculate_CalculationFailedWithoutExceptionAndWithLastErrorPresent_LogErrorAndThrowException() { // Setup - var testDunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator + var calculator = new TestDunesBoundaryConditionsCalculator { EndInFailure = false, LastErrorFileContent = "An error occurred" @@ -443,7 +443,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath)) - .Return(testDunesBoundaryConditionsCalculator); + .Return(calculator); mockRepository.ReplayAll(); var failureMechanism = new DuneErosionFailureMechanism Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -230,10 +230,10 @@ } }; - var testOvertoppingCalculator = new TestOvertoppingCalculator(); + var calculator = new TestOvertoppingCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection); @@ -244,7 +244,7 @@ activity.Run(); // Assert - OvertoppingCalculationInput[] overtoppingCalculationInputs = testOvertoppingCalculator.ReceivedInputs.ToArray(); + OvertoppingCalculationInput[] overtoppingCalculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, overtoppingCalculationInputs.Length); OvertoppingCalculationInput actualInput = overtoppingCalculationInputs[0]; @@ -301,14 +301,14 @@ } }; - var testOvertoppingCalculator = new TestOvertoppingCalculator + var calculator = new TestOvertoppingCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -352,13 +352,13 @@ DikeProfile = CreateDikeProfile() } }; - var testOvertoppingCalculator = new TestOvertoppingCalculator + var calculator = new TestOvertoppingCalculator { EndInFailure = true }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -402,14 +402,14 @@ DikeProfile = CreateDikeProfile() } }; - var testOvertoppingCalculator = new TestOvertoppingCalculator + var calculator = new TestOvertoppingCalculator { LastErrorFileContent = "An error occurred", EndInFailure = false }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -455,7 +455,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); mockRepository.ReplayAll(); @@ -491,12 +491,12 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var testOvertoppingCalculator = new TestOvertoppingCalculator + var calculator = new TestOvertoppingCalculator { EndInFailure = true }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -537,7 +537,7 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); mockRepository.ReplayAll(); @@ -584,12 +584,12 @@ public void Run_ValidDikeHeightCalculation_InputPropertiesCorrectlySendToService(DikeHeightCalculationType dikeHeightCalculationType) { // Setup - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator(); + var dikeHeightCalculator = new TestHydraulicLoadsCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -614,7 +614,7 @@ activity.Run(); // Assert - HydraulicLoadsCalculationInput[] hydraulicLoadsCalculationInputs = testDikeHeightCalculator.ReceivedInputs.ToArray(); + HydraulicLoadsCalculationInput[] hydraulicLoadsCalculationInputs = dikeHeightCalculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, hydraulicLoadsCalculationInputs.Length); HydraulicLoadsCalculationInput actualInput = hydraulicLoadsCalculationInputs[0]; @@ -668,16 +668,16 @@ public void Run_InvalidDikeHeightCalculationWithExceptionAndLastErrorPresent_LogError(DikeHeightCalculationType dikeHeightCalculationType) { // Setup - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -726,15 +726,15 @@ public void Run_InvalidDikeHeightCalculationWithExceptionAndNoLastErrorPresent_LogError(DikeHeightCalculationType dikeHeightCalculationType) { // Setup - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { EndInFailure = true }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -783,16 +783,16 @@ public void Run_InvalidDikeHeightCalculationWithoutExceptionAndWithLastErrorPresent_LogError(DikeHeightCalculationType dikeHeightCalculationType) { // Setup - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { EndInFailure = false, LastErrorFileContent = "An error occurred" }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -841,16 +841,16 @@ public void Run_ValidDikeHeightCalculation_PerformValidationAndCalculationAndLogStartAndEndError(DikeHeightCalculationType dikeHeightCalculationType) { // Setup - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { Value = 2, ReliabilityIndex = -1 }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) @@ -909,14 +909,14 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { Value = double.NaN, EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -961,7 +961,7 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator()); mockRepository.ReplayAll(); @@ -1015,7 +1015,7 @@ var overtoppingRateCalculator = new TestHydraulicLoadsCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1102,7 +1102,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1159,7 +1159,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1217,7 +1217,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1275,7 +1275,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1341,7 +1341,7 @@ Value = double.NaN, EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1388,7 +1388,7 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator()); mockRepository.ReplayAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -511,7 +511,7 @@ GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Stub(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator()); calculatorFactory.Stub(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator()); @@ -603,13 +603,13 @@ mockRepository, validFile); - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -675,13 +675,13 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testOvertoppingRateCalculator = new TestHydraulicLoadsCalculator + var overtoppingRateCalculator = new TestHydraulicLoadsCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(testOvertoppingRateCalculator); + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -745,9 +745,9 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(grassCoverErosionInwardsFailureMechanism, mockRepository, validFile); - var testOvertoppingCalculator = new TestOvertoppingCalculator(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var overtoppingCalculator = new TestOvertoppingCalculator(); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(overtoppingCalculator); mockRepository.ReplayAll(); const string name = ""; @@ -766,7 +766,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - testOvertoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + overtoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.Calculate(calculation, @@ -776,7 +776,7 @@ validFile); // Assert - Assert.IsTrue(testOvertoppingCalculator.IsCanceled); + Assert.IsTrue(overtoppingCalculator.IsCanceled); Assert.IsNull(calculation.Output); } } @@ -795,11 +795,11 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testOvertoppingCalculator = new TestOvertoppingCalculator(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator(); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + var overtoppingCalculator = new TestOvertoppingCalculator(); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(overtoppingCalculator); + var dikeHeightCalculator = new TestHydraulicLoadsCalculator(); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); const string name = ""; @@ -822,11 +822,11 @@ { if (cancelBeforeDikeHeightCalculationStarts) { - testOvertoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + overtoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); } else { - testDikeHeightCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + dikeHeightCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); } // Call @@ -838,8 +838,8 @@ // Assert Assert.IsNull(calculation.Output); - Assert.IsTrue(testOvertoppingCalculator.IsCanceled); - Assert.IsTrue(testDikeHeightCalculator.IsCanceled); + Assert.IsTrue(overtoppingCalculator.IsCanceled); + Assert.IsTrue(dikeHeightCalculator.IsCanceled); } } @@ -857,12 +857,12 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testOvertoppingCalculator = new TestOvertoppingCalculator(); - var testOvertoppingRateCalculator = new TestHydraulicLoadsCalculator(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var overtoppingCalculator = new TestOvertoppingCalculator(); + var overtoppingRateCalculator = new TestHydraulicLoadsCalculator(); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(overtoppingCalculator); calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator()); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(testOvertoppingRateCalculator); + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); const string name = ""; @@ -883,12 +883,9 @@ // Call using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - TestOvertoppingCalculator overToppingCalculator = testOvertoppingCalculator; - TestHydraulicLoadsCalculator overtoppingRateCalculator = testOvertoppingRateCalculator; - if (cancelBeforeOvertoppingRateCalculationStarts) { - overToppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + overtoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); } else { @@ -904,7 +901,7 @@ // Assert Assert.IsNull(calculation.Output); - Assert.IsTrue(overToppingCalculator.IsCanceled); + Assert.IsTrue(overtoppingCalculator.IsCanceled); Assert.IsTrue(overtoppingRateCalculator.IsCanceled); } } @@ -919,13 +916,13 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testOvertoppingCalculator = new TestOvertoppingCalculator + var overtoppingCalculator = new TestOvertoppingCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(overtoppingCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -985,12 +982,12 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testOvertoppingCalculator = new TestOvertoppingCalculator + var overtoppingCalculator = new TestOvertoppingCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(overtoppingCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -1050,13 +1047,13 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testOvertoppingCalculator = new TestOvertoppingCalculator + var overtoppingCalculator = new TestOvertoppingCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(testOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(overtoppingCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -1118,14 +1115,14 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -1189,13 +1186,13 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -1259,13 +1256,13 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testDikeHeightCalculator = new TestHydraulicLoadsCalculator + var dikeHeightCalculator = new TestHydraulicLoadsCalculator { LastErrorFileContent = "An error occurred" }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(testDikeHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(dikeHeightCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -1329,15 +1326,15 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testOvertoppingRateCalculator = new TestHydraulicLoadsCalculator + var overtoppingRateCalculator = new TestHydraulicLoadsCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator()); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(testOvertoppingRateCalculator); + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -1401,14 +1398,14 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var testOvertoppingRateCalculator = new TestHydraulicLoadsCalculator + var overtoppingRateCalculator = new TestHydraulicLoadsCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(testDataPath)).Return(new TestHydraulicLoadsCalculator()); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(testOvertoppingRateCalculator); + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -1472,14 +1469,14 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFile); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(testDataPath)).Return(new TestOvertoppingCalculator()); - var testOvertoppingRateCalculator = new TestHydraulicLoadsCalculator + var overtoppingRateCalculator = new TestHydraulicLoadsCalculator { EndInFailure = false, LastErrorFileContent = "An error occurred" }; - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(testOvertoppingRateCalculator); + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(testDataPath)).Return(overtoppingRateCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision b6d1940005967399be0d9c6fdda3952d6024b97d) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -79,7 +79,7 @@ string testFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, @@ -217,10 +217,15 @@ assessmentSection.GrassCoverErosionOutwards, assessmentSection); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + int nrOfCalculators = calculation.InputParameters.WaterLevels.Count(); + var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) + .Return(waveConditionsCosineCalculator) + .Repeat + .Times(nrOfCalculators); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -229,7 +234,7 @@ activity.Run(); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = testWaveConditionsCosineCalculator.ReceivedInputs.ToArray(); + WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = waveConditionsCosineCalculator.ReceivedInputs.ToArray(); Assert.AreEqual(3, testWaveConditionsInputs.Length); var waterLevelIndex = 0; @@ -276,7 +281,7 @@ assessmentSection); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()); mockRepository.ReplayAll(); @@ -331,7 +336,7 @@ int nrOfCalculators = calculation.InputParameters.WaterLevels.Count(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) .Return(new TestWaveConditionsCosineCalculator()) .Repeat @@ -378,7 +383,7 @@ int nrOfCalculators = calculation.InputParameters.WaterLevels.Count(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) .Return(calculator) .Repeat @@ -411,7 +416,7 @@ assessmentSection.GrassCoverErosionOutwards, assessmentSection); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator + var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator { EndInFailure = true }; @@ -421,7 +426,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) - .Return(testWaveConditionsCosineCalculator) + .Return(waveConditionsCosineCalculator) .Repeat .Times(nrOfCalculators); mockRepository.ReplayAll(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -392,9 +392,9 @@ gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(g => g.MainWindow).Return(mockRepository.Stub()); - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator(); + var designWaterLevelCalculator = new TestDesignWaterLevelCalculator(); var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(designWaterLevelCalculator); mockRepository.ReplayAll(); using (var plugin = new GrassCoverErosionOutwardsPlugin()) @@ -410,7 +410,7 @@ contextMenuAdapter.Items[contextMenuRunDesignWaterLevelCalculationsIndex].PerformClick(); // Assert - AssessmentLevelCalculationInput designWaterLevelCalculationInput = testDesignWaterLevelCalculator.ReceivedInputs.First(); + AssessmentLevelCalculationInput designWaterLevelCalculationInput = designWaterLevelCalculator.ReceivedInputs.First(); Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId); double expectedProbability = RingtoetsCommonDataCalculationService.ProfileSpecificRequiredProbability( @@ -448,12 +448,12 @@ gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(g => g.MainWindow).Return(mockRepository.Stub()); - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var designWaterLevelCalculator = new TestDesignWaterLevelCalculator { Converged = false }; var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(designWaterLevelCalculator); mockRepository.ReplayAll(); using (var plugin = new GrassCoverErosionOutwardsPlugin()) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r5e277dcad3ff1c784146f964852c0f7371565ba1 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 5e277dcad3ff1c784146f964852c0f7371565ba1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -388,12 +388,12 @@ gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(g => g.MainWindow).Return(mockRepository.Stub()); - var testWaveHeightCalculator = new TestWaveHeightCalculator + var waveHeightCalculator = new TestWaveHeightCalculator { EndInFailure = true }; var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + calculatorFactory.Stub(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(waveHeightCalculator); mockRepository.ReplayAll(); plugin.Gui = gui; @@ -441,9 +441,9 @@ gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(g => g.MainWindow).Return(mockRepository.Stub()); - var testWaveHeightCalculator = new TestWaveHeightCalculator(); + var waveHeightCalculator = new TestWaveHeightCalculator(); var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + calculatorFactory.Stub(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(waveHeightCalculator); mockRepository.ReplayAll(); using (var plugin = new GrassCoverErosionOutwardsPlugin()) @@ -459,7 +459,7 @@ contextMenuAdapter.Items[contextMenuRunWaveHeightCalculationsIndex].PerformClick(); // Assert - WaveHeightCalculationInput waveHeightCalculationInput = testWaveHeightCalculator.ReceivedInputs.First(); + WaveHeightCalculationInput waveHeightCalculationInput = waveHeightCalculator.ReceivedInputs.First(); Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId); double expectedProbability = assessmentSection.FailureMechanismContribution.Norm Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -82,7 +82,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -114,7 +114,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -146,7 +146,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -178,7 +178,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -210,7 +210,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -244,7 +244,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -280,7 +280,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -385,7 +385,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Twice(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism, mockRepository); @@ -442,7 +442,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Twice(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism, mockRepository); @@ -504,11 +504,11 @@ { Contribution = 20 }; - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator).Repeat.Times(3); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(waveConditionsCosineCalculator).Repeat.Times(3); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -522,7 +522,7 @@ validFilePath); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = testWaveConditionsCosineCalculator.ReceivedInputs.ToArray(); + WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = waveConditionsCosineCalculator.ReceivedInputs.ToArray(); Assert.AreEqual(3, testWaveConditionsInputs.Length); var waterLevelIndex = 0; @@ -564,7 +564,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( grassCoverErosionOutwardsFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -595,19 +595,19 @@ { Contribution = 20 }; - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(waveConditionsCosineCalculator); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism, mockRepository); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var grassCoverErosionOutwardsWaveConditionsCalculationService = new GrassCoverErosionOutwardsWaveConditionsCalculationService(); - testWaveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => grassCoverErosionOutwardsWaveConditionsCalculationService.Cancel(); + waveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => grassCoverErosionOutwardsWaveConditionsCalculationService.Cancel(); // Call grassCoverErosionOutwardsWaveConditionsCalculationService.Calculate(calculation, @@ -617,7 +617,7 @@ // Assert Assert.IsNull(calculation.Output); - Assert.IsTrue(testWaveConditionsCosineCalculator.IsCanceled); + Assert.IsTrue(waveConditionsCosineCalculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -633,7 +633,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(grassCoverErosionOutwardsFailureMechanism, mockRepository); @@ -666,7 +666,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails).Repeat.Times(3); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -91,7 +91,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)).Return(new TestStructuresOvertoppingCalculator()); mockRepository.ReplayAll(); @@ -147,15 +147,15 @@ public void Run_InvalidCalculationAndRan_PerformValidationAndCalculationAndActivityStateFailed(bool endInFailure, string lastErrorFileContent) { // Setup - var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator + var calculator = new TestStructuresOvertoppingCalculator { EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)).Return(testStructuresOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -202,7 +202,7 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)).Return(new TestStructuresOvertoppingCalculator()); mockRepository.ReplayAll(); @@ -253,12 +253,12 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator + var calculator = new TestStructuresOvertoppingCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)).Return(testStructuresOvertoppingCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -611,7 +611,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)) .Return(new TestStructuresOvertoppingCalculator()); mockRepository.ReplayAll(); @@ -683,7 +683,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)) .Return(new TestStructuresOvertoppingCalculator()); mockRepository.ReplayAll(); @@ -733,10 +733,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository); - var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresOvertoppingCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)) - .Return(testStructuresOvertoppingCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestHeightStructuresCalculation @@ -761,7 +761,7 @@ validFilePath); // Assert - StructuresOvertoppingCalculationInput[] overtoppingCalculationInputs = testStructuresOvertoppingCalculator.ReceivedInputs.ToArray(); + StructuresOvertoppingCalculationInput[] overtoppingCalculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, overtoppingCalculationInputs.Length); GeneralHeightStructuresInput generalInput = heightStructuresFailureMechanism.GeneralInput; @@ -789,7 +789,7 @@ StructuresOvertoppingCalculationInput actualInput = overtoppingCalculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); - Assert.IsFalse(testStructuresOvertoppingCalculator.IsCanceled); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -808,10 +808,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(heightStructuresFailureMechanism, mockRepository); - var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresOvertoppingCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)) - .Return(testStructuresOvertoppingCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestHeightStructuresCalculation @@ -825,7 +825,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var service = new HeightStructuresCalculationService(); - testStructuresOvertoppingCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.Calculate(calculation, @@ -835,7 +835,7 @@ // Assert Assert.IsNull(calculation.Output); - Assert.IsTrue(testStructuresOvertoppingCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -855,14 +855,14 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator + var calculator = new TestStructuresOvertoppingCalculator { EndInFailure = true, LastErrorFileContent = "An error occurred" }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)) - .Return(testStructuresOvertoppingCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestHeightStructuresCalculation @@ -924,13 +924,13 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator + var calculator = new TestStructuresOvertoppingCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)) - .Return(testStructuresOvertoppingCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestHeightStructuresCalculation @@ -992,13 +992,13 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator + var calculator = new TestStructuresOvertoppingCalculator { LastErrorFileContent = "An error occurred" }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresOvertoppingCalculator(testDataPath)) - .Return(testStructuresOvertoppingCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestHeightStructuresCalculation Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rc99108016d70ba90860c383f57b5e1bd8e93eb49 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision c99108016d70ba90860c383f57b5e1bd8e93eb49) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -284,12 +284,12 @@ gui.Stub(g => g.MainWindow).Return(mockRepository.Stub()); gui.Stub(g => g.DocumentViewController).Return(mockRepository.Stub()); - var testDesignWaterLevelCalculator = new TestDesignWaterLevelCalculator + var calculator = new TestDesignWaterLevelCalculator { Converged = false }; var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(testDesignWaterLevelCalculator); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); DialogBoxHandler = (name, wnd) => Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rc99108016d70ba90860c383f57b5e1bd8e93eb49 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision c99108016d70ba90860c383f57b5e1bd8e93eb49) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -285,12 +285,12 @@ gui.Stub(g => g.MainWindow).Return(mockRepository.Stub()); gui.Stub(g => g.DocumentViewController).Return(mockRepository.Stub()); - var testWaveHeightCalculator = new TestWaveHeightCalculator + var calculator = new TestWaveHeightCalculator { Converged = false }; var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(testWaveHeightCalculator); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); DialogBoxHandler = (name, wnd) => Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision b6d1940005967399be0d9c6fdda3952d6024b97d) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -458,13 +458,13 @@ string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); const string calculationName = "test"; - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var calculator = new TestWaveConditionsCosineCalculator(); int nrOfCalculators = input.WaterLevels.Count(); var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) - .Return(testWaveConditionsCosineCalculator) + .Return(calculator) .Repeat .Times(nrOfCalculators); mockRepository.ReplayAll(); @@ -478,7 +478,7 @@ for (var i = 0; i < input.WaterLevels.Count(); i++) { WaveConditionsCosineCalculationInput expectedInput = CreateInput(input.WaterLevels.ElementAt(i), a, b, c, norm, input, useForeshore, useBreakWater); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsCosineCalculator.ReceivedInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, calculator.ReceivedInputs[i]); } } mockRepository.VerifyAll(); @@ -656,22 +656,22 @@ string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var calculator = new TestWaveConditionsCosineCalculator(); var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var service = new WaveConditionsCalculationService(); - testWaveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.PublicCalculate(a, b, c, norm, input, hcldFilePath, name); // Assert - Assert.IsTrue(testWaveConditionsCosineCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -91,7 +91,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) .Return(new TestStructuresStabilityPointCalculator()); mockRepository.ReplayAll(); @@ -150,16 +150,16 @@ public void Run_InvalidCalculationRan_PerformValidationAndCalculationActivityStateFailed(bool endInFailure, string lastErrorFileContent) { // Setup - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator + var calculator = new TestStructuresStabilityPointCalculator { EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -208,7 +208,7 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) .Return(new TestStructuresStabilityPointCalculator()); mockRepository.ReplayAll(); @@ -262,13 +262,13 @@ var observerMock = mockRepository.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator + var calculator = new TestStructuresStabilityPointCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -784,7 +784,7 @@ var mockRepository = new MockRepository(); var assessmentSectionStub = mockRepository.Stub(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -831,7 +831,7 @@ var mockRepository = new MockRepository(); var assessmentSectionStub = mockRepository.Stub(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -874,10 +874,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresStabilityPointCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -904,7 +904,7 @@ validFilePath); // Assert - StructuresStabilityPointCalculationInput[] calculationInputs = testStructuresStabilityPointCalculator.ReceivedInputs.ToArray(); + StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; @@ -976,7 +976,7 @@ var actualInput = (StructuresStabilityPointLowSillLinearCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); - Assert.IsFalse(testStructuresStabilityPointCalculator.IsCanceled); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -993,10 +993,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresStabilityPointCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -1023,7 +1023,7 @@ validFilePath); // Assert - StructuresStabilityPointCalculationInput[] calculationInputs = testStructuresStabilityPointCalculator.ReceivedInputs.ToArray(); + StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; @@ -1095,7 +1095,7 @@ var actualInput = (StructuresStabilityPointLowSillQuadraticCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); - Assert.IsFalse(testStructuresStabilityPointCalculator.IsCanceled); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -1112,10 +1112,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresStabilityPointCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -1142,7 +1142,7 @@ validFilePath); // Assert - StructuresStabilityPointCalculationInput[] calculationInputs = testStructuresStabilityPointCalculator.ReceivedInputs.ToArray(); + StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; @@ -1214,7 +1214,7 @@ var actualInput = (StructuresStabilityPointFloodedCulvertLinearCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); - Assert.IsFalse(testStructuresStabilityPointCalculator.IsCanceled); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -1231,10 +1231,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresStabilityPointCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -1261,7 +1261,7 @@ validFilePath); // Assert - StructuresStabilityPointCalculationInput[] calculationInputs = testStructuresStabilityPointCalculator.ReceivedInputs.ToArray(); + StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; @@ -1333,7 +1333,7 @@ var actualInput = (StructuresStabilityPointFloodedCulvertQuadraticCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); - Assert.IsFalse(testStructuresStabilityPointCalculator.IsCanceled); + Assert.IsFalse(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -1356,7 +1356,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) .Return(new TestStructuresStabilityPointCalculator()); mockRepository.ReplayAll(); @@ -1426,10 +1426,10 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator(); - var calculatorFactory = mockRepository.Stub(); + var calculator = new TestStructuresStabilityPointCalculator(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -1445,7 +1445,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var service = new StabilityPointStructuresCalculationService(); - testStructuresStabilityPointCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call service.Calculate(calculation, @@ -1455,7 +1455,7 @@ // Assert Assert.IsNull(calculation.Output); - Assert.IsTrue(testStructuresStabilityPointCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -1474,14 +1474,14 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator + var calculator = new TestStructuresStabilityPointCalculator { LastErrorFileContent = "An error occurred", EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -1542,13 +1542,13 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator + var calculator = new TestStructuresStabilityPointCalculator { EndInFailure = true }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -1609,13 +1609,13 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - var testStructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator + var calculator = new TestStructuresStabilityPointCalculator { LastErrorFileContent = "An error occurred" }; - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateStructuresStabilityPointCalculator(testDataPath)) - .Return(testStructuresStabilityPointCalculator); + .Return(calculator); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -1660,7 +1660,6 @@ }); Assert.IsTrue(exceptionThrown); Assert.IsNull(calculation.Output); - Assert.AreEqual(testStructuresStabilityPointCalculator.LastErrorFileContent, exceptionMessage); } mockRepository.VerifyAll(); } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision b6d1940005967399be0d9c6fdda3952d6024b97d) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -80,7 +80,7 @@ stabilityStoneCoverFailureMechanism, AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository)); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -115,8 +115,13 @@ stabilityStoneCoverFailureMechanism, AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository)); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()); + int nrOfCalculators = calculation.InputParameters.WaterLevels.Count() * 2; + + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) + .Return(new TestWaveConditionsCosineCalculator()) + .Repeat + .Times(nrOfCalculators); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -154,10 +159,10 @@ validFilePath, stabilityStoneCoverFailureMechanism, assessmentSectionStub); - var calculatorFactory = mockRepository.Stub(); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var calculatorFactory = mockRepository.StrictMock(); + var calculator = new TestWaveConditionsCosineCalculator(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) - .Return(testWaveConditionsCosineCalculator) + .Return(calculator) .Repeat .Times(nrOfCalculators); mockRepository.ReplayAll(); @@ -168,7 +173,7 @@ activity.Run(); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = testWaveConditionsCosineCalculator.ReceivedInputs.ToArray(); + WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(nrOfCalculators, testWaveConditionsInputs.Length); GeneralStabilityStoneCoverWaveConditionsInput generalInput = stabilityStoneCoverFailureMechanism.GeneralInput; @@ -224,9 +229,9 @@ stabilityStoneCoverFailureMechanism, AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository)); - var calculatorFactory = mockRepository.Stub(); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator); + var calculatorFactory = mockRepository.StrictMock(); + var calculator = new TestWaveConditionsCosineCalculator(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculator); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -277,8 +282,12 @@ stabilityStoneCoverFailureMechanism, AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository)); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()); + + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) + .Return(new TestWaveConditionsCosineCalculator()) + .Repeat + .Times(4); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -339,8 +348,8 @@ stabilityStoneCoverFailureMechanism, AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository)); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -378,8 +387,13 @@ stabilityStoneCoverFailureMechanism, AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository)); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()); + int nrOfCalculators = calculation.InputParameters.WaterLevels.Count() * 2; + + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) + .Return(new TestWaveConditionsCosineCalculator()) + .Repeat + .Times(nrOfCalculators); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) @@ -406,7 +420,7 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator { EndInFailure = endInFailure, @@ -443,7 +457,7 @@ stabilityStoneCoverFailureMechanism, AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository)); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator { EndInFailure = true Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -80,7 +80,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -112,7 +112,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -144,7 +144,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -176,7 +176,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -208,7 +208,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -242,7 +242,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -278,7 +278,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -386,7 +386,7 @@ int totalCalculators = calculation.InputParameters.WaterLevels.Count() * 2; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(totalCalculators); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); @@ -449,7 +449,7 @@ int totalCalculators = calculation.InputParameters.WaterLevels.Count() * 2; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(totalCalculators); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); @@ -525,7 +525,7 @@ int totalCalculators = waterLevels.Length * 2; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(totalCalculators); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); @@ -559,13 +559,13 @@ // Setup StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(); var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism(); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var calculator = new TestWaveConditionsCosineCalculator(); int totalCalculators = calculation.InputParameters.WaterLevels.Count() * 2; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator).Repeat.Times(totalCalculators); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculator).Repeat.Times(totalCalculators); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -579,7 +579,7 @@ validFilePath); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = testWaveConditionsCosineCalculator.ReceivedInputs.ToArray(); + WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(6, testWaveConditionsInputs.Length); GeneralStabilityStoneCoverWaveConditionsInput generalInput = stabilityStoneCoverFailureMechanism.GeneralInput; @@ -632,7 +632,7 @@ var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -660,27 +660,27 @@ // Setup StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(); var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism(); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var calculator = new TestWaveConditionsCosineCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculator); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var stabilityStoneCoverWaveConditionsCalculationService = new StabilityStoneCoverWaveConditionsCalculationService(); - testWaveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => stabilityStoneCoverWaveConditionsCalculationService.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => stabilityStoneCoverWaveConditionsCalculationService.Cancel(); // Call stabilityStoneCoverWaveConditionsCalculationService.Calculate(calculation, assessmentSectionStub, stabilityStoneCoverFailureMechanism.GeneralInput, validFilePath); // Assert Assert.IsNull(calculation.Output); - Assert.IsTrue(testWaveConditionsCosineCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -691,11 +691,11 @@ // Setup StabilityStoneCoverWaveConditionsCalculation calculation = GetValidCalculation(); var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism(); - int totalCalculators = calculation.InputParameters.WaterLevels.Count() * 2; + int nrOfCalculators = calculation.InputParameters.WaterLevels.Count() * 2; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(totalCalculators); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(nrOfCalculators); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( stabilityStoneCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -728,7 +728,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails).Repeat.Times(3); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rb6d1940005967399be0d9c6fdda3952d6024b97d -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision b6d1940005967399be0d9c6fdda3952d6024b97d) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -167,13 +167,13 @@ assessmentSection.WaveImpactAsphaltCover, assessmentSection); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var calculator = new TestWaveConditionsCosineCalculator(); int nrOfCalculators = calculation.InputParameters.WaterLevels.Count(); var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) - .Return(testWaveConditionsCosineCalculator) + .Return(calculator) .Repeat .Times(nrOfCalculators); mockRepository.ReplayAll(); @@ -184,7 +184,7 @@ activity.Run(); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = testWaveConditionsCosineCalculator.ReceivedInputs.ToArray(); + WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(3, testWaveConditionsInputs.Length); var waterLevelIndex = 0; @@ -226,7 +226,7 @@ assessmentSection); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()); mockRepository.ReplayAll(); @@ -277,7 +277,7 @@ assessmentSection.WaveImpactAsphaltCover, assessmentSection); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator + var calculator = new TestWaveConditionsCosineCalculator { EndInFailure = true }; @@ -286,7 +286,7 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) - .Return(testWaveConditionsCosineCalculator) + .Return(calculator) .Repeat .Times(nrOfCalculators); mockRepository.ReplayAll(); @@ -324,13 +324,13 @@ var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator + var calculator = new TestWaveConditionsCosineCalculator { EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent }; calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)) - .Return(testWaveConditionsCosineCalculator) + .Return(calculator) .Repeat .Times(nrOfCalculators); mockRepository.ReplayAll(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r3ed8e00da47ef2780e79688a9902e12b674e4cc0 -r736f04ea6f24399148ab8efd7f3b03ae8f8f56b5 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 3ed8e00da47ef2780e79688a9902e12b674e4cc0) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 736f04ea6f24399148ab8efd7f3b03ae8f8f56b5) @@ -80,7 +80,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -112,7 +112,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -144,7 +144,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -176,7 +176,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -208,7 +208,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -242,7 +242,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -278,7 +278,7 @@ { // Setup var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); @@ -387,7 +387,7 @@ var waveImpactAsphaltCoverFailureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Twice(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( waveImpactAsphaltCoverFailureMechanism, mockRepository); @@ -437,7 +437,7 @@ var waveImpactAsphaltCoverFailureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Twice(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( waveImpactAsphaltCoverFailureMechanism, mockRepository); @@ -498,11 +498,11 @@ WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetValidCalculation(); var waveImpactAsphaltCoverFailureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var calculator = new TestWaveConditionsCosineCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator).Repeat.Times(3); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculator).Repeat.Times(3); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( waveImpactAsphaltCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -517,7 +517,7 @@ validFilePath); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = testWaveConditionsCosineCalculator.ReceivedInputs.ToArray(); + WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(3, testWaveConditionsInputs.Length); var waterLevelIndex = 0; @@ -551,7 +551,7 @@ var waveImpactAsphaltCoverFailureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( waveImpactAsphaltCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); @@ -581,19 +581,19 @@ WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); var waveImpactAsphaltCoverFailureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var testWaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); + var calculator = new TestWaveConditionsCosineCalculator(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); - calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(testWaveConditionsCosineCalculator); + var calculatorFactory = mockRepository.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculator); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( waveImpactAsphaltCoverFailureMechanism, mockRepository); mockRepository.ReplayAll(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var waveImpactAsphaltCoverWaveConditionsCalculationService = new WaveImpactAsphaltCoverWaveConditionsCalculationService(); - testWaveConditionsCosineCalculator.CalculationFinishedHandler += (s, e) => waveImpactAsphaltCoverWaveConditionsCalculationService.Cancel(); + calculator.CalculationFinishedHandler += (s, e) => waveImpactAsphaltCoverWaveConditionsCalculationService.Cancel(); // Call waveImpactAsphaltCoverWaveConditionsCalculationService.Calculate( @@ -604,7 +604,7 @@ // Assert Assert.IsNull(calculation.Output); - Assert.IsTrue(testWaveConditionsCosineCalculator.IsCanceled); + Assert.IsTrue(calculator.IsCanceled); } mockRepository.VerifyAll(); } @@ -617,7 +617,7 @@ var waveImpactAsphaltCoverFailureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase( waveImpactAsphaltCoverFailureMechanism, mockRepository); @@ -651,7 +651,7 @@ }; var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.Stub(); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath)).Return(calculatorThatFails).Repeat.Times(3); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(failureMechanism, mockRepository); mockRepository.ReplayAll();