Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs =================================================================== diff -u -r4f65e684123e5d1a3ba8716d99752311dbbb67e2 -r10bca39d367d3a38a61beb614b8f09d7f729af7d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 4f65e684123e5d1a3ba8716d99752311dbbb67e2) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 10bca39d367d3a38a61beb614b8f09d7f729af7d) @@ -32,15 +32,67 @@ /// public class HydraRingConfiguration { + private IEnumerable configurationSettings; + /// + /// Creates a new instance of the class. + /// + public HydraRingConfiguration() + { + configurationSettings = new[] + { + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.QVariant + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveHeight + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.WavePeakPeriod + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveSpectralPeriod + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesOvertopping + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesPiping + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresOvertopping + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresClosure + }, + new HydraRingConfigurationSettings + { + HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure + } + }; + } + + /// /// Gets or sets the . /// - public HydraRingTimeIntegrationSchemeType? HydraRingTimeIntegrationSchemeType { get; set; } + public HydraRingTimeIntegrationSchemeType? TimeIntegrationSchemeType { get; set; } /// /// Gets or sets the . /// - public HydraRingUncertaintiesType? HydraRingUncertaintiesType { get; set; } + public HydraRingUncertaintiesType? UncertaintiesType { get; set; } /// /// Gets or sets the . @@ -50,7 +102,7 @@ /// /// Gets or sets the . /// - public HydraRingFailureMechanismType? HydraRingFailureMechanismType { get; set; } + public HydraRingFailureMechanismType? FailureMechanismType { get; set; } /// /// Generates a database creation script that can be used to perform a Hydra-Ring calculation. @@ -76,24 +128,24 @@ { var formattedExceptionMessage = "Cannot generate database creation script: {0} unspecified."; - if (HydraRingTimeIntegrationSchemeType == null) + if (TimeIntegrationSchemeType == null) { - throw new InvalidOperationException(string.Format(formattedExceptionMessage, "HydraRingTimeIntegrationSchemeType")); + throw new InvalidOperationException(string.Format(formattedExceptionMessage, "TimeIntegrationSchemeType")); } - if (HydraRingUncertaintiesType == null) + if (UncertaintiesType == null) { - throw new InvalidOperationException(string.Format(formattedExceptionMessage, "HydraRingUncertaintiesType")); + throw new InvalidOperationException(string.Format(formattedExceptionMessage, "UncertaintiesType")); } if (HydraulicBoundaryLocation == null) { throw new InvalidOperationException(string.Format(formattedExceptionMessage, "HydraulicBoundaryLocation")); } - if (HydraRingFailureMechanismType == null) + if (FailureMechanismType == null) { - throw new InvalidOperationException(string.Format(formattedExceptionMessage, "HydraRingFailureMechanismType")); + throw new InvalidOperationException(string.Format(formattedExceptionMessage, "FailureMechanismType")); } } @@ -104,10 +156,10 @@ new OrderedDictionary { { - "TimeIntegrationSchemeID", (int?) HydraRingTimeIntegrationSchemeType + "TimeIntegrationSchemeID", (int?) TimeIntegrationSchemeType }, { - "UncertaintiesID", (int?) HydraRingUncertaintiesType + "UncertaintiesID", (int?) UncertaintiesType }, { "DataSetName", "WTI 2017" // Fixed: use the WTI 2017 set of station locations Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs =================================================================== diff -u -r4f65e684123e5d1a3ba8716d99752311dbbb67e2 -r10bca39d367d3a38a61beb614b8f09d7f729af7d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 4f65e684123e5d1a3ba8716d99752311dbbb67e2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 10bca39d367d3a38a61beb614b8f09d7f729af7d) @@ -29,47 +29,47 @@ public class HydraRingConfigurationTest { [Test] - public void GenerateDataBaseCreationScript_HydraRingTimeIntegrationSchemeTypeUnspecified_ThrowsInvalidOperationException() + public void GenerateDataBaseCreationScript_TimeIntegrationSchemeTypeUnspecified_ThrowsInvalidOperationException() { var hydraRingConfiguration = new HydraRingConfiguration { - HydraRingUncertaintiesType = HydraRingUncertaintiesType.Model, + UncertaintiesType = HydraRingUncertaintiesType.Model, HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700003, "", 0, 0), - HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel + FailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel }; // Call TestDelegate test = () => hydraRingConfiguration.GenerateDataBaseCreationScript(); // Assert - Assert.Throws(test, "Cannot generate database creation script: HydraRingTimeIntegrationSchemeType unspecified."); + Assert.Throws(test, "Cannot generate database creation script: TimeIntegrationSchemeType unspecified."); } [Test] - public void GenerateDataBaseCreationScript_HydraRingUncertaintiesTypeUnspecified_ThrowsInvalidOperationException() + public void GenerateDataBaseCreationScript_UncertaintiesTypeUnspecified_ThrowsInvalidOperationException() { var hydraRingConfiguration = new HydraRingConfiguration { - HydraRingTimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.FBC, + TimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.FBC, HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700003, "", 0, 0), - HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel + FailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel }; // Call TestDelegate test = () => hydraRingConfiguration.GenerateDataBaseCreationScript(); // Assert - Assert.Throws(test, "Cannot generate database creation script: HydraRingUncertaintiesType unspecified."); + Assert.Throws(test, "Cannot generate database creation script: UncertaintiesType unspecified."); } [Test] public void GenerateDataBaseCreationScript_HydraulicBoundaryLocationUnspecified_ThrowsInvalidOperationException() { var hydraRingConfiguration = new HydraRingConfiguration { - HydraRingTimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.FBC, - HydraRingUncertaintiesType = HydraRingUncertaintiesType.Model, - HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel + TimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.FBC, + UncertaintiesType = HydraRingUncertaintiesType.Model, + FailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel }; // Call @@ -80,31 +80,31 @@ } [Test] - public void GenerateDataBaseCreationScript_HydraRingFailureMechanismTypeUnspecified_ThrowsInvalidOperationException() + public void GenerateDataBaseCreationScript_FailureMechanismTypeUnspecified_ThrowsInvalidOperationException() { var hydraRingConfiguration = new HydraRingConfiguration { - HydraRingTimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.FBC, - HydraRingUncertaintiesType = HydraRingUncertaintiesType.Model, + TimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.FBC, + UncertaintiesType = HydraRingUncertaintiesType.Model, HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700003, "", 0, 0) }; // Call TestDelegate test = () => hydraRingConfiguration.GenerateDataBaseCreationScript(); // Assert - Assert.Throws(test, "Cannot generate database creation script: HydraRingFailureMechanismType unspecified."); + Assert.Throws(test, "Cannot generate database creation script: FailureMechanismType unspecified."); } [Test] public void GenerateDataBaseCreationScript_NonDefaultHydraRingConfiguration_ReturnsExpectedCreationScript() { var hydraRingConfiguration = new HydraRingConfiguration { - HydraRingTimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.NTI, - HydraRingUncertaintiesType = HydraRingUncertaintiesType.Model, + TimeIntegrationSchemeType = HydraRingTimeIntegrationSchemeType.NTI, + UncertaintiesType = HydraRingUncertaintiesType.Model, HydraulicBoundaryLocation = new HydraulicBoundaryLocation(700003, "", 0, 0), - HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel + FailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel }; var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +