Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs =================================================================== diff -u -r921af2947111ea9701779d5704c47b3ed604e509 -rd1dfa6e258163318dd76735d2f800347b030912b --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs (.../HydraulicLocationConfigurationDatabaseProperties.cs) (revision 921af2947111ea9701779d5704c47b3ed604e509) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicLocationConfigurationDatabaseProperties.cs (.../HydraulicLocationConfigurationDatabaseProperties.cs) (revision d1dfa6e258163318dd76735d2f800347b030912b) @@ -67,7 +67,7 @@ { get { - return data.ScenarioName ?? string.Empty; + return ShowPossibleEmptyValue(data.ScenarioName); } } @@ -79,7 +79,7 @@ { get { - return data.Year?.ToString() ?? string.Empty; + return ShowPossibleEmptyValue(data.Year?.ToString()); } } @@ -91,7 +91,7 @@ { get { - return data.Scope ?? string.Empty; + return ShowPossibleEmptyValue(data.Scope); } } @@ -103,7 +103,7 @@ { get { - return data.SeaLevel ?? string.Empty; + return ShowPossibleEmptyValue(data.SeaLevel); } } @@ -115,7 +115,7 @@ { get { - return data.RiverDischarge ?? string.Empty; + return ShowPossibleEmptyValue(data.RiverDischarge); } } @@ -127,7 +127,7 @@ { get { - return data.LakeLevel ?? string.Empty; + return ShowPossibleEmptyValue(data.LakeLevel); } } @@ -139,7 +139,7 @@ { get { - return data.WindDirection ?? string.Empty; + return ShowPossibleEmptyValue(data.WindDirection); } } @@ -151,7 +151,7 @@ { get { - return data.WindSpeed ?? string.Empty; + return ShowPossibleEmptyValue(data.WindSpeed); } } @@ -163,8 +163,13 @@ { get { - return data.Comment ?? string.Empty; + return ShowPossibleEmptyValue(data.Comment); } } + + private static string ShowPossibleEmptyValue(string possibleEmptyValue) + { + return possibleEmptyValue ?? "-"; + } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs =================================================================== diff -u -r921af2947111ea9701779d5704c47b3ed604e509 -rd1dfa6e258163318dd76735d2f800347b030912b --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs (.../HydraulicLocationConfigurationDatabasePropertiesTest.cs) (revision 921af2947111ea9701779d5704c47b3ed604e509) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicLocationConfigurationDatabasePropertiesTest.cs (.../HydraulicLocationConfigurationDatabasePropertiesTest.cs) (revision d1dfa6e258163318dd76735d2f800347b030912b) @@ -77,15 +77,15 @@ var properties = new HydraulicLocationConfigurationDatabaseProperties(hydraulicLocationConfigurationDatabase); // Assert - Assert.IsEmpty(properties.ScenarioName); - Assert.IsEmpty(properties.Year); - Assert.IsEmpty(properties.Scope); - Assert.IsEmpty(properties.SeaLevel); - Assert.IsEmpty(properties.RiverDischarge); - Assert.IsEmpty(properties.LakeLevel); - Assert.IsEmpty(properties.WindDirection); - Assert.IsEmpty(properties.WindSpeed); - Assert.IsEmpty(properties.Comment); + Assert.AreEqual("-", properties.ScenarioName); + Assert.AreEqual("-", properties.Year); + Assert.AreEqual("-", properties.Scope); + Assert.AreEqual("-", properties.SeaLevel); + Assert.AreEqual("-", properties.RiverDischarge); + Assert.AreEqual("-", properties.LakeLevel); + Assert.AreEqual("-", properties.WindDirection); + Assert.AreEqual("-", properties.WindSpeed); + Assert.AreEqual("-", properties.Comment); } [Test]