Index: Ringtoets/Common/src/Ringtoets.Common.Forms/ImportInfos/RingtoetsImportInfoFactory.cs =================================================================== diff -u -r328fb35c78237dd0e0e3baa2d1e8fbbabf8cf97a -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/Common/src/Ringtoets.Common.Forms/ImportInfos/RingtoetsImportInfoFactory.cs (.../RingtoetsImportInfoFactory.cs) (revision 328fb35c78237dd0e0e3baa2d1e8fbbabf8cf97a) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/ImportInfos/RingtoetsImportInfoFactory.cs (.../RingtoetsImportInfoFactory.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -41,11 +41,9 @@ /// /// The type of calculation group context /// to create the for. - /// The function to determine if the item is enabled. /// The function to create the relevant importer. /// An object. public static ImportInfo CreateCalculationConfigurationImportInfo( - Func isEnabled, Func createFileImporter) where TCalculationGroupContext: ICalculationContext { @@ -56,7 +54,7 @@ Image = Resources.GeneralFolderIcon, FileFilterGenerator = new FileFilterGenerator(Resources.DataTypeDisplayName_xml_file_filter_Extension, Resources.DataTypeDisplayName_xml_file_filter_Description), - IsEnabled = isEnabled, + IsEnabled = context => true, CreateFileImporter = createFileImporter }; } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ImportInfos/RingtoetsImportInfoFactoryTest.cs =================================================================== diff -u -r328fb35c78237dd0e0e3baa2d1e8fbbabf8cf97a -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ImportInfos/RingtoetsImportInfoFactoryTest.cs (.../RingtoetsImportInfoFactoryTest.cs) (revision 328fb35c78237dd0e0e3baa2d1e8fbbabf8cf97a) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ImportInfos/RingtoetsImportInfoFactoryTest.cs (.../RingtoetsImportInfoFactoryTest.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -45,35 +45,21 @@ var fileImporter = mocks.Stub(); mocks.ReplayAll(); - Func, bool> isEnabled = context => false; Func, string, IFileImporter> createFileImporter = (context, s) => fileImporter; // Call - ImportInfo> importInfo = - RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo(isEnabled, createFileImporter); + ImportInfo> importInfo = RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo(createFileImporter); // Assert - Assert.AreSame(isEnabled, importInfo.IsEnabled); Assert.AreSame(createFileImporter, importInfo.CreateFileImporter); - mocks.VerifyAll(); - } - - [Test] - public void CreateCalculationConfigurationImportInfo_Always_ReturnsExpectedProperties() - { - // Call - ImportInfo> importInfo = - RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo - >(null, null); - - // Assert Assert.AreEqual("Ringtoets berekeningenconfiguratie", importInfo.Name); Assert.AreEqual("Algemeen", importInfo.Category); FileFilterGenerator fileFilterGenerator = importInfo.FileFilterGenerator; Assert.AreEqual("Ringtoets berekeningenconfiguratie (*.xml)|*.xml", fileFilterGenerator.Filter); TestHelper.AssertImagesAreEqual(Resources.GeneralFolderIcon, importInfo.Image); + Assert.IsTrue(importInfo.IsEnabled(null)); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r9448c9f34da890e184722d00c3f8b4f765a246b0 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 9448c9f34da890e184722d00c3f8b4f765a246b0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -81,7 +81,6 @@ public override IEnumerable GetImportInfos() { yield return RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo( - context => context.AvailableDikeProfiles.Any() && context.AvailableHydraulicBoundaryLocations.Any(), (context, filePath) => new GrassCoverErosionInwardsCalculationConfigurationImporter( filePath, context.WrappedData, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ImportInfos/GrassCoverErosionInwardsCalculationGroupContextImportInfoTest.cs =================================================================== diff -u -r6c436f86e8054e5d624546e2212f9da4b3500adf -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ImportInfos/GrassCoverErosionInwardsCalculationGroupContextImportInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextImportInfoTest.cs) (revision 6c436f86e8054e5d624546e2212f9da4b3500adf) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ImportInfos/GrassCoverErosionInwardsCalculationGroupContextImportInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextImportInfoTest.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -98,96 +98,13 @@ } [Test] - public void IsEnabled_NoHydraulicBoundaryDatabase_ReturnFalse() + public void IsEnabled_Always_ReturnTrue() { - // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - failureMechanism.DikeProfiles.Add(new TestDikeProfile()); - - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var context = new GrassCoverErosionInwardsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - // Call - bool isEnabled = importInfo.IsEnabled(context); + bool isEnabled = importInfo.IsEnabled(null); // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_HydraulicBoundaryDatabaseWithoutLocations_ReturnFalse() - { - // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - failureMechanism.DikeProfiles.Add(new TestDikeProfile()); - - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - - var context = new GrassCoverErosionInwardsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_NoDikeProfiles_ReturnFalse() - { - // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new GrassCoverErosionInwardsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_AllDataAvailable_ReturnTrue() - { - // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - failureMechanism.DikeProfiles.Add(new TestDikeProfile()); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new GrassCoverErosionInwardsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } [Test] Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r8adb74518625c8452ef17a1b747e754bb2420ca2 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 8adb74518625c8452ef17a1b747e754bb2420ca2) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -102,7 +102,6 @@ public override IEnumerable GetImportInfos() { yield return RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo( - CalculationConfigurationImporterEnabled, (context, filePath) => new WaveConditionsCalculationConfigurationImporter( filePath, @@ -337,11 +336,6 @@ hydraulicBoundaryLocationCalculationGuiService = new HydraulicBoundaryLocationCalculationGuiService(Gui.MainWindow); } - private static bool CalculationConfigurationImporterEnabled(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext context) - { - return context.FailureMechanism.HydraulicBoundaryLocations.Any(); - } - #region ViewInfos #region GrassCoverErosionOutwardsFailureMechanismView ViewInfo Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ImportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextImportInfoTest.cs =================================================================== diff -u -ra2c2136a5fa7cee2cc0fa9a61fd40bf0428c83c7 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ImportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextImportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextImportInfoTest.cs) (revision a2c2136a5fa7cee2cc0fa9a61fd40bf0428c83c7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ImportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextImportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextImportInfoTest.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -97,48 +97,13 @@ } [Test] - public void IsEnabled_NoHydraulicBoundaryDatabase_ReturnFalse() + public void IsEnabled_Always_ReturnTrue() { - // Setup - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - // Call - bool isEnabled = importInfo.IsEnabled(context); + bool isEnabled = importInfo.IsEnabled(null); // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_AllDataAvailable_ReturnTrue() - { - // Setup - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - failureMechanism.HydraulicBoundaryLocations.Add(new TestHydraulicBoundaryLocation()); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } [Test] Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r8adb74518625c8452ef17a1b747e754bb2420ca2 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 8adb74518625c8452ef17a1b747e754bb2420ca2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -123,7 +123,6 @@ }; yield return RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo( - PipingCalculationConfigurationImporterEnabled, (context, filePath) => new PipingCalculationConfigurationImporter( filePath, @@ -360,13 +359,6 @@ } } - private static bool PipingCalculationConfigurationImporterEnabled(PipingCalculationGroupContext context) - { - return context.AvailableHydraulicBoundaryLocations.Any() - && context.AvailableStochasticSoilModels.Any() - && context.AvailablePipingSurfaceLines.Any(); - } - private static StochasticSoilModelImporter StochasticSoilModelImporter(StochasticSoilModelCollectionContext context, string filePath, IImporterMessageProvider messageProvider, IStochasticSoilModelUpdateModelStrategy updateStrategy) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs =================================================================== diff -u -r5e2bd16d7268e107ea6d4a1070778a0323044748 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs (.../PipingCalculationGroupContextImportInfoTest.cs) (revision 5e2bd16d7268e107ea6d4a1070778a0323044748) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs (.../PipingCalculationGroupContextImportInfoTest.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -98,117 +98,13 @@ } [Test] - public void IsEnabled_NoSurfaceLines_ReturnFalse() + public void IsEnabled_Always_ReturnTrue() { - // Setup - var failureMechanism = new PipingFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new PipingCalculationGroupContext(new CalculationGroup(), - Enumerable.Empty(), - new[] - { - new StochasticSoilModel(1, "A", "B") - }, - failureMechanism, - assessmentSection); - // Call - bool isEnabled = importInfo.IsEnabled(context); + bool isEnabled = importInfo.IsEnabled(null); // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_NoSoilModels_ReturnFalse() - { - // Setup - var failureMechanism = new PipingFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new PipingCalculationGroupContext(new CalculationGroup(), - new[] - { - new RingtoetsPipingSurfaceLine() - }, - Enumerable.Empty(), - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_NoHydraulicBoundaryDatabase_ReturnFalse() - { - // Setup - var failureMechanism = new PipingFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new PipingCalculationGroupContext(new CalculationGroup(), - new[] - { - new RingtoetsPipingSurfaceLine() - }, - new[] - { - new StochasticSoilModel(1, "A", "B") - }, - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_AllDataAvailable_ReturnTrue() - { - // Setup - var failureMechanism = new PipingFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new PipingCalculationGroupContext(new CalculationGroup(), - new[] - { - new RingtoetsPipingSurfaceLine() - }, - new[] - { - new StochasticSoilModel(1, "A", "B") - }, - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } [Test] Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r8adb74518625c8452ef17a1b747e754bb2420ca2 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 8adb74518625c8452ef17a1b747e754bb2420ca2) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -156,7 +156,6 @@ public override IEnumerable GetImportInfos() { yield return RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo( - CalculationConfigurationImporterEnabled, (context, filePath) => new WaveConditionsCalculationConfigurationImporter( filePath, @@ -213,12 +212,6 @@ }; } - private static bool CalculationConfigurationImporterEnabled(StabilityStoneCoverWaveConditionsCalculationGroupContext context) - { - return context.AssessmentSection.HydraulicBoundaryDatabase != null - && context.AssessmentSection.HydraulicBoundaryDatabase.Locations.Any(); - } - #region ViewInfos #region StabilityStoneCoverFailureMechanismView ViewInfo Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ImportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextImportInfoTest.cs =================================================================== diff -u -ra2c2136a5fa7cee2cc0fa9a61fd40bf0428c83c7 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ImportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextImportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextImportInfoTest.cs) (revision a2c2136a5fa7cee2cc0fa9a61fd40bf0428c83c7) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ImportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextImportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextImportInfoTest.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -97,47 +97,13 @@ } [Test] - public void IsEnabled_NoHydraulicBoundaryDatabase_ReturnFalse() + public void IsEnabled_Always_ReturnTrue() { - // Setup - var failureMechanism = new StabilityStoneCoverFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - // Call - bool isEnabled = importInfo.IsEnabled(context); + bool isEnabled = importInfo.IsEnabled(null); // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_AllDataAvailable_ReturnTrue() - { - // Setup - var failureMechanism = new StabilityStoneCoverFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } [Test] Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r8adb74518625c8452ef17a1b747e754bb2420ca2 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 8adb74518625c8452ef17a1b747e754bb2420ca2) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -100,7 +100,6 @@ public override IEnumerable GetImportInfos() { yield return RingtoetsImportInfoFactory.CreateCalculationConfigurationImportInfo( - CalculationConfigurationImporterEnabled, (context, filePath) => new WaveConditionsCalculationConfigurationImporter( filePath, @@ -216,12 +215,6 @@ }; } - private static bool CalculationConfigurationImporterEnabled(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context) - { - return context.AssessmentSection.HydraulicBoundaryDatabase != null - && context.AssessmentSection.HydraulicBoundaryDatabase.Locations.Any(); - } - #region ViewInfos #region WaveImpactAsphaltCoverFailureMechanismView ViewInfo Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ImportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs =================================================================== diff -u -r6dc021bb3b8da35557e0e50399d4da3bdacdb635 -r38e69a97ab7003d46b9ac16660b9cb396308ac47 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ImportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs) (revision 6dc021bb3b8da35557e0e50399d4da3bdacdb635) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ImportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextImportInfoTest.cs) (revision 38e69a97ab7003d46b9ac16660b9cb396308ac47) @@ -98,71 +98,13 @@ } [Test] - public void IsEnabled_NoHydraulicBoundaryDatabase_ReturnFalse() + public void IsEnabled_Always_ReturnTrue() { - // Setup - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabase(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - // Call - bool isEnabled = importInfo.IsEnabled(context); + bool isEnabled = importInfo.IsEnabled(null); // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_HydraulicBoundaryDatabaseWithoutLocations_ReturnFalse() - { - // Setup - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - - var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert - Assert.IsFalse(isEnabled); - mocks.VerifyAll(); - } - - [Test] - public void IsEnabled_AllDataAvailable_ReturnTrue() - { - // Setup - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - - var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(new CalculationGroup(), - failureMechanism, - assessmentSection); - - // Call - bool isEnabled = importInfo.IsEnabled(context); - - // Assert Assert.IsTrue(isEnabled); - mocks.VerifyAll(); } [Test]