Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs =================================================================== diff -u -r73597729ce18d3ee00d8036bca8341e9c12f2953 -re867add92d5cb17437fd72eaf5745fafb0a50282 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs (.../TestClosingStructureTest.cs) (revision 73597729ce18d3ee00d8036bca8341e9c12f2953) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs (.../TestClosingStructureTest.cs) (revision e867add92d5cb17437fd72eaf5745fafb0a50282) @@ -36,6 +36,7 @@ // Assert Assert.AreEqual("test", structure.Name); Assert.AreEqual(new Point2D(12345.56789, 9876.54321), structure.Location); + Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType); AssertTestClosingStructureDefaults(structure); } @@ -51,11 +52,12 @@ // Assert Assert.AreEqual(name, structure.Name); Assert.AreEqual(new Point2D(12345.56789, 9876.54321), structure.Location); + Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType); AssertTestClosingStructureDefaults(structure); } [Test] - public void Constructor_WithLocationName_ExpectedValues() + public void Constructor_WithLocation_ExpectedValues() { // Setup Point2D location = new Point2D(1234.5, 5678.9); @@ -64,10 +66,28 @@ ClosingStructure structure = new TestClosingStructure(location); // Assert - Assert.AreEqual(new Point2D(1234.5, 5678.9), structure.Location); + Assert.AreEqual("test", structure.Name); + Assert.AreEqual(location, structure.Location); + Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType); AssertTestClosingStructureDefaults(structure); } + [Test] + [TestCase(ClosingStructureInflowModelType.VerticalWall)] + [TestCase(ClosingStructureInflowModelType.LowSill)] + [TestCase(ClosingStructureInflowModelType.FloodedCulvert)] + public void Constructor_WithLocationName_ExpectedValues(ClosingStructureInflowModelType type) + { + // Call + ClosingStructure structure = new TestClosingStructure(type); + + // Assert + Assert.AreEqual("test", structure.Name); + Assert.AreEqual(new Point2D(12345.56789, 9876.54321), structure.Location); + Assert.AreEqual(type, structure.InflowModelType); + AssertTestClosingStructureDefaults(structure); + } + private static void AssertTestClosingStructureDefaults(ClosingStructure structure) { Assert.AreEqual("id", structure.Id); @@ -105,7 +125,6 @@ Assert.AreEqual(0.1, structure.FailureProbabilityOpenStructure); Assert.AreEqual(4, structure.IdenticalApertures); Assert.AreEqual(1.0, structure.FailureProbabilityReparation); - Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType); } } } \ No newline at end of file