Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionProvider.cs =================================================================== diff -u -rc7d84eedd7f181ba975c3054ea19d8056abd7f2b -ra29ec14a507a807c7d6ecd4ede6a9ebea14682a5 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionProvider.cs (.../AssessmentSectionProvider.cs) (revision c7d84eedd7f181ba975c3054ea19d8056abd7f2b) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionProvider.cs (.../AssessmentSectionProvider.cs) (revision a29ec14a507a807c7d6ecd4ede6a9ebea14682a5) @@ -67,19 +67,19 @@ throw new ArgumentNullException(nameof(filePath)); } - var assessmentSectionsOwner = new AssessmentSectionOwner(); + var assessmentSectionOwner = new AssessmentSectionOwner(); ActivityProgressDialogRunner.Run(viewParent, - LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionsActivity( - assessmentSectionsOwner, new LoadAssessmentSectionService(projectStorage), + LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionActivity( + assessmentSectionOwner, new LoadAssessmentSectionService(projectStorage), filePath)); - if (assessmentSectionsOwner.AssessmentSection == null) + if (assessmentSectionOwner.AssessmentSection == null) { throw new AssessmentSectionProviderException(); } - return assessmentSectionsOwner.AssessmentSection; + return assessmentSectionOwner.AssessmentSection; } } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionActivityFactory.cs =================================================================== diff -u -rc7d84eedd7f181ba975c3054ea19d8056abd7f2b -ra29ec14a507a807c7d6ecd4ede6a9ebea14682a5 --- Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionActivityFactory.cs (.../LoadAssessmentSectionActivityFactory.cs) (revision c7d84eedd7f181ba975c3054ea19d8056abd7f2b) +++ Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionActivityFactory.cs (.../LoadAssessmentSectionActivityFactory.cs) (revision a29ec14a507a807c7d6ecd4ede6a9ebea14682a5) @@ -41,9 +41,9 @@ /// The file path to retrieve the from. /// The to load from a file. /// Thrown when any of the arguments is null. - public static Activity CreateLoadAssessmentSectionsActivity(AssessmentSectionOwner owner, - ILoadAssessmentSectionService loadAssessmentSectionService, - string filePath) + public static Activity CreateLoadAssessmentSectionActivity(AssessmentSectionOwner owner, + ILoadAssessmentSectionService loadAssessmentSectionService, + string filePath) { if (owner == null) { Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionActivityFactoryTest.cs =================================================================== diff -u -rc7d84eedd7f181ba975c3054ea19d8056abd7f2b -ra29ec14a507a807c7d6ecd4ede6a9ebea14682a5 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionActivityFactoryTest.cs (.../LoadAssessmentSectionActivityFactoryTest.cs) (revision c7d84eedd7f181ba975c3054ea19d8056abd7f2b) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionActivityFactoryTest.cs (.../LoadAssessmentSectionActivityFactoryTest.cs) (revision a29ec14a507a807c7d6ecd4ede6a9ebea14682a5) @@ -34,56 +34,52 @@ public class LoadAssessmentSectionActivityFactoryTest { [Test] - public void CreateLoadAssessmentSectionsActivity_AssessmentSectionsOwnerNull_ThrowsArgumentNullException() + public void CreateLoadAssessmentSectionActivity_AssessmentSectionOwnerNull_ThrowsArgumentNullException() { // Setup var mocks = new MockRepository(); var service = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate call = () => LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionsActivity(null, service, string.Empty); + void Call() => LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionActivity(null, service, string.Empty); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("owner", exception.ParamName); mocks.VerifyAll(); } [Test] - public void CreateLoadAssessmentSectionsActivity_LoadAssessmentSectionServiceNull_ThrowsArgumentNullException() + public void CreateLoadAssessmentSectionActivity_LoadAssessmentSectionServiceNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionsActivity(new AssessmentSectionOwner(), - null, - string.Empty); + void Call() => LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionActivity(new AssessmentSectionOwner(), null, string.Empty); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("loadAssessmentSectionService", exception.ParamName); } [Test] - public void CreateLoadAssessmentSectionsActivity_FilePathNull_ThrowsArgumentNullException() + public void CreateLoadAssessmentSectionActivity_FilePathNull_ThrowsArgumentNullException() { // Setup var mocks = new MockRepository(); var service = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate call = () => LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionsActivity(new AssessmentSectionOwner(), - service, - null); + void Call() => LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionActivity(new AssessmentSectionOwner(), service, null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("filePath", exception.ParamName); mocks.VerifyAll(); } [Test] - public void CreateLoadAssessmentSectionsActivity_WithArguments_ReturnsActivityWithParametersSet() + public void CreateLoadAssessmentSectionActivity_WithArguments_ReturnsActivityWithParametersSet() { // Setup const string filePath = "File\\Path"; @@ -97,7 +93,7 @@ mocks.ReplayAll(); // Call - Activity activity = LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionsActivity(owner, service, filePath); + Activity activity = LoadAssessmentSectionActivityFactory.CreateLoadAssessmentSectionActivity(owner, service, filePath); // Assert Assert.IsInstanceOf(activity);