Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs =================================================================== diff -u -r38783906802cd9b7b210218770315f244e87bfe2 -r8d83ee1765cd387e7b7c67575ac454d546671493 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs (.../HydraulicBoundaryDatabaseReaderTest.cs) (revision 38783906802cd9b7b210218770315f244e87bfe2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs (.../HydraulicBoundaryDatabaseReaderTest.cs) (revision 8d83ee1765cd387e7b7c67575ac454d546671493) @@ -110,7 +110,7 @@ public void Read_DatabaseWithoutTrackId_ThrowsCriticalFileReadException() { // Setup - string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "emptySchemaGeneral.sqlite"); + string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "emptyGeneral.sqlite"); using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile)) { @@ -189,7 +189,7 @@ public void ReadTrackId_EmptyDatabase_ThrowsCriticalFileReadException() { // Setup - string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "emptySchemaGeneral.sqlite"); + string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "emptyGeneral.sqlite"); using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile)) { @@ -204,7 +204,7 @@ } [Test] - public void ReadTrackId_InvalidTrackIdColumn_ThrowsCriticalFileReadException() + public void ReadTrackId_InvalidDatabaseWithoutGeneralTable_ThrowsCriticalFileReadException() { // Setup string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "empty.sqlite"); @@ -223,6 +223,25 @@ } [Test] + public void ReadTrackId_InvalidTrackIdColumn_ThrowsLineParseException() + { + // Setup + string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "corruptSchema.sqlite"); + + using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile)) + { + // Call + TestDelegate test = () => reader.ReadTrackId(); + + // Assert + var exception = Assert.Throws(test); + string expectedMessage = $"Fout bij het lezen van bestand '{hydraulicBoundaryDatabaseFile}': kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."; + Assert.AreEqual(expectedMessage, exception.Message); + Assert.IsInstanceOf(exception.InnerException); + } + } + + [Test] public void ReadTrackId_ValidFile_ReturnsReadVersion() { // Setup @@ -242,7 +261,7 @@ public void ReadVersion_EmptyDatabase_ThrowsCriticalFileReadException() { // Setup - string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "emptySchemaGeneral.sqlite"); + string hydraulicBoundaryDatabaseFile = Path.Combine(testDataPath, "emptyGeneral.sqlite"); using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile)) { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/test-data/HydraulicBoundaryDatabaseReader/emptyGeneral.sqlite =================================================================== diff -u Binary files differ Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/test-data/HydraulicBoundaryDatabaseReader/emptySchemaGeneral.sqlite =================================================================== diff -u -r71cdbb68c0ab380b288d5caf67357275fe01b782 -r8d83ee1765cd387e7b7c67575ac454d546671493 Binary files differ Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r9a7ca9f790b29e29a05394ba97d076fcef46f21d -r8d83ee1765cd387e7b7c67575ac454d546671493 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8d83ee1765cd387e7b7c67575ac454d546671493) @@ -226,7 +226,7 @@ } /// - /// Looks up a localized string similar to HLCD importeren afgebroken. Geen gegevens gewijzigd.. + /// Looks up a localized string similar to HLCD bestand importeren afgebroken. Geen gegevens gewijzigd.. /// internal static string HydraulicLocationConfigurationDatabaseImporter_ProgressText_Import_canceled_No_data_changed { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx =================================================================== diff -u -r9a7ca9f790b29e29a05394ba97d076fcef46f21d -r8d83ee1765cd387e7b7c67575ac454d546671493 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision 9a7ca9f790b29e29a05394ba97d076fcef46f21d) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision 8d83ee1765cd387e7b7c67575ac454d546671493) @@ -189,7 +189,7 @@ De tabel 'ScenarioInformation' moet exact 1 rij bevatten. - HLCD importeren afgebroken. Geen gegevens gewijzigd. + HLCD bestand importeren afgebroken. Geen gegevens gewijzigd. 1 of meerdere locaties komen niet voor in de HLCD. Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs =================================================================== diff -u -r34b555e6ff12c9ca437af390530d581101449da0 -r8d83ee1765cd387e7b7c67575ac454d546671493 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision 34b555e6ff12c9ca437af390530d581101449da0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision 8d83ee1765cd387e7b7c67575ac454d546671493) @@ -345,7 +345,7 @@ Action call = () => importResult = importer.Import(); // Assert - const string expectedMessage = "HLCD importeren afgebroken. Geen gegevens gewijzigd."; + const string expectedMessage = "HLCD bestand importeren afgebroken. Geen gegevens gewijzigd."; TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Info), 1); Assert.IsFalse(importResult); mocks.VerifyAll(); @@ -406,7 +406,7 @@ Action call = () => importResult = importer.Import(); // Assert - const string expectedMessage = "HLCD importeren afgebroken. Geen gegevens gewijzigd."; + const string expectedMessage = "HLCD bestand importeren afgebroken. Geen gegevens gewijzigd."; TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Info), 1); Assert.IsFalse(importResult); mocks.VerifyAll();