Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rb7af2852f8e12912a108d10493beb19ec9becc46 -r27c30c69564abf5667d1c840142b9c7a610b989e
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b7af2852f8e12912a108d10493beb19ec9becc46)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 27c30c69564abf5667d1c840142b9c7a610b989e)
@@ -718,6 +718,186 @@
}
///
+ /// Looks up a localized string similar to Overige informatie..
+ ///
+ public static string HydraulicLocationConfigurationSettings_Comment_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Comment_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Overig.
+ ///
+ public static string HydraulicLocationConfigurationSettings_Comment_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Comment_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Locatie van het HLCD bestand..
+ ///
+ public static string HydraulicLocationConfigurationSettings_FilePath_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_FilePath_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to HLCD database locatie.
+ ///
+ public static string HydraulicLocationConfigurationSettings_FilePath_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_FilePath_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klimaatinformatie met betrekking tot het meerpeil/de meerpeilen..
+ ///
+ public static string HydraulicLocationConfigurationSettings_LakeLevel_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_LakeLevel_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Meerpeil.
+ ///
+ public static string HydraulicLocationConfigurationSettings_LakeLevel_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_LakeLevel_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klimaatinformatie met betrekking tot de rivierafvoer..
+ ///
+ public static string HydraulicLocationConfigurationSettings_RiverDischarge_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_RiverDischarge_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Rivierafvoer.
+ ///
+ public static string HydraulicLocationConfigurationSettings_RiverDischarge_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_RiverDischarge_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Algemene naam van het klimaatscenario..
+ ///
+ public static string HydraulicLocationConfigurationSettings_ScenarioName_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_ScenarioName_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klimaatscenario.
+ ///
+ public static string HydraulicLocationConfigurationSettings_ScenarioName_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_ScenarioName_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Projectkader waarin de statistiek bedoeld is te gebruiken..
+ ///
+ public static string HydraulicLocationConfigurationSettings_Scope_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Scope_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Toepassingskader.
+ ///
+ public static string HydraulicLocationConfigurationSettings_Scope_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Scope_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klimaatinformatie met betrekking tot de zeewaterstand..
+ ///
+ public static string HydraulicLocationConfigurationSettings_SeaLevel_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_SeaLevel_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Zeewaterstand.
+ ///
+ public static string HydraulicLocationConfigurationSettings_SeaLevel_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_SeaLevel_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klimaatinformatie met betrekking tot de windrichting..
+ ///
+ public static string HydraulicLocationConfigurationSettings_WindDirection_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_WindDirection_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Windrichting.
+ ///
+ public static string HydraulicLocationConfigurationSettings_WindDirection_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_WindDirection_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Klimaatinformatie met betrekking tot de windsnelheid..
+ ///
+ public static string HydraulicLocationConfigurationSettings_WindSpeed_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_WindSpeed_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Windsnelheid.
+ ///
+ public static string HydraulicLocationConfigurationSettings_WindSpeed_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_WindSpeed_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Jaartal van het jaar waarop de statistiek van toepassing is..
+ ///
+ public static string HydraulicLocationConfigurationSettings_Year_Description {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Year_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Zichtjaar.
+ ///
+ public static string HydraulicLocationConfigurationSettings_Year_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Year_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Overstromingskans van het dijktraject die hoort bij het minimale beschermingsniveau dat de kering moet bieden..
///
public static string LowerLimitNorm_Description {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -rb7af2852f8e12912a108d10493beb19ec9becc46 -r27c30c69564abf5667d1c840142b9c7a610b989e
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision b7af2852f8e12912a108d10493beb19ec9becc46)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 27c30c69564abf5667d1c840142b9c7a610b989e)
@@ -388,4 +388,64 @@
Assemblagekaart
+
+ Overige informatie.
+
+
+ Overig
+
+
+ Locatie van het HLCD bestand.
+
+
+ HLCD database locatie
+
+
+ Klimaatinformatie met betrekking tot het meerpeil/de meerpeilen.
+
+
+ Meerpeil
+
+
+ Klimaatinformatie met betrekking tot de rivierafvoer.
+
+
+ Rivierafvoer
+
+
+ Algemene naam van het klimaatscenario.
+
+
+ Klimaatscenario
+
+
+ Projectkader waarin de statistiek bedoeld is te gebruiken.
+
+
+ Toepassingskader
+
+
+ Klimaatinformatie met betrekking tot de zeewaterstand.
+
+
+ Zeewaterstand
+
+
+ Klimaatinformatie met betrekking tot de windrichting.
+
+
+ Windrichting
+
+
+ Klimaatinformatie met betrekking tot de windsnelheid.
+
+
+ Windsnelheid
+
+
+ Jaartal van het jaar waarop de statistiek van toepassing is.
+
+
+ Zichtjaar
+
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r27c30c69564abf5667d1c840142b9c7a610b989e
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs (.../HydraulicBoundaryDatabaseProperties.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs (.../HydraulicBoundaryDatabaseProperties.cs) (revision 27c30c69564abf5667d1c840142b9c7a610b989e)
@@ -37,6 +37,20 @@
///
public class HydraulicBoundaryDatabaseProperties : ObjectProperties
{
+ private const int hrdFilePathPropertyIndex = 0;
+ private const int hlcdFilePathPropertyIndex = 1;
+ private const int scenarioNamePropertyIndex = 2;
+ private const int yearPropertyIndex = 3;
+ private const int scopePropertyIndex = 4;
+ private const int seaLevelPropertyIndex = 5;
+ private const int riverDischargePropertyIndex = 6;
+ private const int lakeLevelPropertyIndex = 7;
+ private const int windDirectionPropertyIndex = 8;
+ private const int windSpeedPropertyIndex = 9;
+ private const int commentPropertyIndex = 10;
+ private const int usePreprocessorPropertyIndex = 11;
+ private const int preprocessorDirectoryPropertyIndex = 12;
+
///
/// Creates a new instance of .
///
@@ -53,7 +67,7 @@
Data = hydraulicBoundaryDatabase;
}
- [PropertyOrder(1)]
+ [PropertyOrder(hrdFilePathPropertyIndex)]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_FilePath_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_FilePath_Description))]
@@ -65,7 +79,127 @@
}
}
- [PropertyOrder(2)]
+ [PropertyOrder(hlcdFilePathPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_FilePath_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_FilePath_Description))]
+ public string HlcdFilePath
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(scenarioNamePropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_ScenarioName_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_ScenarioName_Description))]
+ public string ScenarioName
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(yearPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Year_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Year_Description))]
+ public int Year
+ {
+ get
+ {
+ return 0;
+ }
+ }
+
+ [PropertyOrder(scopePropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Scope_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Scope_Description))]
+ public string Scope
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(seaLevelPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_SeaLevel_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_SeaLevel_Description))]
+ public string SeaLevel
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(riverDischargePropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_RiverDischarge_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_RiverDischarge_Description))]
+ public string RiverDischarge
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(lakeLevelPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_LakeLevel_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_LakeLevel_Description))]
+ public string LakeLevel
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(windDirectionPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_WindDirection_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_WindDirection_Description))]
+ public string WindDirection
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(windSpeedPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_WindSpeed_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_WindSpeed_Description))]
+ public string WindSpeed
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(commentPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Comment_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Comment_Description))]
+ public string Comment
+ {
+ get
+ {
+ return data.IsLinked() ? data.FilePath : string.Empty;
+ }
+ }
+
+ [PropertyOrder(usePreprocessorPropertyIndex)]
[DynamicVisible]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_UsePreprocessor_DisplayName))]
@@ -83,7 +217,7 @@
}
}
- [PropertyOrder(3)]
+ [PropertyOrder(preprocessorDirectoryPropertyIndex)]
[DynamicVisible]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_PreprocessorDirectory_DisplayName))]
@@ -101,7 +235,7 @@
}
}
- [PropertyOrder(4)]
+ [PropertyOrder(preprocessorDirectoryPropertyIndex)]
[DynamicVisible]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_PreprocessorDirectory_DisplayName))]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r27c30c69564abf5667d1c840142b9c7a610b989e
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs (.../HydraulicBoundaryDatabasePropertiesTest.cs) (revision 27c30c69564abf5667d1c840142b9c7a610b989e)
@@ -33,9 +33,19 @@
[TestFixture]
public class HydraulicBoundaryDatabasePropertiesTest
{
- private const int namePropertyIndex = 0;
- private const int usePreprocessorPropertyIndex = 1;
- private const int preprocessorDirectoryPropertyIndex = 2;
+ private const int hrdFilePathPropertyIndex = 0;
+ private const int hlcdFilePathPropertyIndex = 1;
+ private const int scenarioNamePropertyIndex = 2;
+ private const int yearPropertyIndex = 3;
+ private const int scopePropertyIndex = 4;
+ private const int seaLevelPropertyIndex = 5;
+ private const int riverDischargePropertyIndex = 6;
+ private const int lakeLevelPropertyIndex = 7;
+ private const int windDirectionPropertyIndex = 8;
+ private const int windSpeedPropertyIndex = 9;
+ private const int commentPropertyIndex = 10;
+ private const int usePreprocessorPropertyIndex = 11;
+ private const int preprocessorDirectoryPropertyIndex = 12;
[Test]
public void Constructor_ExpectedValues()
@@ -95,24 +105,95 @@
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(3, dynamicProperties.Count);
+ Assert.AreEqual(13, dynamicProperties.Count);
- PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
- "Algemeen",
+ const string expectedCategory = "Algemeen";
+ PropertyDescriptor hrdFilePathProperty = dynamicProperties[hrdFilePathPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(hrdFilePathProperty,
+ expectedCategory,
"Hydraulische belastingendatabase",
"Locatie van het hydraulische belastingendatabase bestand.",
true);
+ PropertyDescriptor hlcdFilePathProperty = dynamicProperties[hlcdFilePathPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(hlcdFilePathProperty,
+ expectedCategory,
+ "HLCD database locatie",
+ "Locatie van het HLCD bestand.",
+ true);
+
+ PropertyDescriptor scenarioNameProperty = dynamicProperties[scenarioNamePropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(scenarioNameProperty,
+ expectedCategory,
+ "Klimaatscenario",
+ "Algemene naam van het klimaatscenario.",
+ true);
+
+ PropertyDescriptor yearProperty = dynamicProperties[yearPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(yearProperty,
+ expectedCategory,
+ "Zichtjaar",
+ "Jaartal van het jaar waarop de statistiek van toepassing is.",
+ true);
+
+ PropertyDescriptor scopeProperty = dynamicProperties[scopePropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(scopeProperty,
+ expectedCategory,
+ "Toepassingskader",
+ "Projectkader waarin de statistiek bedoeld is te gebruiken.",
+ true);
+
+ PropertyDescriptor seaLevelProperty = dynamicProperties[seaLevelPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(seaLevelProperty,
+ expectedCategory,
+ "Zeewaterstand",
+ "Klimaatinformatie met betrekking tot de zeewaterstand.",
+ true);
+
+ PropertyDescriptor riverDischargeProperty = dynamicProperties[riverDischargePropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(riverDischargeProperty,
+ expectedCategory,
+ "Rivierafvoer",
+ "Klimaatinformatie met betrekking tot de rivierafvoer.",
+ true);
+
+ PropertyDescriptor lakeLevelProperty = dynamicProperties[lakeLevelPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(lakeLevelProperty,
+ expectedCategory,
+ "Meerpeil",
+ "Klimaatinformatie met betrekking tot het meerpeil/de meerpeilen.",
+ true);
+
+ PropertyDescriptor windDirectionProperty = dynamicProperties[windDirectionPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(windDirectionProperty,
+ expectedCategory,
+ "Windrichting",
+ "Klimaatinformatie met betrekking tot de windrichting.",
+ true);
+
+ PropertyDescriptor windSpeedProperty = dynamicProperties[windSpeedPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(windSpeedProperty,
+ expectedCategory,
+ "Windsnelheid",
+ "Klimaatinformatie met betrekking tot de windsnelheid.",
+ true);
+
+ PropertyDescriptor commentProperty = dynamicProperties[commentPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(commentProperty,
+ expectedCategory,
+ "Overig",
+ "Overige informatie.",
+ true);
+
PropertyDescriptor usePreprocessorProperty = dynamicProperties[usePreprocessorPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(usePreprocessorProperty,
- "Algemeen",
+ expectedCategory,
"Gebruik preprocessor",
"Gebruik de preprocessor bij het uitvoeren van een berekening.");
PropertyDescriptor preprocessorDirectoryProperty = dynamicProperties[preprocessorDirectoryPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(preprocessorDirectoryProperty,
- "Algemeen",
+ expectedCategory,
"Locatie preprocessor bestanden",
"Locatie waar de preprocessor bestanden opslaat.",
!usePreprocessor);
@@ -129,14 +210,85 @@
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(1, dynamicProperties.Count);
+ Assert.AreEqual(11, dynamicProperties.Count);
- PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
- "Algemeen",
+ const string expectedCategory = "Algemeen";
+ PropertyDescriptor hrdFilePathProperty = dynamicProperties[hrdFilePathPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(hrdFilePathProperty,
+ expectedCategory,
"Hydraulische belastingendatabase",
"Locatie van het hydraulische belastingendatabase bestand.",
true);
+
+ PropertyDescriptor hlcdFilePathProperty = dynamicProperties[hlcdFilePathPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(hlcdFilePathProperty,
+ expectedCategory,
+ "HLCD database locatie",
+ "Locatie van het HLCD bestand.",
+ true);
+
+ PropertyDescriptor scenarioNameProperty = dynamicProperties[scenarioNamePropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(scenarioNameProperty,
+ expectedCategory,
+ "Klimaatscenario",
+ "Algemene naam van het klimaatscenario.",
+ true);
+
+ PropertyDescriptor yearProperty = dynamicProperties[yearPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(yearProperty,
+ expectedCategory,
+ "Zichtjaar",
+ "Jaartal van het jaar waarop de statistiek van toepassing is.",
+ true);
+
+ PropertyDescriptor scopeProperty = dynamicProperties[scopePropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(scopeProperty,
+ expectedCategory,
+ "Toepassingskader",
+ "Projectkader waarin de statistiek bedoeld is te gebruiken.",
+ true);
+
+ PropertyDescriptor seaLevelProperty = dynamicProperties[seaLevelPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(seaLevelProperty,
+ expectedCategory,
+ "Zeewaterstand",
+ "Klimaatinformatie met betrekking tot de zeewaterstand.",
+ true);
+
+ PropertyDescriptor riverDischargeProperty = dynamicProperties[riverDischargePropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(riverDischargeProperty,
+ expectedCategory,
+ "Rivierafvoer",
+ "Klimaatinformatie met betrekking tot de rivierafvoer.",
+ true);
+
+ PropertyDescriptor lakeLevelProperty = dynamicProperties[lakeLevelPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(lakeLevelProperty,
+ expectedCategory,
+ "Meerpeil",
+ "Klimaatinformatie met betrekking tot het meerpeil/de meerpeilen.",
+ true);
+
+ PropertyDescriptor windDirectionProperty = dynamicProperties[windDirectionPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(windDirectionProperty,
+ expectedCategory,
+ "Windrichting",
+ "Klimaatinformatie met betrekking tot de windrichting.",
+ true);
+
+ PropertyDescriptor windSpeedProperty = dynamicProperties[windSpeedPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(windSpeedProperty,
+ expectedCategory,
+ "Windsnelheid",
+ "Klimaatinformatie met betrekking tot de windsnelheid.",
+ true);
+
+ PropertyDescriptor commentProperty = dynamicProperties[commentPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(commentProperty,
+ expectedCategory,
+ "Overig",
+ "Overige informatie.",
+ true);
}
[Test]