Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -rf7201fff47918e66edbdcb608a5a4410e441c618 -ra228fa87c173763ac0593adc031c0bbf1499bcc2 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision f7201fff47918e66edbdcb608a5a4410e441c618) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision a228fa87c173763ac0593adc031c0bbf1499bcc2) @@ -201,8 +201,7 @@ context.AssessmentSection, () => context.WrappedData.TargetProbability, () => noProbabilityValueDoubleConverter.ConvertToString(context.WrappedData.TargetProbability)), - AfterCreate = (view, context) => { view.CalculationGuiService = duneLocationCalculationGuiService; }, - AdditionalDataCheck = context => context.FailureMechanism.DuneLocations.Any() + AfterCreate = (view, context) => { view.CalculationGuiService = duneLocationCalculationGuiService; } }; } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs =================================================================== diff -u -r67566cc155eae4db632176b6d7197644938ce1e5 -ra228fa87c173763ac0593adc031c0bbf1499bcc2 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision 67566cc155eae4db632176b6d7197644938ce1e5) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision a228fa87c173763ac0593adc031c0bbf1499bcc2) @@ -33,7 +33,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.TestUtil; using Riskeer.DuneErosion.Data; -using Riskeer.DuneErosion.Data.TestUtil; using Riskeer.DuneErosion.Forms.GuiServices; using Riskeer.DuneErosion.Forms.PresentationObjects; using Riskeer.DuneErosion.Forms.Views; @@ -146,61 +145,6 @@ } [Test] - public void AdditionalDataCheck_FailureMechanismWithoutCalculations_ReturnFalse() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), - new DuneErosionFailureMechanism(), - assessmentSection); - - using (var plugin = new DuneErosionPlugin()) - { - ViewInfo info = GetInfo(plugin); - - // Call - bool additionalDataCheck = info.AdditionalDataCheck(context); - - // Assert - Assert.IsFalse(additionalDataCheck); - } - } - - [Test] - public void AdditionalDataCheck_FailureMechanismWithCalculations_ReturnTrue() - { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var duneErosionFailureMechanism = new DuneErosionFailureMechanism(); - - duneErosionFailureMechanism.SetDuneLocations(new[] - { - new TestDuneLocation() - }); - - var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(), - duneErosionFailureMechanism, - assessmentSection); - - using (var plugin = new DuneErosionPlugin()) - { - ViewInfo info = GetInfo(plugin); - - // Call - bool additionalDataCheck = info.AdditionalDataCheck(context); - - // Assert - Assert.IsTrue(additionalDataCheck); - } - } - - [Test] public void CreateInstance_WithContext_SetsExpectedProperties() { // Setup