Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/IHasSectionResults.cs =================================================================== diff -u -rc1daffcbc553fb2f9941234bc64a84d816cd61f5 -r6a5ee965b59e98334c4b4b9740d9de550640ad55 --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/IHasSectionResults.cs (.../IHasSectionResults.cs) (revision c1daffcbc553fb2f9941234bc64a84d816cd61f5) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/IHasSectionResults.cs (.../IHasSectionResults.cs) (revision 6a5ee965b59e98334c4b4b9740d9de550640ad55) @@ -24,30 +24,30 @@ namespace Riskeer.Common.Data.FailureMechanism { /// - /// This interface describes an containing objects. + /// This interface describes an containing objects. /// /// The type of the section results. public interface IHasSectionResults : IFailureMechanism - where T : FailureMechanismSectionResultOld + where T : FailureMechanismSectionResult { /// - /// Gets an of . + /// Gets an of . /// - IObservableEnumerable SectionResultsOld { get; } + IObservableEnumerable SectionResults { get; } } /// - /// This interface describes an containing objects. + /// This interface describes an containing objects. /// /// The old type of the section results. /// The type of the section results. - public interface IHasSectionResults : IHasSectionResults + public interface IHasSectionResults : IHasSectionResults where TOld : FailureMechanismSectionResultOld where T : FailureMechanismSectionResult { /// - /// Gets an of . + /// Gets an of . /// - IObservableEnumerable SectionResults { get; } + IObservableEnumerable SectionResultsOld { get; } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -r31caffb05afa347ddcfa184d56f2e5eb97237ad6 -r6a5ee965b59e98334c4b4b9740d9de550640ad55 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 31caffb05afa347ddcfa184d56f2e5eb97237ad6) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 6a5ee965b59e98334c4b4b9740d9de550640ad55) @@ -47,10 +47,10 @@ public void CreateExportableAssessmentSection_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ExportableAssessmentSectionFactory.CreateExportableAssessmentSection(null); + void Call() => ExportableAssessmentSectionFactory.CreateExportableAssessmentSection(null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("assessmentSection", exception.ParamName); } @@ -193,7 +193,7 @@ private static void AssertExportableFailureMechanismWithProbability(ExportableFailureMechanismType expectedFailureMechanismCode, ExportableFailureMechanismGroup expectedFailureMechanismGroup, - IHasSectionResults failureMechanism, + IHasSectionResults failureMechanism, ExportableFailureMechanism actualExportableFailureMechanism) { Assert.AreEqual(expectedFailureMechanismCode, actualExportableFailureMechanism.Code); @@ -204,7 +204,7 @@ Assert.AreEqual(0, exportableFailureMechanismAssemblyResult.Probability); Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssemblyResult.AssemblyMethod); - Assert.AreEqual(failureMechanism.SectionResultsOld.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count()); + Assert.AreEqual(failureMechanism.SectionResults.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count()); } #endregion @@ -265,7 +265,7 @@ private static void AssertExportableFailureMechanismWithoutProbability(ExportableFailureMechanismType expectedFailureMechanismCode, ExportableFailureMechanismGroup expectedFailureMechanismGroup, - IHasSectionResults failureMechanism, + IHasSectionResults failureMechanism, ExportableFailureMechanism actualExportableFailureMechanism) { Assert.AreEqual(expectedFailureMechanismCode, actualExportableFailureMechanism.Code); @@ -275,7 +275,7 @@ Assert.AreEqual(assemblyCategoryGroup, exportableFailureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssemblyResult.AssemblyMethod); - Assert.AreEqual(failureMechanism.SectionResultsOld.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count()); + Assert.AreEqual(failureMechanism.SectionResults.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count()); } #endregion Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs =================================================================== diff -u -rc08ab9a9934129758efbef975c69d54f927720c3 -r6a5ee965b59e98334c4b4b9740d9de550640ad55 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision c08ab9a9934129758efbef975c69d54f927720c3) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision 6a5ee965b59e98334c4b4b9740d9de550640ad55) @@ -41,7 +41,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); - Assert.IsInstanceOf>(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Golfklappen op asfaltbekleding", failureMechanism.Name); Assert.AreEqual("AGK", failureMechanism.Code); Assert.IsNotNull(failureMechanism.GeneralWaveImpactAsphaltCoverInput);