Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/IImporterMessageProvider.cs =================================================================== diff -u -r2ab087c5f7b254eb7ea6d167b122afaea10b0ff6 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/IImporterMessageProvider.cs (.../IImporterMessageProvider.cs) (revision 2ab087c5f7b254eb7ea6d167b122afaea10b0ff6) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/IImporterMessageProvider.cs (.../IImporterMessageProvider.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -19,6 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; + namespace Ringtoets.Common.IO.FileImporters.MessageProviders { /// @@ -31,5 +33,16 @@ /// /// The progress text. string GetAddDataToModelProgressText(); + + /// + /// Gets the cancelled log message text to be displayed when cancelling an + /// importer action. + /// + /// The type descriptor of the items that were to + /// be imported. + /// The log message. + /// Thrown when + /// is null. + string GetCancelledLogMessageText(string typeDescriptor); } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/ImportMessageProvider.cs =================================================================== diff -u -r2ab087c5f7b254eb7ea6d167b122afaea10b0ff6 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/ImportMessageProvider.cs (.../ImportMessageProvider.cs) (revision 2ab087c5f7b254eb7ea6d167b122afaea10b0ff6) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/ImportMessageProvider.cs (.../ImportMessageProvider.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Ringtoets.Common.IO.Properties; namespace Ringtoets.Common.IO.FileImporters.MessageProviders @@ -32,5 +33,15 @@ { return Resources.Importer_ProgressText_Adding_imported_data_to_data_model; } + + public string GetCancelledLogMessageText(string typeDescriptor) + { + if (typeDescriptor == null) + { + throw new ArgumentNullException(nameof(typeDescriptor)); + } + + return string.Format(Resources.Importer_LogMessageText_Import_of_TypeDescriptor_0_cancelled, typeDescriptor); + } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/UpdateMessageProvider.cs =================================================================== diff -u -r2ab087c5f7b254eb7ea6d167b122afaea10b0ff6 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/UpdateMessageProvider.cs (.../UpdateMessageProvider.cs) (revision 2ab087c5f7b254eb7ea6d167b122afaea10b0ff6) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/MessageProviders/UpdateMessageProvider.cs (.../UpdateMessageProvider.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Ringtoets.Common.IO.Properties; namespace Ringtoets.Common.IO.FileImporters.MessageProviders @@ -32,5 +33,15 @@ { return Resources.Importer_ProgressText_Updating_data_in_data_model; } + + public string GetCancelledLogMessageText(string typeDescriptor) + { + if (typeDescriptor == null) + { + throw new ArgumentNullException(nameof(typeDescriptor)); + } + + return string.Format(Resources.Importer_LogMessageText_Update_of_TypeDescriptor_0_cancelled, typeDescriptor); + } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r24c6381ad343979eeeabaf26e1ab9a85b482f607 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 24c6381ad343979eeeabaf26e1ab9a85b482f607) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -825,6 +825,24 @@ } /// + /// Looks up a localized string similar to {0} importeren afgebroken. Geen data ingelezen.. + /// + public static string Importer_LogMessageText_Import_of_TypeDescriptor_0_cancelled { + get { + return ResourceManager.GetString("Importer_LogMessageText_Import_of_TypeDescriptor_0_cancelled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} bijwerken afgebroken. Geen data ingelezen.. + /// + public static string Importer_LogMessageText_Update_of_TypeDescriptor_0_cancelled { + get { + return ResourceManager.GetString("Importer_LogMessageText_Update_of_TypeDescriptor_0_cancelled", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Geïmporteerde data toevoegen aan het toetsspoor.. /// public static string Importer_ProgressText_Adding_imported_data_to_data_model { @@ -1160,14 +1178,14 @@ } /// - /// Looks up a localized string similar to BEGIN TRANSACTION; - ///CREATE TABLE "TimeIntegrationSettings" ( - /// "LocationID" INTEGER NOT NULL, - /// "CalculationTypeID" INTEGER NOT NULL, - /// "TimeIntegrationSchemeID" INTEGER NOT NULL, - /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"), - /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION - ///); + /// Looks up a localized string similar to BEGIN TRANSACTION; + ///CREATE TABLE "TimeIntegrationSettings" ( + /// "LocationID" INTEGER NOT NULL, + /// "CalculationTypeID" INTEGER NOT NULL, + /// "TimeIntegrationSchemeID" INTEGER NOT NULL, + /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"), + /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION + ///); ///CREATE TABLE "Numeri [rest of string was truncated]";. /// public static string settings_schema { Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx =================================================================== diff -u -r24c6381ad343979eeeabaf26e1ab9a85b482f607 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 24c6381ad343979eeeabaf26e1ab9a85b482f607) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -553,4 +553,10 @@ De locatie met hydraulische randvoorwaarden '{0}' bestaat niet. + + {0} importeren afgebroken. Geen data ingelezen. + + + {0} bijwerken afgebroken. Geen data ingelezen. + \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/MessageProviders/ImportMessageProviderTest.cs =================================================================== diff -u -r2ab087c5f7b254eb7ea6d167b122afaea10b0ff6 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/MessageProviders/ImportMessageProviderTest.cs (.../ImportMessageProviderTest.cs) (revision 2ab087c5f7b254eb7ea6d167b122afaea10b0ff6) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/MessageProviders/ImportMessageProviderTest.cs (.../ImportMessageProviderTest.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using NUnit.Framework; using Ringtoets.Common.IO.FileImporters.MessageProviders; @@ -50,5 +51,34 @@ const string expectedMessage = "Geïmporteerde data toevoegen aan het toetsspoor."; Assert.AreEqual(expectedMessage, message); } + + [Test] + public void GetCancelledLogMessageText_DescriptionNull_ThrowsArgumentNullException() + { + // Setup + var messageProvider = new ImportMessageProvider(); + + // Call + TestDelegate call = () => messageProvider.GetCancelledLogMessageText(null); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("typeDescriptor", paramName); + } + + [Test] + public void GetCancelledLogMessageText_WithDescription_ReturnsExpectedMessage() + { + // Setup + const string typeDescriptor = "Items"; + var messageProvider = new ImportMessageProvider(); + + // Call + string message = messageProvider.GetCancelledLogMessageText(typeDescriptor); + + // Assert + const string expectedMessage = "Items importeren afgebroken. Geen data ingelezen."; + Assert.AreEqual(expectedMessage, message); + } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/MessageProviders/UpdateMessageProviderTest.cs =================================================================== diff -u -r2ab087c5f7b254eb7ea6d167b122afaea10b0ff6 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/MessageProviders/UpdateMessageProviderTest.cs (.../UpdateMessageProviderTest.cs) (revision 2ab087c5f7b254eb7ea6d167b122afaea10b0ff6) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/MessageProviders/UpdateMessageProviderTest.cs (.../UpdateMessageProviderTest.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using NUnit.Framework; using Ringtoets.Common.IO.FileImporters.MessageProviders; @@ -50,5 +51,34 @@ const string expectedMessage = "Bijwerken data in het toetsspoor."; Assert.AreEqual(expectedMessage, message); } + + [Test] + public void GetCancelledLogMessageText_DescriptionNull_ThrowsArgumentNullException() + { + // Setup + var messageProvider = new UpdateMessageProvider(); + + // Call + TestDelegate call = () => messageProvider.GetCancelledLogMessageText(null); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("typeDescriptor", paramName); + } + + [Test] + public void GetCancelledLogMessageText_WithDescription_ReturnsExpectedMessage() + { + // Setup + const string typeDescriptor = "Items"; + var messageProvider = new UpdateMessageProvider(); + + // Call + string message = messageProvider.GetCancelledLogMessageText(typeDescriptor); + + // Assert + const string expectedMessage = "Items bijwerken afgebroken. Geen data ingelezen."; + Assert.AreEqual(expectedMessage, message); + } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs =================================================================== diff -u -r7be65c58634423d5f4e0fb5272158c716d9d3753 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision 7be65c58634423d5f4e0fb5272158c716d9d3753) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -25,7 +25,6 @@ using System.Linq; using Core.Common.Base; using Core.Common.Base.IO; -using Core.Common.IO.Exceptions; using Core.Common.IO.Readers; using log4net; using Ringtoets.Common.IO.FileImporters.MessageProviders; @@ -34,7 +33,8 @@ using Ringtoets.Piping.IO.Properties; using Ringtoets.Piping.IO.SoilProfile; using Ringtoets.Piping.Primitives; -using RingtoestCommonIOResources = Ringtoets.Common.IO.Properties.Resources; +using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources; +using RingtoetsPipingDataResources = Ringtoets.Piping.Data.Properties.Resources; namespace Ringtoets.Piping.IO.Importers { @@ -116,7 +116,8 @@ protected override void LogImportCanceledMessage() { - log.Info(Resources.StochasticSoilModelImporter_Import_Import_canceled); + string message = messageProvider.GetCancelledLogMessageText(RingtoetsPipingDataResources.StochasticSoilModelCollection_TypeDescriptor); + log.Info(message); } private IEnumerable UpdatedInstances { get; set; } = Enumerable.Empty(); @@ -156,7 +157,7 @@ StochasticSoilModel[] importedModels = importStochasticSoilModelResult.Items.ToArray(); foreach (StochasticSoilModel importedModel in importedModels) { - NotifyProgress(RingtoestCommonIOResources.Importer_ProgressText_Validating_imported_data, currentStep, importedModels.Length); + NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Validating_imported_data, currentStep, importedModels.Length); if (Canceled) { yield break; Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r24c6381ad343979eeeabaf26e1ab9a85b482f607 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 24c6381ad343979eeeabaf26e1ab9a85b482f607) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -613,15 +613,6 @@ } /// - /// Looks up a localized string similar to Stochastische ondergrondmodellen importeren afgebroken. Geen data ingelezen.. - /// - public static string StochasticSoilModelImporter_Import_Import_canceled { - get { - return ResourceManager.GetString("StochasticSoilModelImporter_Import_Import_canceled", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Ondergrondschematisatie '{0}' is meerdere keren gevonden in ondergrondmodel '{1}'. Kansen van voorkomen worden opgeteld.. /// public static string StochasticSoilModelImporter_MergeStochasticSoilProfiles_Multiple_SoilProfile_0_used_in_StochasticSoilModel_1_Probabilities_added { Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx =================================================================== diff -u -r24c6381ad343979eeeabaf26e1ab9a85b482f607 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision 24c6381ad343979eeeabaf26e1ab9a85b482f607) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -219,9 +219,6 @@ Parameter '{0}' is niet verschoven lognormaal verdeeld. - - Stochastische ondergrondmodellen importeren afgebroken. Geen data ingelezen. - Er zijn geen ondergrondschematisaties gevonden in het stochastische ondergrondmodel '{0}'. Dit model wordt overgeslagen. Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs =================================================================== diff -u -r7be65c58634423d5f4e0fb5272158c716d9d3753 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 7be65c58634423d5f4e0fb5272158c716d9d3753) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -37,6 +37,7 @@ using Ringtoets.Piping.Plugin.Properties; using Ringtoets.Piping.Primitives; using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources; +using RingtoetsPipingDataResources = Ringtoets.Piping.Data.Properties.Resources; namespace Ringtoets.Piping.Plugin.FileImporter { @@ -125,7 +126,8 @@ protected override void LogImportCanceledMessage() { - log.Info(Resources.PipingSurfaceLinesCsvImporter_Import_Import_canceled); + string message = messageProvider.GetCancelledLogMessageText(RingtoetsPipingDataResources.RingtoetsPipingSurfaceLineCollection_TypeDescriptor); + log.Info(message); } protected override void DoPostImportUpdates() Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -rc31353107227995d74e8727a85b02a89a39c139d -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c31353107227995d74e8727a85b02a89a39c139d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -252,7 +252,7 @@ } /// - /// Looks up a localized string similar to Als u stochastische ondergrondmodellen importeert, dan worden all rekenresultaten van dit toetsspoor verwijderd. + /// Looks up a localized string similar to Als u stochastische ondergrondmodellen importeert, dan worden alle rekenresultaten van dit toetsspoor verwijderd. /// ///Weet u zeker dat u wilt doorgaan?. /// @@ -376,15 +376,6 @@ } /// - /// Looks up a localized string similar to Profielschematisaties importeren afgebroken. Geen data ingelezen.. - /// - public static string PipingSurfaceLinesCsvImporter_Import_Import_canceled { - get { - return ResourceManager.GetString("PipingSurfaceLinesCsvImporter_Import_Import_canceled", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Geen karakteristieke punten-bestand gevonden naast het profielschematisatiesbestand. (Verwacht bestand: {0}). /// public static string PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_ { Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx =================================================================== diff -u -rc31353107227995d74e8727a85b02a89a39c139d -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision c31353107227995d74e8727a85b02a89a39c139d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -123,9 +123,6 @@ soil - - Profielschematisaties importeren afgebroken. Geen data ingelezen. - Inlezen '{0}' @@ -220,7 +217,7 @@ Het bijwerken van de stochastische ondergrondmodellen is mislukt. - Als u stochastische ondergrondmodellen importeert, dan worden all rekenresultaten van dit toetsspoor verwijderd. + Als u stochastische ondergrondmodellen importeert, dan worden alle rekenresultaten van dit toetsspoor verwijderd. Weet u zeker dat u wilt doorgaan? Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs =================================================================== diff -u -r7be65c58634423d5f4e0fb5272158c716d9d3753 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 7be65c58634423d5f4e0fb5272158c716d9d3753) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -301,7 +301,9 @@ public void Import_CancelOfImportWhenReadingSoilProfiles_CancelsImportAndLogs() { // Setup - var messageProvider = mocks.Stub(); + const string cancelledLogMessage = "Operation Cancelled"; + var messageProvider = mocks.StrictMock(); + messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Stochastische ondergrondmodellen")).Return(cancelledLogMessage); mocks.ReplayAll(); string validFilePath = Path.Combine(testDataPath, "complete.soil"); @@ -327,15 +329,18 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Stochastische ondergrondmodellen importeren afgebroken. Geen data ingelezen.", 1); + Tuple expectedLogMessage = Tuple.Create(cancelledLogMessage, LogLevelConstant.Info); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessage, 1); AssertUnsuccessfulImport(importResult, updateStrategy); } [Test] public void Import_CancelOfImportWhenReadingStochasticSoilModels_CancelsImportAndLogs() { // Setup - var messageProvider = mocks.Stub(); + const string cancelledLogMessage = "Operation Cancelled"; + var messageProvider = mocks.StrictMock(); + messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Stochastische ondergrondmodellen")).Return(cancelledLogMessage); mocks.ReplayAll(); string validFilePath = Path.Combine(testDataPath, "complete.soil"); @@ -361,15 +366,18 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Stochastische ondergrondmodellen importeren afgebroken. Geen data ingelezen.", 1); + Tuple expectedLogMessage = Tuple.Create(cancelledLogMessage, LogLevelConstant.Info); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessage, 1); AssertUnsuccessfulImport(importResult, updateStrategy); } [Test] public void Import_CancelOfImportWhenAddingAndCheckingSoilProfiles_CancelsImportAndLogs() { // Setup - var messageProvider = mocks.Stub(); + const string cancelledLogMessage = "Operation Cancelled"; + var messageProvider = mocks.StrictMock(); + messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Stochastische ondergrondmodellen")).Return(cancelledLogMessage); mocks.ReplayAll(); string validFilePath = Path.Combine(testDataPath, "complete.soil"); @@ -395,15 +403,18 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Stochastische ondergrondmodellen importeren afgebroken. Geen data ingelezen.", 1); + Tuple expectedLogMessage = Tuple.Create(cancelledLogMessage, LogLevelConstant.Info); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessage, 1); AssertUnsuccessfulImport(importResult, updateStrategy); } [Test] public void Import_CancelOfImportWhenValidatingStochasticSoilModels_CancelsImportAndLogs() { // Setup - var messageProvider = mocks.Stub(); + const string cancelledLogMessage = "Operation Cancelled"; + var messageProvider = mocks.StrictMock(); + messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Stochastische ondergrondmodellen")).Return(cancelledLogMessage); mocks.ReplayAll(); string validFilePath = Path.Combine(testDataPath, "complete.soil"); @@ -429,7 +440,8 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Stochastische ondergrondmodellen importeren afgebroken. Geen data ingelezen.", 1); + Tuple expectedLogMessage = Tuple.Create(cancelledLogMessage, LogLevelConstant.Info); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessage, 1); AssertUnsuccessfulImport(importResult, updateStrategy); } @@ -466,7 +478,9 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Huidige actie was niet meer te annuleren en is daarom voortgezet.", 1); + var expectedMessage = "Huidige actie was niet meer te annuleren en is daarom voortgezet."; + Tuple expectedLogMessageAndLevel = Tuple.Create(expectedMessage, LogLevelConstant.Warn); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 1); StochasticSoilModel[] readModels = AssertSuccessfulImport(validFilePath, importResult, updateStrategy); Assert.AreEqual(3, readModels.Length); } @@ -529,12 +543,12 @@ string internalErrorMessage = new FileReaderErrorMessageBuilder(pathToCorruptFile) .WithSubject("ondergrondschematisatie 'Profile'") .Build("Ondergrondschematisatie bevat geen geldige waarde in kolom \'IntersectionX\'."); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - $"{internalErrorMessage} \r\nDeze ondergrondschematisatie wordt overgeslagen.", - "Het stochastische ondergrondmodel \'Name\' heeft een ongespecificeerde ondergrondschematisatie. Dit model wordt overgeslagen." + Tuple.Create($"{internalErrorMessage} \r\nDeze ondergrondschematisatie wordt overgeslagen.", LogLevelConstant.Error), + Tuple.Create("Het stochastische ondergrondmodel \'Name\' heeft een ongespecificeerde ondergrondschematisatie. Dit model wordt overgeslagen.", LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 2); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 2); Assert.AreEqual(8, progress); StochasticSoilModel[] readModels = AssertSuccessfulImport(pathToCorruptFile, importResult, updateStrategy); @@ -594,7 +608,8 @@ string expectedLogMessage = $"Fout bij het lezen van bestand '{pathToCorruptFile}': de ondergrondschematisatie verwijst naar een ongeldige waarde." + " Dit stochastische ondergrondmodel wordt overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1); + Tuple expectedLogMessageAndLevel = Tuple.Create(expectedLogMessage, LogLevelConstant.Error); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 1); StochasticSoilModel[] readModels = AssertSuccessfulImport(pathToCorruptFile, importResult, updateStrategy); CollectionAssert.IsEmpty(readModels); @@ -624,8 +639,9 @@ Action call = () => importResult = importer.Import(); // 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); + var expectedLogMessage = "De som van de kansen van voorkomen in het stochastich ondergrondmodel 'Name' is niet gelijk aan 100%."; + Tuple expectedLogMessageAndLevel = Tuple.Create(expectedLogMessage, LogLevelConstant.Warn); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 1); StochasticSoilModel[] readModels = AssertSuccessfulImport(pathToCorruptFile, importResult, updateStrategy); Assert.AreEqual(1, readModels.Length); @@ -738,7 +754,8 @@ // Assert string expectedLogMessage = "Er zijn geen ondergrondschematisaties gevonden in het stochastische " + "ondergrondmodel 'Model'. Dit model wordt overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1); + Tuple expectedLogMessageAndLevel = Tuple.Create(expectedLogMessage, LogLevelConstant.Warn); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 1); StochasticSoilModel[] readModels = AssertSuccessfulImport(validFilePath, importResult, updateStrategy); CollectionAssert.IsEmpty(readModels); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs =================================================================== diff -u -r7be65c58634423d5f4e0fb5272158c716d9d3753 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs (.../PipingSurfaceLinesCsvImporterTest.cs) (revision 7be65c58634423d5f4e0fb5272158c716d9d3753) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs (.../PipingSurfaceLinesCsvImporterTest.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -325,7 +325,9 @@ public void Import_CancelOfImportWhenReadingPipingSurfaceLines_CancelsImportAndLogs() { // Setup - var messageProvider = mocks.Stub(); + const string cancelledLogMessage = "Operation Cancelled"; + var messageProvider = mocks.StrictMock(); + messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Profielschematisaties")).Return(cancelledLogMessage); mocks.ReplayAll(); string validFilePath = Path.Combine(ioTestDataPath, "TwoValidSurfaceLines.csv"); @@ -353,15 +355,18 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Profielschematisaties importeren afgebroken. Geen data ingelezen.", 3); + Tuple expectedLogMessage = Tuple.Create(cancelledLogMessage, LogLevelConstant.Info); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessage, 3); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } [Test] public void Import_CancelOfImportWhenReadingCharacteristicPoints_CancelsImportAndLogs() { // Setup - var messageProvider = mocks.Stub(); + const string cancelledLogMessage = "Operation Cancelled"; + var messageProvider = mocks.StrictMock(); + messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Profielschematisaties")).Return(cancelledLogMessage); mocks.ReplayAll(); string validFilePath = Path.Combine(ioTestDataPath, "TwoValidSurfaceLines.csv"); @@ -389,15 +394,18 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Profielschematisaties importeren afgebroken. Geen data ingelezen.", 4); + Tuple expectedLogMessage = Tuple.Create(cancelledLogMessage, LogLevelConstant.Info); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessage, 4); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } [Test] public void Import_CancelOfImportDuringProcessImportDataToModel_CancelsImportAndLogs() { // Setup - var messageProvider = mocks.Stub(); + const string cancelledLogMessage = "Operation Cancelled"; + var messageProvider = mocks.StrictMock(); + messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Profielschematisaties")).Return(cancelledLogMessage); mocks.ReplayAll(); string validFilePath = Path.Combine(ioTestDataPath, "TwoValidSurfaceLines.csv"); @@ -433,7 +441,8 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Profielschematisaties importeren afgebroken. Geen data ingelezen.", 4); + Tuple expectedLogMessage = Tuple.Create(cancelledLogMessage, LogLevelConstant.Info); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessage, 4); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } @@ -479,7 +488,9 @@ Action call = () => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Huidige actie was niet meer te annuleren en is daarom voortgezet.", 4); + const string expectedMessage = "Huidige actie was niet meer te annuleren en is daarom voortgezet."; + Tuple expectedLogMessageAndLogLevel = Tuple.Create(expectedMessage, LogLevelConstant.Warn); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLogLevel, 4); AssertSuccessfulImport(importResult, expectedNumberOfSurfaceLines, validFilePath, surfaceLineUpdateStrategy); } @@ -548,7 +559,8 @@ .Build("Er zitten ongeldige tekens in het bestandspad. Alle tekens in het bestandspad moeten geldig zijn."); var expectedLogMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, internalErrorMessage); - TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1); + Tuple expectedLogMessageAndLevel = Tuple.Create(expectedLogMessage, LogLevelConstant.Error); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 1); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } @@ -573,16 +585,16 @@ // Assert string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(UtilsResources.Error_File_does_not_exist); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevels = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, - internalErrorMessage), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - corruptPath) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, + internalErrorMessage), LogLevelConstant.Error), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 3); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevels, 3); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } @@ -608,16 +620,16 @@ string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) .WithLocation("op regel 1") .Build(UtilsResources.Error_File_empty); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, - internalErrorMessage) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, + internalErrorMessage), LogLevelConstant.Error) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 3); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 3); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } @@ -643,16 +655,16 @@ string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) .WithLocation("op regel 1") .Build(PipingIOResources.PipingSurfaceLinesCsvReader_File_invalid_header); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, - internalErrorMessage), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - corruptPath) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, + internalErrorMessage), LogLevelConstant.Error), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 3); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 3); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } @@ -685,16 +697,16 @@ // Assert string internalErrorMessage = new FileReaderErrorMessageBuilder(copyTargetPath).Build(UtilsResources.Error_File_does_not_exist); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - copyTargetPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - copyTargetPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, - internalErrorMessage) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + copyTargetPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + copyTargetPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, + internalErrorMessage), LogLevelConstant.Error) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 3); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 3); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } finally @@ -737,17 +749,18 @@ // Assert string duplicateDefinitionMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_Duplicate_definitions_for_same_location_0_, "Rotterdam1"); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - corruptPath), - duplicateDefinitionMessage, - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, expectedCharacteristicPointsFile) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(duplicateDefinitionMessage, LogLevelConstant.Warn), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, + expectedCharacteristicPointsFile), LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 4); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 4); RingtoetsPipingSurfaceLine[] importedSurfaceLines = AssertSuccessfulImport(importResult, 1, corruptPath, surfaceLineUpdateStrategy); Assert.AreEqual(1, importedSurfaceLines.Count(sl => sl.Name == "Rotterdam1")); @@ -790,18 +803,18 @@ .WithSubject("profielschematisatie 'InvalidRow'") .Build(PipingIOResources.Error_SurfaceLine_has_not_double); string characteristicPointsFilePath = Path.Combine(ioTestDataPath, "TwoValidAndOneInvalidNumberRowSurfaceLines.krp.csv"); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped, - internalErrorMessage), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, - characteristicPointsFilePath) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped, + internalErrorMessage), LogLevelConstant.Error), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, + characteristicPointsFilePath), LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 4); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 4); RingtoetsPipingSurfaceLine[] importedSurfaceLines = AssertSuccessfulImport(importResult, 2, corruptPath, surfaceLineUpdateStrategy); Assert.AreEqual(1, importedSurfaceLines.Count(sl => sl.Name == "Rotterdam1")); @@ -849,18 +862,18 @@ .WithLocation("op regel 2") .WithSubject("profielschematisatie 'Rotterdam1'") .Build(PipingIOResources.PipingSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_reclining_geometry); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - path), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - path), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped, - internalErrorMessage), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, - Path.Combine(ioTestDataPath, "InvalidRow_DuplicatePointsCausingRecline.krp.csv")) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + path), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + path), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped, + internalErrorMessage), LogLevelConstant.Error), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, + Path.Combine(ioTestDataPath, "InvalidRow_DuplicatePointsCausingRecline.krp.csv")), LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 4); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 4); AssertSuccessfulImport(importResult, 0, path, surfaceLineUpdateStrategy); Assert.IsTrue(TestHelper.CanOpenFileForWrite(path)); @@ -894,18 +907,18 @@ .WithLocation("op regel 2") .WithSubject("profielschematisatie 'Rotterdam1'") .Build(PipingIOResources.PipingSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_zero_length); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - path), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - path), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped, - internalErrorMessage), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, - Path.Combine(ioTestDataPath, "InvalidRow_DuplicatePointsCausingZeroLength.krp.csv")) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + path), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + path), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped, + internalErrorMessage), LogLevelConstant.Error), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, + Path.Combine(ioTestDataPath, "InvalidRow_DuplicatePointsCausingZeroLength.krp.csv")), LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 4); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 4); AssertSuccessfulImport(importResult, 0, path, surfaceLineUpdateStrategy); Assert.IsTrue(TestHelper.CanOpenFileForWrite(path)); @@ -948,7 +961,8 @@ // Assert var expectedLogMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Import_No_characteristic_points_file_for_surface_line_file_expecting_file_0_, nonExistingCharacteristicFile); - TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 3); + Tuple expectedLogMessageAndLevel = Tuple.Create(expectedLogMessage, LogLevelConstant.Info); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 3); AssertSuccessfulImport(importResult, 2, surfaceLinesFile, surfaceLineUpdateStrategy); } @@ -979,20 +993,20 @@ .WithLocation("op regel 1") .Build(UtilsResources.Error_File_empty); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - surfaceLinesFile), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - surfaceLinesFile), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, - internalErrorMessage) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + surfaceLinesFile), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + surfaceLinesFile), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, + internalErrorMessage), LogLevelConstant.Error) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } @@ -1022,21 +1036,21 @@ .WithLocation("op regel 1") .Build(PipingIOResources.CharacteristicPointsCsvReader_File_invalid_header); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - surfaceLinesFile), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - surfaceLinesFile), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, - internalErrorMessage) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + surfaceLinesFile), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + surfaceLinesFile), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, + internalErrorMessage), LogLevelConstant.Error) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } @@ -1082,20 +1096,20 @@ // Assert string internalErrorMessage = new FileReaderErrorMessageBuilder(copyCharacteristicPointsTargetPath).Build(UtilsResources.Error_File_does_not_exist); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - copyTargetPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - copyTargetPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, - copyCharacteristicPointsTargetPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, - copyCharacteristicPointsTargetPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, - internalErrorMessage) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + copyTargetPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + copyTargetPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, + copyCharacteristicPointsTargetPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, + copyCharacteristicPointsTargetPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, + internalErrorMessage), LogLevelConstant.Error) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); AssertUnsuccessfulImport(importResult, surfaceLineUpdateStrategy); } finally @@ -1145,19 +1159,19 @@ // Assert string duplicateDefinitionMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_Duplicate_definitions_for_same_characteristic_point_location_0_, "Rotterdam1"); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - surfaceLinesFile), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - surfaceLinesFile), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, - corruptPath), - duplicateDefinitionMessage + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + surfaceLinesFile), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + surfaceLinesFile), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(duplicateDefinitionMessage, LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); RingtoetsPipingSurfaceLine[] importedSurfaceLines = AssertSuccessfulImport(importResult, 2, surfaceLinesFile, surfaceLineUpdateStrategy); Assert.AreEqual(1, importedSurfaceLines.Count(sl => sl.Name == "Rotterdam1")); @@ -1202,22 +1216,22 @@ .WithLocation("op regel 2") .WithSubject("locatie 'Rotterdam1Invalid'") .Build(PipingIOResources.Error_CharacteristicPoint_has_not_double); - var expectedLogMessages = new[] + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - surfaceLinesFile), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - surfaceLinesFile), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_ParseErrorMessage_0_CharacteristicPoints_skipped, - internalErrorMessage), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_No_characteristic_points_for_SurfaceLine_0_, - "Rotterdam1Invalid"), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, - corruptPath) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + surfaceLinesFile), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + surfaceLinesFile), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_ParseErrorMessage_0_CharacteristicPoints_skipped, + internalErrorMessage), LogLevelConstant.Error), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_No_characteristic_points_for_SurfaceLine_0_, + "Rotterdam1Invalid"), LogLevelConstant.Warn), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 6); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 6); RingtoetsPipingSurfaceLine[] importedSurfaceLines = AssertSuccessfulImport(importResult, 2, surfaceLinesFile, surfaceLineUpdateStrategy); Assert.AreEqual(1, importedSurfaceLines.Count(sl => sl.Name == "Rotterdam1Invalid")); @@ -1271,20 +1285,20 @@ Action call = () => importResult = importer.Import(); // Assert - string[] expectedLogMessages = + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - surfaceLinesPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - surfaceLinesPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_No_characteristic_points_for_SurfaceLine_0_, - "Rotterdam1") + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + surfaceLinesPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + surfaceLinesPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_No_characteristic_points_for_SurfaceLine_0_, + "Rotterdam1"), LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); RingtoetsPipingSurfaceLine[] importedSurfaceLines = AssertSuccessfulImport(importResult, 2, surfaceLinesPath, surfaceLineUpdateStrategy); Assert.AreEqual(1, importedSurfaceLines.Count(sl => sl.Name == "Rotterdam1")); @@ -1338,20 +1352,20 @@ Action call = () => importResult = importer.Import(); // Assert - string[] expectedLogMessages = + var expectedLogMessagesAndLevel = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - surfaceLinesPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - surfaceLinesPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_Characteristic_points_found_for_unknown_SurfaceLine_0_, - "Extra") + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + surfaceLinesPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + surfaceLinesPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_Characteristic_points_found_for_unknown_SurfaceLine_0_, + "Extra"), LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); RingtoetsPipingSurfaceLine[] importedSurfaceLines = AssertSuccessfulImport(importResult, 2, surfaceLinesPath, surfaceLineUpdateStrategy); Assert.AreEqual(1, importedSurfaceLines.Count(sl => sl.Name == "Rotterdam1")); @@ -1413,21 +1427,21 @@ var pointFormat = string.Format(PipingDataResources.RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_to_assign_as_characteristic_point_1_, new Point3D(0, 1, 2), characteristicPointName); - string[] expectedLogMessages = + var expectedLogMessages = new[] { - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, - surfaceLinesPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, - surfaceLinesPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, - corruptPath), - string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CharacteristicPoint_of_SurfaceLine_0_skipped_cause_1_, - "Rotterdam1Invalid", - pointFormat) + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, + surfaceLinesPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Finished_reading_surface_lines_from_File_0_, + surfaceLinesPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Finished_reading_characteristic_points_from_File_0_, + corruptPath), LogLevelConstant.Info), + Tuple.Create(string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CharacteristicPoint_of_SurfaceLine_0_skipped_cause_1_, + "Rotterdam1Invalid", + pointFormat), LogLevelConstant.Error) }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessages); RingtoetsPipingSurfaceLine[] importedSurfaceLines = AssertSuccessfulImport(importResult, 2, surfaceLinesPath, surfaceLineUpdateStrategy); Assert.AreEqual(1, importedSurfaceLines.Count(sl => sl.Name == "Rotterdam1Invalid")); @@ -1596,8 +1610,9 @@ Action call = () => importResult = importer.Import(); // Assert - var message = "Profielschematisatie ArtifcialLocal doorkruist de huidige referentielijn niet of op meer dan één punt en kan niet worden geïmporteerd. Dit kan komen doordat de profielschematisatie een lokaal coördinaatsysteem heeft."; - TestHelper.AssertLogMessageIsGenerated(call, message); + const string message = "Profielschematisatie ArtifcialLocal doorkruist de huidige referentielijn niet of op meer dan één punt en kan niet worden geïmporteerd. Dit kan komen doordat de profielschematisatie een lokaal coördinaatsysteem heeft."; + Tuple expectedLogMessageAndLevel = Tuple.Create(message, LogLevelConstant.Error); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel); RingtoetsPipingSurfaceLine[] importTargetArray = AssertSuccessfulImport(importResult, expectedNumberOfSurfaceLines, validFilePath, surfaceLineUpdateStrategy); @@ -1646,8 +1661,9 @@ Action call = () => importResult = importer.Import(); // Assert - var mesagge = "Profielschematisatie Rotterdam1 doorkruist de huidige referentielijn niet of op meer dan één punt en kan niet worden geïmporteerd."; - TestHelper.AssertLogMessageIsGenerated(call, mesagge); + const string message = "Profielschematisatie Rotterdam1 doorkruist de huidige referentielijn niet of op meer dan één punt en kan niet worden geïmporteerd."; + Tuple expectedLogMessageAndLevel = Tuple.Create(message, LogLevelConstant.Error); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel); RingtoetsPipingSurfaceLine[] importTargetArray = AssertSuccessfulImport(importResult, expectedNumberOfSurfaceLines, validFilePath, surfaceLineUpdateStrategy); @@ -1695,7 +1711,8 @@ // Assert var message = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CheckCharacteristicPoints_EntryPointL_greater_or_equal_to_ExitPointL_for_0_, "ArtifcialLocal"); - TestHelper.AssertLogMessageIsGenerated(call, message); + Tuple expectedLogMessageAndLevel = Tuple.Create(message, LogLevelConstant.Warn); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel); RingtoetsPipingSurfaceLine[] importTargetArray = AssertSuccessfulImport(importResult, 1, validFilePath, surfaceLineUpdateStrategy); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs =================================================================== diff -u -r07d5be33d21f07a72ac836b16e9639e7118c8af6 -r7c433a2fecb8c13011283032fefffa662b43c8f5 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision 07d5be33d21f07a72ac836b16e9639e7118c8af6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision 7c433a2fecb8c13011283032fefffa662b43c8f5) @@ -215,7 +215,7 @@ // Assert string expectedInquiryMessage = "Als u stochastische ondergrondmodellen importeert, " + - "dan worden all rekenresultaten van dit toetsspoor verwijderd." + + "dan worden alle rekenresultaten van dit toetsspoor verwijderd." + $"{Environment.NewLine}{Environment.NewLine}Weet u zeker dat u wilt doorgaan?"; Assert.AreEqual(expectedInquiryMessage, textBoxMessage); Assert.AreEqual(isActionConfirmed, requiresUpdateConfirmation);