Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/DunesBoundaryConditionsCalculationParserTest.cs =================================================================== diff -u -r4bf03fe0c441a3f3d439bc7ffe09350227435178 -raaba4b75a68957cc119907739669b990275f4ca4 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/DunesBoundaryConditionsCalculationParserTest.cs (.../DunesBoundaryConditionsCalculationParserTest.cs) (revision 4bf03fe0c441a3f3d439bc7ffe09350227435178) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/DunesBoundaryConditionsCalculationParserTest.cs (.../DunesBoundaryConditionsCalculationParserTest.cs) (revision aaba4b75a68957cc119907739669b990275f4ca4) @@ -33,18 +33,10 @@ [TestFixture] public class DunesBoundaryConditionsCalculationParserTest { - private const string emptyWorkingDirectory = "EmptyWorkingDirectory"; - private const string invalidFileInDirectory = "InvalidFile"; - private const string emptyFileInDirectory = "EmptyDatabase"; - private const string noResultsOnLastIteration = "ResultsOnAllButLastIteration"; - private const string permissionDenied = "NoPermissionsToRead"; - private const string validFileNoWaveHeight = "ValidFileNoWaveHeight"; - private const string validFileNoWavePeriod = "ValidFileNoWavePeriod"; - private const string validFileNoWaterLevel = "ValidFileNoWaterLevel"; - private const string validFile= "ValidFile"; + private const string validFile = "ValidFile"; private readonly string testDirectory = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.Calculation, "Parsers"), - "DunesBoundaryConditionsParser"); + nameof(DunesBoundaryConditionsCalculationParser)); [Test] public void Constructor_ExpectedValues() @@ -75,7 +67,7 @@ public void Parse_WithWorkingDirectoryWithoutExpectedFile_ThrowsHydraRingFileParserException() { // Setup - string path = Path.Combine(testDirectory, emptyWorkingDirectory); + string path = Path.Combine(testDirectory, "EmptyWorkingDirectory"); var parser = new DunesBoundaryConditionsCalculationParser(); // Call @@ -90,7 +82,7 @@ public void Parse_WithWorkingDirectoryWithInvalidOutputFile_ThrowsHydraRingFileParserException() { // Setup - string path = Path.Combine(testDirectory, invalidFileInDirectory); + string path = Path.Combine(testDirectory, "InvalidFile"); var parser = new DunesBoundaryConditionsCalculationParser(); // Call @@ -106,7 +98,7 @@ public void Parse_WithWorkingDirectoryWithEmptyFile_ThrowsHydraRingFileParserException() { // Setup - string path = Path.Combine(testDirectory, emptyFileInDirectory); + string path = Path.Combine(testDirectory, "EmptyDatabase"); var parser = new DunesBoundaryConditionsCalculationParser(); // Call @@ -123,7 +115,7 @@ { // Setup var parser = new DunesBoundaryConditionsCalculationParser(); - var workingDirectory = Path.Combine(testDirectory, permissionDenied); + string workingDirectory = Path.Combine(testDirectory, validFile); using (new DirectoryPermissionsRevoker(testDirectory, FileSystemRights.ReadData)) { @@ -139,10 +131,10 @@ } [Test] - [TestCase(validFileNoWaveHeight)] - [TestCase(validFileNoWavePeriod)] - [TestCase(validFileNoWaterLevel)] - [TestCase(noResultsOnLastIteration)] + [TestCase("ValidFileNoWaveHeight")] + [TestCase("ValidFileNoWavePeriod")] + [TestCase("ValidFileNoWaterLevel")] + [TestCase("ResultsOnAllButLastIteration")] public void Parse_NotAllColumnsHasResults_ThrowHydraRingFileParserException(string subFolder) { // Setup @@ -158,8 +150,6 @@ Assert.IsInstanceOf(exception.InnerException); } - - [Test] public void Parse_ValidDataForOtherSection_ThrowsHydraRingFileParserException() {