Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs
===================================================================
diff -u -r3d9b418d483c122040e11a7e074d666c64e9d7b5 -r150366ef474f9522b3af857c29e3eac484910700
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs (.../ExceedanceProbabilityCalculationParserTest.cs) (revision 3d9b418d483c122040e11a7e074d666c64e9d7b5)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationParserTest.cs (.../ExceedanceProbabilityCalculationParserTest.cs) (revision 150366ef474f9522b3af857c29e3eac484910700)
@@ -52,7 +52,7 @@
// Setup
var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser();
- using (new DirectoryDisposeHelper(workingDirectory))
+ using (new TestDataCopyHelper(testDataPath, workingDirectory))
{
// Call
exceedanceProbabilityCalculationParser.Parse(workingDirectory, 1);
@@ -69,9 +69,9 @@
var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser();
var testFile = "empty.sqlite";
- using (new DirectoryDisposeHelper(workingDirectory))
+ using (var copyHelper = new TestDataCopyHelper(testDataPath, workingDirectory))
{
- CopyTestInputToTemporaryOutput(testFile);
+ copyHelper.CopyToTemporaryOutput(testFile, HydraRingFileName.OutputDatabaseFileName);
// Call
exceedanceProbabilityCalculationParser.Parse(workingDirectory, 1);
@@ -109,9 +109,9 @@
var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser();
var testFile = "complete.sqlite";
- using (new DirectoryDisposeHelper(workingDirectory))
+ using (var copyHelper = new TestDataCopyHelper(testDataPath, workingDirectory))
{
- CopyTestInputToTemporaryOutput(testFile);
+ copyHelper.CopyToTemporaryOutput(testFile, HydraRingFileName.OutputDatabaseFileName);
// Call
exceedanceProbabilityCalculationParser.Parse(workingDirectory, sectionId);
@@ -157,7 +157,7 @@
var testFile = "withoutAlphaResults.sqlite";
var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser();
- using (new DirectoryDisposeHelper(workingDirectory))
+ using (new TestDataCopyHelper(testDataPath, workingDirectory))
{
// Call
exceedanceProbabilityCalculationParser.Parse(workingDirectory, 1);
@@ -176,8 +176,10 @@
var testFile = "complete.sqlite";
var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser();
- using (new DirectoryDisposeHelper(workingDirectory))
+ using (var copyHelper = new TestDataCopyHelper(testDataPath, workingDirectory))
{
+ copyHelper.CopyToTemporaryOutput(testFile, HydraRingFileName.OutputDatabaseFileName);
+
// Call
exceedanceProbabilityCalculationParser.Parse(workingDirectory, sectionId);
@@ -186,18 +188,5 @@
Assert.IsTrue(TestHelper.CanOpenFileForWrite(Path.Combine(workingDirectory, testFile)));
}
}
-
- ///
- /// 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.OutputDatabaseFileName);
- File.Copy(inputFilePath, outputFilePath);
- }
}
}
\ No newline at end of file