Fisheye: Tag b1acb656284ee0a7db2384e83d2b36f64fa57dc8 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Exceptions/ForeshoreProfileUpdateException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r9b0af3f940ae57b373ab4edfd7da944090255fde -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 9b0af3f940ae57b373ab4edfd7da944090255fde)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -60,7 +60,6 @@
     <Compile Include="DikeProfiles\IUseBreakWater.cs" />
     <Compile Include="DikeProfiles\IUseForeshore.cs" />
     <Compile Include="Exceptions\DikeProfileUpdateException.cs" />
-    <Compile Include="Exceptions\ForeshoreProfileUpdateException.cs" />
     <Compile Include="FailureMechanism\AssessmentLayerOneState.cs" />
     <Compile Include="Hydraulics\CalculationConvergence.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryDatabase.cs" />
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IForeshoreProfileUpdateDataStrategy.cs
===================================================================
diff -u -r670a5510c7638037a4f7e0c3efea0a261085bfbb -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IForeshoreProfileUpdateDataStrategy.cs	(.../IForeshoreProfileUpdateDataStrategy.cs)	(revision 670a5510c7638037a4f7e0c3efea0a261085bfbb)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IForeshoreProfileUpdateDataStrategy.cs	(.../IForeshoreProfileUpdateDataStrategy.cs)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using Core.Common.Base;
 using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.Exceptions;
 
 namespace Ringtoets.Common.IO.FileImporters
 {
@@ -43,6 +44,8 @@
         /// <returns>An <see cref="IEnumerable{T}"/> of updated instances.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any input argument
         /// is <c>null</c>.</exception>
+        /// <exception cref="UpdateDataException">Thrown when updating the data
+        /// model has failed.</exception>
         IEnumerable<IObservable> UpdateForeshoreProfilesWithImportedData(
             ForeshoreProfileCollection targetDataCollection,
             IEnumerable<ForeshoreProfile> importedDataCollection,
Fisheye: Tag b1acb656284ee0a7db2384e83d2b36f64fa57dc8 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Exceptions/ForeshoreProfileUpdateExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r72786d9fba3205123a66b70c1e775398b325edbe -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 72786d9fba3205123a66b70c1e775398b325edbe)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -71,7 +71,6 @@
     <Compile Include="DikeProfiles\ForeshoreProfileCollectionTest.cs" />
     <Compile Include="DikeProfiles\ForeshoreProfileTest.cs" />
     <Compile Include="Exceptions\DikeProfileUpdateExceptionTest.cs" />
-    <Compile Include="Exceptions\ForeshoreProfileUpdateExceptionTest.cs" />
     <Compile Include="FailureMechanism\AssessmentLayerOneStateTest.cs" />
     <Compile Include="FailureMechanism\AssessmentLayerTwoAResultTest.cs" />
     <Compile Include="Hydraulics\CalculationConvergenceTest.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj
===================================================================
diff -u -r35fa216f8255ce431cd920b991297fa80592b64a -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj	(.../Ringtoets.Common.Data.TestUtil.Test.csproj)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj	(.../Ringtoets.Common.Data.TestUtil.Test.csproj)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -59,6 +59,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestBackgroundDataConfigurationTest.cs" />
     <Compile Include="TestCalculationTest.cs" />
+    <Compile Include="TestCalculationWithForeshoreProfileTest.cs" />
     <Compile Include="TestDikeProfileTest.cs" />
     <Compile Include="TestFailureMechanismSectionResultTest.cs" />
     <Compile Include="TestFailureMechanismTest.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestCalculationWithForeshoreProfileTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestCalculationWithForeshoreProfileTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestCalculationWithForeshoreProfileTest.cs	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -0,0 +1,104 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+
+namespace Ringtoets.Common.Data.TestUtil.Test
+{
+    [TestFixture]
+    public class TestCalculationWithForeshoreProfileTest
+    {
+        [Test]
+        public void CreateDefaultCalculation_ReturnsExpectedValues()
+        {
+            // Call
+            TestCalculationWithForeshoreProfile calculation =
+                TestCalculationWithForeshoreProfile.CreateDefaultCalculation();
+
+            // Assert
+            Assert.IsFalse(calculation.HasOutput);
+            Assert.IsNull(calculation.InputParameters.ForeshoreProfile);
+            Assert.IsNull(calculation.Comments);
+        }
+
+        [Test]
+        public void CreateCalculationWithOutput_ReturnsExpectedValues()
+        {
+            // Setup
+            var foreshoreProfile = new TestForeshoreProfile();
+
+            // Call
+            TestCalculationWithForeshoreProfile calculation =
+                TestCalculationWithForeshoreProfile.CreateCalculationWithOutput(foreshoreProfile);
+
+            // Assert
+            Assert.IsTrue(calculation.HasOutput);
+            Assert.AreSame(foreshoreProfile, calculation.InputParameters.ForeshoreProfile);
+            Assert.IsNull(calculation.Comments);
+        }
+
+        [Test]
+        public void CreateCalculationWithoutOutput_ReturnsExpectedValues()
+        {
+            // Setup
+            var foreshoreProfile = new TestForeshoreProfile();
+
+            // Call
+            TestCalculationWithForeshoreProfile calculation =
+                TestCalculationWithForeshoreProfile.CreateCalculationWithoutOutput(foreshoreProfile);
+
+            // Assert
+            Assert.IsFalse(calculation.HasOutput);
+            Assert.AreSame(foreshoreProfile, calculation.InputParameters.ForeshoreProfile);
+            Assert.IsNull(calculation.Comments);
+        }
+
+        [Test]
+        public void GivenCalculationWithOutPut_WhenClearOutputCalled_ThenOutputCleared()
+        {
+            // Given
+            var foreshoreProfile = new TestForeshoreProfile();
+            var calculation =
+                TestCalculationWithForeshoreProfile.CreateCalculationWithOutput(foreshoreProfile);
+
+            // When
+            calculation.ClearOutput();
+
+            // Then
+            Assert.IsFalse(calculation.HasOutput);
+        }
+
+        [Test]
+        public void GivenCalculationWithoutOutPut_WhenClearOutputCalled_ThenOutputStillClear()
+        {
+            // Given
+            var foreshoreProfile = new TestForeshoreProfile();
+            var calculation =
+                TestCalculationWithForeshoreProfile.CreateCalculationWithoutOutput(foreshoreProfile);
+
+            // When
+            calculation.ClearOutput();
+
+            // Then
+            Assert.IsFalse(calculation.HasOutput);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj
===================================================================
diff -u -ra588b2fbca3ea7073fa3aa30bde0bd59393ff994 -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj	(.../Ringtoets.Common.Data.TestUtil.csproj)	(revision a588b2fbca3ea7073fa3aa30bde0bd59393ff994)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj	(.../Ringtoets.Common.Data.TestUtil.csproj)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -63,6 +63,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestBackgroundDataConfiguration.cs" />
     <Compile Include="TestCalculation.cs" />
+    <Compile Include="TestCalculationWithForeshoreProfile.cs" />
     <Compile Include="TestDikeProfile.cs" />
     <Compile Include="TestFailureMechanism.cs" />
     <Compile Include="TestFailureMechanismSectionResult.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -0,0 +1,128 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.DikeProfiles;
+
+namespace Ringtoets.Common.Data.TestUtil
+{
+    /// <summary>
+    /// A simple test calculation that has input parameters containing a <see cref="ForeshoreProfile"/>
+    /// property.
+    /// </summary>
+    public class TestCalculationWithForeshoreProfile : Observable,
+                                                       ICalculation<TestCalculationWithForeshoreProfile.TestCalculationInputWithForeshoreProfile>
+    {
+        private TestCalculationWithForeshoreProfile(bool hasOutput)
+        {
+            InputParameters = new TestCalculationInputWithForeshoreProfile();
+            HasOutput = hasOutput;
+        }
+
+        public string Name { get; set; }
+        public bool HasOutput { get; private set; }
+        public Comment Comments { get; }
+
+        /// <summary>
+        /// Gets the input parameters of the calculation.
+        /// </summary>
+        public TestCalculationInputWithForeshoreProfile InputParameters { get; }
+
+        /// <summary>
+        /// Create a calculation with a <see cref="ForeshoreProfile"/> and output.
+        /// </summary>
+        /// <param name="foreshoreProfile">The foreshore profile assigned to the calculation.</param>
+        /// <returns>A <see cref="TestCalculationWithForeshoreProfile"/> with a foreshore and 
+        /// calculation output.</returns>
+        public static TestCalculationWithForeshoreProfile CreateCalculationWithOutput(ForeshoreProfile foreshoreProfile)
+        {
+            return new TestCalculationWithForeshoreProfile(true)
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = foreshoreProfile
+                }
+            };
+        }
+
+        /// <summary>
+        /// Create a calculation with a <see cref="ForeshoreProfile"/> and
+        /// without output.
+        /// </summary>
+        /// <param name="foreshoreProfile">The foreshore profile assigned to the calculation.</param>
+        /// <returns>A <see cref="TestCalculationWithForeshoreProfile"/> with a foreshore and 
+        /// without calculation output.</returns>
+        public static TestCalculationWithForeshoreProfile CreateCalculationWithoutOutput(ForeshoreProfile foreshoreProfile)
+        {
+            return new TestCalculationWithForeshoreProfile(false)
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = foreshoreProfile
+                }
+            };
+        }
+
+        /// <summary>
+        /// Creates a default calculation without a <see cref="ForeshoreProfile"/>
+        /// and calculation output.
+        /// </summary>
+        /// <returns>A <see cref="TestCalculationWithForeshoreProfile"/> without 
+        /// a foreshore and calculation output.</returns>
+        public static TestCalculationWithForeshoreProfile CreateDefaultCalculation()
+        {
+            return new TestCalculationWithForeshoreProfile(false);
+        }
+
+        public void ClearOutput()
+        {
+            HasOutput = false;
+        }
+
+        /// <summary>
+        /// A simple input class with a <see cref="ForeshoreProfile"/>.
+        /// </summary>
+        public class TestCalculationInputWithForeshoreProfile : ICalculationInput, IHasForeshoreProfile
+        {
+            /// <summary>
+            /// Gets or sets the foreshore profile.
+            /// </summary>
+            public ForeshoreProfile ForeshoreProfile { get; set; }
+
+            public void Attach(IObserver observer)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void Detach(IObserver observer)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void NotifyObservers()
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs
===================================================================
diff -u -r9b0af3f940ae57b373ab4edfd7da944090255fde -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs	(.../ForeshoreProfileReplaceDataStrategy.cs)	(revision 9b0af3f940ae57b373ab4edfd7da944090255fde)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs	(.../ForeshoreProfileReplaceDataStrategy.cs)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -66,18 +66,7 @@
                                                                                 IEnumerable<ForeshoreProfile> importedDataCollection,
                                                                                 string sourceFilePath)
         {
-            try
-            {
-                return ReplaceTargetCollectionWithImportedData(foreshoreProfiles, importedDataCollection, sourceFilePath);
-            }
-            catch (UpdateDataException e)
-            {
-                string message = string.Format(
-                    Resources.ForeshoreProfileReplaceDataStrategy_UpdateForeshoreProfilesWithImportedData_Importing_ForeshoreProfiles_failed_Reason_0,
-                    e.Message);
-
-                throw new ForeshoreProfileUpdateException(message, e);
-            }
+            return ReplaceTargetCollectionWithImportedData(foreshoreProfiles, importedDataCollection, sourceFilePath);
         }
 
         protected override IEnumerable<IObservable> ClearData()
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r670a5510c7638037a4f7e0c3efea0a261085bfbb -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 670a5510c7638037a4f7e0c3efea0a261085bfbb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -181,16 +181,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het importeren van voorlandprofielen is mislukt: {0}.
-        /// </summary>
-        public static string ForeshoreProfileReplaceDataStrategy_UpdateForeshoreProfilesWithImportedData_Importing_ForeshoreProfiles_failed_Reason_0 {
-            get {
-                return ResourceManager.GetString("ForeshoreProfileReplaceDataStrategy_UpdateForeshoreProfilesWithImportedData_Impor" +
-                        "ting_ForeshoreProfiles_failed_Reason_0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Voorlandprofiellocaties.
         /// </summary>
         public static string ForeshoreProfilesImporter_DisplayName {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r670a5510c7638037a4f7e0c3efea0a261085bfbb -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 670a5510c7638037a4f7e0c3efea0a261085bfbb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -169,7 +169,4 @@
   <data name="BackgroundData_SelectMapData_Tooltip" xml:space="preserve">
     <value>Selecteer een achtergrondkaart.</value>
   </data>
-  <data name="ForeshoreProfileReplaceDataStrategy_UpdateForeshoreProfilesWithImportedData_Importing_ForeshoreProfiles_failed_Reason_0" xml:space="preserve">
-    <value>Het importeren van voorlandprofielen is mislukt: {0}</value>
-  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfileReplaceDataStrategyTest.cs
===================================================================
diff -u -r9b0af3f940ae57b373ab4edfd7da944090255fde -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfileReplaceDataStrategyTest.cs	(.../ForeshoreProfileReplaceDataStrategyTest.cs)	(revision 9b0af3f940ae57b373ab4edfd7da944090255fde)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfileReplaceDataStrategyTest.cs	(.../ForeshoreProfileReplaceDataStrategyTest.cs)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -24,8 +24,6 @@
 using System.Linq;
 using Core.Common.Base;
 using NUnit.Framework;
-using Ringtoets.Common.Data;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Common.Data.FailureMechanism;
@@ -144,11 +142,9 @@
                                                                                        sourceFilePath);
 
             // Assert
-            var exception = Assert.Throws<ForeshoreProfileUpdateException>(call);
-            string expectedMessage = "Het importeren van voorlandprofielen is mislukt: " +
-                                     $"Voorlandprofielen moeten een unieke id hebben. Gevonden dubbele elementen: {duplicateId}.";
+            var exception = Assert.Throws<UpdateDataException>(call);
+            string expectedMessage = $"Voorlandprofielen moeten een unieke id hebben. Gevonden dubbele elementen: {duplicateId}.";
             Assert.AreEqual(expectedMessage, exception.Message);
-            Assert.IsInstanceOf<UpdateDataException>(exception.InnerException);
         }
 
         [Test]
@@ -233,21 +229,12 @@
         {
             // Setup
             var foreshoreProfile = new TestForeshoreProfile();
-            var calculationWithForeshoreProfileAndOutput = new TestCalculationWithForeshoreProfile(true)
-            {
-                InputParameters =
-                {
-                    ForeshoreProfile = foreshoreProfile
-                }
-            };
-            var calculationWithForeshoreProfile = new TestCalculationWithForeshoreProfile(false)
-            {
-                InputParameters =
-                {
-                    ForeshoreProfile = foreshoreProfile
-                }
-            };
-            var calculationWithoutForeshoreProfile = new TestCalculationWithForeshoreProfile(false);
+            TestCalculationWithForeshoreProfile calculationWithForeshoreProfileAndOutput =
+                TestCalculationWithForeshoreProfile.CreateCalculationWithOutput(foreshoreProfile);
+            TestCalculationWithForeshoreProfile calculationWithForeshoreProfile =
+                TestCalculationWithForeshoreProfile.CreateCalculationWithoutOutput(foreshoreProfile);
+            TestCalculationWithForeshoreProfile calculationWithoutForeshoreProfile =
+                TestCalculationWithForeshoreProfile.CreateDefaultCalculation();
 
             var failureMechanism = new TestFailureMechanism(new[]
             {
@@ -289,45 +276,5 @@
                                                 });
             CollectionAssert.AreEquivalent(expectedAffectedObjects, affectedObjects);
         }
-
-        private class TestCalculationWithForeshoreProfile : Observable, ICalculation<TestCalculationInputWithForeshoreProfile>
-        {
-            public TestCalculationWithForeshoreProfile(bool hasOutput)
-            {
-                InputParameters = new TestCalculationInputWithForeshoreProfile();
-                HasOutput = hasOutput;
-            }
-
-            public string Name { get; set; }
-            public bool HasOutput { get; private set; }
-            public Comment Comments { get; }
-
-            public TestCalculationInputWithForeshoreProfile InputParameters { get; }
-
-            public void ClearOutput()
-            {
-                HasOutput = false;
-            }
-        }
-
-        private class TestCalculationInputWithForeshoreProfile : ICalculationInput, IHasForeshoreProfile
-        {
-            public ForeshoreProfile ForeshoreProfile { get; set; }
-
-            public void Attach(IObserver observer)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void Detach(IObserver observer)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyObservers()
-            {
-                throw new NotImplementedException();
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r9b0af3f940ae57b373ab4edfd7da944090255fde -rb1acb656284ee0a7db2384e83d2b36f64fa57dc8
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 9b0af3f940ae57b373ab4edfd7da944090255fde)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision b1acb656284ee0a7db2384e83d2b36f64fa57dc8)
@@ -26,7 +26,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
@@ -1271,21 +1270,12 @@
                 foreshoreProfile
             }, "path");
 
-            var calculationWithForeshoreProfileAndOutput = new TestCalculationWithForeshoreProfile(true)
-            {
-                InputParameters =
-                {
-                    ForeshoreProfile = foreshoreProfile
-                }
-            };
-            var calculationWithForeshoreProfile = new TestCalculationWithForeshoreProfile(false)
-            {
-                InputParameters =
-                {
-                    ForeshoreProfile = foreshoreProfile
-                }
-            };
-            var calculationWithoutForeshoreProfile = new TestCalculationWithForeshoreProfile(false);
+            TestCalculationWithForeshoreProfile calculationWithForeshoreProfileAndOutput =
+                 TestCalculationWithForeshoreProfile.CreateCalculationWithOutput(foreshoreProfile);
+            TestCalculationWithForeshoreProfile calculationWithForeshoreProfile =
+                TestCalculationWithForeshoreProfile.CreateCalculationWithoutOutput(foreshoreProfile);
+            TestCalculationWithForeshoreProfile calculationWithoutForeshoreProfile =
+                TestCalculationWithForeshoreProfile.CreateDefaultCalculation();
 
             var calculations = new List<ICalculation<ICalculationInput>>
             {
@@ -1307,8 +1297,6 @@
             // Note: To make sure the clear is performed regardless of what is done with
             // the return result, no ToArray() should be called before these assertions:
             CollectionAssert.IsEmpty(foreshoreProfiles);
-
-            CollectionAssert.IsEmpty(foreshoreProfiles);
             Assert.IsFalse(calculationWithForeshoreProfileAndOutput.HasOutput);
             Assert.IsTrue(calculationsWithForeshoreProfile.All(calc => calc.InputParameters.ForeshoreProfile == null));
 
@@ -1592,46 +1580,6 @@
             return hydraulicBoundaryLocation.DesignWaterLevelOutput != null || hydraulicBoundaryLocation.WaveHeightOutput != null;
         }
 
-        private class TestCalculationWithForeshoreProfile : Observable, ICalculation<TestCalculationInputWithForeshoreProfile>
-        {
-            public TestCalculationWithForeshoreProfile(bool hasOutput)
-            {
-                InputParameters = new TestCalculationInputWithForeshoreProfile();
-                HasOutput = hasOutput;
-            }
-
-            public string Name { get; set; }
-            public bool HasOutput { get; private set; }
-            public Comment Comments { get; }
-
-            public TestCalculationInputWithForeshoreProfile InputParameters { get; }
-
-            public void ClearOutput()
-            {
-                HasOutput = false;
-            }
-        }
-
-        private class TestCalculationInputWithForeshoreProfile : ICalculationInput, IHasForeshoreProfile
-        {
-            public ForeshoreProfile ForeshoreProfile { get; set; }
-
-            public void Attach(IObserver observer)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void Detach(IObserver observer)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void NotifyObservers()
-            {
-                throw new NotImplementedException();
-            }
-        }
-
         #region TestData
 
         private static IEnumerable<TestCaseData> GetGrassAndDuneLocations(string testName)