Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs =================================================================== diff -u -r900196824f2f860b124571e3ebe8f3c0338b49d2 -rcc7d434570edfed79a1fb6fa30affc15f2aafe8a --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs (.../FailureMechanismSectionAssemblyGroupProperties.cs) (revision 900196824f2f860b124571e3ebe8f3c0338b49d2) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs (.../FailureMechanismSectionAssemblyGroupProperties.cs) (revision cc7d434570edfed79a1fb6fa30affc15f2aafe8a) @@ -27,6 +27,7 @@ using Core.Gui.PropertyBag; using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.Forms; +using Riskeer.Common.Forms.Helpers; using Riskeer.Common.Forms.TypeConverters; using Riskeer.Integration.Forms.Properties; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -98,7 +99,7 @@ public override string ToString() { - return new EnumDisplayWrapper(Group).DisplayName; + return FailureMechanismSectionAssemblyGroupDisplayHelper.GetAssemblyGroupDisplayName(data.Group); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs =================================================================== diff -u -r0b522a31f55a06325a2f4ec7bf4055b12d5a93fe -rcc7d434570edfed79a1fb6fa30affc15f2aafe8a --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs (.../FailureMechanismSectionAssemblyGroupPropertiesTest.cs) (revision 0b522a31f55a06325a2f4ec7bf4055b12d5a93fe) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupPropertiesTest.cs (.../FailureMechanismSectionAssemblyGroupPropertiesTest.cs) (revision cc7d434570edfed79a1fb6fa30affc15f2aafe8a) @@ -22,12 +22,12 @@ using System; using System.ComponentModel; using Core.Common.TestUtil; -using Core.Common.Util; using Core.Gui.PropertyBag; using Core.Gui.TestUtil; using NUnit.Framework; using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.Forms; +using Riskeer.Common.Forms.Helpers; using Riskeer.Integration.Forms.PropertyClasses; namespace Riskeer.Integration.Forms.Test.PropertyClasses @@ -121,8 +121,7 @@ var result = properties.ToString(); // Assert - Assert.AreEqual(new EnumDisplayWrapper( - DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(categoryGroup)).DisplayName, result); + Assert.AreEqual(FailureMechanismSectionAssemblyGroupDisplayHelper.GetAssemblyGroupDisplayName(categoryGroup), result); } } } \ No newline at end of file