Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u -r23eb942299f0d6ee16ef44ae7e9942436ff1e7b4 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 23eb942299f0d6ee16ef44ae7e9942436ff1e7b4)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -37,7 +37,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using ClosingStructuresFormsResources = Ringtoets.ClosingStructures.Forms.Properties.Resources;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -r2ba2957ae849bb05a45cf13f81a8f6464184caef -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 2ba2957ae849bb05a45cf13f81a8f6464184caef)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -23,7 +23,6 @@
using System.ComponentModel;
using System.IO;
using System.Linq;
-using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.TestUtil;
@@ -38,7 +37,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r3e9eb63e09c270127a0db49f2dea3da5ff3a3639 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 3e9eb63e09c270127a0db49f2dea3da5ff3a3639)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -30,7 +30,7 @@
using Ringtoets.HydraRing.Calculation.Calculator;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Data;
namespace Ringtoets.Common.Service
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r3e9eb63e09c270127a0db49f2dea3da5ff3a3639 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 3e9eb63e09c270127a0db49f2dea3da5ff3a3639)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -30,7 +30,7 @@
using Ringtoets.HydraRing.Calculation.Calculator;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Data;
namespace Ringtoets.Common.Service
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -rbc9c19b950e12688f8f97a659af2f2cd3295956a -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -30,7 +30,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data.Input;
using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -rbc9c19b950e12688f8f97a659af2f2cd3295956a -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -30,6 +30,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data.Input;
using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.Parsers;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -r23eb942299f0d6ee16ef44ae7e9942436ff1e7b4 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 23eb942299f0d6ee16ef44ae7e9942436ff1e7b4)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -36,7 +36,7 @@
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
using Ringtoets.HydraRing.Calculation.Data.Input.Overtopping;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
using RingtoetsCommonForms = Ringtoets.Common.Forms.Properties.Resources;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs
===================================================================
diff -u -r2ba2957ae849bb05a45cf13f81a8f6464184caef -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 2ba2957ae849bb05a45cf13f81a8f6464184caef)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -33,7 +33,7 @@
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -rbc9c19b950e12688f8f97a659af2f2cd3295956a -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -22,7 +22,6 @@
using System;
using System.IO;
using System.Linq;
-using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
using Core.Common.TestUtil;
using NUnit.Framework;
@@ -34,7 +33,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r23eb942299f0d6ee16ef44ae7e9942436ff1e7b4 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 23eb942299f0d6ee16ef44ae7e9942436ff1e7b4)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -36,7 +36,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -rbc9c19b950e12688f8f97a659af2f2cd3295956a -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -23,7 +23,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.TestUtil;
@@ -39,7 +38,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Exceptions/HydraRingFileParserException.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Exceptions/HydraRingFileParserException.cs (revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Exceptions/HydraRingFileParserException.cs (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -0,0 +1,58 @@
+// Copyright (C) Stichting Deltares 2016. 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 .
+//
+// 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 System.Runtime.Serialization;
+
+namespace Ringtoets.HydraRing.Calculation.Exceptions
+{
+ ///
+ /// The exception that is thrown when a HydraRing file parser encounters an error while
+ /// parsing HydraRing output.
+ ///
+ [Serializable]
+ public class HydraRingFileParserException : Exception
+ {
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public HydraRingFileParserException() {}
+
+ ///
+ /// Initializes a new instance of the class
+ /// with a specified error message.
+ ///
+ /// The error message that explains the reason for the exception.
+ public HydraRingFileParserException(string message) : base(message) {}
+
+ ///
+ /// Initializes a new instance of the class
+ /// with a specified error message and a reference to the inner exception that is
+ /// the cause of this exception.
+ ///
+ /// The error message that explains the reason for the exception.
+ /// The exception that is the cause of the current exception,
+ /// or a null reference if no inner exception is specified.
+ public HydraRingFileParserException(string message, Exception inner) : base(message, inner) {}
+
+ protected HydraRingFileParserException(SerializationInfo info, StreamingContext context) : base(info, context) {}
+ }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs (.../ExceedanceProbabilityCalculationParser.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs (.../ExceedanceProbabilityCalculationParser.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -25,6 +25,7 @@
using System.Data.SQLite;
using System.IO;
using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.IO;
namespace Ringtoets.HydraRing.Calculation.Parsers
Fisheye: Tag 12fa48e392e145311f2f6fe5822a8692594aaf0f refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingFileParserException.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IHydraRingFileParser.cs
===================================================================
diff -u -r594eede1049807722c951d1d0a7f13f4e3af809c -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IHydraRingFileParser.cs (.../IHydraRingFileParser.cs) (revision 594eede1049807722c951d1d0a7f13f4e3af809c)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IHydraRingFileParser.cs (.../IHydraRingFileParser.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using Ringtoets.HydraRing.Calculation.Exceptions;
namespace Ringtoets.HydraRing.Calculation.Parsers
{
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/LastErrorFileParser.cs
===================================================================
diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/LastErrorFileParser.cs (.../LastErrorFileParser.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/LastErrorFileParser.cs (.../LastErrorFileParser.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -20,6 +20,7 @@
// All rights reserved.
using System.IO;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.Properties;
using Ringtoets.HydraRing.IO;
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -24,6 +24,7 @@
using System.IO;
using System.Linq;
using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.IO;
namespace Ringtoets.HydraRing.Calculation.Parsers
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs (.../ReliabilityIndexCalculationParser.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs (.../ReliabilityIndexCalculationParser.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -24,6 +24,7 @@
using System.IO;
using System.Linq;
using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.IO;
namespace Ringtoets.HydraRing.Calculation.Parsers
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs
===================================================================
diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs (.../WaveConditionsCalculationParser.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs (.../WaveConditionsCalculationParser.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -22,6 +22,7 @@
using System.Globalization;
using System.IO;
using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.IO;
namespace Ringtoets.HydraRing.Calculation.Parsers
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r6591abcf84d7be9d2eba496b655f9c09513bc758 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 6591abcf84d7be9d2eba496b655f9c09513bc758)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -96,11 +96,11 @@
+
-
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Exceptions/HydraRingFileParserExceptionTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Exceptions/HydraRingFileParserExceptionTest.cs (revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Exceptions/HydraRingFileParserExceptionTest.cs (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -0,0 +1,98 @@
+// Copyright (C) Stichting Deltares 2016. 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 .
+//
+// 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.TestUtil;
+using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Exceptions;
+
+namespace Ringtoets.HydraRing.Calculation.Test.Exceptions
+{
+ [TestFixture]
+ public class HydraRingFileParserExceptionTest
+ {
+ [Test]
+ public void DefaultConstructor_InnerExceptionNullAndMessageDefault()
+ {
+ // Setup
+ string expectedMessage = string.Format("Exception of type '{0}' was thrown.", typeof(HydraRingFileParserException).FullName);
+
+ // Call
+ HydraRingFileParserException exception = new HydraRingFileParserException();
+
+ // Assert
+ Assert.IsInstanceOf(exception);
+ Assert.IsNull(exception.InnerException);
+ Assert.AreEqual(expectedMessage, exception.Message);
+ }
+
+ [Test]
+ public void Constructor_WithCustomMessage_InnerExceptionNullAndMessageSetToCustom()
+ {
+ // Setup
+ const string expectedMessage = "Some exception message";
+
+ // Call
+ HydraRingFileParserException exception = new HydraRingFileParserException(expectedMessage);
+
+ // Assert
+ Assert.IsNull(exception.InnerException);
+ Assert.AreEqual(expectedMessage, exception.Message);
+ }
+
+ [Test]
+ public void Constructor_WithCustomMessageAndInnerException_InnerExceptionSetAndMessageSetToCustom()
+ {
+ // Setup
+ const string expectedMessage = "Some exception message";
+ Exception expectedInnerException = new Exception();
+
+ // Call
+ HydraRingFileParserException exception = new HydraRingFileParserException(expectedMessage, expectedInnerException);
+
+ // Assert
+ Assert.AreSame(expectedInnerException, exception.InnerException);
+ Assert.AreEqual(expectedMessage, exception.Message);
+ }
+
+ [Test]
+ public void Constructor_SerializationRoundTrip_ExceptionProperlyInitialized()
+ {
+ // Setup
+ var originalInnerException = new Exception("inner");
+ var originalException = new HydraRingFileParserException("outer", originalInnerException);
+
+ // Precondition
+ Assert.IsNotNull(originalException.InnerException);
+ Assert.IsNull(originalException.InnerException.InnerException);
+
+ // Call
+ HydraRingFileParserException persistedException = SerializationTestHelper.SerializeAndDeserializeException(originalException);
+
+ // Assert
+ Assert.AreEqual(originalException.Message, persistedException.Message);
+ Assert.IsNotNull(persistedException.InnerException);
+ Assert.AreEqual(originalException.InnerException.GetType(), persistedException.InnerException.GetType());
+ Assert.AreEqual(originalException.InnerException.Message, persistedException.InnerException.Message);
+ Assert.IsNull(persistedException.InnerException.InnerException);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs (.../ExceedanceProbabilityCalculationParserTest.cs) (revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs (.../ExceedanceProbabilityCalculationParserTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -24,6 +24,7 @@
using Core.Common.TestUtil;
using NUnit.Framework;
using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.Parsers;
using Ringtoets.HydraRing.IO;
Fisheye: Tag 12fa48e392e145311f2f6fe5822a8692594aaf0f refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingFileParserExceptionTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs
===================================================================
diff -u -rbc9c19b950e12688f8f97a659af2f2cd3295956a -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -24,6 +24,7 @@
using System.Security.AccessControl;
using Core.Common.TestUtil;
using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.Parsers;
using Ringtoets.HydraRing.IO;
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs (.../OvertoppingCalculationWaveHeightParserTest.cs) (revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs (.../OvertoppingCalculationWaveHeightParserTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -22,6 +22,7 @@
using System.IO;
using Core.Common.TestUtil;
using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.Parsers;
namespace Ringtoets.HydraRing.Calculation.Test.Parsers
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ReliabilityIndexCalculationParserTest.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ReliabilityIndexCalculationParserTest.cs (.../ReliabilityIndexCalculationParserTest.cs) (revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ReliabilityIndexCalculationParserTest.cs (.../ReliabilityIndexCalculationParserTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -22,6 +22,7 @@
using System.IO;
using Core.Common.TestUtil;
using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.Parsers;
using Ringtoets.HydraRing.IO;
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r25b96faf582aeda6b257d3f2394b7f0e22b977ba -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 25b96faf582aeda6b257d3f2394b7f0e22b977ba)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -95,8 +95,8 @@
+
-
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs
===================================================================
diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -27,6 +27,7 @@
using Ringtoets.HydraRing.Calculation.Data.Input.Overtopping;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.Parsers;
namespace Ringtoets.HydraRing.Calculation.TestUtil.Calculator
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs
===================================================================
diff -u -r23eb942299f0d6ee16ef44ae7e9942436ff1e7b4 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 23eb942299f0d6ee16ef44ae7e9942436ff1e7b4)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -32,7 +32,7 @@
using Ringtoets.HydraRing.Calculation.Calculator;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.Revetment.Data;
using Ringtoets.Revetment.Service.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -r618aac0fd9007e54793ffd9a5957cb9e4f7bf1a2 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 618aac0fd9007e54793ffd9a5957cb9e4f7bf1a2)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -22,7 +22,6 @@
using System;
using System.IO;
using System.Linq;
-using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
using Core.Common.TestUtil;
using NUnit.Framework;
@@ -31,7 +30,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs
===================================================================
diff -u -r23eb942299f0d6ee16ef44ae7e9942436ff1e7b4 -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 23eb942299f0d6ee16ef44ae7e9942436ff1e7b4)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -35,7 +35,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.StabilityPointStructures.Data;
using Ringtoets.StabilityPointStructures.Service.Properties;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs
===================================================================
diff -u -r2ba2957ae849bb05a45cf13f81a8f6464184caef -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 2ba2957ae849bb05a45cf13f81a8f6464184caef)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -23,7 +23,6 @@
using System.ComponentModel;
using System.IO;
using System.Linq;
-using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.TestUtil;
@@ -36,7 +35,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.StabilityPointStructures.Data;
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -rbc9c19b950e12688f8f97a659af2f2cd3295956a -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -22,7 +22,6 @@
using System;
using System.IO;
using System.Linq;
-using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
using Core.Common.TestUtil;
using NUnit.Framework;
@@ -33,7 +32,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -rbc9c19b950e12688f8f97a659af2f2cd3295956a -r12fa48e392e145311f2f6fe5822a8692594aaf0f
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 12fa48e392e145311f2f6fe5822a8692594aaf0f)
@@ -22,7 +22,6 @@
using System;
using System.IO;
using System.Linq;
-using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
using Core.Common.TestUtil;
using NUnit.Framework;
@@ -33,7 +32,7 @@
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
-using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Exceptions;
using Ringtoets.HydraRing.Calculation.TestUtil;
using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
using Ringtoets.HydraRing.Data;