Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -rcc883c70ff6e0cf28b0afadae0eccc45163784d1 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision cc883c70ff6e0cf28b0afadae0eccc45163784d1)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -362,14 +362,10 @@
-
-
-
-
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r66b001bbe58da39e66aa7d28370ef03fe0a19ad1 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 66b001bbe58da39e66aa7d28370ef03fe0a19ad1)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -1104,16 +1104,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap map {
- get {
- object obj = ResourceManager.GetObject("map", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Berichten.
///
public static string Messages {
@@ -1171,16 +1161,6 @@
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
- public static System.Drawing.Bitmap openfolderHS {
- get {
- object obj = ResourceManager.GetObject("openfolderHS", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
public static System.Drawing.Bitmap OpenIcon {
get {
object obj = ResourceManager.GetObject("OpenIcon", resourceCulture);
@@ -1483,16 +1463,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap SaveAsHH {
- get {
- object obj = ResourceManager.GetObject("SaveAsHH", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Opslaan als.
///
public static string SaveFileDialog_Title {
@@ -1502,16 +1472,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap saveHS {
- get {
- object obj = ResourceManager.GetObject("saveHS", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Initialiseren van opgeslagen project.
///
public static string SaveProjectActivity_ProgressTextStepName_InitializeSavedProject {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r66b001bbe58da39e66aa7d28370ef03fe0a19ad1 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 66b001bbe58da39e66aa7d28370ef03fe0a19ad1)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -142,9 +142,6 @@
Weergeven/Verbergen
-
- ..\Resources\openfolderHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Opslaan
@@ -169,9 +166,6 @@
../Resources/DeleteHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\saveHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Geen enkele 'Importer' is beschikbaar voor dit element ({0}).
@@ -187,9 +181,6 @@
..\Resources\PropertiesHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\map.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Opslaan Als
@@ -217,9 +208,6 @@
..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\SaveAsHH.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Gestart in {0:f2} seconden.
Index: Core/Common/src/Core.Common.Gui/Resources/SaveAsHH.png
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
Binary files differ
Index: Core/Common/src/Core.Common.Gui/Resources/map.png
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
Binary files differ
Index: Core/Common/src/Core.Common.Gui/Resources/openfolderHS.png
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
Binary files differ
Index: Core/Common/src/Core.Common.Gui/Resources/saveHS.png
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
Binary files differ
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureInflowModelTypeTest.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureInflowModelTypeTest.cs (revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureInflowModelTypeTest.cs (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+
+namespace Ringtoets.ClosingStructures.Data.Test
+{
+ [TestFixture]
+ public class ClosingStructureInflowModelTypeTest : EnumWithDisplayNameTestFixture
+ {
+ protected override IDictionary ExpectedValueForEnumValues => new Dictionary
+ {
+ {
+ ClosingStructureInflowModelType.VerticalWall, 1
+ },
+ {
+ ClosingStructureInflowModelType.LowSill, 2
+ },
+ {
+ ClosingStructureInflowModelType.FloodedCulvert, 3
+ }
+ };
+
+ protected override IDictionary ExpectedDisplayNameForEnumValues => new Dictionary
+ {
+ {
+ ClosingStructureInflowModelType.VerticalWall, "Verticale wand"
+ },
+ {
+ ClosingStructureInflowModelType.LowSill, "Lage drempel"
+ },
+ {
+ ClosingStructureInflowModelType.FloodedCulvert, "Verdronken koker"
+ }
+ };
+ }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/Ringtoets.ClosingStructures.Data.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/Ringtoets.ClosingStructures.Data.Test.csproj (.../Ringtoets.ClosingStructures.Data.Test.csproj) (revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/Ringtoets.ClosingStructures.Data.Test.csproj (.../Ringtoets.ClosingStructures.Data.Test.csproj) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -53,6 +53,7 @@
Properties\GlobalAssembly.cs
+
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -145,15 +145,6 @@
}
///
- /// Looks up a localized string similar to Hydraulische randvoorwaarden.
- ///
- public static string HydraulicBoundaryDatabase_DisplayName {
- get {
- return ResourceManager.GetString("HydraulicBoundaryDatabase_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to STBU.
///
public static string MacrostabilityOutwardFailureMechanism_Code {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -120,9 +120,6 @@
Faalkansbegroting
-
- Hydraulische randvoorwaarden
-
Traject
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rd0a9ae3680252d6a0fd203f4c6b1c3d42cd3873b -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d0a9ae3680252d6a0fd203f4c6b1c3d42cd3873b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -101,15 +101,6 @@
}
///
- /// Looks up a localized string similar to Traject.
- ///
- public static string AssessmentSection_DisplayName {
- get {
- return ResourceManager.GetString("AssessmentSection_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to ID van het traject..
///
public static string AssessmentSection_Id_Description {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -rd0a9ae3680252d6a0fd203f4c6b1c3d42cd3873b -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision d0a9ae3680252d6a0fd203f4c6b1c3d42cd3873b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -117,9 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Traject
-
Naam van het toetstraject.
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs
===================================================================
diff -u -r802ea30d1fe8fbae93e58dff9ab054dbabca11ae -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs (.../AssessmentSectionPropertiesTest.cs) (revision 802ea30d1fe8fbae93e58dff9ab054dbabca11ae)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs (.../AssessmentSectionPropertiesTest.cs) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -19,8 +19,10 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System.ComponentModel;
using Core.Common.Base;
using Core.Common.Gui.PropertyBag;
+using Core.Common.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
@@ -89,5 +91,35 @@
Assert.AreEqual(newName, assessmentSection.Name);
mocks.VerifyAll();
}
+
+ [Test]
+ public void Constructor_ValidData_PropertiesHaveExpectedAttributeValues()
+ {
+ // Call
+ var properties = new AssessmentSectionProperties
+ {
+ Data = new AssessmentSection(AssessmentSectionComposition.Dike)
+ };
+
+ // Assert
+ PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+
+ Assert.AreEqual(2, dynamicProperties.Count);
+
+ const string generalCategoryName = "Algemeen";
+
+ PropertyDescriptor idProperty = dynamicProperties[0];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(idProperty,
+ generalCategoryName,
+ "ID",
+ "ID van het traject.",
+ true);
+
+ PropertyDescriptor nameProperty = dynamicProperties[1];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
+ generalCategoryName,
+ "Naam",
+ "Naam van het toetstraject.");
+ }
}
}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs
===================================================================
diff -u -r17b11c850b35c3ea99150ba25098b5b769b58f4f -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs (.../CalculationContextPropertiesTest.cs) (revision 17b11c850b35c3ea99150ba25098b5b769b58f4f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs (.../CalculationContextPropertiesTest.cs) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -19,8 +19,10 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using System.ComponentModel;
using Core.Common.Base;
using Core.Common.Gui.PropertyBag;
+using Core.Common.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.Common.Data.Calculation;
@@ -97,6 +99,25 @@
mocks.VerifyAll();
}
+ [Test]
+ public void Constructor_ValidData_PropertiesHaveExpectedAttributeValues()
+ {
+ // Call
+ var properties = new CalculationContextProperties();
+
+ // Assert
+ PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
+
+ Assert.AreEqual(1, dynamicProperties.Count);
+
+ const string generalCategoryName = "Algemeen";
+ PropertyDescriptor nameProperty = dynamicProperties[0];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
+ generalCategoryName,
+ "Naam",
+ "Naam van de berekening.");
+ }
+
private class TestCalculationContext : Observable, ICalculationContext
{
public TestCalculationContext(ICalculation wrappedData, CalculationGroup parent, IFailureMechanism failureMechanism)
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs
===================================================================
diff -u -r9fa257acbd8aeded7918b346a8e120fdc80f95b0 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9fa257acbd8aeded7918b346a8e120fdc80f95b0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -109,16 +109,6 @@
}
///
- /// Looks up a localized string similar to De waarde voor parameter '{0}' voor de grensspanning moet een concreet getal zijn..
- ///
- public static string MacroStabilityInwardsPreconsolidationStress_ValidateParameter_The_value_of_ParameterName_0_must_be_a_concrete_value {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_ValidateParameter_The_value_of_Parame" +
- "terName_0_must_be_a_concrete_value", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to CPhi.
///
public static string MacroStabilityInwardsShearStrengthModel_CPhi_DisplayName {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx
===================================================================
diff -u -r9fa257acbd8aeded7918b346a8e120fdc80f95b0 -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx (.../Resources.resx) (revision 9fa257acbd8aeded7918b346a8e120fdc80f95b0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx (.../Resources.resx) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
@@ -135,9 +135,6 @@
Zand dijk op zand (geval 2B)
-
- De waarde voor parameter '{0}' voor de grensspanning moet een concreet getal zijn.
-
CPhi of Su berekend