Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ConvergenceParserTest.cs =================================================================== diff -u -r31caf3dc885ae62d4b3772eb0421a3155101bcf4 -r4bf03fe0c441a3f3d439bc7ffe09350227435178 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ConvergenceParserTest.cs (.../ConvergenceParserTest.cs) (revision 31caf3dc885ae62d4b3772eb0421a3155101bcf4) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ConvergenceParserTest.cs (.../ConvergenceParserTest.cs) (revision 4bf03fe0c441a3f3d439bc7ffe09350227435178) @@ -40,6 +40,7 @@ private const string convergenceOnBothForSection1 = "ConvergenceOnBothSection1"; private const string noConvergenceForSection1 = "NoConvergenceSection1"; private const string convergenceOnAllButLastIterationForSection1 = "ConvergenceOnAllButLastIteration"; + private const string convergenceNull = "ConvergenceNull"; private static readonly string testDirectory = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.Calculation, Path.Combine("Parsers", nameof(ConvergenceParser))); [Test] @@ -54,13 +55,13 @@ } [Test] - public void Parse_WithoutWorkingDirectory_ThrowsArgumentNullException() + public void Parse_WorkingDirectoryNull_ThrowsArgumentNullException() { // Setup var parser = new ConvergenceParser(); // Call - TestDelegate test = () => parser.Parse(null, 0); + TestDelegate test = () => parser.Parse(null, 1); // Assert var exception = Assert.Throws(test); @@ -75,7 +76,7 @@ var parser = new ConvergenceParser(); // Call - TestDelegate test = () => parser.Parse(path, 0); + TestDelegate test = () => parser.Parse(path, 1); // Assert var exception = Assert.Throws(test); @@ -90,12 +91,12 @@ var parser = new ConvergenceParser(); // Call - TestDelegate test = () => parser.Parse(path, 0); + TestDelegate test = () => parser.Parse(path, 1); // Assert var exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); - Assert.AreEqual("Er kon geen resultaat voor convergentie gelezen worden uit de Hydra-Ring uitvoerdatabase.", exception.Message); + Assert.AreEqual("Er kon geen resultaat gelezen worden uit de Hydra-Ring uitvoerdatabase.", exception.Message); } [Test] @@ -106,11 +107,12 @@ var parser = new ConvergenceParser(); // Call - TestDelegate test = () => parser.Parse(path, 0); + TestDelegate test = () => parser.Parse(path, 1); // Assert var exception = Assert.Throws(test); Assert.AreEqual("Er is geen resultaat voor convergentie gevonden in de Hydra-Ring uitvoerdatabase.", exception.Message); + Assert.IsInstanceOf(exception.InnerException); } [Test] @@ -126,9 +128,26 @@ // Assert var exception = Assert.Throws(test); Assert.AreEqual("Er is geen resultaat voor convergentie gevonden in de Hydra-Ring uitvoerdatabase.", exception.Message); + Assert.IsInstanceOf(exception.InnerException); } [Test] + public void Parse_ResultNull_ThrowHydraRingFileParserException() + { + // Setup + string path = Path.Combine(testDirectory, convergenceNull); + var parser = new ConvergenceParser(); + + // Call + TestDelegate test = () => parser.Parse(path, 1); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("Er is geen resultaat voor convergentie gevonden in de Hydra-Ring uitvoerdatabase.", exception.Message); + Assert.IsInstanceOf(exception.InnerException); + } + + [Test] [TestCase(noConvergenceForSection1)] [TestCase(convergenceOnAllButLastIterationForSection1)] public void Parse_WithWorkingDirectoryWithFileWithFalseResult_SetOutputFalse(string testSubDirectory)