Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs =================================================================== diff -u -r82bd67cbda97ba7d3752b92b7e642135eba30601 -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs (.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs) (revision 82bd67cbda97ba7d3752b92b7e642135eba30601) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs (.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -66,11 +66,7 @@ ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create() }; - return Create(new long[] - { - 1, - 2 - }, settings); + return CreateWithConfigurationSettings(settings); } /// Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -r91b40aaa93c393a62d8d04f9a7194e2685a7dacd -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 91b40aaa93c393a62d8d04f9a7194e2685a7dacd) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -92,14 +92,10 @@ } ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = readHydraulicLocationConfigurationDatabaseResult.Items.Single(); - IEnumerable hydraulicLocationConfigurationDatabaseSettings = + IEnumerable hydraulicLocationConfigurationDatabaseSettings = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings; - if (hydraulicLocationConfigurationDatabaseSettings == null) + if (hydraulicLocationConfigurationDatabaseSettings != null && hydraulicLocationConfigurationDatabaseSettings.Count() != 1) { - Log.Warn(Resources.HydraulicBoundaryDatabaseImporter_HLCD_No_ScenarioInformation_entries_present); - } - else if (hydraulicLocationConfigurationDatabaseSettings.Count() != 1) - { Log.Error(BuildErrorMessage(GetHlcdFilePath(), Resources.HydraulicBoundaryDatabaseImporter_HLCD_Invalid_number_of_ScenarioInformation_entries)); return false; } Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rd0ae5f5fc50efb5fbc5acc55b2d15f8044b461d3 -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d0ae5f5fc50efb5fbc5acc55b2d15f8044b461d3) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -142,15 +142,6 @@ } /// - /// Looks up a localized string similar to De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaard waarden conform WBI2017 voor de HLCD bestand informatie gebruikt.. - /// - internal static string HydraulicBoundaryDatabaseImporter_HLCD_No_ScenarioInformation_entries_present { - get { - return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_HLCD_No_ScenarioInformation_entries_present", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand.. /// internal static string HydraulicBoundaryDatabaseImporter_HLCD_sqlite_Not_Found { Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx =================================================================== diff -u -rd0ae5f5fc50efb5fbc5acc55b2d15f8044b461d3 -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision d0ae5f5fc50efb5fbc5acc55b2d15f8044b461d3) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -188,9 +188,6 @@ De tabel 'ScenarioInformation' moet exact 1 rij bevatten. - - De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaard waarden conform WBI2017 voor de HLCD bestand informatie gebruikt. - HLCD importeren afgebroken. Geen gegevens gewijzigd. Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Helpers/HydraulicLocationConfigurationSettingsUpdateHelper.cs =================================================================== diff -u -r95eebca678bc422c2b061dba122d838aeaddf185 -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Helpers/HydraulicLocationConfigurationSettingsUpdateHelper.cs (.../HydraulicLocationConfigurationSettingsUpdateHelper.cs) (revision 95eebca678bc422c2b061dba122d838aeaddf185) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Helpers/HydraulicLocationConfigurationSettingsUpdateHelper.cs (.../HydraulicLocationConfigurationSettingsUpdateHelper.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -20,8 +20,10 @@ // All rights reserved. using System; +using log4net; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase; +using Ringtoets.Integration.Plugin.Properties; namespace Ringtoets.Integration.Plugin.Helpers { @@ -30,6 +32,8 @@ /// public static class HydraulicLocationConfigurationSettingsUpdateHelper { + private static readonly ILog log = LogManager.GetLogger(typeof(HydraulicLocationConfigurationSettingsUpdateHelper)); + /// /// Sets the hydraulic location configuration settings. /// @@ -68,6 +72,8 @@ } else { + log.Warn(Resources.HydraulicLocationConfigurationSettingsUpdateHelper_ReadHydraulicLocationConfigurationDatabaseSettings_No_ScenarioInformation_entries_present); + hydraulicLocationConfigurationSettings.SetValues( hlcdFilePath, HydraulicLocationConfigurationSettingsConstants.MandatoryConfigurationPropertyDefaultValue, Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r8f89ae81893aba029a73aeadf014bb0eac9429b0 -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8f89ae81893aba029a73aeadf014bb0eac9429b0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -374,6 +374,16 @@ } /// + /// Looks up a localized string similar to De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaard waarden conform WBI2017 voor de HLCD bestand informatie gebruikt.. + /// + public static string HydraulicLocationConfigurationSettingsUpdateHelper_ReadHydraulicLocationConfigurationDatabaseSettings_No_ScenarioInformation_entries_present { + get { + return ResourceManager.GetString("HydraulicLocationConfigurationSettingsUpdateHelper_ReadHydraulicLocationConfigura" + + "tionDatabaseSettings_No_ScenarioInformation_entries_present", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Na het importeren van een aangepaste ligging van de referentielijn zullen alle geïmporteerde en berekende gegevens van alle toetssporen worden gewist. /// ///Wilt u doorgaan?. Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r8f89ae81893aba029a73aeadf014bb0eac9429b0 -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 8f89ae81893aba029a73aeadf014bb0eac9429b0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -237,4 +237,7 @@ Importeren van het HLCD bestand + + De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaard waarden conform WBI2017 voor de HLCD bestand informatie gebruikt. + \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r91b40aaa93c393a62d8d04f9a7194e2685a7dacd -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 91b40aaa93c393a62d8d04f9a7194e2685a7dacd) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -277,7 +277,7 @@ // Assert string expectedMessage = $"Fout bij het lezen van bestand '{path}': kon het rekeninstellingen bestand niet openen. " + $"Fout bij het lezen van bestand '{HydraulicBoundaryDatabaseHelper.GetHydraulicBoundarySettingsDatabase(path)}': het bestand bestaat niet."; - AssertImportFailed(call, expectedMessage, 2, ref importSuccessful); + AssertImportFailed(call, expectedMessage, ref importSuccessful); mocks.VerifyAll(); } @@ -300,7 +300,7 @@ // Assert string expectedMessage = $"Fout bij het lezen van bestand '{path}': de rekeninstellingen database heeft niet het juiste schema."; - AssertImportFailed(call, expectedMessage, 2, ref importSuccessful); + AssertImportFailed(call, expectedMessage, ref importSuccessful); mocks.VerifyAll(); } @@ -347,7 +347,7 @@ } [Test] - public void Import_WithValidFileAndHlcdWithoutScenarioInformation_UpdatesHydraulicBoundaryDatabaseWithImportedDataAndLogsWarning() + public void Import_WithValidFileAndHlcdWithoutScenarioInformation_UpdatesHydraulicBoundaryDatabaseWithImportedData() { // Setup string hlcdFilePath = Path.Combine(testDataPath, "hlcd.sqlite"); @@ -382,19 +382,15 @@ var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryDatabase, handler, validFilePath); // Call - var importResult = false; - Action call = () => importResult = importer.Import(); + bool importResult = importer.Import(); // Assert - const string expectedMessage = "De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaard waarden " + - "conform WBI2017 voor de HLCD bestand informatie gebruikt."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); Assert.IsTrue(importResult); mocks.VerifyAll(); } [Test] - public void Import_WithValidFileAndHlcdWithValidScenarioInformation_UpdatesHydraulicBoundaryDatabaseWithImportedDataAndDoesNotLogWarning() + public void Import_WithValidFileAndHlcdWithValidScenarioInformation_UpdatesHydraulicBoundaryDatabaseWithImportedData() { // Setup string hydraulicBoundaryDatabaseFilePath = Path.Combine(testDataPath, "hlcdWithValidScenarioInformation", "complete.sqlite"); @@ -430,11 +426,9 @@ var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryDatabase, handler, hydraulicBoundaryDatabaseFilePath); // Call - var importResult = false; - Action call = () => importResult = importer.Import(); + bool importResult = importer.Import(); // Assert - TestHelper.AssertLogMessagesCount(call, 0); Assert.IsTrue(importResult); mocks.VerifyAll(); } @@ -501,10 +495,10 @@ } [Test] - [TestCase(1, 1)] - [TestCase(2, 1)] - [TestCase(3, 2)] - public void Import_CancelOfImportWhilePerformingStep_CancelsImportAndLogs(int stepNumber, int nrOfExpectedLogMessages) + [TestCase(1)] + [TestCase(2)] + [TestCase(3)] + public void Import_CancelOfImportWhilePerformingStep_CancelsImportAndLogs(int stepNumber) { // Setup var mocks = new MockRepository(); @@ -530,7 +524,7 @@ // Assert const string expectedMessage = "Hydraulische belastingen database koppelen afgebroken. Geen gegevens gewijzigd."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Info), nrOfExpectedLogMessages); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Info), 1); Assert.IsFalse(importResult); mocks.VerifyAll(); } @@ -562,7 +556,7 @@ // Assert const string expectedMessage = "Huidige actie was niet meer te annuleren en is daarom voortgezet."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 2); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); Assert.IsTrue(importResult); mocks.VerifyAll(); } @@ -639,17 +633,12 @@ // Assert mocks.VerifyAll(); // Expect no NotifyObserver calls } - + private static void AssertImportFailed(Action call, string errorMessage, ref bool importSuccessful) { - AssertImportFailed(call, errorMessage, 1, ref importSuccessful); - } - - private static void AssertImportFailed(Action call, string errorMessage, int expectedNrOfLogMessages, ref bool importSuccessful) - { string expectedMessage = $"{errorMessage}" + $"{Environment.NewLine}Er is geen hydraulische belastingen database gekoppeld."; - TestHelper.AssertLogMessageWithLevelIsGenerated(call, new Tuple(expectedMessage, LogLevelConstant.Error), expectedNrOfLogMessages); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, new Tuple(expectedMessage, LogLevelConstant.Error), 1); Assert.IsFalse(importSuccessful); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs =================================================================== diff -u -rbeb18e42dc3e7bf19f85bae978634368159989b4 -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision beb18e42dc3e7bf19f85bae978634368159989b4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -658,7 +658,7 @@ } [Test] - public void Update_ReadHydraulicLocationConfigurationDatabaseWithScenarioInformation_SetsHydraulicLocationConfigurationSettings() + public void Update_ReadHydraulicLocationConfigurationDatabaseWithScenarioInformation_SetsHydraulicLocationConfigurationSettingsAndDoesNotLog() { // Setup var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); @@ -680,14 +680,16 @@ Assert.AreEqual(1, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.Count()); // Call - handler.Update(hydraulicBoundaryDatabase, - ReadHydraulicBoundaryDatabaseTestFactory.Create(), - readHydraulicLocationConfigurationDatabase, - Enumerable.Empty(), - hydraulicBoundaryDatabaseFilePath, - hlcdFilePath); + Action call = () => handler.Update(hydraulicBoundaryDatabase, + ReadHydraulicBoundaryDatabaseTestFactory.Create(), + readHydraulicLocationConfigurationDatabase, + Enumerable.Empty(), + hydraulicBoundaryDatabaseFilePath, + hlcdFilePath); // Assert + TestHelper.AssertLogMessagesCount(call, 0); + ReadHydraulicLocationConfigurationDatabaseSettings expectedSettings = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings .Single(); HydraulicLocationConfigurationSettings actualSettings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings; @@ -705,7 +707,7 @@ } [Test] - public void Update_ReadHydraulicLocationConfigurationDatabaseWithoutScenarioInformation_SetsDefaultHydraulicLocationConfigurationSettings() + public void Update_ReadHydraulicLocationConfigurationDatabaseWithoutScenarioInformation_SetsDefaultHydraulicLocationConfigurationSettingsAndLogsWarning() { // Setup var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); @@ -726,14 +728,18 @@ Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings); // Call - handler.Update(hydraulicBoundaryDatabase, - ReadHydraulicBoundaryDatabaseTestFactory.Create(), - readHydraulicLocationConfigurationDatabase, - Enumerable.Empty(), - hydraulicBoundaryDatabaseFilePath, - hlcdFilePath); + Action call = () => handler.Update(hydraulicBoundaryDatabase, + ReadHydraulicBoundaryDatabaseTestFactory.Create(), + readHydraulicLocationConfigurationDatabase, + Enumerable.Empty(), + hydraulicBoundaryDatabaseFilePath, + hlcdFilePath); // Assert + const string expectedMessage = "De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaard waarden " + + "conform WBI2017 voor de HLCD bestand informatie gebruikt."; + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); + HydraulicLocationConfigurationSettings actualSettings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings; Assert.AreEqual(hlcdFilePath, actualSettings.FilePath); Assert.AreEqual("WBI2017", actualSettings.ScenarioName); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs =================================================================== diff -u -r4d7a97b3e1d98dcbadbf3cd53ffd01b5a77c7f1e -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 4d7a97b3e1d98dcbadbf3cd53ffd01b5a77c7f1e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base; +using Core.Common.TestUtil; using NUnit.Extensions.Forms; using NUnit.Framework; using Ringtoets.Common.Data.AssessmentSection; @@ -129,17 +130,21 @@ } [Test] - public void Update_ReadHydraulicLocationConfigurationDatabaseSettingsNull_SetsDefaultValues() + public void Update_ReadHydraulicLocationConfigurationDatabaseSettingsNull_SetsDefaultValuesAndLogsWarning() { // Setup const string hlcdFilePath = "some/file/path"; var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSection()); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); // Call - handler.Update(hydraulicBoundaryDatabase, null, hlcdFilePath); + Action call = () => handler.Update(hydraulicBoundaryDatabase, null, hlcdFilePath); // Assert + const string expectedMessage = "De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaard waarden " + + "conform WBI2017 voor de HLCD bestand informatie gebruikt."; + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); + HydraulicLocationConfigurationSettings settings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings; Assert.AreEqual(hlcdFilePath, settings.FilePath); Assert.AreEqual("WBI2017", settings.ScenarioName); @@ -154,7 +159,7 @@ } [Test] - public void Update_WithReadHydraulicLocationConfigurationDatabaseSettings_SetsExpectedValues() + public void Update_WithReadHydraulicLocationConfigurationDatabaseSettings_SetsExpectedValuesAndDoesNotLog() { // Setup const string hlcdFilePath = "some/file/path"; @@ -163,9 +168,11 @@ ReadHydraulicLocationConfigurationDatabaseSettings readSettings = ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(); // Call - handler.Update(hydraulicBoundaryDatabase, readSettings, hlcdFilePath); + Action call = () => handler.Update(hydraulicBoundaryDatabase, readSettings, hlcdFilePath); // Assert + TestHelper.AssertLogMessagesCount(call, 0); + HydraulicLocationConfigurationSettings settings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings; Assert.AreEqual(hlcdFilePath, settings.FilePath); Assert.AreEqual(readSettings.ScenarioName, settings.ScenarioName); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs =================================================================== diff -u -r3ef793ff9988c152c373edf9a821bb50e88db36f -r9a7ca9f790b29e29a05394ba97d076fcef46f21d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs (.../HydraulicLocationConfigurationSettingsUpdateHelperTest.cs) (revision 3ef793ff9988c152c373edf9a821bb50e88db36f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs (.../HydraulicLocationConfigurationSettingsUpdateHelperTest.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase; @@ -56,16 +57,20 @@ } [Test] - public void SetHydraulicLocationConfigurationSettings_ReadHydraulicLocationConfigurationDatabaseSettingsNull_SetDefaultValues() + public void SetHydraulicLocationConfigurationSettings_ReadHydraulicLocationConfigurationDatabaseSettingsNull_SetDefaultValuesAndLogsWarning() { // Setup const string filePath = "some/file/path"; var settings = new HydraulicLocationConfigurationSettings(); // Call - HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(settings, null, filePath); + Action call = () => HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(settings, null, filePath); // Assert + const string expectedMessage = "De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaard waarden " + + "conform WBI2017 voor de HLCD bestand informatie gebruikt."; + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); + Assert.AreEqual(filePath, settings.FilePath); Assert.AreEqual("WBI2017", settings.ScenarioName); Assert.AreEqual(2023, settings.Year); @@ -79,17 +84,19 @@ } [Test] - public void SetHydraulicLocationConfigurationSettings_ReadHydraulicLocationConfigurationDatabaseSettingsNotNull_SetExpectedValues() + public void SetHydraulicLocationConfigurationSettings_ReadHydraulicLocationConfigurationDatabaseSettingsNotNull_SetExpectedValuesAndDoesNotLog() { // Setup const string filePath = "some/file/path"; var settings = new HydraulicLocationConfigurationSettings(); ReadHydraulicLocationConfigurationDatabaseSettings readSettings = ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(); // Call - HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(settings, readSettings, filePath); + Action call = () => HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(settings, readSettings, filePath); // Assert + TestHelper.AssertLogMessagesCount(call, 0); + Assert.AreEqual(filePath, settings.FilePath); Assert.AreEqual(readSettings.ScenarioName, settings.ScenarioName); Assert.AreEqual(readSettings.Year, settings.Year);