Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs =================================================================== diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r81eeb27299fa8e87731b4a362a3671c8f3cfac02 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs (.../ClosingStructuresImporterTest.cs) (revision f88343c0590cb04c7135ce141872940e59325927) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs (.../ClosingStructuresImporterTest.cs) (revision 81eeb27299fa8e87731b4a362a3671c8f3cfac02) @@ -52,7 +52,7 @@ } [Test] - public void Import_ValidIncompleteFile_LogAndTrue() + public void Import_ValidIncompleteFile_LogAndFalse() { // Setup string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, @@ -68,21 +68,13 @@ // Assert string csvFilePath = Path.ChangeExtension(filePath, "csv"); - string[] expectedSubMessages = + string message = CreateExpectedErrorMessage(csvFilePath, "Gemaal Leemans (93k3)", "KUNST2", new[] { "Geen geldige parameter definities gevonden." - }; - string[] expectedMessages = - { - CreateExpectedErrorMessage(csvFilePath, "Gemaal Leemans (93k3)", "KUNST2", expectedSubMessages), - CreateExpectedErrorMessage(csvFilePath, "Gemaal Lely (93k4)", "KUNST3", expectedSubMessages), - CreateExpectedErrorMessage(csvFilePath, "Gemaal de Stontele (94k1)", "KUNST4", expectedSubMessages), - CreateExpectedErrorMessage(csvFilePath, "Stontelerkeersluis (93k1)", "KUNST5", expectedSubMessages), - CreateExpectedErrorMessage(csvFilePath, "Stontelerschutsluis (93k2)", "KUNST6", expectedSubMessages) - }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedMessages); - Assert.IsTrue(importResult); - Assert.AreEqual(1, importTarget.Count); + }); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(message, LogLevelConstant.Error)); + Assert.IsFalse(importResult); + Assert.AreEqual(0, importTarget.Count); } [Test] @@ -148,26 +140,16 @@ // Assert string csvFilePath = Path.ChangeExtension(filePath, "csv"); - string[] expectedSubMessages = - { - "Geen geldige parameter definities gevonden." - }; - string[] expectedMessages = - { - CreateExpectedErrorMessage(csvFilePath, "Coupure Den Oever (90k1)", "KUNST1", - new[] - { - "De waarde voor parameter 'KW_BETSLUIT3' op regel 13, kolom 'Numeriekewaarde', moet in het bereik [0,0, 360,0] liggen.", - "Parameter 'KW_BETSLUIT5' komt meerdere keren voor." - }), - CreateExpectedErrorMessage(csvFilePath, "Gemaal Leemans (93k3)", "KUNST2", expectedSubMessages), - CreateExpectedErrorMessage(csvFilePath, "Gemaal Lely (93k4)", "KUNST3", expectedSubMessages), - CreateExpectedErrorMessage(csvFilePath, "Gemaal de Stontele (94k1)", "KUNST4", expectedSubMessages), - CreateExpectedErrorMessage(csvFilePath, "Stontelerkeersluis (93k1)", "KUNST5", expectedSubMessages), - CreateExpectedErrorMessage(csvFilePath, "Stontelerschutsluis (93k2)", "KUNST6", expectedSubMessages) - }; - TestHelper.AssertLogMessagesAreGenerated(call, expectedMessages); - Assert.IsTrue(importResult); + string message = CreateExpectedErrorMessage( + csvFilePath, "Coupure Den Oever (90k1)", "KUNST1", + new[] + { + "De waarde voor parameter 'KW_BETSLUIT3' op regel 13, kolom 'Numeriekewaarde', moet in het bereik [0,0, 360,0] liggen.", + "Parameter 'KW_BETSLUIT5' komt meerdere keren voor." + }); + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(message, LogLevelConstant.Error), 1 + ); + Assert.IsFalse(importResult); Assert.AreEqual(0, importTarget.Count); }