Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r0c9054a7f1dfd78f554eacd9a356d59c3878079c --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c) @@ -108,7 +108,7 @@ AssemblyToolKernelFactory.Instance); Dictionary failureMechanismsToAssemble = assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms) + .Concat(assessmentSection.SpecificFailureMechanisms) .Where(fm => fm.InAssembly) .Select((fm, i) => new { Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r0c9054a7f1dfd78f554eacd9a356d59c3878079c --- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c) @@ -496,7 +496,7 @@ var removedObjects = new List(); foreach (IFailureMechanism failureMechanism in assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms)) + .Concat(assessmentSection.SpecificFailureMechanisms)) { ClearResults results = GetClearResultsForFailureMechanism(failureMechanism); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -rdbda180fabc98288e55d846b150f2f959279d98a -r0c9054a7f1dfd78f554eacd9a356d59c3878079c --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c) @@ -186,7 +186,7 @@ AssessmentSectionAssemblyCalculatorStub assessmentSectionAssemblyCalculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; IEnumerable[] actualInput = assessmentSectionAssemblyCalculator.CombinedFailureMechanismSectionsInput.ToArray(); IEnumerable[] expectedInput = CombinedAssemblyFailureMechanismSectionFactory.CreateInput( - assessmentSection, assessmentSection.GetFailureMechanisms().Concat(assessmentSection.SpecificFailureMechanisms)).ToArray(); + assessmentSection, assessmentSection.GetFailureMechanisms().Concat(assessmentSection.SpecificFailureMechanisms)).ToArray(); Assert.AreEqual(expectedInput.Length, actualInput.Length); for (var i = 0; i < expectedInput.Length; i++) @@ -229,7 +229,7 @@ // Assert Dictionary failureMechanisms = assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms) + .Concat(assessmentSection.SpecificFailureMechanisms) .Where(fm => fm.InAssembly) .Select((fm, i) => new { @@ -312,7 +312,6 @@ AssessmentSection assessmentSection = CreateAssessmentSectionContainingFailureMechanismsWithInAssemblyTrue(); assessmentSection.GetFailureMechanisms() - .Cast() .Concat(assessmentSection.SpecificFailureMechanisms) .ForEachElementDo(fp => fp.InAssembly = random.NextBoolean()); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r0c9054a7f1dfd78f554eacd9a356d59c3878079c --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedAssemblyFailureMechanismSectionFactoryTest.cs (.../CombinedAssemblyFailureMechanismSectionFactoryTest.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c) @@ -80,7 +80,7 @@ // Call IEnumerable> inputs = CombinedAssemblyFailureMechanismSectionFactory.CreateInput( - assessmentSection, assessmentSection.GetFailureMechanisms().Concat(assessmentSection.SpecificFailureMechanisms)); + assessmentSection, assessmentSection.GetFailureMechanisms().Concat(assessmentSection.SpecificFailureMechanisms)); // Assert int expectedNrOfGeneralSectionResults = assessmentSection.GetFailureMechanisms().Count(); @@ -149,7 +149,7 @@ // Call IEnumerable> inputs = CombinedAssemblyFailureMechanismSectionFactory.CreateInput( - assessmentSection, assessmentSection.GetFailureMechanisms().Concat(assessmentSection.SpecificFailureMechanisms)); + assessmentSection, assessmentSection.GetFailureMechanisms().Concat(assessmentSection.SpecificFailureMechanisms)); // Assert int expectedNrOfGeneralSectionResults = assessmentSection.GetFailureMechanisms().Count(); Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs =================================================================== diff -u -rdbda180fabc98288e55d846b150f2f959279d98a -r0c9054a7f1dfd78f554eacd9a356d59c3878079c --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision dbda180fabc98288e55d846b150f2f959279d98a) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c) @@ -86,7 +86,7 @@ var assessmentSection = new AssessmentSection(random.NextEnumValue()); assessmentSection.SpecificFailureMechanisms.Add(new SpecificFailureMechanism()); Dictionary failureMechanisms = assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms) + .Concat(assessmentSection.SpecificFailureMechanisms) .Where(fm => fm.InAssembly) .Select((fm, i) => new { @@ -146,7 +146,7 @@ var assessmentSection = new AssessmentSection(random.NextEnumValue()); assessmentSection.SpecificFailureMechanisms.Add(new SpecificFailureMechanism()); Dictionary failureMechanisms = assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms) + .Concat(assessmentSection.SpecificFailureMechanisms) .Where(fm => fm.InAssembly) .Select((fm, i) => new { Index: Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/CombinedFailureMechanismSectionAssemblyTestFactory.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r0c9054a7f1dfd78f554eacd9a356d59c3878079c --- Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/CombinedFailureMechanismSectionAssemblyTestFactory.cs (.../CombinedFailureMechanismSectionAssemblyTestFactory.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/test/Riskeer.Integration.Data.TestUtil/CombinedFailureMechanismSectionAssemblyTestFactory.cs (.../CombinedFailureMechanismSectionAssemblyTestFactory.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c) @@ -24,7 +24,6 @@ using Core.Common.TestUtil; using Riskeer.AssemblyTool.Data; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.FailureMechanism; namespace Riskeer.Integration.Data.TestUtil { @@ -46,7 +45,7 @@ return new CombinedFailureMechanismSectionAssembly( new CombinedAssemblyFailureMechanismSection(random.NextDouble(), random.NextDouble(), random.NextEnumValue()), assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms) + .Concat(assessmentSection.SpecificFailureMechanisms) .Where(fm => fm.InAssembly) .Select(fm => random.NextEnumValue()) .ToArray()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -rf2935589aa89c211c41e339da4ceaa359fc400e1 -r0c9054a7f1dfd78f554eacd9a356d59c3878079c --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision f2935589aa89c211c41e339da4ceaa359fc400e1) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c) @@ -157,7 +157,7 @@ FailureMechanismTestHelper.AddSections(assessmentSection.SpecificFailureMechanisms.Last(), random.Next(1, 10)); foreach (IFailureMechanism failureMechanism in assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms)) + .Concat(assessmentSection.SpecificFailureMechanisms)) { failureMechanism.InAssembly = false; }