Index: Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -40,7 +40,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -82,7 +82,7 @@ } /// - /// Looks up a localized string similar to <geen>. + /// Looks up a localized string similar to <selecteer>. /// public static string DisplayName_None { get { Index: Core/Common/src/Core.Common.Controls/Properties/Resources.resx =================================================================== diff -u -r4cd987d7abd8340848d2159381f1d8ed4dfb7d96 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Core/Common/src/Core.Common.Controls/Properties/Resources.resx (.../Resources.resx) (revision 4cd987d7abd8340848d2159381f1d8ed4dfb7d96) +++ Core/Common/src/Core.Common.Controls/Properties/Resources.resx (.../Resources.resx) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -118,6 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - <geen> + <selecteer> \ No newline at end of file Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs =================================================================== diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs (.../DataGridViewComboBoxItemWrapperTest.cs) (revision a1abe798a3991d9fff01eae522ccae2a43d0a931) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs (.../DataGridViewComboBoxItemWrapperTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -51,7 +51,7 @@ var dataGridViewComboBoxItemWrapper = new DataGridViewComboBoxItemWrapper(null); // Assert - Assert.AreEqual("", dataGridViewComboBoxItemWrapper.DisplayName); + Assert.AreEqual("", dataGridViewComboBoxItemWrapper.DisplayName); Assert.IsNull(dataGridViewComboBoxItemWrapper.WrappedObject); Assert.AreEqual(dataGridViewComboBoxItemWrapper, dataGridViewComboBoxItemWrapper.This); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs =================================================================== diff -u -r9c62dbc3f18cb81172af025c25ef3cc7b5578035 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs (.../ClosingStructuresScenariosViewTest.cs) (revision 9c62dbc3f18cb81172af025c25ef3cc7b5578035) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs (.../ClosingStructuresScenariosViewTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -124,12 +124,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" } }); @@ -171,12 +171,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" } }); @@ -228,17 +228,17 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" }, new[] { - "" + "" } }); } @@ -267,11 +267,11 @@ { new[] { - "" + "" }, new[] { - "", + "", "CalculationA", "CalculationB" } @@ -310,12 +310,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB", "CalculationC" } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ScenarioSelectionControlTest.cs =================================================================== diff -u -r964f8948f0ec59095ea9cc58fdabd706c4b17d22 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ScenarioSelectionControlTest.cs (.../ScenarioSelectionControlTest.cs) (revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ScenarioSelectionControlTest.cs (.../ScenarioSelectionControlTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -184,7 +184,7 @@ CollectionAssert.AreEqual( new[] { - "", + "", calculationA.ToString() }, cellA.Items.OfType>().Select(r => r.DisplayName)); @@ -193,7 +193,7 @@ CollectionAssert.AreEqual( new[] { - "", + "", calculationB.ToString() }, cellB.Items.OfType>().Select(r => r.DisplayName)); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs =================================================================== diff -u -re217c241d1d57575c99e1062b449ea595f9fc764 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs (.../ForeshoreProfileEditorTest.cs) (revision e217c241d1d57575c99e1062b449ea595f9fc764) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs (.../ForeshoreProfileEditorTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -62,7 +62,7 @@ // Assert Assert.IsInstanceOf(editor.PublicNullItem); - Assert.AreEqual("", editor.PublicNullItem.Name); + Assert.AreEqual("", editor.PublicNullItem.Name); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs =================================================================== diff -u -ra90ecfec7dc128234360d4a55ee646928c133b75 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision a90ecfec7dc128234360d4a55ee646928c133b75) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -123,12 +123,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" } }); @@ -170,12 +170,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" } }); @@ -225,17 +225,17 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" }, new[] { - "" + "" } }); } @@ -264,11 +264,11 @@ { new[] { - "" + "" }, new[] { - "", + "", "CalculationA", "CalculationB" } @@ -307,12 +307,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB", "CalculationC" } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs =================================================================== diff -u -r5d822eca2d7467c9781a4a3a54d796ac4229e4a3 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision 5d822eca2d7467c9781a4a3a54d796ac4229e4a3) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -138,7 +138,7 @@ // Assert DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(2, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); Assert.AreEqual("profiel63p1Naam", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); mocks.VerifyAll(); @@ -202,7 +202,7 @@ // Assert DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(2, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); Assert.AreEqual("profiel63p1Naam_changed", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); mocks.VerifyAll(); @@ -262,13 +262,13 @@ // Assert DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(3, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); Assert.AreEqual("profiel63p1NaamCalculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); Assert.AreEqual("profiel63p2NaamCalculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[2].ToString()); DataGridViewCell dataGridViewCellWithRemovedCalculation = dataGridView.Rows[56].Cells[1]; Assert.AreEqual(1, ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items[0].ToString()); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items[0].ToString()); mocks.VerifyAll(); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs =================================================================== diff -u -ra90ecfec7dc128234360d4a55ee646928c133b75 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs (.../HeightStructuresScenariosViewTest.cs) (revision a90ecfec7dc128234360d4a55ee646928c133b75) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs (.../HeightStructuresScenariosViewTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -125,12 +125,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" } }); @@ -172,12 +172,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" } }); @@ -227,17 +227,17 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" }, new[] { - "" + "" } }); } @@ -266,11 +266,11 @@ { new[] { - "" + "" }, new[] { - "", + "", "CalculationA", "CalculationB" } @@ -305,12 +305,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB", "CalculationC" } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs =================================================================== diff -u -r5d822eca2d7467c9781a4a3a54d796ac4229e4a3 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs (.../HeightStructuresScenariosViewIntegrationTest.cs) (revision 5d822eca2d7467c9781a4a3a54d796ac4229e4a3) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs (.../HeightStructuresScenariosViewIntegrationTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -135,7 +135,7 @@ // Assert DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(2, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); Assert.AreEqual("Eerste kunstwerk 6-3", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); } mocks.VerifyAll(); @@ -194,7 +194,7 @@ // Assert DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(2, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); Assert.AreEqual("Eerste kunstwerk 6-3_changed", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); } @@ -251,13 +251,13 @@ // Assert DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(3, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); Assert.AreEqual("Eerste kunstwerk 6-3Calculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); Assert.AreEqual("Tweede kunstwerk 6-3Calculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[2].ToString()); DataGridViewCell dataGridViewCellWithRemovedCalculation = dataGridView.Rows[56].Cells[1]; Assert.AreEqual(1, ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items[0].ToString()); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items[0].ToString()); } mocks.VerifyAll(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -146,7 +146,7 @@ var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex]; DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(3, hydraulicBoundaryLocationComboboxItems.Count); - Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); + Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); Assert.AreEqual("Location 1", hydraulicBoundaryLocationComboboxItems[1].ToString()); Assert.AreEqual("Location 2", hydraulicBoundaryLocationComboboxItems[2].ToString()); } @@ -175,7 +175,7 @@ var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex]; DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(1, hydraulicBoundaryLocationComboboxItems.Count); - Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); + Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); } mocks.VerifyAll(); @@ -200,7 +200,7 @@ var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex]; DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(7, hydraulicBoundaryLocationComboboxItems.Count); - Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); + Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); Assert.AreEqual("Location 1", hydraulicBoundaryLocationComboboxItems[1].ToString()); Assert.AreEqual("Location 2", hydraulicBoundaryLocationComboboxItems[2].ToString()); Assert.AreEqual("Location 1 (2 m)", hydraulicBoundaryLocationComboboxItems[3].ToString()); @@ -269,12 +269,12 @@ // Assert DataGridViewComboBoxCell.ObjectCollection stochasticSoilModelsComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex]).Items; Assert.AreEqual(2, stochasticSoilModelsComboboxItems.Count); - Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); + Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); Assert.AreEqual("Model A", stochasticSoilModelsComboboxItems[1].ToString()); stochasticSoilModelsComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[1].Cells[stochasticSoilModelsColumnIndex]).Items; Assert.AreEqual(3, stochasticSoilModelsComboboxItems.Count); - Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); + Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); Assert.AreEqual("Model A", stochasticSoilModelsComboboxItems[1].ToString()); Assert.AreEqual("Model E", stochasticSoilModelsComboboxItems[2].ToString()); } @@ -297,13 +297,13 @@ // Assert DataGridViewComboBoxCell.ObjectCollection soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex]).Items; Assert.AreEqual(3, soilProfilesComboboxItems.Count); - Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); + Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); Assert.AreEqual("Profile 1", soilProfilesComboboxItems[1].ToString()); Assert.AreEqual("Profile 2", soilProfilesComboboxItems[2].ToString()); soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[1].Cells[stochasticSoilProfilesColumnIndex]).Items; Assert.AreEqual(2, soilProfilesComboboxItems.Count); - Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); + Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); Assert.AreEqual("Profile 5", soilProfilesComboboxItems[1].ToString()); } @@ -330,7 +330,7 @@ Assert.AreEqual(5, cells.Count); Assert.AreEqual("Calculation 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual("Model A", cells[stochasticSoilModelsColumnIndex].FormattedValue); - Assert.AreEqual("", cells[stochasticSoilProfilesColumnIndex].FormattedValue); + Assert.AreEqual("", cells[stochasticSoilProfilesColumnIndex].FormattedValue); Assert.AreEqual(GetFormattedProbabilityValue(0), cells[stochasticSoilProfilesProbabilityColumnIndex].FormattedValue); Assert.AreEqual("Location 1 (2 m)", cells[selectableHydraulicBoundaryLocationsColumnIndex].FormattedValue); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs =================================================================== diff -u -r328c078a05144fb3f65bf75f515532ba9da4dd60 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision 328c078a05144fb3f65bf75f515532ba9da4dd60) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -102,7 +102,7 @@ Assert.AreEqual(2, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex]).Items.Count); Assert.AreEqual("PK001_0001_Stability", dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex].FormattedValue); Assert.AreEqual(1, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex]).Items.Count); - Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); + Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); // Import hydraulic boundary locations and ensure the corresponding combobox items are updated DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -152,7 +152,7 @@ var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex]; DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(3, hydraulicBoundaryLocationComboboxItems.Count); - Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); + Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); Assert.AreEqual("Location 1", hydraulicBoundaryLocationComboboxItems[1].ToString()); Assert.AreEqual("Location 2", hydraulicBoundaryLocationComboboxItems[2].ToString()); } @@ -181,7 +181,7 @@ var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex]; DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(1, hydraulicBoundaryLocationComboboxItems.Count); - Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); + Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); } mocks.VerifyAll(); @@ -206,7 +206,7 @@ var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex]; DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(7, hydraulicBoundaryLocationComboboxItems.Count); - Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); + Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); Assert.AreEqual("Location 1", hydraulicBoundaryLocationComboboxItems[1].ToString()); Assert.AreEqual("Location 2", hydraulicBoundaryLocationComboboxItems[2].ToString()); Assert.AreEqual("Location 1 (2 m)", hydraulicBoundaryLocationComboboxItems[3].ToString()); @@ -275,12 +275,12 @@ // Assert DataGridViewComboBoxCell.ObjectCollection stochasticSoilModelsComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex]).Items; Assert.AreEqual(2, stochasticSoilModelsComboboxItems.Count); - Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); + Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); Assert.AreEqual("Model A", stochasticSoilModelsComboboxItems[1].ToString()); stochasticSoilModelsComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[1].Cells[stochasticSoilModelsColumnIndex]).Items; Assert.AreEqual(3, stochasticSoilModelsComboboxItems.Count); - Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); + Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); Assert.AreEqual("Model A", stochasticSoilModelsComboboxItems[1].ToString()); Assert.AreEqual("Model E", stochasticSoilModelsComboboxItems[2].ToString()); } @@ -303,13 +303,13 @@ // Assert DataGridViewComboBoxCell.ObjectCollection soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex]).Items; Assert.AreEqual(3, soilProfilesComboboxItems.Count); - Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); + Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); Assert.AreEqual("Profile 1", soilProfilesComboboxItems[1].ToString()); Assert.AreEqual("Profile 2", soilProfilesComboboxItems[2].ToString()); soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[1].Cells[stochasticSoilProfilesColumnIndex]).Items; Assert.AreEqual(2, soilProfilesComboboxItems.Count); - Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); + Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); Assert.AreEqual("Profile 5", soilProfilesComboboxItems[1].ToString()); } @@ -336,7 +336,7 @@ Assert.AreEqual(9, cells.Count); Assert.AreEqual("Calculation 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual("Model A", cells[stochasticSoilModelsColumnIndex].FormattedValue); - Assert.AreEqual("", cells[stochasticSoilProfilesColumnIndex].FormattedValue); + Assert.AreEqual("", cells[stochasticSoilProfilesColumnIndex].FormattedValue); Assert.AreEqual(GetFormattedProbabilityValue(0), cells[stochasticSoilProfilesProbabilityColumnIndex].FormattedValue); Assert.AreEqual("Location 1 (2 m)", cells[selectableHydraulicBoundaryLocationsColumnIndex].FormattedValue); Assert.AreEqual(1.111.ToString(CultureInfo.CurrentCulture), cells[dampingFactorExitMeanColumnIndex].FormattedValue); Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -r5fae4678520bd424acf6577dcb0338f1341a7876 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 5fae4678520bd424acf6577dcb0338f1341a7876) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -103,7 +103,7 @@ Assert.AreEqual(2, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex]).Items.Count); Assert.AreEqual("PK001_0001_Piping", dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex].FormattedValue); Assert.AreEqual(1, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex]).Items.Count); - Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); + Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); // Import hydraulic boundary locations and ensure the corresponding combobox items are updated DataImportHelper.ImportHydraulicBoundaryDatabase(assessmentSection); @@ -195,7 +195,7 @@ listBox.SelectedItem = assessmentSection.Piping.Sections.First(s => s.Name == "6-3_19"); Assert.AreEqual("PK001_0002_Piping", dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex].FormattedValue); - Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); + Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); Assert.AreEqual(GetFormattedProbabilityValue(0), dataGridView.Rows[0].Cells[stochasticSoilProfilesProbabilityColumnIndex].FormattedValue); listBox.SelectedItem = assessmentSection.Piping.Sections.First(s => s.Name == "6-3_16"); @@ -204,8 +204,8 @@ Assert.AreEqual(GetFormattedProbabilityValue(100), dataGridView.Rows[0].Cells[stochasticSoilProfilesProbabilityColumnIndex].FormattedValue); listBox.SelectedItem = assessmentSection.Piping.Sections.First(s => s.Name == "6-3_8"); - Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex].FormattedValue); - Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); + Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex].FormattedValue); + Assert.AreEqual("", dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex].FormattedValue); Assert.AreEqual(GetFormattedProbabilityValue(0), dataGridView.Rows[0].Cells[stochasticSoilProfilesProbabilityColumnIndex].FormattedValue); } } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenariosViewTest.cs =================================================================== diff -u -ra90ecfec7dc128234360d4a55ee646928c133b75 -r83fcbece167de3f930a274a6b0c26dafef7ec771 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenariosViewTest.cs (.../StabilityPointStructuresScenariosViewTest.cs) (revision a90ecfec7dc128234360d4a55ee646928c133b75) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresScenariosViewTest.cs (.../StabilityPointStructuresScenariosViewTest.cs) (revision 83fcbece167de3f930a274a6b0c26dafef7ec771) @@ -124,12 +124,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" } }); @@ -171,12 +171,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" } }); @@ -226,17 +226,17 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB" }, new[] { - "" + "" } }); } @@ -265,11 +265,11 @@ { new[] { - "" + "" }, new[] { - "", + "", "CalculationA", "CalculationB" } @@ -308,12 +308,12 @@ { new[] { - "", + "", "CalculationA" }, new[] { - "", + "", "CalculationB", "CalculationC" }