Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs =================================================================== diff -u -rf8d4623fffb36e31e3de990c3b125c6e42049b67 -re48f22a1f61e2fe4e66caf125e26c42fdc595379 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision f8d4623fffb36e31e3de990c3b125c6e42049b67) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision e48f22a1f61e2fe4e66caf125e26c42fdc595379) @@ -59,6 +59,8 @@ var configurationDictionary = new Dictionary>(); InitializeHydraulicModelsConfiguration(configurationDictionary); + InitializeAreasConfiguration(configurationDictionary); + InitializeProjectsConfiguration(configurationDictionary); return GenerateDataBaseCreationScript(configurationDictionary); } @@ -82,6 +84,44 @@ }; } + private void InitializeAreasConfiguration(Dictionary> configurationDictionary) + { + configurationDictionary["Areas"] = new List + { + new OrderedDictionary + { + { + "aDefault", 1 + }, + { + "bDefault", "1" + }, + { + "cDefault", "Nederland" + } + } + }; + } + + private void InitializeProjectsConfiguration(Dictionary> configurationDictionary) + { + configurationDictionary["Projects"] = new List + { + new OrderedDictionary + { + { + "aDefault", 1 + }, + { + "bDefault", "Sprint" + }, + { + "cDefault", "Hydra-Ring Sprint" + } + } + }; + } + private static string GenerateDataBaseCreationScript(Dictionary> configurationDictionary) { var lines = new List(); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/TimeIntegrationSchemeType.cs =================================================================== diff -u -rf8d4623fffb36e31e3de990c3b125c6e42049b67 -re48f22a1f61e2fe4e66caf125e26c42fdc595379 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/TimeIntegrationSchemeType.cs (.../TimeIntegrationSchemeType.cs) (revision f8d4623fffb36e31e3de990c3b125c6e42049b67) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/TimeIntegrationSchemeType.cs (.../TimeIntegrationSchemeType.cs) (revision e48f22a1f61e2fe4e66caf125e26c42fdc595379) @@ -22,7 +22,7 @@ namespace Ringtoets.HydraRing.Calculation { /// - /// Enumeration that defines the possible time integration schemes. + /// Enumeration that defines the possible time integration scheme types. /// /// /// Except for , the integer values correspond to time integration scheme ids defined by Hydra-Ring. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/UncertaintiesType.cs =================================================================== diff -u -rf8d4623fffb36e31e3de990c3b125c6e42049b67 -re48f22a1f61e2fe4e66caf125e26c42fdc595379 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/UncertaintiesType.cs (.../UncertaintiesType.cs) (revision f8d4623fffb36e31e3de990c3b125c6e42049b67) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/UncertaintiesType.cs (.../UncertaintiesType.cs) (revision e48f22a1f61e2fe4e66caf125e26c42fdc595379) @@ -25,7 +25,7 @@ /// Enumeration that defines the possible uncertainties types. /// /// - /// Except for , the integer values correspond to uncertainties type ids defined by Hydra-Ring. + /// Except for , the integer values correspond to uncertainties ids defined by Hydra-Ring. /// public enum UncertaintiesType { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs =================================================================== diff -u -rf8d4623fffb36e31e3de990c3b125c6e42049b67 -re48f22a1f61e2fe4e66caf125e26c42fdc595379 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision f8d4623fffb36e31e3de990c3b125c6e42049b67) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision e48f22a1f61e2fe4e66caf125e26c42fdc595379) @@ -32,7 +32,13 @@ { var hydraRingConfiguration = new HydraRingConfiguration(); var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (NULL, NULL, 'WTI 2017');" + Environment.NewLine; + "INSERT INTO [HydraulicModels] VALUES (NULL, NULL, 'WTI 2017');" + Environment.NewLine + + Environment.NewLine + + "DELETE FROM [Areas];" + Environment.NewLine + + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + + Environment.NewLine + + "DELETE FROM [Projects];" + Environment.NewLine + + "INSERT INTO [Projects] VALUES (1, 'Sprint', 'Hydra-Ring Sprint');" + Environment.NewLine; var creationScript = hydraRingConfiguration.GenerateDataBaseCreationScript(); @@ -49,11 +55,17 @@ }; var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + - "INSERT INTO [HydraulicModels] VALUES (" + (int) TimeIntegrationSchemeType.NTI + ", " + (int) UncertaintiesType.Model + ", 'WTI 2017');" + Environment.NewLine; + "INSERT INTO [HydraulicModels] VALUES (" + (int) TimeIntegrationSchemeType.NTI + ", " + (int) UncertaintiesType.Model + ", 'WTI 2017');" + Environment.NewLine + + Environment.NewLine + + "DELETE FROM [Areas];" + Environment.NewLine + + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + + Environment.NewLine + + "DELETE FROM [Projects];" + Environment.NewLine + + "INSERT INTO [Projects] VALUES (1, 'Sprint', 'Hydra-Ring Sprint');" + Environment.NewLine; var creationScript = hydraRingConfiguration.GenerateDataBaseCreationScript(); Assert.AreEqual(expectedCreationScript, creationScript); } } -} +} \ No newline at end of file