Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -r9d677016ec66d0ec3cfce9e9b47ac89998f9f620 -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 9d677016ec66d0ec3cfce9e9b47ac89998f9f620) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -43,7 +43,6 @@ StructuresCalculation, ClosingStructuresCalculationConfiguration> { - private static IEnumerable Calculations { get Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs =================================================================== diff -u -rb253fd5ebc5d5800f5757be8b04820cb4ca05724 -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs (.../ConvergenceParser.cs) (revision b253fd5ebc5d5800f5757be8b04820cb4ca05724) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ConvergenceParser.cs (.../ConvergenceParser.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -47,11 +47,6 @@ public void Parse(string workingDirectory, int sectionId) { - if (workingDirectory == null) - { - throw new ArgumentNullException(nameof(workingDirectory)); - } - HydraRingDatabaseParseHelper.Parse(workingDirectory, getLastResultQuery, sectionId, @@ -63,7 +58,7 @@ /// Reads the result of the . /// /// The reader to get the result from. - /// Thrown when the the result + /// Thrown when the result /// cannot be converted to the output format. private void ReadResult(HydraRingDatabaseReader reader) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/DunesBoundaryConditionsCalculationParser.cs =================================================================== diff -u -rcaa069a8d2f118af9b92dc6db8c5c5bdbdc358fd -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/DunesBoundaryConditionsCalculationParser.cs (.../DunesBoundaryConditionsCalculationParser.cs) (revision caa069a8d2f118af9b92dc6db8c5c5bdbdc358fd) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/DunesBoundaryConditionsCalculationParser.cs (.../DunesBoundaryConditionsCalculationParser.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -27,7 +27,7 @@ namespace Ringtoets.HydraRing.Calculation.Parsers { /// - /// Class for parsing dunes boundary condition results from a dunes boundary conditions calculation. + /// Parser for the dunes boundary conditions of Hydra-Ring calculations. /// public class DunesBoundaryConditionsCalculationParser : IHydraRingFileParser { @@ -53,23 +53,18 @@ public void Parse(string workingDirectory, int sectionId) { - if (workingDirectory == null) - { - throw new ArgumentNullException(nameof(workingDirectory)); - } - HydraRingDatabaseParseHelper.Parse(workingDirectory, query, sectionId, - Resources.DunesBoundaryConditionsCalculationParser_ParseFile_No_dunes_hydraulic_boundaries_found_in_output_file, + Resources.DunesBoundaryConditionsCalculationParser_Parse_No_dunes_hydraulic_boundaries_found_in_output_file, ReadResult); } /// /// Reads the result of the . /// /// The reader to get the result from. - /// Thrown when the the result + /// Thrown when the result /// cannot be converted to the output format. private void ReadResult(HydraRingDatabaseReader reader) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs =================================================================== diff -u -rb253fd5ebc5d5800f5757be8b04820cb4ca05724 -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs (.../ExceedanceProbabilityCalculationParser.cs) (revision b253fd5ebc5d5800f5757be8b04820cb4ca05724) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs (.../ExceedanceProbabilityCalculationParser.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -26,7 +26,7 @@ namespace Ringtoets.HydraRing.Calculation.Parsers { /// - /// Parser for the output of Hydra-Ring calculations that compute a probability of failure. + /// Parser for the probability of failure of Hydra-Ring calculations. /// public class ExceedanceProbabilityCalculationParser : IHydraRingFileParser { @@ -46,11 +46,6 @@ public void Parse(string workingDirectory, int sectionId) { - if (workingDirectory == null) - { - throw new ArgumentNullException(nameof(workingDirectory)); - } - HydraRingDatabaseParseHelper.Parse(workingDirectory, query, sectionId, @@ -62,7 +57,7 @@ /// Reads the result of the . /// /// The reader to get the result from. - /// Thrown when the the result + /// Thrown when the result /// cannot be converted to the output format. private void ReadResult(HydraRingDatabaseReader reader) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingDatabaseParseHelper.cs =================================================================== diff -u -rc235d644419c9f398fd806f7dce2592f0974ac97 -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingDatabaseParseHelper.cs (.../HydraRingDatabaseParseHelper.cs) (revision c235d644419c9f398fd806f7dce2592f0974ac97) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingDatabaseParseHelper.cs (.../HydraRingDatabaseParseHelper.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -28,22 +28,22 @@ namespace Ringtoets.HydraRing.Calculation.Parsers { /// - /// Helper class for methods that apply for parsing the output from the database. + /// Helper class for methods that apply for parsing output from a Hydra-Ring database. /// internal static class HydraRingDatabaseParseHelper { /// - /// Parses the file. + /// Parses the Hydra-Ring output database. /// /// The path to the directory which contains /// the output of the Hydra-Ring calculation. /// The query to perform when reading the database. /// The section id to get the output for. /// The exception message when there is no result. - /// The action to perform for getting the results of the - /// database. - /// Thrown when the reader - /// encounters an error while reading the database. + /// The action to perform for parsing the results from the database. + /// Thrown when any input parameter is null. + /// Thrown when the reader encounters an error while + /// reading the database. public static void Parse(string workingDirectory, string query, int sectionId, @@ -62,7 +62,7 @@ } catch (SQLiteException e) { - throw new HydraRingFileParserException(Resources.ParseFile_Cannot_read_result_in_output_file, e); + throw new HydraRingFileParserException(Resources.Parse_Cannot_read_result_in_output_file, e); } catch (Exception e) when (e is HydraRingDatabaseReaderException || e is InvalidCastException) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs =================================================================== diff -u -r9a23940073476cb6293dd921afb5298d0aeaab7d -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs (.../ReliabilityIndexCalculationParser.cs) (revision 9a23940073476cb6293dd921afb5298d0aeaab7d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs (.../ReliabilityIndexCalculationParser.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -27,7 +27,7 @@ namespace Ringtoets.HydraRing.Calculation.Parsers { /// - /// Parser for the output of Hydra-Ring calculations that iterate towards a reliability index. + /// Parser for the reliability index of failure of Hydra-Ring calculations. /// public class ReliabilityIndexCalculationParser : IHydraRingFileParser { @@ -49,11 +49,6 @@ public void Parse(string workingDirectory, int sectionId) { - if (workingDirectory == null) - { - throw new ArgumentNullException(nameof(workingDirectory)); - } - HydraRingDatabaseParseHelper.Parse(workingDirectory, query, sectionId, @@ -65,13 +60,13 @@ /// Reads the result of the . /// /// The reader to get the result from. - /// Thrown when the the result + /// Thrown when the result /// cannot be converted to the output format. private void ReadResult(HydraRingDatabaseReader reader) { Output = new ReliabilityIndexCalculationOutput( - Convert.ToDouble(reader.ReadColumn("Value")), - Convert.ToDouble(reader.ReadColumn("BetaValue"))); + Convert.ToDouble(reader.ReadColumn(valueColumnName)), + Convert.ToDouble(reader.ReadColumn(betaColumnName))); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs =================================================================== diff -u -r9a23940073476cb6293dd921afb5298d0aeaab7d -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9a23940073476cb6293dd921afb5298d0aeaab7d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -84,10 +84,10 @@ /// /// Looks up a localized string similar to Er zijn geen berekende hydraulische randvoorwaarden voor duinen gevonden in de Hydra-Ring uitvoerdatabase.. /// - internal static string DunesBoundaryConditionsCalculationParser_ParseFile_No_dunes_hydraulic_boundaries_found_in_output_file { + internal static string DunesBoundaryConditionsCalculationParser_Parse_No_dunes_hydraulic_boundaries_found_in_output_file { get { - return ResourceManager.GetString("DunesBoundaryConditionsCalculationParser_ParseFile_No_dunes_hydraulic_boundaries_" + - "found_in_output_file", resourceCulture); + return ResourceManager.GetString("DunesBoundaryConditionsCalculationParser_Parse_No_dunes_hydraulic_boundaries_foun" + + "d_in_output_file", resourceCulture); } } @@ -138,20 +138,20 @@ } /// - /// Looks up a localized string similar to Er is geen resultaat voor convergentie gevonden in de Hydra-Ring uitvoerdatabase.. + /// Looks up a localized string similar to Er kon geen resultaat gelezen worden uit de Hydra-Ring uitvoerdatabase.. /// - internal static string Parse_No_convergence_found_in_output_file { + internal static string Parse_Cannot_read_result_in_output_file { get { - return ResourceManager.GetString("Parse_No_convergence_found_in_output_file", resourceCulture); + return ResourceManager.GetString("Parse_Cannot_read_result_in_output_file", resourceCulture); } } /// - /// Looks up a localized string similar to Er kon geen resultaat gelezen worden uit de Hydra-Ring uitvoerdatabase.. + /// Looks up a localized string similar to Er is geen resultaat voor convergentie gevonden in de Hydra-Ring uitvoerdatabase.. /// - internal static string ParseFile_Cannot_read_result_in_output_file { + internal static string Parse_No_convergence_found_in_output_file { get { - return ResourceManager.GetString("ParseFile_Cannot_read_result_in_output_file", resourceCulture); + return ResourceManager.GetString("Parse_No_convergence_found_in_output_file", resourceCulture); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx =================================================================== diff -u -r9a23940073476cb6293dd921afb5298d0aeaab7d -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx (.../Resources.resx) (revision 9a23940073476cb6293dd921afb5298d0aeaab7d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx (.../Resources.resx) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -126,7 +126,7 @@ Er is een kritische fout opgetreden bij het uitvoeren van de berekening. - + Er kon geen resultaat gelezen worden uit de Hydra-Ring uitvoerdatabase. @@ -135,7 +135,7 @@ Er is geen resultaat gevonden in de Hydra-Ring uitvoerdatabase. - + Er zijn geen berekende hydraulische randvoorwaarden voor duinen gevonden in de Hydra-Ring uitvoerdatabase. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs =================================================================== diff -u -r31caf3dc885ae62d4b3772eb0421a3155101bcf4 -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision 31caf3dc885ae62d4b3772eb0421a3155101bcf4) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -61,7 +61,8 @@ /// contains illegal characters, or /// contains a colon which is not part of a volume identifier, or /// is too long. - /// + /// + /// /// Thrown when the reader encounters /// an error while connecting to the database. public HydraRingDatabaseReader(string workingDirectory, string query, int sectionId) @@ -78,7 +79,8 @@ this.workingDirectory = workingDirectory; - CreateConnectionAndCommand(query, sectionId); + connection = CreateConnection(); + CreateCommand(query, sectionId); OpenConnection(); GetReader(); } @@ -87,7 +89,7 @@ /// Executes the query on the database. /// /// Thrown when - /// the connection could not be opened or when the database is emtpy. + /// an error encounters while reading the database. public void Execute() { results = new Dictionary(); @@ -153,9 +155,8 @@ connection.Open(); } - private void CreateConnectionAndCommand(string query, int sectionId) + private void CreateCommand(string query, int sectionId) { - connection = CreateConnection(); command = new SQLiteCommand(query, connection); command.Parameters.Add(new SQLiteParameter { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs =================================================================== diff -u -rc235d644419c9f398fd806f7dce2592f0974ac97 -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs (.../HydraRingDatabaseParseHelperTest.cs) (revision c235d644419c9f398fd806f7dce2592f0974ac97) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs (.../HydraRingDatabaseParseHelperTest.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -62,6 +62,7 @@ var exception = Assert.Throws(test); Assert.AreEqual("query", exception.ParamName); } + [Test] public void Parse_ExceptionMessageNull_ThrowArgumentNullException() { @@ -72,6 +73,7 @@ var exception = Assert.Throws(test); Assert.AreEqual("exceptionMessage", exception.ParamName); } + [Test] public void Parse_ReadResultActionNull_ThrowArgumentNullException() { @@ -120,10 +122,7 @@ string directory = Path.Combine(testDirectory, validFile); // Call - TestDelegate test = () => HydraRingDatabaseParseHelper.Parse(directory, query, 0, customMessage, reader => - { - throw new InvalidCastException(); - }); + TestDelegate test = () => HydraRingDatabaseParseHelper.Parse(directory, query, 0, customMessage, reader => { throw new InvalidCastException(); }); // Assert var exception = Assert.Throws(test); @@ -133,16 +132,12 @@ [Test] public void Parse_ValidData_ReadResultActionPerformed() { - // Setup string directory = Path.Combine(testDirectory, validFile); var performed = false; // Call - HydraRingDatabaseParseHelper.Parse(directory, query, 0, "", reader => - { - performed = true; - }); + HydraRingDatabaseParseHelper.Parse(directory, query, 0, "", reader => { performed = true; }); // Assert Assert.IsTrue(performed); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Readers/HydraRingDatabaseReaderTest.cs =================================================================== diff -u -r31caf3dc885ae62d4b3772eb0421a3155101bcf4 -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Readers/HydraRingDatabaseReaderTest.cs (.../HydraRingDatabaseReaderTest.cs) (revision 31caf3dc885ae62d4b3772eb0421a3155101bcf4) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Readers/HydraRingDatabaseReaderTest.cs (.../HydraRingDatabaseReaderTest.cs) (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -32,8 +32,8 @@ [TestFixture] public class HydraRingDatabaseReaderTest { - private const string validWorkingDirectory = "ValidFile"; - private const string invalidDatabase = "InvalidFile"; + private const string validDatabase = "ValidDatabase"; + private const string invalidDatabase = "InvalidDatabase"; private const string emptyWorkingDirectory = "EmptyWorkingDirectory"; private const string emptyDatabase = "EmptyDatabase"; private const string query = "SELECT * FROM IterateToGivenBetaConvergence " + @@ -46,7 +46,7 @@ public void Constructor_ExpectedValues() { // Setup - string directory = Path.Combine(testDirectory, validWorkingDirectory); + string directory = Path.Combine(testDirectory, validDatabase); // Call using (var reader = new HydraRingDatabaseReader(directory, "", 0)) @@ -71,7 +71,7 @@ public void Constructor_QueryNull_ThrowArgumentNullException() { // Setup - string directory = Path.Combine(testDirectory, validWorkingDirectory); + string directory = Path.Combine(testDirectory, validDatabase); // Call TestDelegate test = () => new HydraRingDatabaseReader(directory, null, 0); @@ -95,7 +95,7 @@ [Test] [TestCase(emptyWorkingDirectory)] [TestCase(invalidDatabase)] - public void Constructor_EmptyWorkingDirectory_ThrowSQLiteException(string path) + public void Constructor_EmptyWorkingDirectoryOrInvalidDatabase_ThrowSQLiteException(string path) { // Setup string directory = Path.Combine(testDirectory, path); @@ -131,7 +131,7 @@ public void ReadColumn_ColumnNameNull_ThrowArgumentNullException() { // Setup - string directory = Path.Combine(testDirectory, validWorkingDirectory); + string directory = Path.Combine(testDirectory, validDatabase); using (var reader = new HydraRingDatabaseReader(directory, query, 0)) { @@ -150,7 +150,7 @@ public void ReadColumn_ValidDatabaseAndWithColumnName_ReturnColumnValue() { // Setup - string directory = Path.Combine(testDirectory, validWorkingDirectory); + string directory = Path.Combine(testDirectory, validDatabase); using (var reader = new HydraRingDatabaseReader(directory, query, 0)) { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Readers/HydraRingDatabaseReader/InvalidDatabase/output.sqlite =================================================================== diff -u --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Readers/HydraRingDatabaseReader/InvalidDatabase/output.sqlite (revision 0) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Readers/HydraRingDatabaseReader/InvalidDatabase/output.sqlite (revision 9bc5d8bc179ba0be25c9746859da3726b8b6a33e) @@ -0,0 +1 @@ \ No newline at end of file Fisheye: Tag 9bc5d8bc179ba0be25c9746859da3726b8b6a33e refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Readers/HydraRingDatabaseReader/InvalidFile/output.sqlite'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Readers/HydraRingDatabaseReader/ValidDatabase/output.sqlite =================================================================== diff -u Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Readers/HydraRingDatabaseReader/ValidFile/output.sqlite =================================================================== diff -u -r31caf3dc885ae62d4b3772eb0421a3155101bcf4 -r9bc5d8bc179ba0be25c9746859da3726b8b6a33e Binary files differ