Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/ReplaceDataStrategyBaseTest.cs =================================================================== diff -u -raae2ecaacbb094fe66d6a54d6ac4b1e6780b0864 -r66239a42b315209acc4d124200c58d8be1a18195 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/ReplaceDataStrategyBaseTest.cs (.../ReplaceDataStrategyBaseTest.cs) (revision aae2ecaacbb094fe66d6a54d6ac4b1e6780b0864) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/ReplaceDataStrategyBaseTest.cs (.../ReplaceDataStrategyBaseTest.cs) (revision 66239a42b315209acc4d124200c58d8be1a18195) @@ -98,7 +98,7 @@ } [Test] - public void ReplaceData_CallsClearData_ReturnsTrue() + public void ReplaceData_Always_CallsClearData() { // Setup var strategy = new ConcreteStrategyClass(new TestFailureMechanism()); @@ -205,22 +205,26 @@ } [Test] - public void ReplaceData_ClearDataCalled_ReturnsExpectedItems() + public void ReplaceData_Always_CalledWithExpectedFailureMechanism() { // Setup var failureMechanism = new TestFailureMechanism(); + var collection = new TestUniqueItemCollection(); var strategy = new ConcreteStrategyClass(failureMechanism); + var expectedObservables = new[] + { + collection + }; + strategy.ClearDataReturnedList = expectedObservables; - var collection = new TestUniqueItemCollection(); - // Call IObservable[] affectedObjects = strategy.ConcreteReplaceData(collection, Enumerable.Empty(), "some/source").ToArray(); // Assert - Assert.AreEqual(1, affectedObjects.Length); - Assert.AreSame(failureMechanism, affectedObjects[0]); + Assert.AreSame(failureMechanism, strategy.ClearDataFailureMechanism); + CollectionAssert.AreEqual(expectedObservables, affectedObjects); } #region Helper classes @@ -229,6 +233,8 @@ { public ConcreteStrategyClass(TestFailureMechanism failureMechanism) : base(failureMechanism) {} public bool IsClearDataCalled { get; private set; } + public TestFailureMechanism ClearDataFailureMechanism { get; private set; } + public IEnumerable ClearDataReturnedList { private get; set; } = Enumerable.Empty(); public IEnumerable ConcreteReplaceData(ObservableUniqueItemCollectionWithSourcePath items, IEnumerable readItems, @@ -240,10 +246,9 @@ protected override IEnumerable ClearData(TestFailureMechanism failureMechanism) { IsClearDataCalled = true; - return new[] - { - failureMechanism - }; + ClearDataFailureMechanism = failureMechanism; + + return ClearDataReturnedList; } } @@ -252,7 +257,6 @@ public TestUniqueItemCollection() : base(item => item.Name, "TestItem", "naam") {} } - private class TestItem { public TestItem(string name)