Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs =================================================================== diff -u -r223528aec31c0f78f0f8ff67991e43f781075931 -rea8d46d1ac88024537a4316b3020b6281986c063 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs (.../ImportSoilProfileFromDatabaseTest.cs) (revision 223528aec31c0f78f0f8ff67991e43f781075931) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs (.../ImportSoilProfileFromDatabaseTest.cs) (revision ea8d46d1ac88024537a4316b3020b6281986c063) @@ -44,7 +44,7 @@ public void GivenDatabaseWithSimple1DProfile_WhenImportingPipingProfile_ThenPipingProfileHasValuesCorrectlySet() { // Given - var databasePath = Path.Combine(testDataPath, "1dprofile.soil"); + string databasePath = Path.Combine(testDataPath, "1dprofile.soil"); var pipingFailureMechanism = new PipingFailureMechanism(); var mocks = new MockRepository(); @@ -92,7 +92,7 @@ public void GivenDatabaseWithValid2DProfileAnd2dProfileWithInvalidLayerGeometry_WhenImportingPipingProfile_ThenValidPipingProfileHasValuesCorrectlySet() { // Given - var databasePath = Path.Combine(testDataPath, "invalid2dGeometry.soil"); + string databasePath = Path.Combine(testDataPath, "invalid2dGeometry.soil"); var pipingFailureMechanism = new PipingFailureMechanism(); var mocks = new MockRepository(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/IntegrationTestHelper.cs =================================================================== diff -u -rb53320286e086524c6003dc6e47af798ee3935be -rea8d46d1ac88024537a4316b3020b6281986c063 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/IntegrationTestHelper.cs (.../IntegrationTestHelper.cs) (revision b53320286e086524c6003dc6e47af798ee3935be) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/IntegrationTestHelper.cs (.../IntegrationTestHelper.cs) (revision ea8d46d1ac88024537a4316b3020b6281986c063) @@ -53,7 +53,6 @@ var activity = new FileImportActivity(new ReferenceLineImporter(), new ReferenceLineContext(assessmentSection), Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "traject_6-3.shp")); - activity.Run(); activity.Finish(); } @@ -77,7 +76,6 @@ var activity = new FileImportActivity(new FailureMechanismSectionsImporter(), new FailureMechanismSectionsContext(failureMechanism, assessmentSection), Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "traject_6-3_vakken.shp")); - activity.Run(); activity.Finish(); } @@ -94,12 +92,10 @@ false, "HRD dutch coast south.sqlite", "HLCD.sqlite")) + using (var hydraulicBoundaryDatabaseImporter = new HydraulicBoundaryDatabaseImporter()) { - using (var hydraulicBoundaryDatabaseImporter = new HydraulicBoundaryDatabaseImporter()) - { - var filePath = Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "HRD dutch coast south.sqlite"); - hydraulicBoundaryDatabaseImporter.Import(assessmentSection, filePath); - } + var filePath = Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "HRD dutch coast south.sqlite"); + hydraulicBoundaryDatabaseImporter.Import(assessmentSection, filePath); } } @@ -118,7 +114,6 @@ var activity = new FileImportActivity(new PipingSurfaceLinesCsvImporter(), new RingtoetsPipingSurfaceLinesContext(assessmentSection.PipingFailureMechanism, assessmentSection), Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "DR6_surfacelines.csv")); - activity.Run(); activity.Finish(); } @@ -138,7 +133,6 @@ var activity = new FileImportActivity(new PipingSoilProfilesImporter(), new StochasticSoilModelContext(assessmentSection.PipingFailureMechanism.StochasticSoilModels, assessmentSection.PipingFailureMechanism, assessmentSection), Path.Combine(embeddedResourceFileWriter.TargetFolderPath, "DR6.soil")); - activity.Run(); activity.Finish(); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -rea8d46d1ac88024537a4316b3020b6281986c063 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision be66e1bec38a780abb27fedea8632acf4d24a173) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision ea8d46d1ac88024537a4316b3020b6281986c063) @@ -47,7 +47,7 @@ form.Show(); // Obtain the data grid view - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Set all necessary data to the view var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); @@ -110,14 +110,14 @@ pipingCalculation1.Output = new PipingOutput(0, 0, 0, 0, 0, 0); pipingCalculation1.SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, probability, 0, 0); pipingCalculation1.NotifyObservers(); - Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / pipingCalculation1.Probability), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); + Assert.AreEqual(string.Format("1/{0:N0}", 1.0/pipingCalculation1.Probability), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(string.Empty, dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Add another, nested calculation without surface line and ensure the data grid view is updated when the surface line is set var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput()); nestedPipingCalculationGroup.Children.Add(pipingCalculation3); nestedPipingCalculationGroup.NotifyObservers(); - Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / pipingCalculation1.Probability), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); + Assert.AreEqual(string.Format("1/{0:N0}", 1.0/pipingCalculation1.Probability), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(string.Empty, dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); pipingCalculation3.InputParameters.SurfaceLine = assessmentSection.PipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001"); @@ -145,7 +145,7 @@ // Set contribution again so we have a probability. pipingCalculation1.Contribution = (RoundedDouble) 1.0; pipingCalculation1.NotifyObservers(); - Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / pipingCalculation1.Probability), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); + Assert.AreEqual(string.Format("1/{0:N0}", 1.0/pipingCalculation1.Probability), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(string.Empty, dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Clear the output of the calculation and make sure the data grid view is updated