Index: Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs =================================================================== diff -u -r1b062cc4b3f0dd11defb95dd7ad5689a595274db -rac85d678e1c2819bd1b14b6bdbc12b8e2cdf1493 --- Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs (.../RiskeerUpdateInfoFactory.cs) (revision 1b062cc4b3f0dd11defb95dd7ad5689a595274db) +++ Riskeer/Common/src/Riskeer.Common.Forms/UpdateInfos/RiskeerUpdateInfoFactory.cs (.../RiskeerUpdateInfoFactory.cs) (revision ac85d678e1c2819bd1b14b6bdbc12b8e2cdf1493) @@ -79,52 +79,5 @@ new UpdateMessageProvider()) }; } - - /// - /// Creates a object for a . - /// - /// The type of the failure mechanism sections context - /// to create the for. - /// The type of the failure mechanism to create - /// the for. - /// /// The type of the old failure mechanism section result - /// to create the for. - /// The type of the failure mechanism section result - /// to create the for. - /// The - /// to use for the created . - /// An object. - /// Thrown when - /// is null. - public static UpdateInfo CreateFailureMechanismSectionsUpdateInfo( - IFailureMechanismSectionResultUpdateStrategy sectionResultUpdateStrategy) - where TSectionContext : FailureMechanismSectionsContext - where TFailureMechanism : IHasSectionResults - where TSectionResultOld : FailureMechanismSectionResultOld - where TSectionResult : FailureMechanismSectionResult - { - if (sectionResultUpdateStrategy == null) - { - throw new ArgumentNullException(nameof(sectionResultUpdateStrategy)); - } - - return new UpdateInfo - { - Name = Resources.FailureMechanismSections_DisplayName, - Category = Resources.Riskeer_Category, - Image = Resources.SectionsIcon, - FileFilterGenerator = new FileFilterGenerator(RiskeerCommonIOResources.Shape_file_filter_Extension, - RiskeerCommonIOResources.Shape_file_filter_Description), - IsEnabled = context => context.WrappedData.FailureMechanismSectionSourcePath != null, - CurrentPath = context => context.WrappedData.FailureMechanismSectionSourcePath, - CreateFileImporter = (context, filePath) => new FailureMechanismSectionsImporter( - context.WrappedData, - context.AssessmentSection.ReferenceLine, - filePath, - new FailureMechanismSectionUpdateStrategy( - (TFailureMechanism) context.WrappedData, sectionResultUpdateStrategy), - new UpdateMessageProvider()) - }; - } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/UpdateInfos/RiskeerUpdateInfoFactoryTest.cs =================================================================== diff -u -r1b062cc4b3f0dd11defb95dd7ad5689a595274db -rac85d678e1c2819bd1b14b6bdbc12b8e2cdf1493 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/UpdateInfos/RiskeerUpdateInfoFactoryTest.cs (.../RiskeerUpdateInfoFactoryTest.cs) (revision 1b062cc4b3f0dd11defb95dd7ad5689a595274db) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/UpdateInfos/RiskeerUpdateInfoFactoryTest.cs (.../RiskeerUpdateInfoFactoryTest.cs) (revision ac85d678e1c2819bd1b14b6bdbc12b8e2cdf1493) @@ -40,7 +40,7 @@ public class RiskeerUpdateInfoFactoryTest { [Test] - public void OldCreateFailureMechanismSectionsUpdateInfo_SectionResultUpdateStrategyNull_ThrowsArgumentNullException() + public void CreateFailureMechanismSectionsUpdateInfo_SectionResultUpdateStrategyNull_ThrowsArgumentNullException() { // Call void Call() => RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< @@ -52,7 +52,7 @@ } [Test] - public void OldCreateFailureMechanismSectionsUpdateInfo_WithArguments_ExpectedPropertiesSet() + public void CreateFailureMechanismSectionsUpdateInfo_WithArguments_ExpectedPropertiesSet() { // Setup var mocks = new MockRepository(); @@ -79,7 +79,7 @@ } [Test] - public void OldCreateFailureMechanismSectionsUpdateInfo_WithArguments_ReturnsExpectedCreatedFileImporter() + public void CreateFailureMechanismSectionsUpdateInfo_WithArguments_ReturnsExpectedCreatedFileImporter() { // Setup var mocks = new MockRepository(); @@ -100,7 +100,7 @@ } [Test] - public void OldCreateFailureMechanismSectionsUpdateInfo_WithSourcePath_ReturnsIsEnabledTrue() + public void CreateFailureMechanismSectionsUpdateInfo_WithSourcePath_ReturnsIsEnabledTrue() { // Setup var mocks = new MockRepository(); @@ -122,7 +122,7 @@ } [Test] - public void OldCreateFailureMechanismSectionsUpdateInfo_WithSourcePath_ReturnsSourcePath() + public void CreateFailureMechanismSectionsUpdateInfo_WithSourcePath_ReturnsSourcePath() { // Setup var mocks = new MockRepository(); @@ -145,7 +145,7 @@ } [Test] - public void OldCreateFailureMechanismSectionsUpdateInfo_WithoutSourcePath_ReturnsIsEnabledFalse() + public void CreateFailureMechanismSectionsUpdateInfo_WithoutSourcePath_ReturnsIsEnabledFalse() { // Setup var mocks = new MockRepository(); @@ -165,7 +165,7 @@ } [Test] - public void OldCreateFailureMechanismSectionsUpdateInfo_WithoutSourcePath_ReturnsNullPath() + public void CreateFailureMechanismSectionsUpdateInfo_WithoutSourcePath_ReturnsNullPath() { // Setup var mocks = new MockRepository(); @@ -183,150 +183,5 @@ Assert.IsNull(updateInfo.CurrentPath(failureMechanismSectionsContext)); mocks.VerifyAll(); } - - [Test] - public void CreateFailureMechanismSectionsUpdateInfo_SectionResultUpdateStrategyNull_ThrowsArgumentNullException() - { - // Call - void Call() => RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< - FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(null); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("sectionResultUpdateStrategy", exception.ParamName); - } - - [Test] - public void CreateFailureMechanismSectionsUpdateInfo_WithArguments_ExpectedPropertiesSet() - { - // Setup - var mocks = new MockRepository(); - var sectionResultUpdateStrategy = mocks.Stub>(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); - mocks.ReplayAll(); - - // Call - UpdateInfo updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< - FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(sectionResultUpdateStrategy); - - // Assert - Assert.AreEqual("Vakindeling", updateInfo.Name); - Assert.AreEqual("Algemeen", updateInfo.Category); - - FileFilterGenerator fileFilterGenerator = updateInfo.FileFilterGenerator; - Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilterGenerator.Filter); - - TestHelper.AssertImagesAreEqual(Resources.SectionsIcon, updateInfo.Image); - Assert.IsNull(updateInfo.VerifyUpdates); - - mocks.VerifyAll(); - } - - [Test] - public void CreateFailureMechanismSectionsUpdateInfo_WithArguments_ReturnsExpectedCreatedFileImporter() - { - // Setup - var mocks = new MockRepository(); - var sectionResultUpdateStrategy = mocks.Stub>(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); - mocks.ReplayAll(); - - // Call - UpdateInfo updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< - FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(sectionResultUpdateStrategy); - - // Assert - var failureMechanismSectionsContext = new FailureMechanismSectionsContext(new TestFailureMechanism(), assessmentSection); - Assert.IsInstanceOf(updateInfo.CreateFileImporter(failureMechanismSectionsContext, "")); - - mocks.VerifyAll(); - } - - [Test] - public void CreateFailureMechanismSectionsUpdateInfo_WithSourcePath_ReturnsIsEnabledTrue() - { - // Setup - var mocks = new MockRepository(); - var sectionResultUpdateStrategy = mocks.Stub>(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); - mocks.ReplayAll(); - - // Call - UpdateInfo updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< - FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(sectionResultUpdateStrategy); - - // Assert - var testFailureMechanism = new TestFailureMechanism(); - testFailureMechanism.SetSections(Enumerable.Empty(), "path/to/sections"); - var failureMechanismSectionsContext = new FailureMechanismSectionsContext(testFailureMechanism, assessmentSection); - Assert.IsTrue(updateInfo.IsEnabled(failureMechanismSectionsContext)); - mocks.VerifyAll(); - } - - [Test] - public void CreateFailureMechanismSectionsUpdateInfo_WithSourcePath_ReturnsSourcePath() - { - // Setup - var mocks = new MockRepository(); - var sectionResultUpdateStrategy = mocks.Stub>(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); - mocks.ReplayAll(); - - // Call - UpdateInfo updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< - FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(sectionResultUpdateStrategy); - - // Assert - var testFailureMechanism = new TestFailureMechanism(); - testFailureMechanism.SetSections(Enumerable.Empty(), "path/to/sections"); - var failureMechanismSectionsContext = new FailureMechanismSectionsContext(testFailureMechanism, assessmentSection); - Assert.AreEqual(testFailureMechanism.FailureMechanismSectionSourcePath, - updateInfo.CurrentPath(failureMechanismSectionsContext)); - mocks.VerifyAll(); - } - - [Test] - public void CreateFailureMechanismSectionsUpdateInfo_WithoutSourcePath_ReturnsIsEnabledFalse() - { - // Setup - var mocks = new MockRepository(); - var sectionResultUpdateStrategy = mocks.Stub>(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); - mocks.ReplayAll(); - - // Call - UpdateInfo updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< - FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(sectionResultUpdateStrategy); - - // Assert - var failureMechanismSectionsContext = new FailureMechanismSectionsContext(new TestFailureMechanism(), assessmentSection); - Assert.IsFalse(updateInfo.IsEnabled(failureMechanismSectionsContext)); - mocks.VerifyAll(); - } - - [Test] - public void CreateFailureMechanismSectionsUpdateInfo_WithoutSourcePath_ReturnsNullPath() - { - // Setup - var mocks = new MockRepository(); - var sectionResultUpdateStrategy = mocks.Stub>(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); - mocks.ReplayAll(); - - // Call - UpdateInfo updateInfo = RiskeerUpdateInfoFactory.CreateFailureMechanismSectionsUpdateInfo< - FailureMechanismSectionsContext, TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(sectionResultUpdateStrategy); - - // Assert - var failureMechanismSectionsContext = new FailureMechanismSectionsContext(new TestFailureMechanism(), assessmentSection); - Assert.IsNull(updateInfo.CurrentPath(failureMechanismSectionsContext)); - mocks.VerifyAll(); - } } } \ No newline at end of file