Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r1d6571206d815886a014b0f59f3aae070d46154c --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs (.../OvertoppingCalculationWaveHeightParserTest.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightParserTest.cs (.../OvertoppingCalculationWaveHeightParserTest.cs) (revision 1d6571206d815886a014b0f59f3aae070d46154c) @@ -33,7 +33,7 @@ [TestFixture] public class OvertoppingCalculationWaveHeightParserTest { - private const string validFile = "ValidFile"; + private const string validFileOvertoppingDominant = "ValidFileOvertoppingDominant"; private static readonly string testDirectory = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.Calculation, "Parsers"), nameof(OvertoppingCalculationWaveHeightParser)); @@ -115,7 +115,7 @@ // Assert var exception = Assert.Throws(test); Assert.AreEqual("Er is geen resultaat voor overslag en overloop gevonden in de Hydra-Ring uitvoerdatabase.", exception.Message); - Assert.IsInstanceOf(exception.InnerException); + Assert.IsInstanceOf(exception.InnerException); } [Test] @@ -131,15 +131,15 @@ // Assert var exception = Assert.Throws(test); Assert.AreEqual("Er is geen resultaat voor overslag en overloop gevonden in de Hydra-Ring uitvoerdatabase.", exception.Message); - Assert.IsInstanceOf(exception.InnerException); + Assert.IsInstanceOf(exception.InnerException); } [Test] public void Parse_ErrorWhileReadingFile_ThrowsHydraRingFileParserException() { // Setup var parser = new OvertoppingCalculationWaveHeightParser(); - string workingDirectory = Path.Combine(testDirectory, validFile); + string workingDirectory = Path.Combine(testDirectory, validFileOvertoppingDominant); using (new DirectoryPermissionsRevoker(testDirectory, FileSystemRights.ReadData)) { @@ -171,18 +171,20 @@ } [Test] - public void Parse_ValidData_OutputSet() + [TestCase(validFileOvertoppingDominant, 0.26586599999999999, true)] + [TestCase("ValidFileOvertoppingNotDominant", 0.00035540600000000001, false)] + public void Parse_ValidData_OutputSet(string file, double expectedWaveHeight, bool expectedOvertoppingDominant) { // Setup - string path = Path.Combine(testDirectory, validFile); + string path = Path.Combine(testDirectory, file); var parser = new OvertoppingCalculationWaveHeightParser(); // Call parser.Parse(path, 1); // Assert - Assert.AreEqual(1.56783, parser.Output.WaveHeight); - Assert.IsTrue(parser.Output.IsOvertoppingDominant); + Assert.AreEqual(expectedWaveHeight, parser.Output.WaveHeight); + Assert.AreEqual(expectedOvertoppingDominant, parser.Output.IsOvertoppingDominant); } } } \ No newline at end of file