Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -rf132c3732b41ebd5837b63d44fa4c9401f6061c0 -raa0ea3c679dde0f922521dc6abc005354674668a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision f132c3732b41ebd5837b63d44fa4c9401f6061c0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision aa0ea3c679dde0f922521dc6abc005354674668a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Windows.Forms; using Core.Common.Base; @@ -61,15 +62,16 @@ public void Constructor_DefaultValues() { // Call - var pipingCalculationsView = new PipingCalculationsView(); - - // Assert - Assert.IsInstanceOf(pipingCalculationsView); - Assert.IsInstanceOf(pipingCalculationsView); - Assert.IsNull(pipingCalculationsView.Data); - Assert.IsNull(pipingCalculationsView.PipingFailureMechanism); - Assert.IsNull(pipingCalculationsView.AssessmentSection); - Assert.IsNull(pipingCalculationsView.ApplicationSelection); + using (var pipingCalculationsView = new PipingCalculationsView()) + { + // Assert + Assert.IsInstanceOf(pipingCalculationsView); + Assert.IsInstanceOf(pipingCalculationsView); + Assert.IsNull(pipingCalculationsView.Data); + Assert.IsNull(pipingCalculationsView.PipingFailureMechanism); + Assert.IsNull(pipingCalculationsView.AssessmentSection); + Assert.IsNull(pipingCalculationsView.ApplicationSelection); + } } [Test] @@ -141,22 +143,23 @@ mocks.ReplayAll(); - var pipingCalculationsView = new PipingCalculationsView + using (var pipingCalculationsView = new PipingCalculationsView { PipingFailureMechanism = pipingFailureMechanism, AssessmentSection = assessmentSection, - }; + }) + { + // Precondition + Assert.IsNotNull(pipingCalculationsView.PipingFailureMechanism); + Assert.IsNotNull(pipingCalculationsView.AssessmentSection); - // Precondition - Assert.IsNotNull(pipingCalculationsView.PipingFailureMechanism); - Assert.IsNotNull(pipingCalculationsView.AssessmentSection); + // Call + pipingCalculationsView.Dispose(); - // Call - pipingCalculationsView.Dispose(); - - // Assert - Assert.IsNull(pipingCalculationsView.PipingFailureMechanism); - Assert.IsNull(pipingCalculationsView.AssessmentSection); + // Assert + Assert.IsNull(pipingCalculationsView.PipingFailureMechanism); + Assert.IsNull(pipingCalculationsView.AssessmentSection); + } } [Test] @@ -287,20 +290,20 @@ Assert.AreEqual("Calculation 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual("Profile 1", cells[soilProfilesColumnIndex].FormattedValue); Assert.AreEqual("Location 1", cells[hydraulicBoundaryLocationsColumnIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 1.111), cells[dampingFactorExitMeanColumnIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 2.222), cells[phreaticLevelExitMeanColumnIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 3.33), cells[entryPointLColumnIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 4.44), cells[exitPointLColumnIndex].FormattedValue); + Assert.AreEqual(1.111.ToString(CultureInfo.CurrentCulture), cells[dampingFactorExitMeanColumnIndex].FormattedValue); + Assert.AreEqual(2.222.ToString(CultureInfo.CurrentCulture), cells[phreaticLevelExitMeanColumnIndex].FormattedValue); + Assert.AreEqual(3.33.ToString(CultureInfo.CurrentCulture), cells[entryPointLColumnIndex].FormattedValue); + Assert.AreEqual(4.44.ToString(CultureInfo.CurrentCulture), cells[exitPointLColumnIndex].FormattedValue); cells = rows[1].Cells; Assert.AreEqual(7, cells.Count); Assert.AreEqual("Calculation 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual("Profile 5", cells[soilProfilesColumnIndex].FormattedValue); Assert.AreEqual("Location 2", cells[hydraulicBoundaryLocationsColumnIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 5.556), cells[dampingFactorExitMeanColumnIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 6.667), cells[phreaticLevelExitMeanColumnIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 7.78), cells[entryPointLColumnIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 8.89), cells[exitPointLColumnIndex].FormattedValue); + Assert.AreEqual(5.556.ToString(CultureInfo.CurrentCulture), cells[dampingFactorExitMeanColumnIndex].FormattedValue); + Assert.AreEqual(6.667.ToString(CultureInfo.CurrentCulture), cells[phreaticLevelExitMeanColumnIndex].FormattedValue); + Assert.AreEqual(7.78.ToString(CultureInfo.CurrentCulture), cells[entryPointLColumnIndex].FormattedValue); + Assert.AreEqual(8.89.ToString(CultureInfo.CurrentCulture), cells[exitPointLColumnIndex].FormattedValue); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -r8b5a6f938fe2b04cd78623649df37580e145055f -raa0ea3c679dde0f922521dc6abc005354674668a --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 8b5a6f938fe2b04cd78623649df37580e145055f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision aa0ea3c679dde0f922521dc6abc005354674668a) @@ -77,7 +77,7 @@ // Import hydraulic boundary locations and ensure the corresponding combobox items are updated ImportHydraulicBoundaryDatabase(assessmentSection); - Assert.AreEqual(19, ((DataGridViewComboBoxCell)dataGridView.Rows[0].Cells[2]).Items.Count); + Assert.AreEqual(19, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[2]).Items.Count); // Add another, nested calculation and ensure the data grid view is updated var nestedPipingCalculationGroup = new PipingCalculationGroup("New group", false); @@ -102,9 +102,16 @@ private void ImportReferenceLine(AssessmentSection assessmentSection) { - using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, true, "traject_6-3.shp", "traject_6-3.dbf", "traject_6-3.prj", "traject_6-3.shx")) + using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, + true, + "traject_6-3.shp", + "traject_6-3.dbf", + "traject_6-3.prj", + "traject_6-3.shx")) { - var activity = new FileImportActivity(new ReferenceLineImporter(), new ReferenceLineContext(assessmentSection), Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "traject_6-3.shp")); + var activity = new FileImportActivity(new ReferenceLineImporter(), + new ReferenceLineContext(assessmentSection), + Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "traject_6-3.shp")); activity.Run(); activity.Finish(); @@ -113,9 +120,16 @@ private void ImportFailureMechanismSections(AssessmentSection assessmentSection, IFailureMechanism failureMechanism) { - using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, true, "traject_6-3_vakken.shp", "traject_6-3_vakken.dbf", "traject_6-3_vakken.prj", "traject_6-3_vakken.shx")) + using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, + true, + "traject_6-3_vakken.shp", + "traject_6-3_vakken.dbf", + "traject_6-3_vakken.prj", + "traject_6-3_vakken.shx")) { - var activity = new FileImportActivity(new FailureMechanismSectionsImporter(), new FailureMechanismSectionsContext(failureMechanism, assessmentSection), Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "traject_6-3_vakken.shp")); + var activity = new FileImportActivity(new FailureMechanismSectionsImporter(), + new FailureMechanismSectionsContext(failureMechanism, assessmentSection), + Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "traject_6-3_vakken.shp")); activity.Run(); activity.Finish(); @@ -124,7 +138,10 @@ private void ImportHydraulicBoundaryDatabase(AssessmentSection assessmentSection) { - using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, false, "HRD dutch coast south.sqlite", "HLCD.sqlite")) + using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, + false, + "HRD dutch coast south.sqlite", + "HLCD.sqlite")) { using (var hydraulicBoundaryDatabaseImporter = new HydraulicBoundaryDatabaseImporter()) { @@ -136,9 +153,14 @@ private void ImportSurfaceLines(AssessmentSection assessmentSection) { - using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, true, "DR6_surfacelines.csv", "DR6_surfacelines.krp.csv")) + using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, + true, + "DR6_surfacelines.csv", + "DR6_surfacelines.krp.csv")) { - var activity = new FileImportActivity(new PipingSurfaceLinesCsvImporter(), new RingtoetsPipingSurfaceLinesContext(assessmentSection.PipingFailureMechanism, assessmentSection), Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "DR6_surfacelines.csv")); + var activity = new FileImportActivity(new PipingSurfaceLinesCsvImporter(), + new RingtoetsPipingSurfaceLinesContext(assessmentSection.PipingFailureMechanism, assessmentSection), + Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "DR6_surfacelines.csv")); activity.Run(); activity.Finish(); @@ -147,9 +169,13 @@ private void ImportSoilProfiles(AssessmentSection assessmentSection) { - using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, true, "DR6.soil")) + using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, + true, + "DR6.soil")) { - var activity = new FileImportActivity(new PipingSoilProfilesImporter(), new StochasticSoilModelContext(assessmentSection.PipingFailureMechanism, assessmentSection), Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "DR6.soil")); + var activity = new FileImportActivity(new PipingSoilProfilesImporter(), + new StochasticSoilModelContext(assessmentSection.PipingFailureMechanism, assessmentSection), + Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "DR6.soil")); activity.Run(); activity.Finish();