Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelper.cs =================================================================== diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r3f25c919e2681707819ec90d84627d452007396e --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelper.cs (.../HydraulicLocationConfigurationDatabaseUpdateHelper.cs) (revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelper.cs (.../HydraulicLocationConfigurationDatabaseUpdateHelper.cs) (revision 3f25c919e2681707819ec90d84627d452007396e) @@ -74,15 +74,15 @@ log.Warn(Resources.HydraulicLocationConfigurationDatabaseUpdateHelper_ReadHydraulicLocationConfigurationDatabase_No_ScenarioInformation_entries_present); hydraulicLocationConfigurationDatabase.FilePath = hlcdFilePath; - hydraulicLocationConfigurationDatabase.ScenarioName = HydraulicLocationConfigurationDatabaseConstants.MandatoryConfigurationPropertyDefaultValue; - hydraulicLocationConfigurationDatabase.Year = HydraulicLocationConfigurationDatabaseConstants.YearDefaultValue; - hydraulicLocationConfigurationDatabase.Scope = HydraulicLocationConfigurationDatabaseConstants.MandatoryConfigurationPropertyDefaultValue; - hydraulicLocationConfigurationDatabase.SeaLevel = HydraulicLocationConfigurationDatabaseConstants.OptionalConfigurationPropertyDefaultValue; - hydraulicLocationConfigurationDatabase.RiverDischarge = HydraulicLocationConfigurationDatabaseConstants.OptionalConfigurationPropertyDefaultValue; - hydraulicLocationConfigurationDatabase.LakeLevel = HydraulicLocationConfigurationDatabaseConstants.OptionalConfigurationPropertyDefaultValue; - hydraulicLocationConfigurationDatabase.WindDirection = HydraulicLocationConfigurationDatabaseConstants.OptionalConfigurationPropertyDefaultValue; - hydraulicLocationConfigurationDatabase.WindSpeed = HydraulicLocationConfigurationDatabaseConstants.OptionalConfigurationPropertyDefaultValue; - hydraulicLocationConfigurationDatabase.Comment = HydraulicLocationConfigurationDatabaseConstants.AdditionalInformationConfigurationPropertyValue; + hydraulicLocationConfigurationDatabase.ScenarioName = null; + hydraulicLocationConfigurationDatabase.Year = null; + hydraulicLocationConfigurationDatabase.Scope = null; + hydraulicLocationConfigurationDatabase.SeaLevel = null; + hydraulicLocationConfigurationDatabase.RiverDischarge = null; + hydraulicLocationConfigurationDatabase.LakeLevel = null; + hydraulicLocationConfigurationDatabase.WindDirection = null; + hydraulicLocationConfigurationDatabase.WindSpeed = null; + hydraulicLocationConfigurationDatabase.Comment = null; } } } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs =================================================================== diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r3f25c919e2681707819ec90d84627d452007396e --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 3f25c919e2681707819ec90d84627d452007396e) @@ -181,15 +181,15 @@ HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase; Assert.AreEqual(hlcdFilePath, hydraulicLocationConfigurationDatabase.FilePath); - Assert.AreEqual("WBI2017", hydraulicLocationConfigurationDatabase.ScenarioName); - Assert.AreEqual(2023, hydraulicLocationConfigurationDatabase.Year); - Assert.AreEqual("WBI2017", hydraulicLocationConfigurationDatabase.Scope); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.SeaLevel); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.RiverDischarge); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.LakeLevel); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.WindDirection); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.WindSpeed); - Assert.AreEqual("Gegenereerd door Riskeer (conform WBI2017)", hydraulicLocationConfigurationDatabase.Comment); + Assert.IsNull(hydraulicLocationConfigurationDatabase.ScenarioName); + Assert.IsNull(hydraulicLocationConfigurationDatabase.Year); + Assert.IsNull(hydraulicLocationConfigurationDatabase.Scope); + Assert.IsNull(hydraulicLocationConfigurationDatabase.SeaLevel); + Assert.IsNull(hydraulicLocationConfigurationDatabase.RiverDischarge); + Assert.IsNull(hydraulicLocationConfigurationDatabase.LakeLevel); + Assert.IsNull(hydraulicLocationConfigurationDatabase.WindDirection); + Assert.IsNull(hydraulicLocationConfigurationDatabase.WindSpeed); + Assert.IsNull(hydraulicLocationConfigurationDatabase.Comment); } [Test] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs =================================================================== diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -r3f25c919e2681707819ec90d84627d452007396e --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs) (revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs) (revision 3f25c919e2681707819ec90d84627d452007396e) @@ -73,15 +73,15 @@ TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Warn), 1); Assert.AreEqual(filePath, hydraulicLocationConfigurationDatabase.FilePath); - Assert.AreEqual("WBI2017", hydraulicLocationConfigurationDatabase.ScenarioName); - Assert.AreEqual(2023, hydraulicLocationConfigurationDatabase.Year); - Assert.AreEqual("WBI2017", hydraulicLocationConfigurationDatabase.Scope); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.SeaLevel); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.RiverDischarge); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.LakeLevel); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.WindDirection); - Assert.AreEqual("Conform WBI2017", hydraulicLocationConfigurationDatabase.WindSpeed); - Assert.AreEqual("Gegenereerd door Riskeer (conform WBI2017)", hydraulicLocationConfigurationDatabase.Comment); + Assert.IsNull(hydraulicLocationConfigurationDatabase.ScenarioName); + Assert.IsNull(hydraulicLocationConfigurationDatabase.Year); + Assert.IsNull(hydraulicLocationConfigurationDatabase.Scope); + Assert.IsNull(hydraulicLocationConfigurationDatabase.SeaLevel); + Assert.IsNull(hydraulicLocationConfigurationDatabase.RiverDischarge); + Assert.IsNull(hydraulicLocationConfigurationDatabase.LakeLevel); + Assert.IsNull(hydraulicLocationConfigurationDatabase.WindDirection); + Assert.IsNull(hydraulicLocationConfigurationDatabase.WindSpeed); + Assert.IsNull(hydraulicLocationConfigurationDatabase.Comment); } [Test]