Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r489cbf6d1e84948fe927655e1a9bd4fcb4968bfe -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 489cbf6d1e84948fe927655e1a9bd4fcb4968bfe) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -98,6 +98,7 @@ /// is null /// is null /// + /// Thrown when expected table entries cannot be found. internal static void ReadAsPipingFailureMechanism(this FailureMechanismEntity entity, PipingFailureMechanism failureMechanism, ReadConversionCollector collector) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -rd99c3b3ea6676f572c9bc5fb2615cabeb589c0f4 -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs (.../PipingFailureMechanismMetaEntityReadExtensions.cs) (revision d99c3b3ea6676f572c9bc5fb2615cabeb589c0f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs (.../PipingFailureMechanismMetaEntityReadExtensions.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -38,12 +38,9 @@ /// The to obtain value for A from. /// The to set the /// for. - internal static PipingProbabilityAssessmentInput ReadProbabilityAssessmentInput( - this PipingFailureMechanismMetaEntity entity, - PipingProbabilityAssessmentInput input) + internal static void ReadProbabilityAssessmentInput(this PipingFailureMechanismMetaEntity entity, PipingProbabilityAssessmentInput input) { input.A = entity.A; - return input; } /// @@ -54,12 +51,9 @@ /// WaterVolumetricWeight from. /// The to set the /// for. - internal static GeneralPipingInput ReadGeneralPipingInput( - this PipingFailureMechanismMetaEntity entity, - GeneralPipingInput input) + internal static void ReadGeneralPipingInput(this PipingFailureMechanismMetaEntity entity, GeneralPipingInput input) { input.WaterVolumetricWeight = (RoundedDouble) entity.WaterVolumetricWeight; - return input; } /// Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r539d342dcf52309b4cb05b7cf49ded99c122d44f -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 539d342dcf52309b4cb05b7cf49ded99c122d44f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -206,9 +206,7 @@ } [Test] - [TestCase(true)] - [TestCase(false)] - public void Create_WithCalculationGroup_ReturnFailureMechanismEntityWithCalculationGroupEntities(bool isRelevant) + public void Create_WithCalculationGroup_ReturnFailureMechanismEntityWithCalculationGroupEntities() { // Setup var failureMechanism = new PipingFailureMechanism(); Index: Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs =================================================================== diff -u -rdc682a1792664507e869ee5ecda02a9cff5426ea -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs (.../PluginTestHelper.cs) (revision dc682a1792664507e869ee5ecda02a9cff5426ea) +++ Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs (.../PluginTestHelper.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -41,7 +41,7 @@ /// The type of the object which shows the data object properties. /// The found property info. /// Thrown when the is null - /// or does not contain a defintion for the combination of and + /// or does not contain a definition for the combination of and /// . public static PropertyInfo AssertPropertyInfoDefined(IEnumerable propertyInfos, Type dataObjectType, Type propertyObjectType) { Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r3722e29f53ce7db0f11fb184cdc2a76d33078cf2 -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 3722e29f53ce7db0f11fb184cdc2a76d33078cf2) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -407,42 +407,42 @@ private static HeightStructure CreateDemoHeightStructure() { return new HeightStructure(new HeightStructure.ConstructionProperties - { - Id = "KUNST1", Name = "KUNST1", - Location = new Point2D(12345.56789, 9876.54321), - StructureNormalOrientation = 10.0, - LevelCrestStructure = - { - Mean = (RoundedDouble) 4.95, - StandardDeviation = (RoundedDouble) 0.05 - }, - FlowWidthAtBottomProtection = - { - Mean = (RoundedDouble) 25.0, - StandardDeviation = (RoundedDouble) 0.05 - }, - CriticalOvertoppingDischarge = - { - Mean = (RoundedDouble) 0.1, - CoefficientOfVariation = (RoundedDouble) 0.15 - }, - WidthFlowApertures = - { - Mean = (RoundedDouble) 21.0, - CoefficientOfVariation = (RoundedDouble) 0.05 - }, - FailureProbabilityStructureWithErosion = 1.0, - StorageStructureArea = - { - Mean = (RoundedDouble) 20000.0, - CoefficientOfVariation = (RoundedDouble) 0.1 - }, - AllowedLevelIncreaseStorage = - { - Mean = (RoundedDouble) 0.2, - StandardDeviation = (RoundedDouble) 0.1 - } - }); + { + Id = "KUNST1", Name = "KUNST1", + Location = new Point2D(12345.56789, 9876.54321), + StructureNormalOrientation = 10.0, + LevelCrestStructure = + { + Mean = (RoundedDouble) 4.95, + StandardDeviation = (RoundedDouble) 0.05 + }, + FlowWidthAtBottomProtection = + { + Mean = (RoundedDouble) 25.0, + StandardDeviation = (RoundedDouble) 0.05 + }, + CriticalOvertoppingDischarge = + { + Mean = (RoundedDouble) 0.1, + CoefficientOfVariation = (RoundedDouble) 0.15 + }, + WidthFlowApertures = + { + Mean = (RoundedDouble) 21.0, + CoefficientOfVariation = (RoundedDouble) 0.05 + }, + FailureProbabilityStructureWithErosion = 1.0, + StorageStructureArea = + { + Mean = (RoundedDouble) 20000.0, + CoefficientOfVariation = (RoundedDouble) 0.1 + }, + AllowedLevelIncreaseStorage = + { + Mean = (RoundedDouble) 0.2, + StandardDeviation = (RoundedDouble) 0.1 + } + }); } #endregion @@ -546,8 +546,8 @@ using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, true, "DR6.soil")) { var soilProfilesImporter = new StochasticSoilModelImporter(pipingFailureMechanism.StochasticSoilModels, - Path.Combine(embeddedResourceFileWriter.TargetFolderPath, - "DR6.soil")); + Path.Combine(embeddedResourceFileWriter.TargetFolderPath, + "DR6.soil")); soilProfilesImporter.Import(); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -r6ddd27897f8c0d4b1e3c4b720e06df9dd855aaf8 -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 6ddd27897f8c0d4b1e3c4b720e06df9dd855aaf8) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -62,25 +62,25 @@ /// /// Gets the available within the scope of the piping failure mechanism. /// - public ObservableList SurfaceLines { get; private set; } + public ObservableList SurfaceLines { get; } /// /// Gets the available stochastic soil models within the scope of the piping failure mechanism. /// - public StochasticSoilModelCollection StochasticSoilModels { get; private set; } + public StochasticSoilModelCollection StochasticSoilModels { get; } /// /// Gets the general piping calculation input parameters that apply to each piping calculation. /// - public GeneralPipingInput GeneralInput { get; private set; } + public GeneralPipingInput GeneralInput { get; } /// /// Gets the general probabilistic assessment input parameters that apply to each calculation /// in a semi-probabilistic assessment. /// - public PipingProbabilityAssessmentInput PipingProbabilityAssessmentInput { get; private set; } + public PipingProbabilityAssessmentInput PipingProbabilityAssessmentInput { get; } - public CalculationGroup CalculationsGroup { get; private set; } + public CalculationGroup CalculationsGroup { get; } public IEnumerable SectionResults { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs =================================================================== diff -u -r5b2709976f49c35903cba5915b7c5217402b8aa7 -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs (.../StochasticSoilModelCollection.cs) (revision 5b2709976f49c35903cba5915b7c5217402b8aa7) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs (.../StochasticSoilModelCollection.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -29,7 +29,7 @@ public class StochasticSoilModelCollection : ObservableList { /// - /// Gets the last known file path from which the + /// Gets or sets the last known file path from which the /// elements were imported. /// public string SourcePath { get; set; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelCollectionContext.cs =================================================================== diff -u -rdc682a1792664507e869ee5ecda02a9cff5426ea -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelCollectionContext.cs (.../StochasticSoilModelCollectionContext.cs) (revision dc682a1792664507e869ee5ecda02a9cff5426ea) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelCollectionContext.cs (.../StochasticSoilModelCollectionContext.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base; using Core.Common.Controls.PresentationObjects; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Piping.Data; @@ -40,8 +39,8 @@ /// The assessment section. /// Thrown when any input argument is null. public StochasticSoilModelCollectionContext(StochasticSoilModelCollection wrappedStochasticSoilModels, - PipingFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + PipingFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) : base(wrappedStochasticSoilModels) { if (failureMechanism == null) Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rdc682a1792664507e869ee5ecda02a9cff5426ea -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision dc682a1792664507e869ee5ecda02a9cff5426ea) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -103,7 +103,7 @@ FileFilter = $"{PipingPluginResources.Soil_file_name} (*.soil)|*.soil", IsEnabled = context => context.AssessmentSection.ReferenceLine != null, CreateFileImporter = (context, filePath) => new StochasticSoilModelImporter(context.WrappedData, - filePath) + filePath) }; } @@ -118,16 +118,16 @@ }; yield return new ViewInfo< - FailureMechanismSectionResultContext, - IEnumerable, - PipingFailureMechanismResultView> - { - GetViewName = (view, results) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, - GetViewData = context => context.WrappedData, - AfterCreate = (view, context) => view.FailureMechanism = context.FailureMechanism - }; + FailureMechanismSectionResultContext, + IEnumerable, + PipingFailureMechanismResultView> + { + GetViewName = (view, results) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, + Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, + CloseForData = CloseFailureMechanismResultViewForData, + GetViewData = context => context.WrappedData, + AfterCreate = (view, context) => view.FailureMechanism = context.FailureMechanism + }; yield return new ViewInfo { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilModelCollectionTest.cs =================================================================== diff -u -r5b2709976f49c35903cba5915b7c5217402b8aa7 -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilModelCollectionTest.cs (.../StochasticSoilModelCollectionTest.cs) (revision 5b2709976f49c35903cba5915b7c5217402b8aa7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilModelCollectionTest.cs (.../StochasticSoilModelCollectionTest.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -27,7 +27,6 @@ [TestFixture] public class StochasticSoilModelCollectionTest { - [Test] public void DefaultConstructor_ReturnObservableStochasticSoilModelCollection() { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/StochasticSoilModelCollectionContextTest.cs =================================================================== diff -u -rdc682a1792664507e869ee5ecda02a9cff5426ea -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/StochasticSoilModelCollectionContextTest.cs (.../StochasticSoilModelCollectionContextTest.cs) (revision dc682a1792664507e869ee5ecda02a9cff5426ea) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/StochasticSoilModelCollectionContextTest.cs (.../StochasticSoilModelCollectionContextTest.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -37,19 +37,19 @@ { // Setup var mocks = new MockRepository(); - var assessmentSectionMock = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var failureMechanism = new PipingFailureMechanism(); // Call - var context = new StochasticSoilModelCollectionContext(failureMechanism.StochasticSoilModels, failureMechanism, assessmentSectionMock); + var context = new StochasticSoilModelCollectionContext(failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection); // Assert Assert.IsInstanceOf>(context); Assert.AreSame(failureMechanism.StochasticSoilModels, context.WrappedData); Assert.AreSame(failureMechanism, context.FailureMechanism); - Assert.AreSame(assessmentSectionMock, context.AssessmentSection); + Assert.AreSame(assessmentSection, context.AssessmentSection); mocks.VerifyAll(); } @@ -58,13 +58,13 @@ { // Setup var mocks = new MockRepository(); - var assessmentSectionMock = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var stochasticSoilModels = new StochasticSoilModelCollection(); // Call - TestDelegate test = () => new StochasticSoilModelCollectionContext(stochasticSoilModels, null, assessmentSectionMock); + TestDelegate test = () => new StochasticSoilModelCollectionContext(stochasticSoilModels, null, assessmentSection); // Assert var exception = Assert.Throws(test); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelImporterTest.cs =================================================================== diff -u -r5b2709976f49c35903cba5915b7c5217402b8aa7 -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 5b2709976f49c35903cba5915b7c5217402b8aa7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -132,7 +132,7 @@ } [Test] - public void Import_ImportingToValidTargetWithValidFile_ImportSoilModelToCollectionSourcePathSet() + public void Import_ImportingToValidTargetWithValidFile_ImportSoilModelToCollectionAndSourcePathSet() { // Setup string validFilePath = Path.Combine(testDataPath, "complete.soil"); @@ -359,10 +359,10 @@ public void Import_ImportingToValidTargetWithEmptyFile_AbortImportAndLog() { // Setup - string corruptPath = Path.Combine(testDataPath, "empty.soil"); + string pathToCorruptFile = Path.Combine(testDataPath, "empty.soil"); var failureMechanism = new PipingFailureMechanism(); - var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, corruptPath); + var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, pathToCorruptFile); importer.SetProgressChanged(IncrementProgress); var importResult = true; @@ -371,7 +371,7 @@ Action call = () => importResult = importer.Import(); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); + var internalErrorMessage = new FileReaderErrorMessageBuilder(pathToCorruptFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); var expectedLogMessage = $"{internalErrorMessage} \r\nHet bestand wordt overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1); Assert.AreEqual(1, progress); @@ -383,10 +383,10 @@ public void Import_ImportingToValidTargetWithProfileContainingInvalidAtX_SkipImportAndLog() { // Setup - string corruptPath = Path.Combine(testDataPath, "invalidAtX2dProperty.soil"); + string pathToCorruptFile = Path.Combine(testDataPath, "invalidAtX2dProperty.soil"); var failureMechanism = new PipingFailureMechanism(); - var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, corruptPath); + var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, pathToCorruptFile); importer.SetProgressChanged(IncrementProgress); var importResult = false; @@ -395,7 +395,7 @@ Action call = () => importResult = importer.Import(); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) + var internalErrorMessage = new FileReaderErrorMessageBuilder(pathToCorruptFile) .WithSubject("ondergrondschematisatie 'Profile'") .Build("Ondergrondschematisatie bevat geen geldige waarde in kolom \'IntersectionX\'."); var expectedLogMessages = new[] @@ -406,34 +406,34 @@ TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 2); Assert.AreEqual(7, progress); - AssertSuccessfulImport(0, corruptPath, importResult, failureMechanism.StochasticSoilModels); + AssertSuccessfulImport(0, pathToCorruptFile, importResult, failureMechanism.StochasticSoilModels); } [Test] public void Import_ImportingToValidTargetWithProfileContainingInvalidParameterValue_ZeroForValue() { // Setup - string corruptPath = Path.Combine(testDataPath, "incorrectValue2dProperty.soil"); + string pathToCorruptFile = Path.Combine(testDataPath, "incorrectValue2dProperty.soil"); var failureMechanism = new PipingFailureMechanism(); - var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, corruptPath); + var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, pathToCorruptFile); importer.SetProgressChanged(IncrementProgress); // Call var importResult = importer.Import(); // Assert - AssertSuccessfulImport(0, corruptPath, importResult, failureMechanism.StochasticSoilModels); + AssertSuccessfulImport(0, pathToCorruptFile, importResult, failureMechanism.StochasticSoilModels); } [Test] public void Import_IncorrectProfiles_SkipModelAndLog() { // Setup - string corruptPath = Path.Combine(testDataPath, "invalidStochasticSoilProfiles.soil"); + string pathToCorruptFile = Path.Combine(testDataPath, "invalidStochasticSoilProfiles.soil"); var failureMechanism = new PipingFailureMechanism(); - var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, corruptPath); + var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, pathToCorruptFile); importer.SetProgressChanged(IncrementProgress); var importResult = false; @@ -443,20 +443,20 @@ // Assert var expectedLogMessage = - $"Fout bij het lezen van bestand '{corruptPath}': de ondergrondschematisatie verwijst naar een ongeldige waarde." + + $"Fout bij het lezen van bestand '{pathToCorruptFile}': de ondergrondschematisatie verwijst naar een ongeldige waarde." + " Dit stochastische ondergrondmodel wordt overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1); - AssertSuccessfulImport(0, corruptPath, importResult, failureMechanism.StochasticSoilModels); + AssertSuccessfulImport(0, pathToCorruptFile, importResult, failureMechanism.StochasticSoilModels); } [Test] public void Import_IncorrectProbability_LogAndImportSoilModelToCollection() { // Setup - string corruptPath = Path.Combine(testDataPath, "incorrectProbability.soil"); + string pathToCorruptFile = Path.Combine(testDataPath, "incorrectProbability.soil"); var failureMechanism = new PipingFailureMechanism(); - var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, corruptPath); + var importer = new StochasticSoilModelImporter(failureMechanism.StochasticSoilModels, pathToCorruptFile); importer.SetProgressChanged(IncrementProgress); var importResult = false; @@ -467,7 +467,7 @@ // Assert var expectedLogMessages = "De som van de kansen van voorkomen in het stochastich ondergrondmodel 'Name' is niet gelijk aan 100%."; TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessages, 1); - AssertSuccessfulImport(1, corruptPath, importResult, failureMechanism.StochasticSoilModels); + AssertSuccessfulImport(1, pathToCorruptFile, importResult, failureMechanism.StochasticSoilModels); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs =================================================================== diff -u -rdc682a1792664507e869ee5ecda02a9cff5426ea -r203d0f03d922b6dac20080dad8e82fe92c7bec86 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision dc682a1792664507e869ee5ecda02a9cff5426ea) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 203d0f03d922b6dac20080dad8e82fe92c7bec86) @@ -90,11 +90,15 @@ public void Text_Always_ReturnsTextFromResource() { // Setup - var failureMechanismMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var stochasticSoilModelContextMock = mocks.StrictMock(failureMechanismMock.StochasticSoilModels, failureMechanismMock, assessmentSectionMock); + var failureMechanism = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); + var stochasticSoilModelContextMock = new StochasticSoilModelCollectionContext( + failureMechanism.StochasticSoilModels, + failureMechanism, + assessmentSection); + // Call var text = info.Text(stochasticSoilModelContextMock); @@ -106,11 +110,15 @@ public void Image_Always_ReturnsSetImage() { // Setup - var failureMechanismMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var stochasticSoilModelContextMock = mocks.StrictMock(failureMechanismMock.StochasticSoilModels, failureMechanismMock, assessmentSectionMock); + var failureMechanism = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); + var stochasticSoilModelContextMock = new StochasticSoilModelCollectionContext( + failureMechanism.StochasticSoilModels, + failureMechanism, + assessmentSection); + // Call var image = info.Image(stochasticSoilModelContextMock); @@ -122,11 +130,15 @@ public void ForeColor_CollectionWithoutSoilProfiles_ReturnsGrayText() { // Setup - var failureMechanismMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var stochasticSoilModelContextMock = mocks.StrictMock(failureMechanismMock.StochasticSoilModels, failureMechanismMock, assessmentSectionMock); + var failureMechanism = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); + var stochasticSoilModelContextMock = new StochasticSoilModelCollectionContext( + failureMechanism.StochasticSoilModels, + failureMechanism, + assessmentSection); + // Call var foreColor = info.ForeColor(stochasticSoilModelContextMock); @@ -138,12 +150,16 @@ public void ForeColor_CollectionWithSoilProfiles_ReturnsControlText() { // Setup - var failureMechanismMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var stochasticSoilModelContextMock = mocks.StrictMock(failureMechanismMock.StochasticSoilModels, failureMechanismMock, assessmentSectionMock); - failureMechanismMock.StochasticSoilModels.Add(new StochasticSoilModel(0, "Name", "Name")); + var failureMechanism = mocks.Stub(); + var assessmentSection = mocks.Stub(); + failureMechanism.StochasticSoilModels.Add(new StochasticSoilModel(0, "Name", "Name")); mocks.ReplayAll(); + var stochasticSoilModelContextMock = new StochasticSoilModelCollectionContext( + failureMechanism.StochasticSoilModels, + failureMechanism, + assessmentSection); + // Call var foreColor = info.ForeColor(stochasticSoilModelContextMock); @@ -176,10 +192,13 @@ stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile1); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile2); - var failureMechanismMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var stochasticSoilModelContextMock = mocks.StrictMock(failureMechanismMock.StochasticSoilModels, failureMechanismMock, assessmentSectionMock); - failureMechanismMock.StochasticSoilModels.Add(stochasticSoilModel); + var failureMechanism = mocks.Stub(); + var assessmentSection = mocks.Stub(); + var stochasticSoilModelContextMock = new StochasticSoilModelCollectionContext( + failureMechanism.StochasticSoilModels, + failureMechanism, + assessmentSection); + failureMechanism.StochasticSoilModels.Add(stochasticSoilModel); mocks.ReplayAll();