Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs =================================================================== diff -u -rea7fd6455177ea93f8419e6a29fc00d1d3167359 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs (.../FailureMechanismBaseTest.cs) (revision ea7fd6455177ea93f8419e6a29fc00d1d3167359) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs (.../FailureMechanismBaseTest.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -136,20 +136,21 @@ } [Test] - public void AddSection_SectionIsNull_ThrowArgumentNullException() + public void AddSections_SectionsNull_ThrowArgumentNullException() { // Setup var failureMechanism = new SimpleFailureMechanismBase(); - // Call - TestDelegate call = () => failureMechanism.AddSectionResult(null); + // Call + TestDelegate call = () => failureMechanism.AddSections(null); // Assert - Assert.Throws(call); + var exception = Assert.Throws(call); + Assert.AreEqual("sections", exception.ParamName); } [Test] - public void AddSection_FirstSectionAdded_SectionAddedToSections() + public void AddSections_FirstSectionAdded_SectionAddedToSections() { // Setup var failureMechanism = new SimpleFailureMechanismBase(); @@ -161,7 +162,10 @@ }); // Call - failureMechanism.AddSectionResult(section); + failureMechanism.AddSections(new[] + { + section + }); // Assert CollectionAssert.AreEqual(new[] @@ -171,7 +175,7 @@ } [Test] - public void AddSection_SecondSectionStartConnectingToEndOfFirst_Section2AddedAfterSection1() + public void AddSections_SecondSectionStartConnectingToEndOfFirst_Section2AddedAfterSection1() { // Setup var failureMechanism = new SimpleFailureMechanismBase(); @@ -191,8 +195,11 @@ }); // Call - failureMechanism.AddSectionResult(section1); - failureMechanism.AddSectionResult(section2); + failureMechanism.AddSections(new[] + { + section1, + section2 + }); // Assert CollectionAssert.AreEqual(new[] @@ -203,7 +210,7 @@ } [Test] - public void AddSection_SecondSectionEndConnectingToStartOfFirst_ThrowArgumentException() + public void AddSections_SecondSectionEndConnectingToStartOfFirst_ThrowArgumentException() { // Setup var failureMechanism = new SimpleFailureMechanismBase(); @@ -222,18 +229,20 @@ new Point2D(matchingX, matchingY) }); - failureMechanism.AddSectionResult(section1); - // Call - TestDelegate call = () => failureMechanism.AddSectionResult(section2); + TestDelegate call = () => failureMechanism.AddSections(new[] + { + section1, + section2 + }); // Assert const string expectedMessage = "Vak 'B' sluit niet aan op de al gedefinieerde vakken van het toetsspoor."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } [Test] - public void AddSection_SecondSectionDoesNotConnectToFirst_ThrowArgumentException() + public void AddSections_SecondSectionDoesNotConnectToFirst_ThrowArgumentException() { // Setup var failureMechanism = new SimpleFailureMechanismBase(); @@ -249,10 +258,12 @@ new Point2D(7, 8) }); - failureMechanism.AddSectionResult(section1); - // Call - TestDelegate call = () => failureMechanism.AddSectionResult(section2); + TestDelegate call = () => failureMechanism.AddSections(new[] + { + section1, + section2 + }); // Assert const string expectedMessage = "Vak 'B' sluit niet aan op de al gedefinieerde vakken van het toetsspoor."; @@ -270,7 +281,10 @@ }); var failureMechanism = new SimpleFailureMechanismBase(); - failureMechanism.AddSectionResult(section); + failureMechanism.AddSections(new[] + { + section + }); // Call failureMechanism.ClearAllSections(); @@ -281,8 +295,8 @@ private class SimpleFailureMechanismBase : FailureMechanismBase { - public SimpleFailureMechanismBase(string name = "SomeName", - string failureMechanismCode = "SomeCode", + public SimpleFailureMechanismBase(string name = "SomeName", + string failureMechanismCode = "SomeCode", int group = 1) : base(name, failureMechanismCode, group) {} public override IEnumerable Calculations Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestFailureMechanismTest.cs =================================================================== diff -u -rea7fd6455177ea93f8419e6a29fc00d1d3167359 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestFailureMechanismTest.cs (.../TestFailureMechanismTest.cs) (revision ea7fd6455177ea93f8419e6a29fc00d1d3167359) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestFailureMechanismTest.cs (.../TestFailureMechanismTest.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -81,14 +81,17 @@ } [Test] - public void AddSection_WithSection_AddedSectionResult() + public void AddSections_WithSection_AddedSectionResult() { // Setup var failureMechanism = new TestFailureMechanism(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call - failureMechanism.AddSectionResult(section); + failureMechanism.AddSections(new[] + { + section + }); // Assert Assert.AreEqual(1, failureMechanism.Sections.Count()); @@ -102,14 +105,17 @@ // Setup var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] + failureMechanism.AddSections(new[] { - new Point2D(2, 1) - })); - failureMechanism.AddSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] - { - new Point2D(2, 1) - })); + FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] + { + new Point2D(2, 1) + }), + FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] + { + new Point2D(2, 1) + }) + }); // Precondition Assert.AreEqual(2, failureMechanism.Sections.Count()); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestFailureMechanism.cs =================================================================== diff -u -rea7fd6455177ea93f8419e6a29fc00d1d3167359 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestFailureMechanism.cs (.../TestFailureMechanism.cs) (revision ea7fd6455177ea93f8419e6a29fc00d1d3167359) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestFailureMechanism.cs (.../TestFailureMechanism.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -58,7 +58,7 @@ } } - public override void AddSectionResult(FailureMechanismSection section) + protected override void AddSectionResult(FailureMechanismSection section) { base.AddSectionResult(section); sectionResults.Add(new TestFailureMechanismSectionResult(section)); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs =================================================================== diff -u -rea7fd6455177ea93f8419e6a29fc00d1d3167359 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs (.../FailureMechanismResultObserverTest.cs) (revision ea7fd6455177ea93f8419e6a29fc00d1d3167359) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs (.../FailureMechanismResultObserverTest.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -107,7 +107,10 @@ { // Given var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + failureMechanism.AddSections(new[] + { + FailureMechanismSectionTestFactory.CreateFailureMechanismSection() + }); using (var resultObserver = new FailureMechanismResultObserver(failureMechanism)) { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsProbabilityAssessmentViewTest.cs =================================================================== diff -u -rea7fd6455177ea93f8419e6a29fc00d1d3167359 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsProbabilityAssessmentViewTest.cs (.../FailureMechanismSectionsProbabilityAssessmentViewTest.cs) (revision ea7fd6455177ea93f8419e6a29fc00d1d3167359) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsProbabilityAssessmentViewTest.cs (.../FailureMechanismSectionsProbabilityAssessmentViewTest.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -151,7 +151,7 @@ var failureMechanism = mocks.Stub(); mocks.ReplayAll(); - var sections = new[] + FailureMechanismSection[] sections = { CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0), CreateFailureMechanismSection("b", 1.0, 1.0, 2.0, 2.0), @@ -179,7 +179,10 @@ { // Given var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSectionResult(CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0)); + failureMechanism.AddSections(new[] + { + CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0) + }); ProbabilityAssessmentInput probabilityAssessmentInput = CreateProbabilityAssessmentInput(); @@ -193,7 +196,10 @@ AssertSectionsDataGridViewControl(failureMechanism.Sections.ToArray(), probabilityAssessmentInput, sectionsDataGridViewControl); // When - failureMechanism.AddSectionResult(CreateFailureMechanismSection("a", 1.0, 1.0, 2.0, 2.0)); + failureMechanism.AddSections(new[] + { + CreateFailureMechanismSection("a", 1.0, 1.0, 2.0, 2.0) + }); failureMechanism.NotifyObservers(); // Then @@ -206,7 +212,10 @@ { // Given var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSectionResult(CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0)); + failureMechanism.AddSections(new[] + { + CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0) + }); ProbabilityAssessmentInput probabilityAssessmentInput = CreateProbabilityAssessmentInput(); @@ -240,7 +249,10 @@ { // Given var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSectionResult(CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0)); + failureMechanism.AddSections(new[] + { + CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0) + }); ProbabilityAssessmentInput probabilityAssessmentInput = CreateProbabilityAssessmentInput(); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs =================================================================== diff -u -rea7fd6455177ea93f8419e6a29fc00d1d3167359 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs (.../FailureMechanismSectionsViewTest.cs) (revision ea7fd6455177ea93f8419e6a29fc00d1d3167359) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs (.../FailureMechanismSectionsViewTest.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -148,7 +148,7 @@ var failureMechanism = mocks.Stub(); mocks.ReplayAll(); - var sections = new[] + FailureMechanismSection[] sections = { CreateFailureMechanismSection("a"), CreateFailureMechanismSection("b"), @@ -172,7 +172,10 @@ { // Given var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSectionResult(CreateFailureMechanismSection("a")); + failureMechanism.AddSections(new[] + { + CreateFailureMechanismSection("a") + }); using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(failureMechanism.Sections, failureMechanism)) { @@ -182,7 +185,10 @@ AssertSectionsDataGridViewControl(failureMechanism.Sections.ToArray(), sectionsDataGridViewControl); // When - failureMechanism.AddSectionResult(CreateFailureMechanismSection("b")); + failureMechanism.AddSections(new[] + { + CreateFailureMechanismSection("b") + }); failureMechanism.NotifyObservers(); // Then @@ -195,7 +201,10 @@ { // Given var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSectionResult(CreateFailureMechanismSection("a")); + failureMechanism.AddSections(new[] + { + CreateFailureMechanismSection("a") + }); using (FailureMechanismSectionsView view = ShowFailureMechanismSectionsView(failureMechanism.Sections, failureMechanism)) { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs =================================================================== diff -u -rea7fd6455177ea93f8419e6a29fc00d1d3167359 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision ea7fd6455177ea93f8419e6a29fc00d1d3167359) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -149,9 +149,12 @@ }); var failureMechanism = new TestFailureMechanism(); - failureMechanism.AddSectionResult(new FailureMechanismSection("A", geometryPoints.Take(2))); - failureMechanism.AddSectionResult(new FailureMechanismSection("B", geometryPoints.Skip(1).Take(2))); - failureMechanism.AddSectionResult(new FailureMechanismSection("C", geometryPoints.Skip(2).Take(2))); + failureMechanism.AddSections(new[] + { + new FailureMechanismSection("A", geometryPoints.Take(2)), + new FailureMechanismSection("B", geometryPoints.Skip(1).Take(2)), + new FailureMechanismSection("C", geometryPoints.Skip(2).Take(2)) + }); // Call using (var view = new FailureMechanismView(failureMechanism, assessmentSection)) @@ -313,11 +316,14 @@ var sectionsEndsMapData = (MapPointData) map.Data.Collection.ElementAt(sectionsEndPointIndex); // Call - failureMechanism.AddSectionResult(new FailureMechanismSection(string.Empty, new[] + failureMechanism.AddSections(new[] { - new Point2D(1, 2), - new Point2D(1, 2) - })); + new FailureMechanismSection(string.Empty, new[] + { + new Point2D(1, 2), + new Point2D(1, 2) + }) + }); failureMechanism.NotifyObservers(); // Assert Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTestFixture.cs =================================================================== diff -u -r0078247e1ebbfa5d7c4a89795778ecd995611dd5 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTestFixture.cs (.../FailureMechanismAssemblyCategoryGroupControlTestFixture.cs) (revision 0078247e1ebbfa5d7c4a89795778ecd995611dd5) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTestFixture.cs (.../FailureMechanismAssemblyCategoryGroupControlTestFixture.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -69,7 +69,10 @@ { // Setup var failureMechanism = new TFailureMechanism(); - failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + failureMechanism.AddSections(new[] + { + FailureMechanismSectionTestFactory.CreateFailureMechanismSection() + }); // Call using (new AssemblyToolCalculatorFactoryConfig()) @@ -141,7 +144,7 @@ using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorfactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance; + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; @@ -167,7 +170,10 @@ { // Given var failureMechanism = new TFailureMechanism(); - failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + failureMechanism.AddSections(new[] + { + FailureMechanismSectionTestFactory.CreateFailureMechanismSection() + }); using (new AssemblyToolCalculatorFactoryConfig()) using (ShowFailureMechanismResultsView(failureMechanism)) Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs =================================================================== diff -u -r88a54829a0338f02115f9c6a6728c101c3244624 -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs (.../FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs) (revision 88a54829a0338f02115f9c6a6728c101c3244624) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs (.../FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -72,7 +72,10 @@ { // Setup var failureMechanism = new TFailureMechanism(); - failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + failureMechanism.AddSections(new[] + { + FailureMechanismSectionTestFactory.CreateFailureMechanismSection() + }); // Call using (new AssemblyToolCalculatorFactoryConfig()) @@ -147,7 +150,7 @@ using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorfactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance; + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; @@ -173,7 +176,10 @@ { // Given var failureMechanism = new TFailureMechanism(); - failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + failureMechanism.AddSections(new[] + { + FailureMechanismSectionTestFactory.CreateFailureMechanismSection() + }); using (new AssemblyToolCalculatorFactoryConfig()) using (ShowFailureMechanismResultsView(failureMechanism)) Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r18e0e94b678cbab4d81a7da5702a15960e6d696f -r05685e09226026b830d0d84359c700b7c61ed64d --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 18e0e94b678cbab4d81a7da5702a15960e6d696f) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 05685e09226026b830d0d84359c700b7c61ed64d) @@ -1062,8 +1062,7 @@ new Point2D(5, 5), new Point2D(15, 15) }); - failureMechanism.AddSection(section1); - failureMechanism.AddSection(section2); + failureMechanism.AddSections(new [] { section1, section2}); } private static void AddFailureMechanismSections(IFailureMechanism failureMechanism, int numberOfSections)