Index: Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionService.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r1d302616c3befb3565d6270dc6dd6c4d108f5d57 --- Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionService.cs (.../LoadAssessmentSectionService.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionService.cs (.../LoadAssessmentSectionService.cs) (revision 1d302616c3befb3565d6270dc6dd6c4d108f5d57) @@ -71,7 +71,10 @@ throw new LoadAssessmentSectionException(); } - return openedProject.AssessmentSections; + return new[] + { + openedProject.AssessmentSection + }; } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r1d302616c3befb3565d6270dc6dd6c4d108f5d57 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs (.../LoadAssessmentSectionServiceTest.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs (.../LoadAssessmentSectionServiceTest.cs) (revision 1d302616c3befb3565d6270dc6dd6c4d108f5d57) @@ -21,10 +21,12 @@ using System; using System.Collections.Generic; +using System.Linq; using Core.Common.Base.Storage; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; +using Riskeer.Common.Data.AssessmentSection; using Riskeer.Integration.Data; using Riskeer.Integration.Service.Exceptions; using Riskeer.Integration.Service.Merge; @@ -69,7 +71,7 @@ var mocks = new MockRepository(); var storeProject = mocks.StrictMock(); - storeProject.Expect(sp => sp.LoadProject(filePath)).Return(new RiskeerProject()); + storeProject.Expect(sp => sp.LoadProject(filePath)).Return(CreateProject()); mocks.ReplayAll(); var service = new LoadAssessmentSectionService(storeProject); @@ -85,7 +87,7 @@ public void LoadAssessmentSections_LoadingProjectSuccessful_ReturnsRiskeerProject() { // Setup - var project = new RiskeerProject(); + RiskeerProject project = CreateProject(); var mocks = new MockRepository(); var storeProject = mocks.StrictMock(); @@ -100,7 +102,7 @@ IEnumerable assessmentSections = service.LoadAssessmentSections(string.Empty); // Assert - Assert.AreSame(project.AssessmentSections, assessmentSections); + Assert.AreSame(project.AssessmentSection, assessmentSections.Single()); mocks.VerifyAll(); } @@ -163,5 +165,11 @@ Assert.AreEqual(storageException.Message, exception.Message); mocks.VerifyAll(); } + + private static RiskeerProject CreateProject() + { + var random = new Random(21); + return new RiskeerProject(new AssessmentSection(random.NextEnumValue())); + } } } \ No newline at end of file