Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs =================================================================== diff -u -r29ba2b6f4e2ebff307732e34c3f7e1593b99909a -r57fa3aad06255aa7faa0bf3e786e0ae6d79c8a93 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs (.../StabilityPointStructuresImporterTest.cs) (revision 29ba2b6f4e2ebff307732e34c3f7e1593b99909a) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs (.../StabilityPointStructuresImporterTest.cs) (revision 57fa3aad06255aa7faa0bf3e786e0ae6d79c8a93) @@ -124,12 +124,11 @@ var messageProvider = mocks.Stub(); var updateStrategy = mocks.StrictMock>(); - updateStrategy.Expect(u => u.UpdateStructuresWithImportedData(null, null, null)).IgnoreArguments().WhenCalled(i => + updateStrategy.Expect(u => u.UpdateStructuresWithImportedData(null, null)).IgnoreArguments().WhenCalled(i => { - Assert.AreSame(importTarget, i.Arguments[0]); - Assert.AreEqual(filePath, i.Arguments[2]); + Assert.AreEqual(filePath, i.Arguments[1]); - var structures = (IEnumerable) i.Arguments[1]; + var structures = (IEnumerable) i.Arguments[0]; Assert.AreEqual(1, structures.Count()); StabilityPointStructure structure = structures.First(); @@ -238,11 +237,10 @@ var messageProvider = mocks.Stub(); var updateStrategy = mocks.Stub>(); - updateStrategy.Expect(u => u.UpdateStructuresWithImportedData(null, null, null)).IgnoreArguments().WhenCalled(i => + updateStrategy.Expect(u => u.UpdateStructuresWithImportedData(null, null)).IgnoreArguments().WhenCalled(i => { - Assert.AreSame(importTarget, i.Arguments[0]); - Assert.AreEqual(filePath, i.Arguments[2]); - Assert.AreEqual(4, ((IEnumerable) i.Arguments[1]).Count()); + Assert.AreEqual(filePath, i.Arguments[1]); + Assert.AreEqual(4, ((IEnumerable) i.Arguments[0]).Count()); }); mocks.ReplayAll(); @@ -280,12 +278,11 @@ var messageProvider = mocks.Stub(); var updateStrategy = mocks.Stub>(); - updateStrategy.Expect(u => u.UpdateStructuresWithImportedData(null, null, null)).IgnoreArguments().WhenCalled(i => + updateStrategy.Expect(u => u.UpdateStructuresWithImportedData(null, null)).IgnoreArguments().WhenCalled(i => { - Assert.AreSame(importTarget, i.Arguments[0]); - Assert.AreEqual(filePath, i.Arguments[2]); + Assert.AreEqual(filePath, i.Arguments[1]); - var readStructures = (IEnumerable) i.Arguments[1]; + var readStructures = (IEnumerable) i.Arguments[0]; Assert.AreEqual(1, readStructures.Count()); StabilityPointStructure importedStructure = readStructures.First(); @@ -343,12 +340,11 @@ var messageProvider = mocks.Stub(); var updateStrategy = mocks.Stub>(); - updateStrategy.Expect(u => u.UpdateStructuresWithImportedData(null, null, null)).IgnoreArguments().WhenCalled(i => + updateStrategy.Expect(u => u.UpdateStructuresWithImportedData(null, null)).IgnoreArguments().WhenCalled(i => { - Assert.AreSame(importTarget, i.Arguments[0]); - Assert.AreEqual(filePath, i.Arguments[2]); + Assert.AreEqual(filePath, i.Arguments[1]); - var readStructures = (IEnumerable) i.Arguments[1]; + var readStructures = (IEnumerable) i.Arguments[0]; Assert.AreEqual(1, readStructures.Count()); StabilityPointStructure importedStructure = readStructures.First(); @@ -405,13 +401,12 @@ var messageProvider = mocks.Stub(); var strategy = mocks.StrictMock>(); - strategy.Expect(s => s.UpdateStructuresWithImportedData(null, null, null)).IgnoreArguments() + strategy.Expect(s => s.UpdateStructuresWithImportedData(null, null)).IgnoreArguments() .WhenCalled(invocation => { - Assert.AreSame(invocation.Arguments[0], importTarget); - Assert.AreSame(invocation.Arguments[2], filePath); + Assert.AreSame(invocation.Arguments[1], filePath); - var readStructures = (IEnumerable) invocation.Arguments[1]; + var readStructures = (IEnumerable) invocation.Arguments[0]; Assert.AreEqual(1, readStructures.Count()); }) .Return(Enumerable.Empty()); @@ -496,7 +491,7 @@ }; var strategy = mocks.StrictMock>(); - strategy.Expect(s => s.UpdateStructuresWithImportedData(null, null, null)).IgnoreArguments().Return(observables); + strategy.Expect(s => s.UpdateStructuresWithImportedData(null, null)).IgnoreArguments().Return(observables); mocks.ReplayAll(); string filePath = Path.Combine(testDataPath, nameof(StabilityPointStructuresImporter),