Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs =================================================================== diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891) +++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -75,6 +75,8 @@ LogImportUncancelableMessage(); Canceled = false; } + + LogImportSuccessfulMessage(); } else { @@ -153,5 +155,10 @@ { Log.Warn(Resources.FileImporterBase_LogUncancelableMessage_Import_cannot_be_canceled_and_continued); } + + private void LogImportSuccessfulMessage() + { + Log.InfoFormat(Resources.FileImporterBase_Import_Data_imported_from_File_0, FilePath); + } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs =================================================================== diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891) +++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -165,6 +165,15 @@ } /// + /// Looks up a localized string similar to Gegevens zijn geïmporteerd vanuit bestand '{0}'.. + /// + public static string FileImporterBase_Import_Data_imported_from_File_0 { + get { + return ResourceManager.GetString("FileImporterBase_Import_Data_imported_from_File_0", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Huidige actie was niet meer te annuleren en is daarom voortgezet.. /// public static string FileImporterBase_LogUncancelableMessage_Import_cannot_be_canceled_and_continued { Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx =================================================================== diff -u -r9c44f4325ec7cec8bfcd88f757de9f2d181a1d34 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 9c44f4325ec7cec8bfcd88f757de9f2d181a1d34) +++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -186,4 +186,7 @@ Stap {0} van {1} | {2} + + Gegevens zijn geïmporteerd vanuit bestand '{0}'. + \ No newline at end of file Index: Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs =================================================================== diff -u -r51b64230b9b947ba32821ed104809429d469959b -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision 51b64230b9b947ba32821ed104809429d469959b) +++ Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -163,11 +163,13 @@ Action call = () => simpleImporter.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Huidige actie was niet meer te annuleren en is daarom voortgezet."); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, new Tuple( + "Huidige actie was niet meer te annuleren en is daarom voortgezet.", + LogLevelConstant.Warn)); } [Test] - public void Import_CancelGivesUnsuccessfulImport_CallsLogImportoverigensCanceledMessage() + public void Import_CancelGivesUnsuccessfulImport_CallsLogImportCanceledMessage() { // Setup var importTarget = new object(); @@ -185,6 +187,25 @@ Assert.IsTrue(simpleImporter.LogCanceledMessageCalled); } + [Test] + public void Import_ImportSuccessful_LogsImportSuccessfulMessage() + { + // Setup + var importTarget = new object(); + var simpleImporter = new SimpleFileImporter(importTarget) + { + ImportSuccessful = true + }; + + // Call + Action call = () => simpleImporter.Import(); + + // Asset + TestHelper.AssertLogMessageWithLevelIsGenerated(call, new Tuple( + $"Gegevens zijn geïmporteerd vanuit bestand '{string.Empty}'.", + LogLevelConstant.Info)); + } + private class SimpleFileImporter : FileImporterBase { public SimpleFileImporter(T importTarget) : this("", importTarget) {} Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs (.../ClosingStructuresImporterTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs (.../ClosingStructuresImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -250,9 +250,11 @@ filePath, messageProvider, updateStrategy); // Call - bool importResult = structuresImporter.Import(); + var importResult = false; + Action call = () => importResult = structuresImporter.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 5); Assert.IsTrue(importResult); } @@ -300,7 +302,7 @@ TestHelper.AssertLogMessages(call, msgs => { string[] messages = msgs.ToArray(); - Assert.AreEqual(9, messages.Length); + Assert.AreEqual(10, messages.Length); const string structure = "'Coupure Den Oever (90k1)' (KUNST1)"; @@ -357,7 +359,7 @@ TestHelper.AssertLogMessages(call, msgs => { string[] messages = msgs.ToArray(); - Assert.AreEqual(9, messages.Length); + Assert.AreEqual(10, messages.Length); const string structure = "'Coupure Den Oever (90k1)' (KUNST1)"; Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -317,7 +317,7 @@ // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -348,7 +348,7 @@ // Assert const string expectedMessage = "Het opgegeven voorlandprofiel 'Voorlandprofiel' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -384,9 +384,12 @@ new ClosingStructuresFailureMechanism()); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); + Assert.IsTrue(successful); var expectedCalculation = new StructuresCalculation { @@ -744,7 +747,7 @@ // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs =================================================================== diff -u -rfa3f7ff065303b85ad82e65d8557c8d425a47164 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision fa3f7ff065303b85ad82e65d8557c8d425a47164) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -197,7 +197,7 @@ Tuple.Create($"Profielgegevens definiëren geen dijkgeometrie. Bestand '{Path.Combine(fileDirectory, "profiel002NoGeometry.prfl")}' wordt overgeslagen.", LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3); Assert.IsTrue(importResult); Assert.IsTrue(updateStrategy.Updated); Assert.AreEqual(5, updateStrategy.ReadDikeProfiles.Length); @@ -262,9 +262,12 @@ dikeProfilesImporter.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps))); // Call - bool importResult = dikeProfilesImporter.Import(); + var importResult = false; + Action call = () => importResult = dikeProfilesImporter.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); + Assert.IsTrue(importResult); var expectedProgressMessages = new List { Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -646,7 +646,7 @@ Action call = () => importSuccessful = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Huidige actie was niet meer te annuleren en is daarom voortgezet.", 1); + TestHelper.AssertLogMessageIsGenerated(call, "Huidige actie was niet meer te annuleren en is daarom voortgezet.", 2); Assert.IsTrue(importSuccessful); CollectionAssert.IsNotEmpty(updateStrategy.ImportedFailureMechanismSections); mocks.VerifyAll(); @@ -677,9 +677,11 @@ importer.SetProgressChanged(null); // Call - bool importSuccessful = importer.Import(); + var importSuccessful = false; + Action call = () => importSuccessful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{sectionsFilePath}'.", 1); Assert.IsTrue(importSuccessful); IEnumerable sections = updateStrategy.ImportedFailureMechanismSections; Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs =================================================================== diff -u -rfa3f7ff065303b85ad82e65d8557c8d425a47164 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs (.../ForeshoreProfilesImporterTest.cs) (revision fa3f7ff065303b85ad82e65d8557c8d425a47164) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs (.../ForeshoreProfilesImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -226,7 +226,7 @@ $"Profielgegevens definiëren geen dam en geen voorlandgeometrie. Bestand '{Path.Combine(fileDirectory, "profiel002NoForeshoreNoDam.prfl")}' wordt overgeslagen.", LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 2); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3); Assert.IsTrue(importResult); } @@ -302,9 +302,11 @@ foreshoreProfilesImporter.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps))); // Call - bool importResult = foreshoreProfilesImporter.Import(); + var importResult = false; + Action call = () => importResult = foreshoreProfilesImporter.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(importResult); var expectedProgressMessages = new List { Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/ProfilesImporterTest.cs =================================================================== diff -u -rfa3f7ff065303b85ad82e65d8557c8d425a47164 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/ProfilesImporterTest.cs (.../ProfilesImporterTest.cs) (revision fa3f7ff065303b85ad82e65d8557c8d425a47164) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/ProfilesImporterTest.cs (.../ProfilesImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -480,7 +480,7 @@ Action call = () => importResult = testProfilesImporter.Import(); // Assert - TestHelper.AssertLogMessagesCount(call, 0); + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(importResult); } @@ -566,7 +566,7 @@ // Assert const string expectedMessage = "Huidige actie was niet meer te annuleren en is daarom voortgezet."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 2); Assert.IsTrue(importResult); } Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/StructuresImporterTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/StructuresImporterTest.cs (.../StructuresImporterTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/StructuresImporterTest.cs (.../StructuresImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -426,7 +426,7 @@ // Assert const string expectedMessage = "Huidige actie was niet meer te annuleren en is daarom voortgezet."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 2); Assert.IsTrue(importResult); } Index: Riskeer/Common/test/Riskeer.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Common/test/Riskeer.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -110,9 +110,11 @@ var importer = new ReferenceLineImporter(originalReferenceLine, handler, path); // Call - bool importSuccessful = importer.Import(); + var importSuccessful = false; + Action call = () => importSuccessful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{path}'.", 1); Assert.IsTrue(importSuccessful); mocks.VerifyAll(); } @@ -278,9 +280,9 @@ // Call importer.Import(); Action call = () => importResult = importer.Import(); - + // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Huidige actie was niet meer te annuleren en is daarom voortgezet.", 1); + TestHelper.AssertLogMessageIsGenerated(call, "Huidige actie was niet meer te annuleren en is daarom voortgezet.", 2); Assert.IsTrue(importResult); mocks.VerifyAll(); } Index: Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -294,9 +294,11 @@ progressChangeNotifications.Add(new ProgressNotification(description, step, steps))); // Call - bool importResult = importer.Import(); + var importResult = false; + Action call = () => importResult = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{validFilePath}'.", 1); Assert.IsTrue(importResult); var expectedProgressMessages = new List @@ -546,7 +548,7 @@ // Assert const string expectedMessage = "Huidige actie was niet meer te annuleren en is daarom voortgezet."; Tuple expectedLogMessageAndLevel = Tuple.Create(expectedMessage, LogLevelConstant.Warn); - TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 2); Assert.IsTrue(importResult); } @@ -642,7 +644,7 @@ // Assert const string 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); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 2); Assert.IsTrue(importResult); } Index: Riskeer/Common/test/Riskeer.Common.IO.Test/SurfaceLines/SurfaceLinesCsvImporterTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Common/test/Riskeer.Common.IO.Test/SurfaceLines/SurfaceLinesCsvImporterTest.cs (.../SurfaceLinesCsvImporterTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/SurfaceLines/SurfaceLinesCsvImporterTest.cs (.../SurfaceLinesCsvImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -216,9 +216,11 @@ Assert.IsTrue(File.Exists(validFilePath)); // Call - bool importResult = importer.Import(); + var importResult = false; + Action call = () => importResult = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn ge�mporteerd vanuit bestand '{validFilePath}'.", 4); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); Assert.AreEqual(validFilePath, surfaceLineUpdateStrategy.FilePath); @@ -275,7 +277,7 @@ $"Geen karakteristieke punten-bestand gevonden naast het profielschematisatiesbestand. (Verwacht bestand: {Path.Combine(ioTestDataPath, "ValidSurfaceLine_HasConsecutiveDuplicatePoints.krp.csv")})" }; - TestHelper.AssertLogMessagesAreGenerated(call, messages, 4); + TestHelper.AssertLogMessagesAreGenerated(call, messages, 5); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); Assert.AreEqual(validFilePath, surfaceLineUpdateStrategy.FilePath); @@ -450,7 +452,7 @@ // Assert 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); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLogLevel, 5); Assert.IsTrue(importResult); } @@ -747,7 +749,7 @@ Tuple.Create($"Geen karakteristieke punten-bestand gevonden naast het profielschematisatiesbestand. (Verwacht bestand: {expectedCharacteristicPointsFile})", LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 4); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); @@ -795,7 +797,7 @@ Tuple.Create($"{internalErrorMessage} \r\nDeze profielschematisatie wordt overgeslagen.", LogLevelConstant.Error), Tuple.Create($"Geen karakteristieke punten-bestand gevonden naast het profielschematisatiesbestand. (Verwacht bestand: {characteristicPointsFilePath})", LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 4); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); @@ -854,7 +856,7 @@ Tuple.Create($"{internalErrorMessage} \r\nDeze profielschematisatie wordt overgeslagen.", LogLevelConstant.Error), Tuple.Create($"Geen karakteristieke punten-bestand gevonden naast het profielschematisatiesbestand. (Verwacht bestand: {Path.Combine(ioTestDataPath, "InvalidRow_DuplicatePointsCausingRecline.krp.csv")})", LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 4); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); Assert.AreEqual(path, surfaceLineUpdateStrategy.FilePath); @@ -897,7 +899,7 @@ Tuple.Create($"{internalErrorMessage} \r\nDeze profielschematisatie wordt overgeslagen.", LogLevelConstant.Error), Tuple.Create($"Geen karakteristieke punten-bestand gevonden naast het profielschematisatiesbestand. (Verwacht bestand: {Path.Combine(ioTestDataPath, "InvalidRow_DuplicatePointsCausingZeroLength.krp.csv")})", LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 4); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); Assert.AreEqual(path, surfaceLineUpdateStrategy.FilePath); @@ -938,7 +940,7 @@ // Assert string expectedLogMessage = $"Geen karakteristieke punten-bestand gevonden naast het profielschematisatiesbestand. (Verwacht bestand: {nonExistingCharacteristicFile})"; Tuple expectedLogMessageAndLevel = Tuple.Create(expectedLogMessage, LogLevelConstant.Info); - TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 3); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessageAndLevel, 4); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); @@ -1170,7 +1172,7 @@ Tuple.Create($"Klaar met het inlezen van karakteristieke punten uit bestand '{corruptPath}'.", LogLevelConstant.Info), Tuple.Create(duplicateDefinitionMessage, LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 6); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); @@ -1284,7 +1286,7 @@ Tuple.Create("Er konden geen karakteristieke punten gevonden worden voor locatie 'Rotterdam1Invalid'.", LogLevelConstant.Warn), Tuple.Create($"Klaar met het inlezen van karakteristieke punten uit bestand '{corruptPath}'.", LogLevelConstant.Info) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 6); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 7); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); @@ -1352,7 +1354,7 @@ Tuple.Create($"Klaar met het inlezen van karakteristieke punten uit bestand '{corruptPath}'.", LogLevelConstant.Info), Tuple.Create("Er konden geen karakteristieke punten gevonden worden voor locatie \'Rotterdam1\'.", LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 6); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); @@ -1420,7 +1422,7 @@ Tuple.Create($"Klaar met het inlezen van karakteristieke punten uit bestand '{corruptPath}'.", LogLevelConstant.Info), Tuple.Create("Karakteristieke punten gevonden zonder bijbehorende profielschematisatie voor locatie \'Extra\'.", LogLevelConstant.Warn) }; - TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 5); + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedLogMessagesAndLevel, 6); Assert.IsTrue(importResult); Assert.IsTrue(surfaceLineUpdateStrategy.Updated); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -rf1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision f1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -135,7 +135,7 @@ // Assert const string expectedMessage = "Een waarde van '380' als oriëntatie is ongeldig. De waarde voor de oriëntatie moet in het bereik [0,00, 360,00] liggen. " + "Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -163,7 +163,7 @@ const string expectedMessage = "Een gemiddelde van '-1' is ongeldig voor stochast 'overslagdebiet'. " + "Gemiddelde moet groter zijn dan 0. " + "Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -191,7 +191,7 @@ const string expectedMessage = "Een standaardafwijking van '-2,1' is ongeldig voor stochast 'overslagdebiet'. " + "Standaardafwijking (σ) moet groter zijn dan of gelijk zijn aan 0. " + "Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -216,7 +216,7 @@ // Assert const string expectedMessage = "De hydraulische belastingenlocatie 'Locatie' bestaat niet. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -241,7 +241,7 @@ // Assert const string expectedMessage = "Het dijkprofiel met ID 'Dijkprofiel' bestaat niet. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -266,7 +266,7 @@ // Assert const string expectedMessage = "Er is geen dijkprofiel opgegeven om golfreductie parameters aan toe te voegen. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -291,7 +291,7 @@ // Assert const string expectedMessage = "Er is geen dijkprofiel opgegeven om de dijkhoogte aan toe te voegen. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -316,7 +316,7 @@ // Assert const string expectedMessage = "Er is geen dijkprofiel opgegeven om de oriëntatie aan toe te voegen. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -345,7 +345,7 @@ // Assert const string expectedMessage = "Het opgegeven dijkprofiel 'Dijkprofiel ID' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -535,9 +535,12 @@ new GrassCoverErosionInwardsFailureMechanism()); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); + Assert.IsTrue(successful); var expectedCalculation = new GrassCoverErosionInwardsCalculation Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -261,7 +261,7 @@ // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -292,7 +292,7 @@ // Assert const string expectedMessage = "Het opgegeven voorlandprofiel 'Voorlandprofiel' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -328,9 +328,12 @@ new HeightStructuresFailureMechanism()); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); + Assert.IsTrue(successful); var expectedCalculation = new StructuresCalculation { @@ -636,7 +639,7 @@ // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/HeightStructuresImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/HeightStructuresImporterTest.cs (.../HeightStructuresImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.IO.Test/HeightStructuresImporterTest.cs (.../HeightStructuresImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -258,7 +258,7 @@ TestHelper.AssertLogMessages(call, msgs => { string[] messages = msgs.ToArray(); - Assert.AreEqual(4, messages.Length); + Assert.AreEqual(5, messages.Length); const string structure = "'Coupure Den Oever (90k1)' (KUNST1)"; @@ -315,7 +315,7 @@ TestHelper.AssertLogMessages(call, msgs => { string[] messages = msgs.ToArray(); - Assert.AreEqual(4, messages.Length); + Assert.AreEqual(5, messages.Length); const string structure = "'Coupure Den Oever (90k1)' (KUNST1)"; @@ -362,9 +362,11 @@ messageProvider, strategy); // Call - bool importResult = importer.Import(); + var importResult = false; + Action call = () => importResult = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 13); Assert.IsTrue(importResult); } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -339,9 +339,11 @@ var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryDatabase, handler, validFilePath); // Call - bool importResult = importer.Import(); + var importResult = false; + Action call = () => importResult = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{validFilePath}'.", 1); Assert.IsTrue(importResult); mocks.VerifyAll(); } @@ -382,9 +384,11 @@ var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryDatabase, handler, validFilePath); // Call - bool importResult = importer.Import(); + var importResult = false; + Action call = () => importResult = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{validFilePath}'.", 1); Assert.IsTrue(importResult); mocks.VerifyAll(); } @@ -426,9 +430,11 @@ var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryDatabase, handler, hydraulicBoundaryDatabaseFilePath); // Call - bool importResult = importer.Import(); + var importResult = false; + Action call = () => importResult = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{hydraulicBoundaryDatabaseFilePath}'.", 1); Assert.IsTrue(importResult); mocks.VerifyAll(); } @@ -556,7 +562,7 @@ // Assert const string expectedMessage = "Huidige actie was niet meer te annuleren en is daarom voortgezet."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 2); Assert.IsTrue(importResult); mocks.VerifyAll(); } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -381,7 +381,7 @@ // Assert const string expectedMessage = "Huidige actie was niet meer te annuleren en is daarom voortgezet."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 2); Assert.IsTrue(importResult); mocks.VerifyAll(); } @@ -435,9 +435,11 @@ hydraulicBoundaryDatabase, filePath); // Call - bool importResult = importer.Import(); + var importResult = false; + Action call = () => importResult = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(importResult); mocks.VerifyAll(); } @@ -465,9 +467,11 @@ hydraulicBoundaryDatabase, filePath); // Call - bool importResult = importer.Import(); + var importResult = false; + Action call = () => importResult = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(importResult); mocks.VerifyAll(); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -103,7 +103,7 @@ // Assert const string expectedMessage = "De hydraulische belastingenlocatie 'Locatie' bestaat niet. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -126,7 +126,7 @@ // Assert const string expectedMessage = "De profielschematisatie 'Profielschematisatie' bestaat niet. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -150,7 +150,7 @@ // Assert const string expectedMessage = "Het stochastische ondergrondmodel 'Ondergrondmodel' bestaat niet. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -197,7 +197,7 @@ // Assert const string expectedMessage = "Het stochastische ondergrondmodel 'Ondergrondmodel'doorkruist de profielschematisatie 'Profielschematisatie' niet. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -244,7 +244,7 @@ // Assert const string expectedMessage = "De ondergrondschematisatie 'Ondergrondschematisatie' bestaat niet binnen het stochastische ondergrondmodel 'Ondergrondmodel'. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -268,7 +268,7 @@ // Assert const string expectedMessage = "Er is geen stochastisch ondergrondmodel opgegeven bij ondergrondschematisatie 'Ondergrondschematisatie'. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -295,7 +295,7 @@ // Assert const string expectedMessage = "In een berekening moet voor het scenario tenminste de relevantie of contributie worden opgegeven. " + "Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -458,7 +458,7 @@ const string expectedMessage = "Een waarde van '0,00' als tangentlijn Z-boven en '10,00' als tangentlijn Z-onder is ongeldig. " + "Tangentlijn Z-onder moet kleiner zijn dan of gelijk zijn aan tangentlijn Z-boven, of NaN. " + "Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -511,9 +511,11 @@ new MacroStabilityInwardsFailureMechanism()); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculations = new[] @@ -659,9 +661,11 @@ new MacroStabilityInwardsFailureMechanism()); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculations = new[] @@ -812,7 +816,7 @@ Action call = () => successful = importer.Import(); // Assert - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -867,9 +871,11 @@ failureMechanism); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new MacroStabilityInwardsCalculationScenario Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs (.../PipingCalculationConfigurationImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs (.../PipingCalculationConfigurationImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -142,7 +142,7 @@ // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -165,7 +165,7 @@ // Assert const string expectedMessage = "De hydraulische belastingenlocatie 'Locatie' bestaat niet. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -188,7 +188,7 @@ // Assert const string expectedMessage = "De profielschematisatie 'Profielschematisatie' bestaat niet. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -212,7 +212,7 @@ // Assert const string expectedMessage = "Het stochastische ondergrondmodel 'Ondergrondmodel' bestaat niet. Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -260,7 +260,7 @@ // Assert const string expectedMessage = "Het stochastische ondergrondmodel 'Ondergrondmodel'doorkruist de profielschematisatie 'Profielschematisatie' niet." + " Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -308,7 +308,7 @@ // Assert const string expectedMessage = "De ondergrondschematisatie 'Ondergrondschematisatie' bestaat niet binnen het stochastische ondergrondmodel 'Ondergrondmodel'. " + "Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -333,7 +333,7 @@ // Assert const string expectedMessage = "Er is geen stochastisch ondergrondmodel opgegeven bij ondergrondschematisatie 'Ondergrondschematisatie'. " + "Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -362,7 +362,7 @@ // Assert const string expectedMessage = "Er is geen profielschematisatie, maar wel een intrede- of uittredepunt opgegeven. " + "Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -383,9 +383,11 @@ pipingFailureMechanism); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput) @@ -413,9 +415,11 @@ pipingFailureMechanism); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput) @@ -454,9 +458,11 @@ pipingFailureMechanism); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput) @@ -502,7 +508,7 @@ // Assert const string expectedMessage = "In een berekening moet voor het scenario tenminste de relevantie of contributie worden opgegeven. " + "Berekening 'Calculation' is overgeslagen."; - TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -523,9 +529,11 @@ pipingFailureMechanism); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput) @@ -554,9 +562,11 @@ pipingFailureMechanism); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput) @@ -619,9 +629,11 @@ pipingFailureMechanism); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new PipingCalculationScenario(pipingFailureMechanism.GeneralInput) Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -119,7 +119,7 @@ // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -144,7 +144,7 @@ // Assert const string expectedMessage = "De hydraulische belastingenlocatie 'Locatie' bestaat niet. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -169,7 +169,7 @@ // Assert const string expectedMessage = "Het voorlandprofiel met ID 'Voorlandprofiel' bestaat niet. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -194,7 +194,7 @@ // Assert const string expectedMessage = "Er is geen voorlandprofiel opgegeven om golfreductie parameters aan toe te voegen. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -223,7 +223,7 @@ // Assert const string expectedMessage = "Het opgegeven voorlandprofiel 'Voorlandprofiel' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -301,9 +301,11 @@ normType); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new TestTargetTestWaveConditionsCalculation Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -582,7 +582,7 @@ // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -614,7 +614,7 @@ // Assert const string expectedMessage = "Het opgegeven voorlandprofiel 'Voorlandprofiel' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. " + "Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -922,9 +922,11 @@ new StabilityPointStructuresFailureMechanism()); // Call - bool successful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 1); Assert.IsTrue(successful); var expectedCalculation = new StructuresCalculation { @@ -1169,7 +1171,7 @@ // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 2); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs (.../StabilityPointStructuresImporterTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs (.../StabilityPointStructuresImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92) @@ -261,9 +261,11 @@ updateStrategy); // Call - bool importResult = structuresImporter.Import(); + var importResult = false; + Action call = () => importResult = structuresImporter.Import(); // Assert + TestHelper.AssertLogMessageIsGenerated(call, $"Gegevens zijn geïmporteerd vanuit bestand '{filePath}'.", 9); Assert.IsTrue(importResult); } @@ -315,7 +317,7 @@ TestHelper.AssertLogMessages(call, msgs => { string[] messages = msgs.ToArray(); - Assert.AreEqual(11, messages.Length); + Assert.AreEqual(12, messages.Length); const string structure = "'Coupure Den Oever (90k1)' (KUNST1)"; @@ -377,7 +379,7 @@ TestHelper.AssertLogMessages(call, msgs => { string[] messages = msgs.ToArray(); - Assert.AreEqual(11, messages.Length); + Assert.AreEqual(12, messages.Length); const string structure = "'Coupure Den Oever (90k1)' (KUNST1)";