Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs =================================================================== diff -u -rde4477561032a5d95d5e65e50b719724466648ed -r16d6d5ad38a45e4e0e8b3a9b41b3383d31595a36 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs (.../HydraRingInitializationServiceTest.cs) (revision de4477561032a5d95d5e65e50b719724466648ed) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs (.../HydraRingInitializationServiceTest.cs) (revision 16d6d5ad38a45e4e0e8b3a9b41b3383d31595a36) @@ -22,7 +22,6 @@ using System; using System.IO; using System.Reflection; -using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Services; @@ -32,6 +31,8 @@ [TestFixture] public class HydraRingInitializationServiceTest { + private string hydraRingDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"HydraRing"); + [Test] public void ParameteredConstructor_ExpectedValues() { @@ -46,18 +47,14 @@ Assert.AreEqual("D:\\work\\temp.sqlite", hydraRingInitializationService.OutputDataBasePath); Assert.AreEqual("D:\\hlcd\\HLCD.sqlite", hydraRingInitializationService.HlcdFilePath); - var hydraRingDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"HydraRing"); Assert.AreEqual(Path.Combine(hydraRingDirectory, "MechanismComputation.exe"), hydraRingInitializationService.MechanismComputationExeFilePath); } [Test] public void GenerateInitializationScript_ReturnsExpectedInitializationScript() { // Setup - var hydraRingDirectory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"HydraRing"); - var workingDirectory = Path.Combine(hydraRingDirectory, "temp"); - - var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.DikesPiping, 700001, "D:\\hlcd", workingDirectory); + var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.DikesPiping, 700001, "D:\\hlcd", ""); var configurationDatabaseFilePath = Path.Combine(hydraRingDirectory, "config.sqlite"); var expectedInitializationScript = "section = 700001" + Environment.NewLine + @@ -72,15 +69,13 @@ "configdbfilename = " + configurationDatabaseFilePath + Environment.NewLine + "hydraulicdbfilename = D:\\hlcd\\HLCD.sqlite"; - using (new DirectoryDisposeHelper(workingDirectory)) - { - // Call - hydraRingInitializationService.WriteInitializationScript(); + // Call + hydraRingInitializationService.WriteInitializationScript(); - // Assert - var initializationScript = File.ReadAllText(hydraRingInitializationService.IniFilePath); - Assert.AreEqual(expectedInitializationScript, initializationScript); - } + // Assert + var initializationScript = File.ReadAllText(hydraRingInitializationService.IniFilePath); + Assert.AreEqual(expectedInitializationScript, initializationScript); + File.Delete(hydraRingInitializationService.IniFilePath); } } } \ No newline at end of file