Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/ReferenceLineMeta.cs =================================================================== diff -u -r78022747a007922974c3729d464fa4a5184b77f9 -rca058d5baba8ff65adc03cc9081f5d6c1437ae92 --- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/ReferenceLineMeta.cs (.../ReferenceLineMeta.cs) (revision 78022747a007922974c3729d464fa4a5184b77f9) +++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/ReferenceLineMeta.cs (.../ReferenceLineMeta.cs) (revision ca058d5baba8ff65adc03cc9081f5d6c1437ae92) @@ -27,7 +27,7 @@ public class ReferenceLineMeta { /// - /// Initializes a new instance of the class. + /// Creates a new instance of . /// public ReferenceLineMeta() { @@ -40,12 +40,12 @@ public string AssessmentSectionId { get; set; } /// - /// Gets or sets the signaling value for the assessment section. + /// Gets or sets the signal flooding probability for the assessment section. /// public int? SignalFloodingProbability { get; set; } /// - /// Gets or sets the maximum allowable flooding probability of the assessment section. + /// Gets or sets the maximum allowable flooding probability for the assessment section. /// public int MaximumAllowableFloodingProbability { get; set; } Index: Riskeer/Common/src/Riskeer.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs =================================================================== diff -u -r78022747a007922974c3729d464fa4a5184b77f9 -rca058d5baba8ff65adc03cc9081f5d6c1437ae92 --- Riskeer/Common/src/Riskeer.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs (.../ReferenceLinesMetaReader.cs) (revision 78022747a007922974c3729d464fa4a5184b77f9) +++ Riskeer/Common/src/Riskeer.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs (.../ReferenceLinesMetaReader.cs) (revision ca058d5baba8ff65adc03cc9081f5d6c1437ae92) @@ -43,8 +43,8 @@ public static class ReferenceLinesMetaReader { private const string assessmentsectionIdAttributeKey = "TRAJECT_ID"; - private const string signalingValueAttributeKey = "NORM_SW"; - private const string lowerLimitValueAttributeKey = "NORM_OG"; + private const string signalFloodingProbabilityValueAttributeKey = "NORM_SW"; + private const string maximumAllowableFloodingProbabilityValueAttributeKey = "NORM_OG"; /// /// Reads the current features in the shape file into a collection of objects. @@ -134,14 +134,14 @@ yield return assessmentsectionIdAttributeKey; } - if (!polylineShapeFileReader.HasAttribute(signalingValueAttributeKey)) + if (!polylineShapeFileReader.HasAttribute(signalFloodingProbabilityValueAttributeKey)) { - yield return signalingValueAttributeKey; + yield return signalFloodingProbabilityValueAttributeKey; } - if (!polylineShapeFileReader.HasAttribute(lowerLimitValueAttributeKey)) + if (!polylineShapeFileReader.HasAttribute(maximumAllowableFloodingProbabilityValueAttributeKey)) { - yield return lowerLimitValueAttributeKey; + yield return maximumAllowableFloodingProbabilityValueAttributeKey; } } @@ -177,22 +177,22 @@ MapFeature feature = lineData.Features.First(); string assessmentSectionId = GetAssessmentSectionId(feature); - int? signalingValue = ParseNormValue(feature.MetaData[signalingValueAttributeKey]); - int? lowerLimitValue = ParseNormValue(feature.MetaData[lowerLimitValueAttributeKey]); + int? signalFloodingProbability = ParseNormValue(feature.MetaData[signalFloodingProbabilityValueAttributeKey]); + int? maximumAllowableFloodingProbability = ParseNormValue(feature.MetaData[maximumAllowableFloodingProbabilityValueAttributeKey]); IEnumerable geometryPoints = GetSectionGeometry(feature); var referenceLineMeta = new ReferenceLineMeta { AssessmentSectionId = assessmentSectionId }; - if (lowerLimitValue != null) + if (maximumAllowableFloodingProbability != null) { - referenceLineMeta.MaximumAllowableFloodingProbability = lowerLimitValue.Value; + referenceLineMeta.MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability.Value; } - if (signalingValue != null) + if (signalFloodingProbability != null) { - referenceLineMeta.SignalFloodingProbability = signalingValue.Value; + referenceLineMeta.SignalFloodingProbability = signalFloodingProbability.Value; } referenceLineMeta.ReferenceLine.SetGeometry(geometryPoints); Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/ReferenceLineMetaTest.cs =================================================================== diff -u -r78022747a007922974c3729d464fa4a5184b77f9 -rca058d5baba8ff65adc03cc9081f5d6c1437ae92 --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/ReferenceLineMetaTest.cs (.../ReferenceLineMetaTest.cs) (revision 78022747a007922974c3729d464fa4a5184b77f9) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/ReferenceLineMetaTest.cs (.../ReferenceLineMetaTest.cs) (revision ca058d5baba8ff65adc03cc9081f5d6c1437ae92) @@ -28,57 +28,17 @@ public class ReferenceLineMetaTest { [Test] - public void DefaultConstructor_ExpectedValues() + public void Constructor_ExpectedValues() { // Call - var referenceLine = new ReferenceLineMeta(); + var referenceLineMeta = new ReferenceLineMeta(); // Assert - Assert.IsInstanceOf(referenceLine.ReferenceLine); - CollectionAssert.IsEmpty(referenceLine.ReferenceLine.Points); + Assert.IsNotNull(referenceLineMeta.ReferenceLine); + CollectionAssert.IsEmpty(referenceLineMeta.ReferenceLine.Points); + Assert.IsNull(referenceLineMeta.AssessmentSectionId); + Assert.IsNull(referenceLineMeta.SignalFloodingProbability); + Assert.AreEqual(0, referenceLineMeta.MaximumAllowableFloodingProbability); } - - [Test] - public void SetAssessmentSectionId_ExpectedValue() - { - // Setup - const string assessmentSectionId = "SomeStringValue"; - var referenceLine = new ReferenceLineMeta(); - - // Call - referenceLine.AssessmentSectionId = assessmentSectionId; - - // Assert - Assert.AreEqual(assessmentSectionId, referenceLine.AssessmentSectionId); - } - - [Test] - [TestCase(1234)] - [TestCase(null)] - public void SetSignalingValue_ExpectedValue(int? signalingValue) - { - // Setup - var referenceLine = new ReferenceLineMeta(); - - // Call - referenceLine.SignalFloodingProbability = signalingValue; - - // Assert - Assert.AreEqual(signalingValue, referenceLine.SignalFloodingProbability); - } - - [Test] - public void SetLowerLimitValue_ExpectedValue() - { - // Setup - var referenceLine = new ReferenceLineMeta(); - const int lowerLimitValue = 1234; - - // Call - referenceLine.MaximumAllowableFloodingProbability = lowerLimitValue; - - // Assert - Assert.AreEqual(lowerLimitValue, referenceLine.MaximumAllowableFloodingProbability); - } } } \ No newline at end of file