Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -r87b570e7c534d3cbb38a4a108a80f69dc9f40904 -r7d99437022eb55c347813078a1d180d9e9be9983
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 87b570e7c534d3cbb38a4a108a80f69dc9f40904)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs	(.../CalculationConfigurationImporterTest.cs)	(revision 7d99437022eb55c347813078a1d180d9e9be9983)
@@ -155,45 +155,22 @@
         {
             // Given
             string filePath = Path.Combine(readerPath, "validConfiguration.xml");
-            var importer = new CalculationConfigurationImporter(filePath,
-                                                                new CalculationGroup());
+            var progressChangeNotifications = new List<ProgressNotification>();
 
-            var expectedProgressMessages = new[]
-            {
-                new ExpectedProgressNotification
-                {
-                    Text = "Inlezen berekeningenconfiguratie.",
-                    CurrentStep = 1,
-                    TotalNumberOfSteps = 3
-                },
-                new ExpectedProgressNotification
-                {
-                    Text = "Valideren berekeningenconfiguratie.",
-                    CurrentStep = 2,
-                    TotalNumberOfSteps = 3
-                },
-                new ExpectedProgressNotification
-                {
-                    Text = "Geïmporteerde data toevoegen aan het toetsspoor.",
-                    CurrentStep = 3,
-                    TotalNumberOfSteps = 3
-                }
-            };
+            var importer = new CalculationConfigurationImporter(filePath, new CalculationGroup());
+            importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps)));
 
-            var progressChangedCallCount = 0;
-            importer.SetProgressChanged((description, step, steps) =>
-            {
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].Text, description);
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].CurrentStep, step);
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].TotalNumberOfSteps, steps);
-                progressChangedCallCount++;
-            });
-
             // When
             importer.Import();
 
             // Then
-            Assert.AreEqual(expectedProgressMessages.Length, progressChangedCallCount);
+            var expectedProgressNotifications = new[]
+            {
+                new ProgressNotification("Inlezen berekeningenconfiguratie.", 1, 3),
+                new ProgressNotification("Valideren berekeningenconfiguratie.", 2, 3),
+                new ProgressNotification("Geïmporteerde data toevoegen aan het toetsspoor.", 3, 3)
+            };
+            ProgressNotificationTestHelper.AssertProgressNotificationsAreEqual(expectedProgressNotifications, progressChangeNotifications);
         }
 
         [Test]
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs
===================================================================
diff -u -r3e64f99c301d02f327d88ce3738dd0c96c273c46 -r7d99437022eb55c347813078a1d180d9e9be9983
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs	(.../ReferenceLineImporterTest.cs)	(revision 3e64f99c301d02f327d88ce3738dd0c96c273c46)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs	(.../ReferenceLineImporterTest.cs)	(revision 7d99437022eb55c347813078a1d180d9e9be9983)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Core.Common.Base;
@@ -130,36 +131,21 @@
             string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO,
                                                      Path.Combine("ReferenceLine", "traject_10-2.shp"));
 
-            var expectedProgressMessages = new[]
-            {
-                new ExpectedProgressNotification
-                {
-                    Text = "Inlezen referentielijn.",
-                    CurrentStep = 1,
-                    TotalNumberOfSteps = 2
-                },
-                new ExpectedProgressNotification
-                {
-                    Text = "Geïmporteerde data toevoegen aan het traject.",
-                    CurrentStep = 2,
-                    TotalNumberOfSteps = 2
-                }
-            };
-            var progressChangedCallCount = 0;
+            var progressChangeNotifications = new List<ProgressNotification>();
+
             var importer = new ReferenceLineImporter(new ReferenceLine(), handler, path);
-            importer.SetProgressChanged((description, step, steps) =>
-            {
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].Text, description);
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].CurrentStep, step);
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].TotalNumberOfSteps, steps);
-                progressChangedCallCount++;
-            });
+            importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps)));
 
             // Call
             importer.Import();
 
             // Assert
-            Assert.AreEqual(expectedProgressMessages.Length, progressChangedCallCount);
+            var expectedProgressNotifications = new[]
+            {
+                new ProgressNotification("Inlezen referentielijn.", 1, 2),
+                new ProgressNotification("Geïmporteerde data toevoegen aan het traject.", 2, 2)
+            };
+            ProgressNotificationTestHelper.AssertProgressNotificationsAreEqual(expectedProgressNotifications, progressChangeNotifications);
             mocks.VerifyAll();
         }
 
Fisheye: Tag 7d99437022eb55c347813078a1d180d9e9be9983 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/ExpectedProgressNotification.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/Ringtoets.Common.IO.TestUtil.csproj
===================================================================
diff -u -r87b570e7c534d3cbb38a4a108a80f69dc9f40904 -r7d99437022eb55c347813078a1d180d9e9be9983
--- Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/Ringtoets.Common.IO.TestUtil.csproj	(.../Ringtoets.Common.IO.TestUtil.csproj)	(revision 87b570e7c534d3cbb38a4a108a80f69dc9f40904)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/Ringtoets.Common.IO.TestUtil.csproj	(.../Ringtoets.Common.IO.TestUtil.csproj)	(revision 7d99437022eb55c347813078a1d180d9e9be9983)
@@ -22,7 +22,6 @@
   <ItemGroup>
     <Compile Include="CustomCalculationConfigurationExporterDesignGuidelinesTestFixture.cs" />
     <Compile Include="CustomCalculationConfigurationWriterDesignGuidelinesTestFixture.cs" />
-    <Compile Include="ExpectedProgressNotification.cs" />
     <Compile Include="FileTestHelper.cs" />
     <Compile Include="ProgressNotification.cs" />
     <Compile Include="ProgressNotificationTestHelper.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r7cf555dac4d0ea4187b0771e62a7fdd65ee10a92 -r7d99437022eb55c347813078a1d180d9e9be9983
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 7cf555dac4d0ea4187b0771e62a7fdd65ee10a92)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 7d99437022eb55c347813078a1d180d9e9be9983)
@@ -331,50 +331,25 @@
             handler.Stub(h => h.Update(null, null, null, null, null)).IgnoreArguments().Return(Enumerable.Empty<IObservable>());
             mocks.ReplayAll();
 
-            var expectedProgressMessages = new[]
-            {
-                new ExpectedProgressNotification
-                {
-                    Text = "Inlezen van het hydraulische belastingen bestand.",
-                    CurrentStep = 1,
-                    TotalNumberOfSteps = 4
-                },
-                new ExpectedProgressNotification
-                {
-                    Text = "Inlezen van het hydraulische locatie configuratie bestand.",
-                    CurrentStep = 2,
-                    TotalNumberOfSteps = 4
-                },
-                new ExpectedProgressNotification
-                {
-                    Text = "Inlezen van het rekeninstellingen bestand.",
-                    CurrentStep = 3,
-                    TotalNumberOfSteps = 4
-                },
-                new ExpectedProgressNotification
-                {
-                    Text = "Geïmporteerde data toevoegen aan het traject.",
-                    CurrentStep = 4,
-                    TotalNumberOfSteps = 4
-                }
-            };
-            var progressChangedCallCount = 0;
+            var progressChangeNotifications = new List<ProgressNotification>();
 
             var importer = new HydraulicBoundaryDatabaseImporter(new HydraulicBoundaryDatabase(), handler, validFilePath);
-            importer.SetProgressChanged((description, step, steps) =>
-            {
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].Text, description);
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].CurrentStep, step);
-                Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].TotalNumberOfSteps, steps);
-                progressChangedCallCount++;
-            });
+            importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps)));
 
+
             // Call
             bool importResult = importer.Import();
 
             // Assert
             Assert.IsTrue(importResult);
-            Assert.AreEqual(4, progressChangedCallCount);
+            var expectedProgressNotifications = new[]
+            {
+                new ProgressNotification("Inlezen van het hydraulische belastingen bestand.", 1, 4),
+                new ProgressNotification("Inlezen van het hydraulische locatie configuratie bestand.", 2, 4),
+                new ProgressNotification("Inlezen van het rekeninstellingen bestand.", 3, 4),
+                new ProgressNotification("Geïmporteerde data toevoegen aan het traject.", 4, 4)
+            };
+            ProgressNotificationTestHelper.AssertProgressNotificationsAreEqual(expectedProgressNotifications, progressChangeNotifications);
             mocks.VerifyAll();
         }