Fisheye: Tag 9809ad89ea28ce2af0c388d1344174d22105d204 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs =================================================================== diff -u -r7fa1b53f7c2098dd5f6691f5722479f9e0fefa88 -r9809ad89ea28ce2af0c388d1344174d22105d204 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision 7fa1b53f7c2098dd5f6691f5722479f9e0fefa88) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision 9809ad89ea28ce2af0c388d1344174d22105d204) @@ -34,12 +34,10 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; -using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.TestUtil; using Riskeer.Common.Forms.Views; using Riskeer.GrassCoverErosionOutwards.Data; -using Riskeer.GrassCoverErosionOutwards.Data.TestUtil; using Riskeer.GrassCoverErosionOutwards.Forms.Views; namespace Riskeer.GrassCoverErosionOutwards.Forms.Test.Views @@ -206,10 +204,6 @@ { ReferenceLine = referenceLine }; - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[] - { - new HydraulicBoundaryLocation(1, "test", 1.0, 2.0) - }); // Call GrassCoverErosionOutwardsFailureMechanismView view = CreateView(failureMechanism, assessmentSection); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailurePathViewTest.cs =================================================================== diff -u -r6f2c12ab2e1154360a34b52c4a4b09cdf1dd169e -r9809ad89ea28ce2af0c388d1344174d22105d204 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailurePathViewTest.cs (.../GrassCoverErosionOutwardsFailurePathViewTest.cs) (revision 6f2c12ab2e1154360a34b52c4a4b09cdf1dd169e) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailurePathViewTest.cs (.../GrassCoverErosionOutwardsFailurePathViewTest.cs) (revision 9809ad89ea28ce2af0c388d1344174d22105d204) @@ -39,12 +39,10 @@ using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; -using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.TestUtil; using Riskeer.Common.Forms.Views; using Riskeer.GrassCoverErosionOutwards.Data; -using Riskeer.GrassCoverErosionOutwards.Data.TestUtil; using Riskeer.GrassCoverErosionOutwards.Forms.Views; namespace Riskeer.GrassCoverErosionOutwards.Forms.Test.Views @@ -180,11 +178,6 @@ failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA); failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[] - { - new HydraulicBoundaryLocation(1, "test", 1.0, 2.0) - }); - var expectedSimpleAssembly = new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue()); var expectedDetailedAssemblyCategory = random.NextEnumValue(); var expectedTailorMadeAssemblyCategory = random.NextEnumValue(); @@ -213,14 +206,14 @@ Assert.AreEqual(6, mapDataList.Count); MapDataTestHelper.AssertReferenceLineMapData(assessmentSection.ReferenceLine, mapDataList[referenceLineIndex]); MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection, mapDataList[hydraulicBoundaryLocationsIndex]); - + IEnumerable sectionsCollection = ((MapDataCollection) mapDataList[sectionsCollectionIndex]).Collection; MapDataTestHelper.AssertFailureMechanismSectionsMapData(failureMechanism.Sections, sectionsCollection.ElementAt(sectionsIndex)); MapDataTestHelper.AssertFailureMechanismSectionsStartPointMapData(failureMechanism.Sections, sectionsCollection.ElementAt(sectionsStartPointIndex)); MapDataTestHelper.AssertFailureMechanismSectionsEndPointMapData(failureMechanism.Sections, sectionsCollection.ElementAt(sectionsEndPointIndex)); MapDataTestHelper.AssertForeshoreProfilesMapData(failureMechanism.ForeshoreProfiles, mapDataList[foreshoreProfilesIndex]); AssertCalculationsMapData(failureMechanism.Calculations.Cast(), mapDataList[calculationsIndex]); - + MapDataTestHelper.AssertAssemblyMapDataCollection(expectedSimpleAssembly.Group, expectedDetailedAssemblyCategory, expectedTailorMadeAssemblyCategory, Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rb9ce34760e692ecfe64825c71e22acaf149c9d0d -r9809ad89ea28ce2af0c388d1344174d22105d204 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 9809ad89ea28ce2af0c388d1344174d22105d204) @@ -35,7 +35,6 @@ using Riskeer.Common.Service; using Riskeer.Common.Service.TestUtil; using Riskeer.GrassCoverErosionOutwards.Data; -using Riskeer.GrassCoverErosionOutwards.Data.TestUtil; using Riskeer.GrassCoverErosionOutwards.Service; using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data; @@ -59,25 +58,18 @@ { // Setup string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); assessmentSection.HydraulicBoundaryDatabase.FilePath = invalidFilePath; - - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - hydraulicBoundaryLocation - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); - GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation); + GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -109,13 +101,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -128,6 +113,7 @@ var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -158,17 +144,11 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -214,19 +194,12 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - calculation.InputParameters.BreakWater.Type = breakWaterType; + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -301,17 +274,11 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -367,17 +334,11 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -417,17 +378,11 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -465,13 +420,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -493,6 +441,7 @@ .Times(nrOfCalculators); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -517,17 +466,11 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -566,17 +509,11 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -611,13 +548,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -626,6 +556,7 @@ assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = validPreprocessorDirectory; + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -660,13 +591,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -675,6 +599,7 @@ assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = false; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -724,19 +649,12 @@ mockRepository.ReplayAll(); AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - calculation.Attach(observer); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection); @@ -792,6 +710,10 @@ FilePath = validFilePath } }; + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); return assessmentSection; Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs =================================================================== diff -u -rb5d7394714ada93dfff0349111dacc17c4030638 -r9809ad89ea28ce2af0c388d1344174d22105d204 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs) (revision b5d7394714ada93dfff0349111dacc17c4030638) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 9809ad89ea28ce2af0c388d1344174d22105d204) @@ -43,7 +43,6 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Service.TestUtil; using Riskeer.GrassCoverErosionOutwards.Data; -using Riskeer.GrassCoverErosionOutwards.Data.TestUtil; using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects; using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; @@ -300,27 +299,25 @@ public void GivenValidCalculations_WhenCalculatingAllFromContextMenu_ThenAllCalculationsScheduled() { // Given + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("Test"); var assessmentSection = new AssessmentSectionStub { HydraulicBoundaryDatabase = { FilePath = validFilePath } }; + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + hydraulicBoundaryLocation + }); HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism { Contribution = 5 }; - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("Test"); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, assessmentSection, new[] - { - hydraulicBoundaryLocation - }); - assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0).Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -re18321bd281493bf1108fd06db72bd57fd412905 -r9809ad89ea28ce2af0c388d1344174d22105d204 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision e18321bd281493bf1108fd06db72bd57fd412905) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 9809ad89ea28ce2af0c388d1344174d22105d204) @@ -317,6 +317,10 @@ var location = new TestHydraulicBoundaryLocation(); var assessmentSection = new AssessmentSectionStub(); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + location + }); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -331,12 +335,6 @@ foreshoreProfile }, "path"); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, assessmentSection, new[] - { - location - }); - var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation, parent, failureMechanism, @@ -375,6 +373,10 @@ var location = new TestHydraulicBoundaryLocation(); var assessmentSection = new AssessmentSectionStub(); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + location + }); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -389,12 +391,6 @@ foreshoreProfile }, "path"); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, assessmentSection, new[] - { - location - }); - var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation, parent, failureMechanism, @@ -990,15 +986,15 @@ { // Given AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + + var random = new Random(21); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = validCalculation ? GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()) : new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -1064,15 +1060,14 @@ { // Given AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + var parent = new CalculationGroup(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation, @@ -1125,19 +1120,18 @@ { // Given AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = false; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + var parent = new CalculationGroup(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation, @@ -1190,19 +1184,18 @@ { // Given AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = TestHelper.GetScratchPadPath(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + var parent = new CalculationGroup(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation, @@ -1255,19 +1248,18 @@ { // Given AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + var parent = new CalculationGroup(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -1488,15 +1480,14 @@ { // Given AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + var parent = new CalculationGroup(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); calculation.Name = "A"; Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -re18321bd281493bf1108fd06db72bd57fd412905 -r9809ad89ea28ce2af0c388d1344174d22105d204 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision e18321bd281493bf1108fd06db72bd57fd412905) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 9809ad89ea28ce2af0c388d1344174d22105d204) @@ -854,13 +854,10 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculationA = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -870,6 +867,7 @@ group.Children.Add(calculationA); group.Children.Add(calculationB); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, @@ -913,22 +911,19 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); var group = new CalculationGroup(); group.Children.Add(calculation); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, failureMechanism.WaveConditionsCalculationGroup, failureMechanism, @@ -968,26 +963,24 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = false; + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; + GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); var group = new CalculationGroup(); group.Children.Add(calculation); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; - assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = false; - assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; - var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, failureMechanism.WaveConditionsCalculationGroup, failureMechanism, @@ -1027,26 +1020,24 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true; + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = TestHelper.GetScratchPadPath(); + GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); var group = new CalculationGroup(); group.Children.Add(calculation); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; - assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true; - assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = TestHelper.GetScratchPadPath(); - var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, failureMechanism.WaveConditionsCalculationGroup, failureMechanism, @@ -1086,13 +1077,10 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -1113,6 +1101,7 @@ var group = new CalculationGroup(); group.Children.Add(calculation); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; @@ -1159,13 +1148,10 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); var group = new CalculationGroup(); @@ -1176,6 +1162,7 @@ group.Children.Add(calculationA); group.Children.Add(calculationB); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, @@ -1792,14 +1779,12 @@ NormativeNorm = normType } }; + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + hydraulicBoundaryLocation1, + hydraulicBoundaryLocation2 + }); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, assessmentSection, new[] - { - hydraulicBoundaryLocation1, - hydraulicBoundaryLocation2 - }); - var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, @@ -1867,14 +1852,12 @@ var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var assessmentSection = new AssessmentSectionStub(); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + hydraulicBoundaryLocation1, + hydraulicBoundaryLocation2 + }); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, assessmentSection, new[] - { - hydraulicBoundaryLocation1, - hydraulicBoundaryLocation2 - }); - var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, null, failureMechanism, Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -re18321bd281493bf1108fd06db72bd57fd412905 -r9809ad89ea28ce2af0c388d1344174d22105d204 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision e18321bd281493bf1108fd06db72bd57fd412905) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 9809ad89ea28ce2af0c388d1344174d22105d204) @@ -35,7 +35,6 @@ using Riskeer.Common.Service; using Riskeer.Common.Service.TestUtil; using Riskeer.GrassCoverErosionOutwards.Data; -using Riskeer.GrassCoverErosionOutwards.Data.TestUtil; using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.WaveConditions; @@ -113,7 +112,7 @@ hydraulicBoundaryDatabase.FilePath = validFilePath; var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName 1"); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[] + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] { hydraulicBoundaryLocation }, true); @@ -129,7 +128,7 @@ AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity( activity, calculation, - failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result, + assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result, hydraulicBoundaryDatabase); } @@ -191,10 +190,11 @@ hydraulicBoundaryDatabase.FilePath = validFilePath; var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName 1"); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[] + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] { hydraulicBoundaryLocation }, true); + GrassCoverErosionOutwardsWaveConditionsCalculation calculation1 = CreateValidCalculation(hydraulicBoundaryLocation); GrassCoverErosionOutwardsWaveConditionsCalculation calculation2 = CreateValidCalculation(hydraulicBoundaryLocation); @@ -215,7 +215,7 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(GrassCoverErosionOutwardsWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - RoundedDouble assessmentLevel = failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result; + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result; AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel, hydraulicBoundaryDatabase); AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel, hydraulicBoundaryDatabase); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -rb9ce34760e692ecfe64825c71e22acaf149c9d0d -r9809ad89ea28ce2af0c388d1344174d22105d204 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 9809ad89ea28ce2af0c388d1344174d22105d204) @@ -34,7 +34,6 @@ using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Service.TestUtil; using Riskeer.GrassCoverErosionOutwards.Data; -using Riskeer.GrassCoverErosionOutwards.Data.TestUtil; using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data; using Riskeer.HydraRing.Calculation.Data.Input; @@ -160,13 +159,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -186,6 +178,7 @@ .Times(nrOfCalculators); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call @@ -221,15 +214,10 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray(); int nrOfCalculators = waterLevels.Length * 3; @@ -297,15 +285,10 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); calculation.InputParameters.CalculationType = calculationType; @@ -390,13 +373,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -425,6 +401,7 @@ Assert.AreEqual(GrassCoverErosionOutwardsWaveConditionsCalculationType.All, calculation.InputParameters.CalculationType); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call @@ -503,13 +480,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -518,6 +488,7 @@ var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var grassCoverErosionOutwardsWaveConditionsCalculationService = new GrassCoverErosionOutwardsWaveConditionsCalculationService(); @@ -540,13 +511,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -560,6 +524,7 @@ .Return(waveConditionsCosineCalculator); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var grassCoverErosionOutwardsWaveConditionsCalculationService = new GrassCoverErosionOutwardsWaveConditionsCalculationService(); @@ -590,13 +555,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -614,6 +572,7 @@ .Times(nrOfCalculators); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call @@ -658,13 +617,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -674,6 +626,7 @@ EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent }; + var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null)) @@ -683,6 +636,7 @@ .Times(3); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { HydraRingCalculationException exception = null; @@ -753,13 +707,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -768,6 +715,7 @@ EndInFailure = endInFailure, LastErrorFileContent = lastErrorFileContent }; + var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null)) @@ -785,6 +733,7 @@ .Times(5); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call @@ -852,13 +801,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -879,6 +821,7 @@ .Times(nrOfCalculators); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call @@ -899,14 +842,6 @@ assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = TestHelper.GetScratchPadPath(); - - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -927,6 +862,7 @@ .Times(nrOfCalculators); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call @@ -947,14 +883,6 @@ assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = false; assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory"; - - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -976,6 +904,7 @@ .Times(nrOfCalculators); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call @@ -999,14 +928,6 @@ { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); - - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( - failureMechanism, - assessmentSection, new[] - { - new TestHydraulicBoundaryLocation() - }); ConfigureAssessmentSectionWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -1019,6 +940,7 @@ .Return(new TestWaveConditionsCosineCalculator()); mockRepository.ReplayAll(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { var currentStep = 1; @@ -1101,6 +1023,10 @@ } }; HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); return assessmentSection; }