Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -ra04eb13a6d2bf03c00551c5e9330d07a399caca4 -r2b0814631c8cf9138e4ad20b28d2484d3afddd51 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs) (revision a04eb13a6d2bf03c00551c5e9330d07a399caca4) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs) (revision 2b0814631c8cf9138e4ad20b28d2484d3afddd51) @@ -919,23 +919,23 @@ var failureMechanism = new TestClosingStructuresFailureMechanism(); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.Id).Return(string.Empty); - assessmentSection.Stub(a => a.FailureMechanismContribution).Return(FailureMechanismContributionTestFactory.CreateFailureMechanismContribution()); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { - FilePath = validFilePath, + FilePath = Path.Combine(testDataPath, "complete.sqlite"), Version = "random", Locations = { hydraulicBoundaryLocation } - }); + }; + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.Id).Return(string.Empty); + assessmentSection.Stub(a => a.FailureMechanismContribution).Return(FailureMechanismContributionTestFactory.CreateFailureMechanismContribution()); + + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new TestClosingStructuresCalculation { @@ -957,9 +957,9 @@ Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase), + (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestStructuresCalculator()); mocks.ReplayAll();