Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/TargetProbabilityCalculationParserTest.cs =================================================================== diff -u -r3d9b418d483c122040e11a7e074d666c64e9d7b5 -r150366ef474f9522b3af857c29e3eac484910700 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/TargetProbabilityCalculationParserTest.cs (.../TargetProbabilityCalculationParserTest.cs) (revision 3d9b418d483c122040e11a7e074d666c64e9d7b5) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/TargetProbabilityCalculationParserTest.cs (.../TargetProbabilityCalculationParserTest.cs) (revision 150366ef474f9522b3af857c29e3eac484910700) @@ -50,7 +50,7 @@ // Setup var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); - using (new DirectoryDisposeHelper(workingDirectory)) + using (new TestDataCopyHelper(testDataPath, workingDirectory)) { // Call targetProbabilityCalculationParser.Parse(workingDirectory, 1); @@ -66,9 +66,9 @@ // Setup var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); - using (new DirectoryDisposeHelper(workingDirectory)) + using (var copyHelper = new TestDataCopyHelper(testDataPath, workingDirectory)) { - CopyTestInputToTemporaryOutput("empty.txt"); + copyHelper.CopyToTemporaryOutput("empty.txt", HydraRingFileName.DesignTablesFileName); // Call targetProbabilityCalculationParser.Parse(workingDirectory, 1); @@ -86,9 +86,9 @@ // Setup var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); - using (new DirectoryDisposeHelper(workingDirectory)) + using (var copyHelper = new TestDataCopyHelper(testDataPath, workingDirectory)) { - CopyTestInputToTemporaryOutput("exampleOutputTable.txt"); + copyHelper.CopyToTemporaryOutput("exampleOutputTable.txt", HydraRingFileName.DesignTablesFileName); // Call targetProbabilityCalculationParser.Parse(workingDirectory, sectionId); @@ -107,9 +107,9 @@ // Setup var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); - using (new DirectoryDisposeHelper(workingDirectory)) + using (var copyHelper = new TestDataCopyHelper(testDataPath, workingDirectory)) { - CopyTestInputToTemporaryOutput("exampleOutputTable.txt"); + copyHelper.CopyToTemporaryOutput("exampleOutputTable.txt", HydraRingFileName.DesignTablesFileName); // Call targetProbabilityCalculationParser.Parse(workingDirectory, 2); @@ -118,18 +118,5 @@ // Assert Assert.IsNull(targetProbabilityCalculationParser.Output); } - - /// - /// Copies the testfile from the test directory to the working directory. - /// - /// The name of the test's input file. - /// The copied file is removed from the working directory by using the , - /// which recursively removes all files in the directory. - private void CopyTestInputToTemporaryOutput(string testFile) - { - var inputFilePath = Path.Combine(testDataPath, testFile); - var outputFilePath = Path.Combine(workingDirectory, HydraRingFileName.DesignTablesFileName); - File.Copy(inputFilePath, outputFilePath); - } } } \ No newline at end of file