Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -r6a7a721c90be4624a149e5025747e4e2eaaf88b3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 6a7a721c90be4624a149e5025747e4e2eaaf88b3) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -418,11 +418,10 @@ const double norm = 0.2; string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); - string ringId = "11-1"; string calculationName = "test"; // Call - TestDelegate test = () => new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, null, hcldFilePath, ringId, calculationName); + TestDelegate test = () => new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, null, hcldFilePath, calculationName); // Assert var exception = Assert.Throws(test); @@ -454,19 +453,17 @@ }; string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); - string ringId = "11-1"; string calculationName = "test"; using (new HydraRingCalculatorFactoryConfig()) { var testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; // Call - new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, input, hcldFilePath, ringId, calculationName); + new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, input, hcldFilePath, calculationName); // Assert Assert.AreEqual(Path.GetDirectoryName(hcldFilePath), testCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testCalculator.RingId); for (int i = 0; i < input.WaterLevels.Count(); i++) { WaveConditionsCosineCalculationInput expectedInput = CreateInput(input.WaterLevels.ElementAt(i), a, b, c, norm, input, useForeshore, useBreakWater); @@ -492,7 +489,6 @@ LowerBoundaryRevetment = (RoundedDouble) 3 }; - const string ringId = "11-1"; const string calculationName = "test"; string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); @@ -508,7 +504,7 @@ { try { - new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, input, hcldFilePath, ringId, calculationName); + new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, input, hcldFilePath, calculationName); } catch (HydraRingCalculationException) { @@ -547,7 +543,6 @@ LowerBoundaryRevetment = (RoundedDouble) 3 }; - const string ringId = "11-1"; const string name = "test"; string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); @@ -559,7 +554,7 @@ testCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call - service.PublicCalculate(a, b, c, norm, input, hcldFilePath, ringId, name); + service.PublicCalculate(a, b, c, norm, input, hcldFilePath, name); // Assert Assert.IsTrue(testCalculator.IsCanceled); @@ -610,9 +605,9 @@ return ValidateWaveConditionsInput(waveConditionsInput, calculationName, dbFilePath, valueName); } - public void PublicCalculate(RoundedDouble a, RoundedDouble b, RoundedDouble c, double norm, WaveConditionsInput input, string dbFilePath, string ringId, string name) + public void PublicCalculate(RoundedDouble a, RoundedDouble b, RoundedDouble c, double norm, WaveConditionsInput input, string dbFilePath, string name) { - CalculateWaveConditions(name, input, a, b, c, norm, ringId, dbFilePath); + CalculateWaveConditions(name, input, a, b, c, norm, dbFilePath); } } } \ No newline at end of file