Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/CalculationConfigurationWriter.cs =================================================================== diff -u -re507c88f2863ff7bc93505caf71c5f8025fb48c0 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/CalculationConfigurationWriter.cs (.../CalculationConfigurationWriter.cs) (revision e507c88f2863ff7bc93505caf71c5f8025fb48c0) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/CalculationConfigurationWriter.cs (.../CalculationConfigurationWriter.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -106,6 +106,8 @@ /// The writer to use for writing. /// The name of the distribution. /// The configuration for the distribution that can be null. + /// Thrown when the is + /// closed. /// Thrown when or /// is null. protected static void WriteDistributionWhenAvailable(XmlWriter writer, string distributionName, StochastConfiguration configuration) @@ -184,6 +186,8 @@ /// /// The writer to use for writing. /// The configuration for the wave reduction that can be null. + /// Thrown when the is + /// closed. /// Thrown when is null. protected static void WriteWaveReductionWhenAvailable(XmlWriter writer, WaveReductionConfiguration configuration) { @@ -199,6 +203,27 @@ } /// + /// Writes a scenario configuration when it has a value. + /// + /// The writer to use for writing. + /// The configuration for the scenario that can be null. + /// Thrown when the is + /// closed. + /// Thrown when is null. + protected static void WriteScenarioWhenAvailable(XmlWriter writer, ScenarioConfiguration configuration) + { + if (writer == null) + { + throw new ArgumentNullException(nameof(writer)); + } + + if (configuration != null) + { + writer.WriteScenario(configuration); + } + } + + /// /// Writes the in XML format to file. /// /// The calculation group(s) and/or calculation(s) to write. Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/XmlWriterExtensions.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/XmlWriterExtensions.cs (.../XmlWriterExtensions.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/XmlWriterExtensions.cs (.../XmlWriterExtensions.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -37,7 +37,7 @@ /// The name of the distribution to write. /// The distribution to write. /// Thrown when the is - /// in an invalid state for writing. + /// closed. /// Thrown when any of the input parameters is null. public static void WriteDistribution(this XmlWriter writer, string name, StochastConfiguration distribution) { @@ -79,7 +79,7 @@ /// The writer to use to write the wave reduction. /// The wave reduction to write. /// Thrown when the is - /// in an invalid state for writing. + /// closed /// Thrown when any of the input parameters is null. public static void WriteWaveReduction(this XmlWriter writer, WaveReductionConfiguration waveReduction) { @@ -115,10 +115,45 @@ } /// + /// Writes a single as a scenario element in file. + /// + /// The writer to use to write the scenario. + /// The scenario to write. + /// Thrown when the is + /// closed. + /// Thrown when any of the input parameters is null. + public static void WriteScenario(this XmlWriter writer, ScenarioConfiguration scenarioConfiguration) + { + if (writer == null) + { + throw new ArgumentNullException(nameof(writer)); + } + if (scenarioConfiguration == null) + { + throw new ArgumentNullException(nameof(scenarioConfiguration)); + } + + writer.WriteStartElement(ConfigurationSchemaIdentifiers.ScenarioElement); + + if (scenarioConfiguration.IsRelevant.HasValue) + { + writer.WriteElementString(ConfigurationSchemaIdentifiers.IsRelevantScenarioName, XmlConvert.ToString(scenarioConfiguration.IsRelevant.Value)); + } + if (scenarioConfiguration.Contribution.HasValue) + { + writer.WriteElementString(ConfigurationSchemaIdentifiers.ContributionScenarioName, XmlConvert.ToString(scenarioConfiguration.Contribution.Value)); + } + + writer.WriteEndElement(); + } + + /// /// Writes the start tag of a folder element. /// /// The writer to use to write the folder. /// The name of the folder. + /// Thrown when the is + /// closed. /// Thrown when any of the input parameters is null. public static void WriteStartFolder(this XmlWriter writer, string name) { Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationWriterTest.cs =================================================================== diff -u -r393ce53735571a8f2d947aa9842b868391b1b397 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationWriterTest.cs (.../CalculationConfigurationWriterTest.cs) (revision 393ce53735571a8f2d947aa9842b868391b1b397) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/CalculationConfigurationWriterTest.cs (.../CalculationConfigurationWriterTest.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -411,6 +411,56 @@ mocks.VerifyAll(); } + [Test] + public void WriteScenarioWhenAvailable_WriterNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => ExposedCalculationConfigurationWriter.PublicWriteScenarioWhenAvailable( + null, + new ScenarioConfiguration()); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("writer", exception.ParamName); + } + + [Test] + public void WriteScenarioWhenAvailable_ScenarioConfigurationNull_WriterNotCalled() + { + // Setup + var mocks = new MockRepository(); + var xmlWriter = mocks.StrictMock(); + mocks.ReplayAll(); + + // Call + ExposedCalculationConfigurationWriter.PublicWriteScenarioWhenAvailable( + xmlWriter, + null); + + // Assert + mocks.VerifyAll(); + } + + [Test] + public void WriteScenarioWhenAvailable_ScenarioConfigurationSet_WriterCalledWithExpectedParameters() + { + // Setup + var configuration = new ScenarioConfiguration(); + + var mocks = new MockRepository(); + var xmlWriter = mocks.StrictMock(); + xmlWriter.Expect(w => w.WriteScenario(configuration)); + mocks.ReplayAll(); + + // Call + ExposedCalculationConfigurationWriter.PublicWriteScenarioWhenAvailable( + xmlWriter, + configuration); + + // Assert + mocks.VerifyAll(); + } + private static IEnumerable GetCalculationConfigurations() { var calculation1 = new TestConfigurationItem @@ -490,6 +540,11 @@ WriteWaveReductionWhenAvailable(writer, configuration); } + public static void PublicWriteScenarioWhenAvailable(XmlWriter writer, ScenarioConfiguration configuration) + { + WriteScenarioWhenAvailable(writer, configuration); + } + protected override void WriteCalculation(TestConfigurationItem calculation, XmlWriter writer) { throw new NotImplementedException(); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs (.../XmlWriterExtensionsTest.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs (.../XmlWriterExtensionsTest.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -78,7 +78,7 @@ public void WriteStartFolder_WithoutName_ThrowsArgumentNullException() { // Setup - string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WithDifferentSetParameters_WritesStochastWithSetParameters)); + string filePath = TestHelper.GetScratchPadPath(nameof(WriteStartFolder_WithoutName_ThrowsArgumentNullException)); try { @@ -99,6 +99,31 @@ } [Test] + public void WriteStartFolder_WriterClosed_ThrowsInvalidOperationException() + { + // Setup + string filePath = TestHelper.GetScratchPadPath(nameof(WriteStartFolder_WriterClosed_ThrowsInvalidOperationException)); + + try + { + using (XmlWriter xmlWriter = CreateXmlWriter(filePath)) + { + xmlWriter.Close(); + + // Call + TestDelegate testDelegate = () => xmlWriter.WriteStartFolder("name"); + + // Assert + Assert.Throws(testDelegate); + } + } + finally + { + File.Delete(filePath); + } + } + + [Test] public void WriteDistribution_StandardDeviationDistributionWithoutWriter_ThrowsArgumentNullException() { // Call @@ -113,7 +138,7 @@ public void WriteDistribution_StandardDeviationDistributionWithoutName_ThrowsArgumentNullException() { // Setup - string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WithDifferentSetParameters_WritesStochastWithSetParameters)); + string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_StandardDeviationDistributionWithoutName_ThrowsArgumentNullException)); try { @@ -137,7 +162,7 @@ public void WriteDistribution_WithoutStandardDeviationDistribution_ThrowsArgumentNullException() { // Setup - string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WithDifferentSetParameters_WritesStochastWithSetParameters)); + string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WithoutStandardDeviationDistribution_ThrowsArgumentNullException)); try { @@ -199,7 +224,7 @@ public void WriteDistribution_VariationCoefficientDistributionWithoutName_ThrowsArgumentNullException() { // Setup - string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WithDifferentSetParameters_WritesStochastWithSetParameters)); + string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_VariationCoefficientDistributionWithoutName_ThrowsArgumentNullException)); try { @@ -223,7 +248,7 @@ public void WriteDistribution_WithoutVariationCoefficientDistribution_ThrowsArgumentNullException() { // Setup - string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WithDifferentSetParameters_WritesStochastWithSetParameters)); + string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WithoutVariationCoefficientDistribution_ThrowsArgumentNullException)); try { @@ -244,6 +269,31 @@ } [Test] + public void WriteDistribution_WriterClosed_ThrowsInvalidOperationException() + { + // Setup + string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WriterClosed_ThrowsInvalidOperationException)); + + try + { + using (XmlWriter xmlWriter = CreateXmlWriter(filePath)) + { + xmlWriter.Close(); + + // Call + TestDelegate testDelegate = () => xmlWriter.WriteDistribution("name", new StochastConfiguration()); + + // Assert + Assert.Throws(testDelegate); + } + } + finally + { + File.Delete(filePath); + } + } + + [Test] [TestCaseSource(nameof(GetWaveReductions))] public void WriteWaveReduction_WithoutDifferentSetParameters_WritesStochastWithSetParameters(WaveReductionConfiguration waveReduction, string fileName) { @@ -285,7 +335,7 @@ public void WriteWaveReduction_WithoutWaveReduction_ThrowsArgumentNullException() { // Setup - string filePath = TestHelper.GetScratchPadPath(nameof(WriteDistribution_WithDifferentSetParameters_WritesStochastWithSetParameters)); + string filePath = TestHelper.GetScratchPadPath(nameof(WriteWaveReduction_WithoutWaveReduction_ThrowsArgumentNullException)); try { @@ -305,6 +355,118 @@ } } + [Test] + public void WriteWaveReduction_WriterClosed_ThrowsInvalidOperationException() + { + // Setup + string filePath = TestHelper.GetScratchPadPath(nameof(WriteWaveReduction_WriterClosed_ThrowsInvalidOperationException)); + + try + { + using (XmlWriter xmlWriter = CreateXmlWriter(filePath)) + { + xmlWriter.Close(); + + // Call + TestDelegate testDelegate = () => xmlWriter.WriteWaveReduction(new WaveReductionConfiguration()); + + // Assert + Assert.Throws(testDelegate); + } + } + finally + { + File.Delete(filePath); + } + } + + [Test] + [TestCaseSource(nameof(GetScenarioConfigurations))] + public void WriteScenario_WithoutDifferentSetParameters_WritesExpectedParameters(ScenarioConfiguration configuration, string fileName) + { + // Setup + string filePath = TestHelper.GetScratchPadPath( + $"{nameof(WriteScenario_WithoutDifferentSetParameters_WritesExpectedParameters)}.{fileName}"); + + try + { + using (XmlWriter xmlWriter = CreateXmlWriter(filePath)) + { + // Call + xmlWriter.WriteScenario(configuration); + } + + // Assert + string actualXml = File.ReadAllText(filePath); + string expectedXml = GetTestFileContent(fileName); + Assert.AreEqual(expectedXml, actualXml); + } + finally + { + File.Delete(filePath); + } + } + + [Test] + public void WriteScenario_WithoutWriter_ThrowsArgumentNullException() + { + // Call + TestDelegate testDelegate = () => ((XmlWriter) null).WriteScenario(new ScenarioConfiguration()); + + // Assert + var exception = Assert.Throws(testDelegate); + Assert.AreEqual("writer", exception.ParamName); + } + + [Test] + public void WriteScenario_WithoutScenarioConfiguration_ThrowsArgumentNullException() + { + // Setup + string filePath = TestHelper.GetScratchPadPath(nameof(WriteScenario_WithoutScenarioConfiguration_ThrowsArgumentNullException)); + + try + { + using (XmlWriter xmlWriter = CreateXmlWriter(filePath)) + { + // Call + TestDelegate testDelegate = () => xmlWriter.WriteScenario(null); + + // Assert + var exception = Assert.Throws(testDelegate); + Assert.AreEqual("scenarioConfiguration", exception.ParamName); + } + } + finally + { + File.Delete(filePath); + } + } + + [Test] + public void WriteScenario_WriterClosed_ThrowsInvalidOperationException() + { + // Setup + string filePath = TestHelper.GetScratchPadPath(nameof(WriteScenario_WriterClosed_ThrowsInvalidOperationException)); + + try + { + using (XmlWriter xmlWriter = CreateXmlWriter(filePath)) + { + xmlWriter.Close(); + + // Call + TestDelegate testDelegate = () => xmlWriter.WriteScenario(new ScenarioConfiguration()); + + // Assert + Assert.Throws(testDelegate); + } + } + finally + { + File.Delete(filePath); + } + } + public static IEnumerable GetDistributions() { yield return new TestCaseData( @@ -360,7 +522,7 @@ yield return new TestCaseData( new WaveReductionConfiguration(), "waveReductionWithoutParameters.xml") - .SetName("Wave reduction without any of its paramters set."); + .SetName("Wave reduction without any of its parameters set."); yield return new TestCaseData( new WaveReductionConfiguration @@ -371,7 +533,7 @@ UseForeshoreProfile = false }, "waveReduction.xml") - .SetName("Wave reduction with all its paramters set."); + .SetName("Wave reduction with all its parameters set."); yield return new TestCaseData( new WaveReductionConfiguration @@ -414,6 +576,41 @@ .SetName("Wave reduction without use foreshore profile set."); } + public static IEnumerable GetScenarioConfigurations() + { + const string testNameFormat = "{m}({1:40})"; + + yield return new TestCaseData( + new ScenarioConfiguration(), + "scenarioConfigurationWithoutParameters.xml") + .SetName(testNameFormat); + + yield return new TestCaseData( + new ScenarioConfiguration + { + IsRelevant = true, + Contribution = 0.8 + }, + "scenarioConfiguration.xml") + .SetName(testNameFormat); + + yield return new TestCaseData( + new ScenarioConfiguration + { + IsRelevant = true + }, + "scenarioConfigurationWithoutContribution.xml") + .SetName(testNameFormat); + + yield return new TestCaseData( + new ScenarioConfiguration + { + Contribution = 0.8 + }, + "scenarioConfigurationWithoutIsRelevant.xml") + .SetName(testNameFormat); + } + private string GetTestFileContent(string testFile) { return File.ReadAllText(Path.Combine(testDirectory, testFile)); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfiguration.xml =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfiguration.xml (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfiguration.xml (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -0,0 +1,4 @@ + + true + 0.8 + \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutContribution.xml =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutContribution.xml (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutContribution.xml (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -0,0 +1,3 @@ + + true + \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutIsRelevant.xml =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutIsRelevant.xml (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutIsRelevant.xml (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -0,0 +1,3 @@ + + 0.8 + \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutParameters.xml =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutParameters.xml (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/XmlWriterExtensions/scenarioConfigurationWithoutParameters.xml (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -0,0 +1 @@ + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs =================================================================== diff -u -re8b26aea321478305dfba9eb8ed6c2146ac5c9ea -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs (.../PipingCalculationConfigurationExporter.cs) (revision e8b26aea321478305dfba9eb8ed6c2146ac5c9ea) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationExporter.cs (.../PipingCalculationConfigurationExporter.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -83,6 +83,8 @@ calculationConfiguration.StochasticSoilProfileName = input.StochasticSoilProfile?.SoilProfile.Name; } + calculationConfiguration.Scenario = calculation.ToScenarioConfiguration(); + return calculationConfiguration; } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs (.../PipingCalculationConfigurationWriter.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Configurations/PipingCalculationConfigurationWriter.cs (.../PipingCalculationConfigurationWriter.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -48,8 +48,22 @@ protected override void WriteCalculation(PipingCalculationConfiguration configuration, XmlWriter writer) { writer.WriteStartElement(ConfigurationSchemaIdentifiers.CalculationElement); + writer.WriteAttributeString(ConfigurationSchemaIdentifiers.NameAttribute, configuration.Name); + WriteCalculationElements(writer, configuration); + + writer.WriteEndElement(); + } + + /// + /// Writes the elements of the in XML format to file. + /// + /// The writer to use for writing. + /// The calculation configuration to write. + /// Thrown when the is closed. + private static void WriteCalculationElements(XmlWriter writer, PipingCalculationConfiguration configuration) + { WriteElementWhenContentAvailable(writer, PipingCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement, configuration.AssessmentLevel); @@ -73,6 +87,19 @@ PipingCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement, configuration.StochasticSoilProfileName); + WriteStochasts(writer, configuration); + + WriteScenarioWhenAvailable(writer, configuration.Scenario); + } + + /// + /// Writes the stochats elements of the in XML format to file. + /// + /// The writer to use for writing. + /// The calculation configuration to write. + /// Thrown when the is closed. + private static void WriteStochasts(XmlWriter writer, PipingCalculationConfiguration configuration) + { writer.WriteStartElement(ConfigurationSchemaIdentifiers.StochastsElement); WriteDistributionWhenAvailable(writer, @@ -84,8 +111,6 @@ configuration.DampingFactorExit); writer.WriteEndElement(); - - writer.WriteEndElement(); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs =================================================================== diff -u -re8b26aea321478305dfba9eb8ed6c2146ac5c9ea -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision e8b26aea321478305dfba9eb8ed6c2146ac5c9ea) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -64,7 +64,6 @@ yield return new TestCaseData("calculationWithoutSoilProfile", PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilProfile()) .SetName(testNameFormat); - yield return new TestCaseData("calculationIrrelevant", PipingTestDataGenerator.GetIrrelevantPipingCalculationScenario()) .SetName(testNameFormat); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationWriterTest.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationWriterTest.cs (.../PipingCalculationConfigurationWriterTest.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationWriterTest.cs (.../PipingCalculationConfigurationWriterTest.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -53,9 +53,9 @@ new Point3D(0, 10, 0) }); - var calculation = CreateFullCalculationConfiguration(); + PipingCalculationConfiguration calculation = CreateFullCalculationConfiguration(); - var calculation2 = CreateFullCalculationConfiguration(); + PipingCalculationConfiguration calculation2 = CreateFullCalculationConfiguration(); calculation2.Name = "PK001_0002 W1-6_4_1D1"; calculation2.HydraulicBoundaryLocationName = "PUNT_SCH_17"; calculation2.SurfaceLineName = "PK001_0002"; @@ -119,6 +119,11 @@ { Mean = 0.7, StandardDeviation = 0.1 + }, + Scenario = new ScenarioConfiguration + { + IsRelevant = true, + Contribution = 0.3 } }; } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml =================================================================== diff -u -re8b26aea321478305dfba9eb8ed6c2146ac5c9ea -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision e8b26aea321478305dfba9eb8ed6c2146ac5c9ea) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -17,5 +17,9 @@ 0.1 + + false + 0.5 + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml =================================================================== diff -u -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -17,5 +17,9 @@ 0.1 + + true + 1 + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml =================================================================== diff -u -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -17,5 +17,9 @@ INF + + true + INF + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml =================================================================== diff -u -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -17,5 +17,9 @@ NaN + + true + NaN + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml =================================================================== diff -u -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -16,5 +16,9 @@ 0.1 + + true + 1 + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml =================================================================== diff -u -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -16,5 +16,9 @@ 0.1 + + true + 1 + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml =================================================================== diff -u -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -15,5 +15,9 @@ 0.1 + + true + 1 + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml =================================================================== diff -u -r5a34759978bfb0c2982463f8f8c2adfc29b1c666 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 5a34759978bfb0c2982463f8f8c2adfc29b1c666) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -14,5 +14,9 @@ 0.1 + + true + 1 + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rc4528c8f253cdfee73a61d9af5fe869de793cc40 -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision c4528c8f253cdfee73a61d9af5fe869de793cc40) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -18,6 +18,10 @@ 0.1 + + true + 1 + @@ -37,6 +41,10 @@ 0.1 + + true + 1 + Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rf01786afaf51ad02f5be5e2a320461ebfe576bba -r9a84eac646ba120e685a58839a3d3ad71d077c2e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision f01786afaf51ad02f5be5e2a320461ebfe576bba) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) @@ -18,6 +18,10 @@ 0.1 + + true + 0.3 + @@ -37,6 +41,10 @@ 0.1 + + true + 0.3 +