Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs =================================================================== diff -u -rf8f4d73db42727f98beb697e6f7613145d66c628 -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision f8f4d73db42727f98beb697e6f7613145d66c628) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -236,7 +236,7 @@ PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex]; Assert.IsInstanceOf(criticalOvertoppingDischargeProperty.Converter); Assert.AreEqual(schematizationCategory, criticalOvertoppingDischargeProperty.Category); - Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName); + Assert.AreEqual("Kritiek instromend debiet [m²/s]", criticalOvertoppingDischargeProperty.DisplayName); Assert.AreEqual("Kritiek instromend debiet directe invoer.", criticalOvertoppingDischargeProperty.Description); PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[probabilityOpenStructureBeforeFloodingPropertyIndex]; Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs =================================================================== diff -u -r64fea503e6e9cacfb0ff8f22cfdd864b60c95bab -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs (.../StructuresInputBase.cs) (revision 64fea503e6e9cacfb0ff8f22cfdd864b60c95bab) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs (.../StructuresInputBase.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -254,7 +254,7 @@ /// /// Gets or sets the critical overtopping discharge. - /// [m^3/s/m] + /// [m^2/s] /// public VariationCoefficientLogNormalDistribution CriticalOvertoppingDischarge { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b6f4e414fc874653cc6ad84b80f330b28e69b823) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -1694,7 +1694,7 @@ } /// - /// Looks up a localized string similar to Kritiek instromend debiet [m³/s/m]. + /// Looks up a localized string similar to Kritiek instromend debiet [m²/s]. /// public static string Structure_CriticalOvertoppingDischarge_DisplayName { get { @@ -1829,7 +1829,7 @@ } /// - /// Looks up a localized string similar to Drempelhoogte niet gesloten kering of hoogte van de onderkant van de wand/drempel. + /// Looks up a localized string similar to Drempelhoogte niet gesloten kering of hoogte van de onderkant van de wand/drempel.. /// public static string Structure_ThresholdHeightOpenWeir_Description { get { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision b6f4e414fc874653cc6ad84b80f330b28e69b823) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -713,7 +713,7 @@ Kritiek instromend debiet directe invoer. - Kritiek instromend debiet [m³/s/m] + Kritiek instromend debiet [m²/s] Valversnelling. Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs =================================================================== diff -u -r2698972311ca90c3af1171c554c4dec237e34111 -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -87,7 +87,7 @@ /// /// Gets the critical overtopping discharge of the height structure. - /// [m^3/s/m] + /// [m^2/s] /// public VariationCoefficientLogNormalDistribution CriticalOvertoppingDischarge { get; private set; } @@ -147,7 +147,7 @@ /// /// Gets the critical overtopping discharge of the height structure. - /// [m^3/s/m] + /// [m^2/s] /// public VariationCoefficientLogNormalDistribution CriticalOvertoppingDischarge { get; private set; } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs =================================================================== diff -u -rd39966fb0ba934896979db057b1d4b07dad086ed -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision d39966fb0ba934896979db057b1d4b07dad086ed) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -177,7 +177,7 @@ PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex]; Assert.IsInstanceOf(criticalOvertoppingDischargeProperty.Converter); Assert.AreEqual(schematizationCategory, criticalOvertoppingDischargeProperty.Category); - Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName); + Assert.AreEqual("Kritiek instromend debiet [m²/s]", criticalOvertoppingDischargeProperty.DisplayName); Assert.AreEqual("Kritiek instromend debiet directe invoer.", criticalOvertoppingDischargeProperty.Description); PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[failureProbabilityStructureWithErosionPropertyIndex]; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r3dc04fc5fb21350c7b4da44fdba336aead86560e -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -478,7 +478,7 @@ PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex]; Assert.IsInstanceOf(criticalOvertoppingDischargeProperty.Converter); Assert.AreEqual(schematizationCategory, criticalOvertoppingDischargeProperty.Category); - Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName); + Assert.AreEqual("Kritiek instromend debiet [m²/s]", criticalOvertoppingDischargeProperty.DisplayName); Assert.AreEqual("Kritiek instromend debiet directe invoer.", criticalOvertoppingDischargeProperty.Description); PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[failureProbabilityStructureWithErosionPropertyIndex]; Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs =================================================================== diff -u -r2698972311ca90c3af1171c554c4dec237e34111 -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -176,7 +176,7 @@ /// /// Gets the critical overtopping discharge of the stability point structure. - /// [m^3/s/m] + /// [m^2/s] /// public VariationCoefficientLogNormalDistribution CriticalOvertoppingDischarge { get; private set; } @@ -236,7 +236,7 @@ /// /// Gets the failure collision energy of the stability point structure. - /// [kNm] + /// [kN m] /// public VariationCoefficientLogNormalDistribution FailureCollisionEnergy { get; private set; } @@ -260,7 +260,7 @@ /// /// Gets the probability of a secondary collision on the structure. - /// [1/year/levelling] + /// [1/(year levelling)] /// public double ProbabilityCollisionSecondaryStructure { get; private set; } @@ -356,7 +356,7 @@ /// /// Gets the critical overtopping discharge of the stability point structure. - /// [m^3/s/m] + /// [m^2/s] /// public VariationCoefficientLogNormalDistribution CriticalOvertoppingDischarge { get; private set; } @@ -391,7 +391,7 @@ public NormalDistribution InsideWaterLevelFailureConstruction { get; private set; } /// - /// Gets the evaluation level of the stability point structure. + /// Gets or sets the evaluation level of the stability point structure. /// [m+NAP] /// public double EvaluationLevel { get; set; } @@ -403,26 +403,26 @@ public NormalDistribution LevelCrestStructure { get; private set; } /// - /// Gets the vertical distance of the stability point structure. + /// Gets or sets the vertical distance of the stability point structure. /// [m] /// public double VerticalDistance { get; set; } /// - /// Gets the probability of failing to repair a failed closure of the stability point structure. + /// Gets or sets the probability of failing to repair a failed closure of the stability point structure. /// [1/year] /// public double FailureProbabilityRepairClosure { get; set; } /// /// Gets the failure collision energy of the stability point structure. - /// [kNm] + /// [kN m] /// public VariationCoefficientLogNormalDistribution FailureCollisionEnergy { get; private set; } /// /// Gets the mass of the ship. - /// [tons] + /// [ton] /// public VariationCoefficientNormalDistribution ShipMass { get; private set; } @@ -433,14 +433,14 @@ public VariationCoefficientNormalDistribution ShipVelocity { get; private set; } /// - /// Gets the levelling count. + /// Gets or sets the levelling count. /// [1/year] /// public int LevellingCount { get; set; } /// - /// Gets the probability of a secondary collision on the structure. - /// [1/year/levelling] + /// Gets or sets the probability of a secondary collision on the structure. + /// [1/(year levelling)] /// public double ProbabilityCollisionSecondaryStructure { get; set; } @@ -469,7 +469,7 @@ public LogNormalDistribution AreaFlowApertures { get; private set; } /// - /// Gets the type of stability point structure inflow model. + /// Gets or sets the type of stability point structure inflow model. /// public StabilityPointStructureInflowModelType InflowModelType { get; set; } } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs =================================================================== diff -u -r5e9769061c2802f1182ed502e2a32581cfb68196 -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 5e9769061c2802f1182ed502e2a32581cfb68196) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -372,7 +372,7 @@ /// /// Gets or sets the storm duration. - /// [hrs] + /// [h] /// /// Only sets the mean. public VariationCoefficientLogNormalDistribution StormDuration @@ -629,7 +629,7 @@ /// /// Gets or sets the failure collision energy. - /// [kNm] + /// [kN m] /// public VariationCoefficientLogNormalDistribution FailureCollisionEnergy { @@ -646,7 +646,7 @@ /// /// Gets or sets the mass of the ship. - /// [tons] + /// [ton] /// public VariationCoefficientNormalDistribution ShipMass { @@ -758,7 +758,7 @@ /// /// Gets or sets the critical overtopping discharge. - /// [m^3/s/m] + /// [m^2/s] /// public VariationCoefficientLogNormalDistribution CriticalOvertoppingDischarge { Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r3b7c66a337a7aec08939f964d8b9257442cb7bbe -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3b7c66a337a7aec08939f964d8b9257442cb7bbe) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -181,7 +181,7 @@ } /// - /// Looks up a localized string similar to Bezwijkwaarde aanvaarenergie [kNm]. + /// Looks up a localized string similar to Bezwijkwaarde aanvaarenergie [kN m]. /// internal static string Structure_FailureCollisionEnergy_DisplayName { get { @@ -271,7 +271,7 @@ } /// - /// Looks up a localized string similar to Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]. + /// Looks up a localized string similar to Kans op aanvaring tweede keermiddel per nivellering [1/(jaar niv)]. /// internal static string Structure_ProbabilityCollisionSecondaryStructure_DisplayName { get { Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx =================================================================== diff -u -r3b7c66a337a7aec08939f964d8b9257442cb7bbe -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3b7c66a337a7aec08939f964d8b9257442cb7bbe) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -151,7 +151,7 @@ Bezwijkwaarde aanvaarenergie. - Bezwijkwaarde aanvaarenergie [kNm] + Bezwijkwaarde aanvaarenergie [kN m] Faalkans herstel van gefaalde situatie. @@ -181,7 +181,7 @@ Kans op aanvaring tweede keermiddel per nivellering. - Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv] + Kans op aanvaring tweede keermiddel per nivellering [1/(jaar niv)] Massa van het schip. Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs =================================================================== diff -u -r3b7c66a337a7aec08939f964d8b9257442cb7bbe -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision 3b7c66a337a7aec08939f964d8b9257442cb7bbe) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -306,7 +306,7 @@ PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex]; Assert.IsInstanceOf(criticalOvertoppingDischargeProperty.Converter); Assert.AreEqual(schematizationCategory, criticalOvertoppingDischargeProperty.Category); - Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName); + Assert.AreEqual("Kritiek instromend debiet [m²/s]", criticalOvertoppingDischargeProperty.DisplayName); Assert.AreEqual("Kritiek instromend debiet directe invoer.", criticalOvertoppingDischargeProperty.Description); PropertyDescriptor constructiveStrengthLinearLoadModelProperty = dynamicProperties[constructiveStrengthLinearLoadModelPropertyIndex]; @@ -345,7 +345,7 @@ PropertyDescriptor failureCollisionEnergyProperty = dynamicProperties[failureCollisionEnergyPropertyIndex]; Assert.IsInstanceOf(failureCollisionEnergyProperty.Converter); Assert.AreEqual(schematizationCategory, failureCollisionEnergyProperty.Category); - Assert.AreEqual("Bezwijkwaarde aanvaarenergie [kNm]", failureCollisionEnergyProperty.DisplayName); + Assert.AreEqual("Bezwijkwaarde aanvaarenergie [kN m]", failureCollisionEnergyProperty.DisplayName); Assert.AreEqual("Bezwijkwaarde aanvaarenergie.", failureCollisionEnergyProperty.Description); PropertyDescriptor shipMassProperty = dynamicProperties[shipMassPropertyIndex]; @@ -367,7 +367,7 @@ PropertyDescriptor probabilityCollisionSecondaryStructureProperty = dynamicProperties[probabilityCollisionSecondaryStructurePropertyIndex]; Assert.AreEqual(schematizationCategory, probabilityCollisionSecondaryStructureProperty.Category); - Assert.AreEqual("Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]", probabilityCollisionSecondaryStructureProperty.DisplayName); + Assert.AreEqual("Kans op aanvaring tweede keermiddel per nivellering [1/(jaar niv)]", probabilityCollisionSecondaryStructureProperty.DisplayName); Assert.AreEqual("Kans op aanvaring tweede keermiddel per nivellering.", probabilityCollisionSecondaryStructureProperty.Description); PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[flowVelocityStructureClosablePropertyIndex]; Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs =================================================================== diff -u -r6713bc5528f2ef4327708039ccc17b1eecf7d1fe -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs (.../StabilityPointStructureTreeNodeInfoTest.cs) (revision 6713bc5528f2ef4327708039ccc17b1eecf7d1fe) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs (.../StabilityPointStructureTreeNodeInfoTest.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -111,7 +111,6 @@ menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - mocksRepository.ReplayAll(); using (var plugin = new StabilityPointStructuresPlugin()) using (var treeViewControl = new TreeViewControl()) @@ -120,6 +119,7 @@ var info = GetInfo(plugin); guiMock.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); + mocksRepository.ReplayAll(); // Call info.ContextMenuStrip(null, null, treeViewControl); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs =================================================================== diff -u -r44837ec463259677b2bc84d05e020de9fb5b782c -rabf027a3519fdb584ae797edd62f2baaab6d6968 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs (.../StabilityPointStructuresPluginTest.cs) (revision 44837ec463259677b2bc84d05e020de9fb5b782c) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs (.../StabilityPointStructuresPluginTest.cs) (revision abf027a3519fdb584ae797edd62f2baaab6d6968) @@ -53,7 +53,7 @@ } [Test] - public void GetPropertyInfos_ReturnsSupportedPropertyClasses() + public void GetPropertyInfos_ReturnsSupportedPropertyClassesWithExpectedValues() { // Setup using (var plugin = new StabilityPointStructuresPlugin())