Index: Core/Common/src/Core.Common.IO/Readers/ReadResult.cs =================================================================== diff -u -r151bab16a7ebc1bffc0621ab56c6dc219db1e90f -rf0546eef016ca191ca0958e00cfed380f682c80d --- Core/Common/src/Core.Common.IO/Readers/ReadResult.cs (.../ReadResult.cs) (revision 151bab16a7ebc1bffc0621ab56c6dc219db1e90f) +++ Core/Common/src/Core.Common.IO/Readers/ReadResult.cs (.../ReadResult.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -39,18 +39,18 @@ public ReadResult(bool errorOccurred) { CriticalErrorOccurred = errorOccurred; - ImportedItems = new T[0]; + Items = new T[0]; } /// - /// Gets or sets the of items that were imported. + /// Gets or sets the of items that were read. /// - public ICollection ImportedItems { get; set; } + public ICollection Items { get; set; } /// /// Gets or sets the representing whether an critical error has occurred during /// import. /// - public bool CriticalErrorOccurred { get; private set; } + public bool CriticalErrorOccurred { get; } } } \ No newline at end of file Index: Core/Common/test/Core.Common.IO.Test/Readers/ReadResultTest.cs =================================================================== diff -u -ra8bfedc443289dd37ebd3c2304d4c4add4ef7d58 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Core/Common/test/Core.Common.IO.Test/Readers/ReadResultTest.cs (.../ReadResultTest.cs) (revision a8bfedc443289dd37ebd3c2304d4c4add4ef7d58) +++ Core/Common/test/Core.Common.IO.Test/Readers/ReadResultTest.cs (.../ReadResultTest.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -36,7 +36,7 @@ var readResult = new ReadResult(errorOccurred); // Assert - CollectionAssert.IsEmpty(readResult.ImportedItems); + CollectionAssert.IsEmpty(readResult.Items); Assert.AreEqual(errorOccurred, readResult.CriticalErrorOccurred); } } Index: Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs (.../FeatureBasedMapDataImporter.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs (.../FeatureBasedMapDataImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -62,7 +62,7 @@ return false; } - AddFeatureBasedMapDataToMapDataCollection(readResult.ImportedItems.First()); + AddFeatureBasedMapDataToMapDataCollection(readResult.Items.First()); return true; } @@ -113,7 +113,7 @@ return new ReadResult(false) { - ImportedItems = new[] + Items = new[] { importedData } Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs (.../DikeProfilesImporter.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs (.../DikeProfilesImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -51,8 +51,8 @@ protected override void CreateProfiles(ReadResult importProfileLocationResult, ReadResult importDikeProfileDataResult) { - IEnumerable importedDikeProfiles = CreateDikeProfiles(importProfileLocationResult.ImportedItems, - importDikeProfileDataResult.ImportedItems); + IEnumerable importedDikeProfiles = CreateDikeProfiles(importProfileLocationResult.Items, + importDikeProfileDataResult.Items); foreach (DikeProfile dikeProfile in importedDikeProfiles) { Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -81,7 +81,7 @@ } NotifyProgress(Resources.FailureMechanismSectionsImporter_ProgressText_Validating_imported_sections, 2, 3); - ICollection readFailureMechanismSections = readResults.ImportedItems; + ICollection readFailureMechanismSections = readResults.Items; if (HasStartOrEndPointsTooFarFromReferenceLine(referenceLine, readFailureMechanismSections)) { LogCriticalFileReadError(Resources.FailureMechanismSectionsImporter_Import_Imported_sections_too_far_from_current_referenceline); @@ -157,7 +157,7 @@ return new ReadResult(false) { - ImportedItems = importedSections + Items = importedSections }; } catch (CriticalFileReadException e) Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs (.../ForeshoreProfilesImporter.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs (.../ForeshoreProfilesImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -52,7 +52,7 @@ ReadResult importDikeProfileDataResult) { IEnumerable importedForeshoreProfiles = - CreateForeshoreProfiles(importProfileLocationResult.ImportedItems, importDikeProfileDataResult.ImportedItems); + CreateForeshoreProfiles(importProfileLocationResult.Items, importDikeProfileDataResult.Items); foreach (ForeshoreProfile foreshoreProfile in importedForeshoreProfiles) { Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs =================================================================== diff -u -r05a4b5f35f68fcccf274c23bddfc05a4a7731919 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs (.../ProfilesImporter.cs) (revision 05a4b5f35f68fcccf274c23bddfc05a4a7731919) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs (.../ProfilesImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -74,7 +74,7 @@ } string folderPath = Path.GetDirectoryName(FilePath); - string[] acceptedIds = importDikeProfilesResult.ImportedItems.Select(dp => dp.Id).ToArray(); + string[] acceptedIds = importDikeProfilesResult.Items.Select(dp => dp.Id).ToArray(); ReadResult importDikeProfileDataResult = ReadDikeProfileData(folderPath, acceptedIds); if (importDikeProfileDataResult.CriticalErrorOccurred || Canceled) { @@ -187,7 +187,7 @@ } return new ReadResult(false) { - ImportedItems = profileLocations + Items = profileLocations }; } @@ -282,7 +282,7 @@ ? new ReadResult(true) : new ReadResult(false) { - ImportedItems = dikeProfileData + Items = dikeProfileData }; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs (.../StructuresImporter.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs (.../StructuresImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -138,11 +138,11 @@ ReadResult importStructureParameterRowsDataResult) { Dictionary> groupedRows = - importStructureParameterRowsDataResult.ImportedItems + importStructureParameterRowsDataResult.Items .GroupBy(row => row.LocationId) .ToDictionary(g => g.Key, g => g.ToList()); - CreateSpecificStructures(importStructureLocationsResult.ImportedItems, groupedRows); + CreateSpecificStructures(importStructureLocationsResult.Items, groupedRows); } private ReadResult ReadStructureParameterRowsData() @@ -193,7 +193,7 @@ return new ReadResult(false) { - ImportedItems = rows + Items = rows }; } } @@ -247,7 +247,7 @@ } return new ReadResult(false) { - ImportedItems = structureLocations + Items = structureLocations }; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs =================================================================== diff -u -r693cdb62ee142136d80bc08f36fa506fe9c64438 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision 693cdb62ee142136d80bc08f36fa506fe9c64438) +++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -78,7 +78,7 @@ return false; } - AddReferenceLineToDataModel(readResult.ImportedItems.First(), clearReferenceLineDependentData); + AddReferenceLineToDataModel(readResult.Items.First(), clearReferenceLineDependentData); return true; } @@ -123,7 +123,7 @@ { return new ReadResult(false) { - ImportedItems = new[] + Items = new[] { new ReferenceLineReader().ReadReferenceLine(FilePath) } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs =================================================================== diff -u -rdfe649292c68391f773d01a0ec9e9950a04e031e -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -97,7 +97,7 @@ var validCalculationItems = new List(); - foreach (IReadPipingCalculationItem readItem in readResult.ImportedItems) + foreach (IReadPipingCalculationItem readItem in readResult.Items) { if (Canceled) { @@ -354,7 +354,7 @@ { return new ReadResult(false) { - ImportedItems = new PipingConfigurationReader(FilePath).Read().ToList() + Items = new PipingConfigurationReader(FilePath).Read().ToList() }; } catch (Exception exception) when (exception is ArgumentException Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs =================================================================== diff -u -re45d53ab48741d0112dca1ad6bb6cf199535c8b7 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision e45d53ab48741d0112dca1ad6bb6cf199535c8b7) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -85,9 +85,9 @@ return false; } - AddSoilProfilesToStochasticSoilModels(importSoilProfileResult.ImportedItems, importStochasticSoilModelResult.ImportedItems); - MergeStochasticSoilProfiles(importStochasticSoilModelResult.ImportedItems); - CheckIfAllProfilesAreUsed(importSoilProfileResult.ImportedItems, importStochasticSoilModelResult.ImportedItems); + AddSoilProfilesToStochasticSoilModels(importSoilProfileResult.Items, importStochasticSoilModelResult.Items); + MergeStochasticSoilProfiles(importStochasticSoilModelResult.Items); + CheckIfAllProfilesAreUsed(importSoilProfileResult.Items, importStochasticSoilModelResult.Items); if (Canceled) { return false; @@ -137,7 +137,7 @@ private IEnumerable GetValidStochasticSoilModels(ReadResult importStochasticSoilModelResult) { var currentStep = 1; - StochasticSoilModel[] importedModels = importStochasticSoilModelResult.ImportedItems.ToArray(); + StochasticSoilModel[] importedModels = importStochasticSoilModelResult.Items.ToArray(); foreach (StochasticSoilModel importedModel in importedModels) { NotifyProgress(RingtoestCommonIOResources.Importer_ProgressText_Adding_imported_data_to_DataModel, currentStep, importedModels.Length); @@ -263,7 +263,7 @@ } return new ReadResult(false) { - ImportedItems = soilModels + Items = soilModels }; } @@ -321,7 +321,7 @@ } return new ReadResult(false) { - ImportedItems = profiles + Items = profiles }; } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rdfe649292c68391f773d01a0ec9e9950a04e031e -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -203,7 +203,7 @@ /// /// Looks up a localized string similar to {0} - ///Er is geen berekening configuratie geïmporteerd.. + ///Er is geen berekeningenconfiguratie geïmporteerd.. /// public static string PipingConfigurationImporter_HandleCriticalFileReadError_Error_0_no_configuration_imported { get { @@ -213,7 +213,7 @@ } /// - /// Looks up a localized string similar to Berekening configuratie importeren afgebroken. Geen data ingelezen.. + /// Looks up a localized string similar to Berekeningenconfiguratie importeren afgebroken. Geen data ingelezen.. /// public static string PipingConfigurationImporter_LogImportCanceledMessage_Import_canceled_no_data_read { get { @@ -223,7 +223,7 @@ } /// - /// Looks up a localized string similar to Inlezen berekening configuratie.. + /// Looks up a localized string similar to Inlezen berekeningenconfiguratie.. /// public static string PipingConfigurationImporter_ProgressText_Reading_configuration { get { @@ -232,7 +232,7 @@ } /// - /// Looks up a localized string similar to Valideren berekening configuratie.. + /// Looks up a localized string similar to Valideren berekeningenconfiguratie.. /// public static string PipingConfigurationImporter_ProgressText_Validating_imported_data { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx =================================================================== diff -u -rdfe649292c68391f773d01a0ec9e9950a04e031e -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -285,11 +285,11 @@ Er zijn stochastische ondergrondschematisaties zonder geldige kans van voorkomen. - Berekening configuratie importeren afgebroken. Geen data ingelezen. + Berekeningenconfiguratie importeren afgebroken. Geen data ingelezen. {0} -Er is geen berekening configuratie geïmporteerd. +Er is geen berekeningenconfiguratie geïmporteerd. Het XML-document dat de configuratie voor de berekeningen beschrijft bevat geen berekeningselementen. @@ -320,9 +320,9 @@ ..\Resources\XmlGeometrySchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - Inlezen berekening configuratie. + Inlezen berekeningenconfiguratie. - Valideren berekening configuratie. + Valideren berekeningenconfiguratie. \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs =================================================================== diff -u -r92549be285a5082435e9625732cf33ff50cd60b9 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 92549be285a5082435e9625732cf33ff50cd60b9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -104,8 +104,8 @@ return false; } - RingtoetsPipingSurfaceLine[] importResults = ProcessImportedDataToModel(importSurfaceLinesResult.ImportedItems, - importCharacteristicPointsResult.ImportedItems).ToArray(); + RingtoetsPipingSurfaceLine[] importResults = ProcessImportedDataToModel(importSurfaceLinesResult.Items, + importCharacteristicPointsResult.Items).ToArray(); if (Canceled) { return false; @@ -343,7 +343,7 @@ return new ReadResult(false) { - ImportedItems = readSurfaceLines + Items = readSurfaceLines }; } @@ -501,7 +501,7 @@ return new ReadResult(false) { - ImportedItems = readCharacteristicPointsLocations + Items = readCharacteristicPointsLocations }; } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs =================================================================== diff -u -r110999cffbcac705d99ff96033e9eabb0e0b5e12 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -39,7 +39,8 @@ [TestFixture] public class PipingConfigurationImporterTest { - private readonly string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, "PipingConfigurationReader"); + private readonly string readerPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, "PipingConfigurationReader"); + private readonly string importerPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, "PipingConfigurationImporter"); private static IEnumerable ValidConfigurationsWithValidData { @@ -112,7 +113,7 @@ // Assert string expectedMessage = $"Fout bij het lezen van bestand '{filePath}': bestandspad mag niet verwijzen naar een lege bestandsnaam. " + Environment.NewLine + - "Er is geen berekening configuratie geïmporteerd."; + "Er is geen berekeningenconfiguratie geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importSuccessful); } @@ -133,7 +134,7 @@ // Assert string expectedMessage = $"Fout bij het lezen van bestand '{filePath}': het bestand bestaat niet. " + Environment.NewLine + - "Er is geen berekening configuratie geïmporteerd."; + "Er is geen berekeningenconfiguratie geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importSuccessful); } @@ -142,7 +143,7 @@ public void Import_InvalidFile_CancelImportWithErrorMessage() { // Setup - string filePath = Path.Combine(path, "invalidConfigurationCalculationContainingEmptyStrings.xml"); + string filePath = Path.Combine(readerPath, "invalidConfigurationCalculationContainingEmptyStrings.xml"); var importer = new PipingConfigurationImporter(filePath, new CalculationGroup(), Enumerable.Empty(), @@ -167,10 +168,11 @@ [SetCulture("nl-NL")] [TestCase("validConfigurationInvalidEntryExitPoint.xml", "Het uittredepunt moet landwaarts van het intredepunt liggen.")] [TestCase("validConfigurationExitPointNotOnSurfaceLine.xml", "Het gespecificeerde punt moet op het profiel liggen (bereik [0,0, 10,0]).")] + [TestCase("validConfigurationEntryPointNotOnSurfaceLine.xml", "Het gespecificeerde punt moet op het profiel liggen (bereik [0,0, 10,0]).")] public void Import_ValidConfigurationInvalidData_LogMessageAndContinueImport(string file, string expectedErrorMessage) { // Setup - string filePath = Path.Combine(path, file); + string filePath = Path.Combine(importerPath, file); var calculationGroup = new CalculationGroup(); var surfaceLine = new RingtoetsPipingSurfaceLine @@ -203,11 +205,11 @@ pipingFailureMechanism.SurfaceLines.AddRange(new[] { surfaceLine - }, "path"); + }, "readerPath"); pipingFailureMechanism.StochasticSoilModels.AddRange(new[] { stochasticSoilModel - }, "path"); + }, "readerPath"); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20); var importer = new PipingConfigurationImporter(filePath, @@ -237,7 +239,7 @@ // Setup var calculationGroup = new CalculationGroup(); - string filePath = Path.Combine(path, "validConfigurationNesting.xml"); + string filePath = Path.Combine(readerPath, "validConfigurationNesting.xml"); var importer = new PipingConfigurationImporter(filePath, calculationGroup, Enumerable.Empty(), @@ -256,7 +258,7 @@ Action call = () => importSuccessful = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Berekening configuratie importeren afgebroken. Geen data ingelezen.", 1); + TestHelper.AssertLogMessageIsGenerated(call, "Berekeningenconfiguratie importeren afgebroken. Geen data ingelezen.", 1); CollectionAssert.IsEmpty(calculationGroup.Children); Assert.IsFalse(importSuccessful); } @@ -265,7 +267,7 @@ public void GivenImport_WhenImporting_ThenExpectedProgressMessagesGenerated() { // Given - string filePath = Path.Combine(path, "validConfigurationNesting.xml"); + string filePath = Path.Combine(readerPath, "validConfigurationNesting.xml"); var importer = new PipingConfigurationImporter(filePath, new CalculationGroup(), Enumerable.Empty(), @@ -275,11 +277,11 @@ { new ExpectedProgressNotification { - Text = "Inlezen berekening configuratie.", CurrentStep = 1, TotalNumberOfSteps = 3 + Text = "Inlezen berekeningenconfiguratie.", CurrentStep = 1, TotalNumberOfSteps = 3 }, new ExpectedProgressNotification { - Text = "Valideren berekening configuratie.", CurrentStep = 2, TotalNumberOfSteps = 3 + Text = "Valideren berekeningenconfiguratie.", CurrentStep = 2, TotalNumberOfSteps = 3 }, new ExpectedProgressNotification { @@ -308,7 +310,7 @@ { // Setup var calculationGroup = new CalculationGroup(); - string filePath = Path.Combine(path, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); + string filePath = Path.Combine(readerPath, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); var importer = new PipingConfigurationImporter(filePath, calculationGroup, Enumerable.Empty(), @@ -331,7 +333,7 @@ // Setup var calculationGroup = new CalculationGroup(); - string filePath = Path.Combine(path, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); + string filePath = Path.Combine(readerPath, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); var importer = new PipingConfigurationImporter(filePath, calculationGroup, new[] @@ -355,7 +357,7 @@ public void Import_StochasticSoilModelInvalid_LogMessageAndContinueImport() { // Setup - string filePath = Path.Combine(path, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); + string filePath = Path.Combine(readerPath, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); var calculationGroup = new CalculationGroup(); var surfaceLine = new RingtoetsPipingSurfaceLine @@ -372,7 +374,7 @@ pipingFailureMechanism.SurfaceLines.AddRange(new[] { surfaceLine - }, "path"); + }, "readerPath"); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20); var importer = new PipingConfigurationImporter(filePath, @@ -398,7 +400,7 @@ public void Import_StochasticSoilModelNotIntersectingWithSurfaceLine_LogMessageAndContinueImport() { // Setup - string filePath = Path.Combine(path, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); + string filePath = Path.Combine(readerPath, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); var calculationGroup = new CalculationGroup(); var surfaceLine = new RingtoetsPipingSurfaceLine @@ -422,11 +424,11 @@ pipingFailureMechanism.SurfaceLines.AddRange(new[] { surfaceLine - }, "path"); + }, "readerPath"); pipingFailureMechanism.StochasticSoilModels.AddRange(new[] { stochasticSoilModel - }, "path"); + }, "readerPath"); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20); var importer = new PipingConfigurationImporter(filePath, @@ -452,7 +454,7 @@ public void Import_StochasticSoilProfileInvalid_LogMessageAndContinueImport() { // Setup - string filePath = Path.Combine(path, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); + string filePath = Path.Combine(readerPath, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); var calculationGroup = new CalculationGroup(); var surfaceLine = new RingtoetsPipingSurfaceLine @@ -476,11 +478,11 @@ pipingFailureMechanism.SurfaceLines.AddRange(new[] { surfaceLine - }, "path"); + }, "readerPath"); pipingFailureMechanism.StochasticSoilModels.AddRange(new[] { stochasticSoilModel - }, "path"); + }, "readerPath"); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20); var importer = new PipingConfigurationImporter(filePath, @@ -508,7 +510,7 @@ public void Import_ValidConfigurationWithValidHydraulicBoundaryData_DataAddedToModel(string file, bool manualAssessmentLevel) { // Setup - string filePath = Path.Combine(path, file); + string filePath = Path.Combine(readerPath, file); var calculationGroup = new CalculationGroup(); var surfaceLine = new RingtoetsPipingSurfaceLine @@ -541,11 +543,11 @@ pipingFailureMechanism.SurfaceLines.AddRange(new[] { surfaceLine - }, "path"); + }, "readerPath"); pipingFailureMechanism.StochasticSoilModels.AddRange(new[] { stochasticSoilModel - }, "path"); + }, "readerPath"); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20); var importer = new PipingConfigurationImporter(filePath, @@ -605,7 +607,7 @@ public void Import_ValidConfigurationWithValidData_DataAddedToModel(string file, CalculationGroup expectedCalculationGroup) { // Setup - string filePath = Path.Combine(path, file); + string filePath = Path.Combine(readerPath, file); var calculationGroup = new CalculationGroup(); var pipingFailureMechanism = new PipingFailureMechanism(); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs =================================================================== diff -u -r27a3de13b3b94459fc79664d521de3790dd6b0df -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision 27a3de13b3b94459fc79664d521de3790dd6b0df) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -142,7 +142,7 @@ "The element 'berekening' has invalid child element 'ondergrondschematisatie'.") .SetName("invalidCalculationMultipleStochasticSoilProfile"); yield return new TestCaseData("invalidCalculationMultipleStochasts.xml", - "The element 'berekening' has invalid child element 'stochasts'.") + "The element 'berekening' has invalid child element 'stochasten'.") .SetName("invalidCalculationMultipleStochasts"); yield return new TestCaseData("invalidConfigurationCalculationContainingEmptyHydraulicBoundaryLocation.xml", "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value.") Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationEntryPointNotOnSurfaceLine.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationEntryPointNotOnSurfaceLine.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationEntryPointNotOnSurfaceLine.xml (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -0,0 +1,8 @@ + + + + Profielschematisatie + -10 + 2.2 + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationExitPointNotOnSurfaceLine.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationExitPointNotOnSurfaceLine.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationExitPointNotOnSurfaceLine.xml (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -0,0 +1,8 @@ + + + + Profielschematisatie + 2.2 + 200.2 + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationInvalidEntryExitPoint.xml =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationInvalidEntryExitPoint.xml (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationImporter/validConfigurationInvalidEntryExitPoint.xml (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -0,0 +1,7 @@ + + + + 3.3 + 2.2 + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidCalculationMultipleStochasts.xml =================================================================== diff -u -r80f26bb57c31ea312cbe1461eb979033c8299517 -rf0546eef016ca191ca0958e00cfed380f682c80d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidCalculationMultipleStochasts.xml (.../invalidCalculationMultipleStochasts.xml) (revision 80f26bb57c31ea312cbe1461eb979033c8299517) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidCalculationMultipleStochasts.xml (.../invalidCalculationMultipleStochasts.xml) (revision f0546eef016ca191ca0958e00cfed380f682c80d) @@ -1,7 +1,7 @@ - - + + \ No newline at end of file Fisheye: Tag f0546eef016ca191ca0958e00cfed380f682c80d refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationExitPointNotOnSurfaceLine.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f0546eef016ca191ca0958e00cfed380f682c80d refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationInvalidEntryExitPoint.xml'. Fisheye: No comparison available. Pass `N' to diff?