Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -r2e944cbf52d124fd501ed4ed8e991aa50299cc69 -r9a6b8bd8e680c7b847ad548bad1c5a8c2d33b143
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 2e944cbf52d124fd501ed4ed8e991aa50299cc69)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 9a6b8bd8e680c7b847ad548bad1c5a8c2d33b143)
@@ -295,7 +295,7 @@
         }
 
         [Test]
-        public void Calculate_ValidDesignWaterLevelCalculationButIllustrationPointResultsWithDuplicateStochasts_IllustrationPointNotSetAndLog()
+        public void Calculate_CalculationRanErrorInSettingIllustrationPoints_GeneralResultNotSetAndLogsWarning()
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
@@ -312,8 +312,8 @@
 
             var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
-            calculation.Expect(c => c.Id).Return(100);
-            calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
+            calculation.Stub(c => c.Id).Return(100);
+            calculation.Stub(c => c.CalculateIllustrationPoints).Return(true);
 
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             mockRepository.ReplayAll();
@@ -349,168 +349,6 @@
         }
 
         [Test]
-        public void Calculate_ValidDesignWaterLevelCalculationButIllustrationPointResultsWithIncorrectTopLevelStochasts_IllustrationPointNotSetAndLog()
-        {
-            // Setup
-            string validFilePath = Path.Combine(testDataPath, validFile);
-
-            var calculator = new TestDesignWaterLevelCalculator
-            {
-                IllustrationPointsResult = GeneralResultTestFactory.CreateGeneralResultSubMechanismWithIncorrectTopLevelStochasts(),
-                Converged = true
-            };
-
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator);
-
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
-            calculation.Stub(c => c.Name).Return("punt_flw_ 1");
-            calculation.Expect(c => c.Id).Return(100);
-            calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
-
-            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                // Call
-                Action call = () => new DesignWaterLevelCalculationService().Calculate(calculation,
-                                                                                       validFilePath,
-                                                                                       1.0 / 30,
-                                                                                       calculationMessageProvider);
-
-                // Assert
-                TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages =>
-                {
-                    Tuple<string, Level, Exception>[] tupleArray = messages.ToArray();
-
-                    string[] msgs = tupleArray.Select(tuple => tuple.Item1).ToArray();
-                    Assert.AreEqual(4, msgs.Length);
-
-                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    Assert.AreEqual("Fout bij het uitlezen van de illustratiepunten voor berekening punt_flw_ 1: " +
-                                    "De stochasten van een illustratiepunt bevatten niet dezelfde stochasten als in de onderliggende illustratiepunten. " +
-                                    "Het uitlezen van illustratiepunten wordt overgeslagen.", msgs[1]);
-                    Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
-                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
-                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-                });
-                Assert.IsNotNull(calculation.Output);
-                Assert.IsFalse(calculation.Output.HasGeneralResult);
-            }
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_ValidDesignWaterLevelCalculationButIllustrationPointResultsWithDuplicateIllustrationPoints_IllustrationPointNotSetAndLog()
-        {
-            // Setup
-            string validFilePath = Path.Combine(testDataPath, validFile);
-
-            var calculator = new TestDesignWaterLevelCalculator
-            {
-                IllustrationPointsResult = GeneralResultTestFactory.CreateGeneralResultSubMechanismWithDuplicateIllustrationPoints(),
-                Converged = true
-            };
-
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator);
-
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
-            calculation.Stub(c => c.Name).Return("punt_flw_ 1");
-            calculation.Expect(c => c.Id).Return(100);
-            calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
-
-            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                // Call
-                Action call = () => new DesignWaterLevelCalculationService().Calculate(calculation,
-                                                                                       validFilePath,
-                                                                                       1.0 / 30,
-                                                                                       calculationMessageProvider);
-
-                // Assert
-                TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages =>
-                {
-                    Tuple<string, Level, Exception>[] tupleArray = messages.ToArray();
-
-                    string[] msgs = tupleArray.Select(tuple => tuple.Item1).ToArray();
-                    Assert.AreEqual(4, msgs.Length);
-
-                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    Assert.AreEqual("Fout bij het uitlezen van de illustratiepunten voor berekening punt_flw_ 1: " +
-                                    "Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting. " +
-                                    "Het uitlezen van illustratiepunten wordt overgeslagen.", msgs[1]);
-                    Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
-                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
-                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-                });
-                Assert.IsNotNull(calculation.Output);
-                Assert.IsFalse(calculation.Output.HasGeneralResult);
-            }
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void Calculate_ValidDesignWaterLevelCalculationButIllustrationPointResultsWithDuplicateIllustrationPointResults_IllustrationPointNotSetAndLog()
-        {
-            // Setup
-            string validFilePath = Path.Combine(testDataPath, validFile);
-
-            var calculator = new TestDesignWaterLevelCalculator
-            {
-                IllustrationPointsResult = GeneralResultTestFactory.CreateGeneralResultSubMechanismWithDuplicateIllustrationPointResults(),
-                Converged = true
-            };
-
-            var mockRepository = new MockRepository();
-            var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator);
-
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
-            calculation.Stub(c => c.Name).Return("punt_flw_ 1");
-            calculation.Expect(c => c.Id).Return(100);
-            calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
-
-            var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
-            mockRepository.ReplayAll();
-
-            using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
-            {
-                // Call
-                Action call = () => new DesignWaterLevelCalculationService().Calculate(calculation,
-                                                                                       validFilePath,
-                                                                                       1.0 / 30,
-                                                                                       calculationMessageProvider);
-
-                // Assert
-                TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages =>
-                {
-                    Tuple<string, Level, Exception>[] tupleArray = messages.ToArray();
-
-                    string[] msgs = tupleArray.Select(tuple => tuple.Item1).ToArray();
-                    Assert.AreEqual(4, msgs.Length);
-
-                    CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
-                    Assert.AreEqual("Fout bij het uitlezen van de illustratiepunten voor berekening punt_flw_ 1: " +
-                                    "Een of meerdere uitvoer variabelen hebben dezelfde naam. " +
-                                    "Het uitlezen van illustratiepunten wordt overgeslagen.", msgs[1]);
-                    Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " +
-                                    "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]);
-                    CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]);
-                });
-                Assert.IsNotNull(calculation.Output);
-                Assert.IsFalse(calculation.Output.HasGeneralResult);
-            }
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
         public void Calculate_ValidDesignWaterLevelCalculationThrowsException_ThrowsHydraRingFileParserException()
         {
             // Setup