Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs =================================================================== diff -u -r84e9dd40942da514fb2f2cb270001e81857b1be4 -r57fed0613dfbabcbd1a4541c0e833590f24eef58 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs (.../ExceedanceProbabilityCalculationParser.cs) (revision 84e9dd40942da514fb2f2cb270001e81857b1be4) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs (.../ExceedanceProbabilityCalculationParser.cs) (revision 57fed0613dfbabcbd1a4541c0e833590f24eef58) @@ -56,19 +56,6 @@ { try { - Path.GetFullPath(workingDirectory); - } - catch (ArgumentNullException) - { - throw new ArgumentNullException("workingDirectory"); - } - catch - { - throw new ArgumentException("workingDirectory"); - } - - try - { Output = DoParse(Path.Combine(workingDirectory, HydraRingFileName.OutputDatabaseFileName), sectionId); } catch Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingLogFileParser.cs =================================================================== diff -u -r0e14239586de6a1a6be2b557a1b9fcc9869d55ed -r57fed0613dfbabcbd1a4541c0e833590f24eef58 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingLogFileParser.cs (.../HydraRingLogFileParser.cs) (revision 0e14239586de6a1a6be2b557a1b9fcc9869d55ed) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingLogFileParser.cs (.../HydraRingLogFileParser.cs) (revision 57fed0613dfbabcbd1a4541c0e833590f24eef58) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.IO; using log4net; using Ringtoets.HydraRing.Calculation.Properties; @@ -35,24 +34,11 @@ public void Parse(string workingDirectory, int sectionId) { - try - { - Path.GetFullPath(workingDirectory); - } - catch (ArgumentNullException) - { - throw new ArgumentNullException("workingDirectory"); - } - catch - { - throw new ArgumentException("workingDirectory"); - } - string logFileName = sectionId + ".log"; try { - LogFileContent = File.ReadAllText(Path.Combine(workingDirectory, logFileName)); + LogFileContent = File.ReadAllText(Path.Combine(workingDirectory, sectionId + ".log")); } catch { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs =================================================================== diff -u -r28eca7c7266b51b09790d1dcaa23808283457c46 -r57fed0613dfbabcbd1a4541c0e833590f24eef58 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision 28eca7c7266b51b09790d1dcaa23808283457c46) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs (.../OvertoppingCalculationWaveHeightParser.cs) (revision 57fed0613dfbabcbd1a4541c0e833590f24eef58) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.Globalization; using System.IO; @@ -80,19 +79,6 @@ public void Parse(string workingDirectory, int sectionId) { - try - { - Path.GetFullPath(workingDirectory); - } - catch (ArgumentNullException) - { - throw new ArgumentNullException("workingDirectory"); - } - catch - { - throw new ArgumentException("workingDirectory"); - } - string fileName = string.Format("{0}{1}", sectionId, HydraRingFileName.OutputFileSuffix); try Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/TargetProbabilityCalculationParser.cs =================================================================== diff -u -r28eca7c7266b51b09790d1dcaa23808283457c46 -r57fed0613dfbabcbd1a4541c0e833590f24eef58 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/TargetProbabilityCalculationParser.cs (.../TargetProbabilityCalculationParser.cs) (revision 28eca7c7266b51b09790d1dcaa23808283457c46) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/TargetProbabilityCalculationParser.cs (.../TargetProbabilityCalculationParser.cs) (revision 57fed0613dfbabcbd1a4541c0e833590f24eef58) @@ -45,19 +45,6 @@ { try { - Path.GetFullPath(workingDirectory); - } - catch (ArgumentNullException) - { - throw new ArgumentNullException("workingDirectory"); - } - catch - { - throw new ArgumentException("workingDirectory"); - } - - try - { using (var streamReader = new StreamReader(Path.Combine(workingDirectory, HydraRingFileName.DesignTablesFileName))) { var fileContents = streamReader.ReadToEnd(); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs =================================================================== diff -u -r557c60f6aadb50bcb07503a0f5a1ea34ca6a3885 -r57fed0613dfbabcbd1a4541c0e833590f24eef58 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs (.../ExceedanceProbabilityCalculationParserTest.cs) (revision 557c60f6aadb50bcb07503a0f5a1ea34ca6a3885) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs (.../ExceedanceProbabilityCalculationParserTest.cs) (revision 57fed0613dfbabcbd1a4541c0e833590f24eef58) @@ -47,51 +47,6 @@ } [Test] - public void Parse_NullWorkingDirectory_ThrowArgumentNullException() - { - // Setup - var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser(); - - // Call - TestDelegate call = () => exceedanceProbabilityCalculationParser.Parse(null, 1); - - // Assert - Assert.Throws(call); - } - - [Test] - [TestCase("")] - [TestCase(" ")] - public void Parse_NoWorkingDirectory_ThrowArgumentException(string directoryPath) - { - // Setup - var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser(); - - // Call - TestDelegate call = () => exceedanceProbabilityCalculationParser.Parse(directoryPath, 1); - - // Assert - Assert.Throws(call); - } - - [Test] - public void Parse_NoWorkingDirectory_ThrowArgumentException() - { - // Setup - var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser(); - - char[] invalidFileNameChars = Path.GetInvalidFileNameChars(); - string invalidCharacter = invalidFileNameChars[0].ToString(); - var directoryPath = "c:/test_directory".Replace("_", invalidCharacter); - - // Call - TestDelegate call = () => exceedanceProbabilityCalculationParser.Parse(directoryPath, 1); - - // Assert - Assert.Throws(call); - } - - [Test] public void Parse_NotExistingOutputFile_OutputNull() { // Setup Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LogFileParserTest.cs =================================================================== diff -u -r557c60f6aadb50bcb07503a0f5a1ea34ca6a3885 -r57fed0613dfbabcbd1a4541c0e833590f24eef58 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LogFileParserTest.cs (.../LogFileParserTest.cs) (revision 557c60f6aadb50bcb07503a0f5a1ea34ca6a3885) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LogFileParserTest.cs (.../LogFileParserTest.cs) (revision 57fed0613dfbabcbd1a4541c0e833590f24eef58) @@ -86,50 +86,5 @@ var expectedMessage = "In dit bestand staan veschillende log berichten, welke door Hydra-Ring gegenereerd zijn."; Assert.AreEqual(expectedMessage, logFileParser.LogFileContent); } - - [Test] - public void Parse_NullWorkingDirectory_ThrowArgumentNullException() - { - // Setup - var logFileParser = new HydraRingLogFileParser(); - - // Call - TestDelegate call =() => logFileParser.Parse(null, 1); - - // Assert - Assert.Throws(call); - } - - [Test] - [TestCase("")] - [TestCase(" ")] - public void Parse_NoWorkingDirectory_ThrowArgumentException(string directoryPath) - { - // Setup - var logFileParser = new HydraRingLogFileParser(); - - // Call - TestDelegate call = () => logFileParser.Parse(directoryPath, 1); - - // Assert - Assert.Throws(call); - } - - [Test] - public void Parse_NoWorkingDirectory_ThrowArgumentException() - { - // Setup - var logFileParser = new HydraRingLogFileParser(); - - char[] invalidFileNameChars = Path.GetInvalidFileNameChars(); - string invalidCharacter = invalidFileNameChars[0].ToString(); - var directoryPath = "c:/test_directory".Replace("_", invalidCharacter); - - // Call - TestDelegate call = () => logFileParser.Parse(directoryPath, 1); - - // Assert - Assert.Throws(call); - } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs =================================================================== diff -u -r557c60f6aadb50bcb07503a0f5a1ea34ca6a3885 -r57fed0613dfbabcbd1a4541c0e833590f24eef58 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs (.../OvertoppingCalculationWaveHeightParserTest.cs) (revision 557c60f6aadb50bcb07503a0f5a1ea34ca6a3885) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs (.../OvertoppingCalculationWaveHeightParserTest.cs) (revision 57fed0613dfbabcbd1a4541c0e833590f24eef58) @@ -47,51 +47,6 @@ } [Test] - public void Parse_NullWorkingDirectory_ThrowArgumentNullException() - { - // Setup - var parser = new OvertoppingCalculationWaveHeightParser(); - - // Call - TestDelegate call = () => parser.Parse(null, 1); - - // Assert - Assert.Throws(call); - } - - [Test] - [TestCase("")] - [TestCase(" ")] - public void Parse_NoWorkingDirectory_ThrowArgumentException(string directoryPath) - { - // Setup - var parser = new OvertoppingCalculationWaveHeightParser(); - - // Call - TestDelegate call = () => parser.Parse(directoryPath, 1); - - // Assert - Assert.Throws(call); - } - - [Test] - public void Parse_NoWorkingDirectory_ThrowArgumentException() - { - // Setup - var parser = new OvertoppingCalculationWaveHeightParser(); - - char[] invalidFileNameChars = Path.GetInvalidFileNameChars(); - string invalidCharacter = invalidFileNameChars[0].ToString(); - var directoryPath = "c:/test_directory".Replace("_", invalidCharacter); - - // Call - TestDelegate call = () => parser.Parse(directoryPath, 1); - - // Assert - Assert.Throws(call); - } - - [Test] public void Parse_NotExistingOutputFile_OutputNull() { // Setup Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/TargetProbabilityCalculationParserTest.cs =================================================================== diff -u -r557c60f6aadb50bcb07503a0f5a1ea34ca6a3885 -r57fed0613dfbabcbd1a4541c0e833590f24eef58 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/TargetProbabilityCalculationParserTest.cs (.../TargetProbabilityCalculationParserTest.cs) (revision 557c60f6aadb50bcb07503a0f5a1ea34ca6a3885) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/TargetProbabilityCalculationParserTest.cs (.../TargetProbabilityCalculationParserTest.cs) (revision 57fed0613dfbabcbd1a4541c0e833590f24eef58) @@ -45,51 +45,6 @@ } [Test] - public void Parse_NullWorkingDirectory_ThrowArgumentNullException() - { - // Setup - var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); - - // Call - TestDelegate call = () => targetProbabilityCalculationParser.Parse(null, 1); - - // Assert - Assert.Throws(call); - } - - [Test] - [TestCase("")] - [TestCase(" ")] - public void Parse_NoWorkingDirectory_ThrowArgumentException(string directoryPath) - { - // Setup - var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); - - // Call - TestDelegate call = () => targetProbabilityCalculationParser.Parse(directoryPath, 1); - - // Assert - Assert.Throws(call); - } - - [Test] - public void Parse_NoWorkingDirectory_ThrowArgumentException() - { - // Setup - var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); - - char[] invalidFileNameChars = Path.GetInvalidFileNameChars(); - string invalidCharacter = invalidFileNameChars[0].ToString(); - var directoryPath = "c:/test_directory".Replace("_", invalidCharacter); - - // Call - TestDelegate call = () => targetProbabilityCalculationParser.Parse(directoryPath, 1); - - // Assert - Assert.Throws(call); - } - - [Test] public void Parse_NotExistingOutputFile_OutputNull() { // Setup