Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/Riskeer.ClosingStructures.Data.TestUtil.csproj =================================================================== diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/Riskeer.ClosingStructures.Data.TestUtil.csproj (.../Riskeer.ClosingStructures.Data.TestUtil.csproj) (revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/Riskeer.ClosingStructures.Data.TestUtil.csproj (.../Riskeer.ClosingStructures.Data.TestUtil.csproj) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -10,12 +10,12 @@ - - - - - - + + + + + + Fisheye: Tag 4d3c79ba89108714dd2187ef5728811a8111e2f0 refers to a dead (removed) revision in file `Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/TestClosingStructuresFailureMechanism.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r10523021ee8dbce608fc3c1fa165468e6a70eac0 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 10523021ee8dbce608fc3c1fa165468e6a70eac0) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -216,7 +216,7 @@ var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculationScenario(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -279,7 +279,7 @@ var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculationScenario(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -320,7 +320,7 @@ DikeProfile = DikeProfileTestFactory.CreateDikeProfile() } }; - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -362,7 +362,7 @@ DikeProfile = dikeProfile } }; - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -574,7 +574,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculationScenario(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -606,7 +606,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculationScenario(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -650,7 +650,7 @@ var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculationScenario(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -681,7 +681,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculationScenario(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -713,7 +713,7 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculationScenario(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -756,7 +756,7 @@ var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculationScenario(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -789,7 +789,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -852,10 +852,10 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // When - Action action = () => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); + void Action() => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(action, messages => + TestHelper.AssertLogMessages(Action, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); @@ -879,7 +879,7 @@ // Given var observer = mocks.StrictMock(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -924,10 +924,10 @@ using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { // When - Action action = () => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); + void Action() => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(action, messages => + TestHelper.AssertLogMessages(Action, messages => { string[] msgs = messages.ToArray(); CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r07256b6a9cc4abaff600e7c9a266cef54295b3c3 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 07256b6a9cc4abaff600e7c9a266cef54295b3c3) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -437,7 +437,7 @@ } }; - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); @@ -448,7 +448,7 @@ var applicationFeatureCommandHandler = mocks.Stub(); var importHandler = mocks.Stub(); - importHandler.Stub(ih => ih.GetSupportedImportInfos(nodeData)).Return(new ImportInfo[0]); + importHandler.Stub(ih => ih.GetSupportedImportInfos(nodeData)).Return(Array.Empty()); var exportHandler = mocks.Stub(); var updateHandler = mocks.Stub(); var viewCommandsHandler = mocks.Stub(); @@ -946,7 +946,7 @@ } }; - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); @@ -958,7 +958,7 @@ var applicationFeatureCommandHandler = mocks.Stub(); var importHandler = mocks.Stub(); - importHandler.Stub(ih => ih.GetSupportedImportInfos(nodeData)).Return(new ImportInfo[0]); + importHandler.Stub(ih => ih.GetSupportedImportInfos(nodeData)).Return(Array.Empty()); var exportHandler = mocks.Stub(); var updateHandler = mocks.Stub(); var viewCommandsHandler = mocks.Stub(); @@ -1004,7 +1004,7 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase @@ -1054,7 +1054,7 @@ } }; - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); @@ -1065,7 +1065,7 @@ var applicationFeatureCommandHandler = mocks.Stub(); var importHandler = mocks.Stub(); - importHandler.Stub(ih => ih.GetSupportedImportInfos(nodeData)).Return(new ImportInfo[0]); + importHandler.Stub(ih => ih.GetSupportedImportInfos(nodeData)).Return(Array.Empty()); var exportHandler = mocks.Stub(); var updateHandler = mocks.Stub(); var viewCommandsHandler = mocks.Stub(); @@ -1109,7 +1109,7 @@ } }; - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); @@ -1121,7 +1121,7 @@ var applicationFeatureCommandHandler = mocks.Stub(); var importHandler = mocks.Stub(); - importHandler.Stub(ih => ih.GetSupportedImportInfos(nodeData)).Return(new ImportInfo[0]); + importHandler.Stub(ih => ih.GetSupportedImportInfos(nodeData)).Return(Array.Empty()); var exportHandler = mocks.Stub(); var updateHandler = mocks.Stub(); var viewCommandsHandler = mocks.Stub(); @@ -1168,7 +1168,7 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase @@ -1504,7 +1504,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "A", @@ -1574,7 +1574,7 @@ IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "A", Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r9e22f2d5306cc6a32c1fd37e6164f3d1581adaaf -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 9e22f2d5306cc6a32c1fd37e6164f3d1581adaaf) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -256,7 +256,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); @@ -289,7 +289,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); @@ -324,7 +324,7 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -367,7 +367,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemValidateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); @@ -401,7 +401,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemValidateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); @@ -436,7 +436,7 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemValidateAllEnabled() { // Setup - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -482,7 +482,7 @@ IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocksRepository); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "A", @@ -580,7 +580,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation { Name = "A", Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -313,10 +313,7 @@ }); HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0).Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r07256b6a9cc4abaff600e7c9a266cef54295b3c3 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 07256b6a9cc4abaff600e7c9a266cef54295b3c3) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -490,7 +490,7 @@ } }; - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); @@ -533,7 +533,7 @@ } }; - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); @@ -580,7 +580,7 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase @@ -631,7 +631,7 @@ } }; - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); @@ -675,7 +675,7 @@ } }; - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); @@ -722,7 +722,7 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase @@ -766,7 +766,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new StructuresCalculationScenario { InputParameters = @@ -819,7 +819,7 @@ calculationInputObserver.Expect(o => o.UpdateObserver()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var calculation = new StructuresCalculationScenario { @@ -1093,7 +1093,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestHeightStructuresCalculationScenario { Name = "A", @@ -1190,7 +1190,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestHeightStructuresCalculationScenario { Name = "A", Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r1bc5f2299c66132f869d09d017327d80f4a9522c -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 1bc5f2299c66132f869d09d017327d80f4a9522c) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -214,7 +214,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -286,7 +286,7 @@ var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -327,7 +327,7 @@ Structure = new TestHeightStructure() } }; - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -368,7 +368,7 @@ Structure = new TestHeightStructure() } }; - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -577,7 +577,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -609,7 +609,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -653,7 +653,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -684,7 +684,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -716,7 +716,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -762,7 +762,7 @@ var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var nodeData = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -791,7 +791,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); @@ -829,7 +829,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario { @@ -873,7 +873,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var foreshoreProfileInput = new TestForeshoreProfile(); var parent = new CalculationGroup(); @@ -976,7 +976,7 @@ var calculationObserver = mocks.StrictMock(); var calculationInputObserver = mocks.StrictMock(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var foreshoreProfileInput = new TestForeshoreProfile(true); var parent = new CalculationGroup(); @@ -1057,7 +1057,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase @@ -1119,10 +1119,10 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // When - Action action = () => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); + void Action() => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(action, messages => + TestHelper.AssertLogMessages(Action, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); @@ -1172,7 +1172,7 @@ }; calculation.Attach(observer); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); var calculationContext = new HeightStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -1187,10 +1187,10 @@ using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { // When - Action action = () => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); + void Action() => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(action, messages => + TestHelper.AssertLogMessages(Action, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationsContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationsContextTreeNodeInfoTest.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationsContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationsContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.Drawing; using System.IO; @@ -262,7 +261,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); @@ -295,7 +294,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); @@ -330,7 +329,7 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -373,7 +372,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemValidateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); @@ -407,7 +406,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemValidateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); @@ -442,7 +441,7 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemValidateAllEnabled() { // Setup - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -487,7 +486,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestHeightStructuresCalculationScenario { Name = "A", @@ -582,7 +581,7 @@ public void ContextMenuStrip_ClickOnValidateAllItem_ValidateAllChildCalculations() { // Setup - var failureMechanism = new TestHeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestHeightStructuresCalculationScenario { Name = "A", @@ -626,10 +625,10 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(context, null, treeViewControl)) { // Call - Action call = () => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); + void Call() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] messageList = messages.ToArray(); @@ -755,7 +754,7 @@ Output = new TestStructuresOutput() }; - var failureMechanism = new TestHeightStructuresFailureMechanism + var failureMechanism = new HeightStructuresFailureMechanism { CalculationsGroup = { @@ -822,7 +821,7 @@ Output = new TestStructuresOutput() }; - var failureMechanism = new TestHeightStructuresFailureMechanism + var failureMechanism = new HeightStructuresFailureMechanism { CalculationsGroup = { Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r537d0e410ca5a54b12bd4e696af391ca6283381f -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 537d0e410ca5a54b12bd4e696af391ca6283381f) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Linq; using System.Windows.Forms; using Core.Common.Base; @@ -192,7 +191,7 @@ Output = MacroStabilityInwardsOutputTestFactory.CreateOutput() }); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new MacroStabilityInwardsCalculationGroupContext(group, parentGroup, @@ -323,7 +322,7 @@ Output = MacroStabilityInwardsOutputTestFactory.CreateOutput() }); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new MacroStabilityInwardsCalculationGroupContext(group, null, @@ -566,7 +565,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -765,7 +764,7 @@ group.Children.Add(emptyChildGroup); group.Children.Add(invalidCalculation); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var nodeData = new MacroStabilityInwardsCalculationGroupContext(group, parentGroup, @@ -792,10 +791,10 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // Call - Action call = () => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick(); + void Call() => contextMenu.Items[contextMenuValidateAllIndexNestedGroup].PerformClick(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(9, msgs.Length); @@ -841,7 +840,7 @@ group.Children.Add(emptyChildGroup); group.Children.Add(calculationB); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var nodeData = new MacroStabilityInwardsCalculationGroupContext(group, parentGroup, Enumerable.Empty(), @@ -875,10 +874,10 @@ }; // Call - Action call = () => contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick(); + void Call() => contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(16, msgs.Length); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r537d0e410ca5a54b12bd4e696af391ca6283381f -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 537d0e410ca5a54b12bd4e696af391ca6283381f) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -152,7 +152,7 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new MacroStabilityInwardsCalculationScenario(); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new MacroStabilityInwardsCalculationScenarioContext(calculation, new CalculationGroup(), @@ -191,7 +191,7 @@ { Output = MacroStabilityInwardsOutputTestFactory.CreateOutput() }; - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new MacroStabilityInwardsCalculationScenarioContext(calculation, new CalculationGroup(), @@ -226,7 +226,7 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new MacroStabilityInwardsCalculationScenario(); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var nodeData = new MacroStabilityInwardsCalculationScenarioContext(calculation, new CalculationGroup(), @@ -367,7 +367,7 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new MacroStabilityInwardsCalculationScenario(); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var calculationContext = new MacroStabilityInwardsCalculationScenarioContext(calculation, new CalculationGroup(), @@ -399,11 +399,11 @@ using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { // When - Action action = () => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); + void Action() => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); // Then const int expectedValidationMessageCount = 3; - TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(action, messages => + TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(Action, messages => { Tuple[] tupleArray = messages.ToArray(); string[] msgs = tupleArray.Select(tuple => tuple.Item1).ToArray(); @@ -430,7 +430,7 @@ using (var treeViewControl = new TreeViewControl()) { var calculation = new MacroStabilityInwardsCalculationScenario(); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var calculationContext = new MacroStabilityInwardsCalculationScenarioContext(calculation, @@ -456,13 +456,13 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // When - Action action = () => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); + void Action() => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); // Then const int expectedValidationMessageCount = 3; const int expectedStatusMessageCount = 2; const int expectedLogMessageCount = expectedValidationMessageCount + expectedStatusMessageCount; - TestHelper.AssertLogMessagesCount(action, expectedLogMessageCount); + TestHelper.AssertLogMessagesCount(Action, expectedLogMessageCount); } } } @@ -473,7 +473,7 @@ // Given using (var treeViewControl = new TreeViewControl()) { - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -514,10 +514,10 @@ using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { // When - Action action = () => contextMenuAdapter.Items[contextMenuCalculateIndex].PerformClick(); + void Action() => contextMenuAdapter.Items[contextMenuCalculateIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(action, messages => + TestHelper.AssertLogMessages(Action, messages => { using (IEnumerator msgs = messages.GetEnumerator()) { Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rf7f338e47831f88d0522f77e84a3e587303584d6 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs) (revision f7f338e47831f88d0522f77e84a3e587303584d6) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -243,7 +243,7 @@ public void ContextMenuStrip_HasCalculationWithOutput_ReturnsContextMenuWithCommonItems() { // Setup - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var calculation = new MacroStabilityInwardsCalculationScenario { Output = MacroStabilityInwardsOutputTestFactory.CreateOutput() @@ -341,7 +341,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var data = mocks.StrictMock(); - data.Stub(dm => dm.Calculations).Return(new ICalculation[0]); + data.Stub(dm => dm.Calculations).Return(Array.Empty()); var assessmentSection = mocks.Stub(); var context = new MacroStabilityInwardsCalculationsContext(data, assessmentSection); @@ -415,7 +415,7 @@ hydraulicBoundaryLocation }, true); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism + var failureMechanism = new MacroStabilityInwardsFailureMechanism { CalculationsGroup = { @@ -508,7 +508,7 @@ hydraulicBoundaryLocation }, true); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(hydraulicBoundaryLocation); validCalculation.Name = "A"; MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); @@ -531,10 +531,10 @@ using (new MacroStabilityInwardsCalculatorFactoryConfig()) { // Call - Action call = () => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); + void Call() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(9, msgs.Length); @@ -555,7 +555,7 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); @@ -594,10 +594,10 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(context, null, treeViewControl)) { // Call - Action call = () => contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(); + void Call() => contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(16, msgs.Length); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs =================================================================== diff -u -r68ec97043e735b40f5f6fa555ad53ef7cc43527d -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs (.../StabilityPointStructuresUpdateDataStrategyTest.cs) (revision 68ec97043e735b40f5f6fa555ad53ef7cc43527d) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs (.../StabilityPointStructuresUpdateDataStrategyTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -598,7 +598,7 @@ Structure = structure } }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism + var failureMechanism = new StabilityPointStructuresFailureMechanism { CalculationsGroup = { Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r07256b6a9cc4abaff600e7c9a266cef54295b3c3 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 07256b6a9cc4abaff600e7c9a266cef54295b3c3) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -349,7 +349,7 @@ } }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); @@ -399,7 +399,7 @@ } }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); @@ -453,7 +453,7 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario()); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase @@ -1469,7 +1469,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "A", @@ -1574,7 +1574,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "A", Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r1bc5f2299c66132f869d09d017327d80f4a9522c -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 1bc5f2299c66132f869d09d017327d80f4a9522c) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -213,7 +213,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -284,7 +284,7 @@ var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -325,7 +325,7 @@ Structure = new TestStabilityPointStructure() } }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -366,7 +366,7 @@ Structure = new TestStabilityPointStructure() } }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -403,7 +403,7 @@ calculationInputObserver.Expect(o => o.UpdateObserver()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario @@ -452,7 +452,7 @@ var calculationObserver = mocks.StrictMock(); var calculationInputObserver = mocks.StrictMock(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario @@ -526,7 +526,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemPerformCalculationAndValidationDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); @@ -564,7 +564,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemPerformCalculationAndValidationDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath"); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); @@ -616,7 +616,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); @@ -652,7 +652,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario(); @@ -690,7 +690,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculationScenario { @@ -734,7 +734,7 @@ { // Setup IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var foreshoreProfileInput = new TestForeshoreProfile(); var parent = new CalculationGroup(); @@ -784,7 +784,7 @@ calculationInputObserver.Expect(o => o.UpdateObserver()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var foreshoreProfileInput = new TestForeshoreProfile(true); var parent = new CalculationGroup(); @@ -837,7 +837,7 @@ var calculationObserver = mocks.StrictMock(); var calculationInputObserver = mocks.StrictMock(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var foreshoreProfileInput = new TestForeshoreProfile(true); var parent = new CalculationGroup(); @@ -947,7 +947,7 @@ }; calculation.Attach(observer); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculationContext = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -981,10 +981,10 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // When - Action action = () => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); + void Action() => contextMenuStrip.Items[contextMenuCalculateIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(action, messages => + TestHelper.AssertLogMessages(Action, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); @@ -1037,7 +1037,7 @@ }; calculation.Attach(observer); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculationContext = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -1052,10 +1052,10 @@ using (ContextMenuStrip contextMenuStrip = info.ContextMenuStrip(calculationContext, null, treeViewControl)) { // When - Action action = () => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); + void Action() => contextMenuStrip.Items[contextMenuValidateIndex].PerformClick(); // Then - TestHelper.AssertLogMessages(action, messages => + TestHelper.AssertLogMessages(Action, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); @@ -1077,7 +1077,7 @@ { Output = new TestStructuresOutput(new TestGeneralResultFaultTreeIllustrationPoint()) }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); var nodeData = new StabilityPointStructuresCalculationScenarioContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r62b8135dcc02e56da0616c5d6f4e345198994393 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs) (revision 62b8135dcc02e56da0616c5d6f4e345198994393) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.Drawing; using System.IO; @@ -286,7 +285,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemCalculateAllAndValidateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocksRepository); @@ -328,7 +327,7 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemCalculateAllAndValidateAllDisabledAndTooltipSet() { // Setup - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocksRepository, "invalidFilePath"); @@ -372,7 +371,7 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllAndValidateAllEnabled() { // Setup - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -423,7 +422,7 @@ // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "A", @@ -526,7 +525,7 @@ public void ContextMenuStrip_ClickOnValidateAllItem_ValidateAllChildCalculations() { // Setup - var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new TestStabilityPointStructuresCalculationScenario { Name = "A", @@ -575,10 +574,10 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(context, null, treeViewControl)) { // Call - Action call = () => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); + void Call() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] messageList = messages.ToArray(); @@ -606,7 +605,7 @@ Output = new TestStructuresOutput() }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism + var failureMechanism = new StabilityPointStructuresFailureMechanism { CalculationsGroup = { @@ -656,7 +655,7 @@ Output = new TestStructuresOutput() }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism + var failureMechanism = new StabilityPointStructuresFailureMechanism { CalculationsGroup = { @@ -710,7 +709,7 @@ Output = new TestStructuresOutput() }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism + var failureMechanism = new StabilityPointStructuresFailureMechanism { CalculationsGroup = { @@ -779,7 +778,7 @@ Output = new TestStructuresOutput() }; - var failureMechanism = new TestStabilityPointStructuresFailureMechanism + var failureMechanism = new StabilityPointStructuresFailureMechanism { CalculationsGroup = { Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r60051f2e130e94f8005499c5c6d84ac48b59a1d3 -r4d3c79ba89108714dd2187ef5728811a8111e2f0 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 60051f2e130e94f8005499c5c6d84ac48b59a1d3) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) @@ -413,10 +413,7 @@ string detailedReport) { // Setup - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism - { - Contribution = 20 - }; + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var calculatorThatFails = new TestWaveConditionsCosineCalculator { EndInFailure = endInFailure, @@ -501,10 +498,7 @@ string detailedReport) { // Setup - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism - { - Contribution = 20 - }; + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var calculatorThatFails = new TestWaveConditionsCosineCalculator { EndInFailure = endInFailure,