Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModel.cs =================================================================== diff -u -r69073aa40549000b0d80aeb36b7b4ef67b1fa728 -rdf7f80662b76b8985bdb043ff22eeacefa5d80ad --- Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModel.cs (.../PipingScenariosViewFailureMechanismSectionViewModel.cs) (revision 69073aa40549000b0d80aeb36b7b4ef67b1fa728) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModel.cs (.../PipingScenariosViewFailureMechanismSectionViewModel.cs) (revision df7f80662b76b8985bdb043ff22eeacefa5d80ad) @@ -75,22 +75,16 @@ /// public PipingScenarioConfigurationPerFailureMechanismSection ScenarioConfigurationPerSection { get; } - /// - /// Gets the display name. - /// - public string DisplayName + public override string ToString() { - get - { - string name = Section.Name; + string name = Section.Name; - if (failureMechanism.ScenarioConfigurationType == PipingScenarioConfigurationType.PerFailureMechanismSection) - { - name += $" ({GetScenarioConfigurationTypeDisplayName()})"; - } - - return name; + if (failureMechanism.ScenarioConfigurationType == PipingScenarioConfigurationType.PerFailureMechanismSection) + { + name += $" ({GetScenarioConfigurationTypeDisplayName()})"; } + + return name; } private string GetScenarioConfigurationTypeDisplayName() Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs =================================================================== diff -u -r86fb3392cf6d4c6048cb86e1f768a7fb4b2712b8 -rdf7f80662b76b8985bdb043ff22eeacefa5d80ad --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision 86fb3392cf6d4c6048cb86e1f768a7fb4b2712b8) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision df7f80662b76b8985bdb043ff22eeacefa5d80ad) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. +// Copyright (C) Stichting Deltares 2021. All rights reserved. // // This file is part of Riskeer. // @@ -177,7 +177,6 @@ private void InitializeListBox() { - listBox.DisplayMember = nameof(PipingScenariosViewFailureMechanismSectionViewModel.DisplayName); listBox.SelectedValueChanged += ListBoxOnSelectedValueChanged; } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModelTest.cs =================================================================== diff -u -r69073aa40549000b0d80aeb36b7b4ef67b1fa728 -rdf7f80662b76b8985bdb043ff22eeacefa5d80ad --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModelTest.cs (.../PipingScenariosViewFailureMechanismSectionViewModelTest.cs) (revision 69073aa40549000b0d80aeb36b7b4ef67b1fa728) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PresentationObjects/PipingScenariosViewFailureMechanismSectionViewModelTest.cs (.../PipingScenariosViewFailureMechanismSectionViewModelTest.cs) (revision df7f80662b76b8985bdb043ff22eeacefa5d80ad) @@ -90,7 +90,7 @@ [Test] [TestCase(PipingScenarioConfigurationType.SemiProbabilistic)] [TestCase(PipingScenarioConfigurationType.Probabilistic)] - public void DisplayName_FailureMechanismScenarioConfigurationTypeNotPerSection_ReturnsExpectedName(PipingScenarioConfigurationType scenarioConfigurationType) + public void ToString_FailureMechanismScenarioConfigurationTypeNotPerSection_ReturnsExpectedName(PipingScenarioConfigurationType scenarioConfigurationType) { // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); @@ -103,16 +103,16 @@ var viewModel = new PipingScenariosViewFailureMechanismSectionViewModel(section, pipingFailureMechanism, scenarioConfiguration); // Call - string displayName = viewModel.DisplayName; + var toString = viewModel.ToString(); // Assert - Assert.AreEqual(section.Name, displayName); + Assert.AreEqual(section.Name, toString); } [Test] [TestCase(PipingScenarioConfigurationPerFailureMechanismSectionType.SemiProbabilistic, "semi-probabilistisch")] [TestCase(PipingScenarioConfigurationPerFailureMechanismSectionType.Probabilistic, "probabilistisch")] - public void DisplayName_FailureMechanismScenarioConfigurationTypePerSection_ReturnsExpectedName( + public void ToString_FailureMechanismScenarioConfigurationTypePerSection_ReturnsExpectedName( PipingScenarioConfigurationPerFailureMechanismSectionType scenarioConfigurationType, string displayNameSuffix) { // Setup @@ -129,10 +129,10 @@ var viewModel = new PipingScenariosViewFailureMechanismSectionViewModel(section, pipingFailureMechanism, scenarioConfiguration); // Call - string displayName = viewModel.DisplayName; + var toString = viewModel.ToString(); // Assert - Assert.AreEqual($"{section.Name} ({displayNameSuffix})", displayName); + Assert.AreEqual($"{section.Name} ({displayNameSuffix})", toString); } } } \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs =================================================================== diff -u -r86fb3392cf6d4c6048cb86e1f768a7fb4b2712b8 -rdf7f80662b76b8985bdb043ff22eeacefa5d80ad --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 86fb3392cf6d4c6048cb86e1f768a7fb4b2712b8) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision df7f80662b76b8985bdb043ff22eeacefa5d80ad) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. +// Copyright (C) Stichting Deltares 2021. All rights reserved. // // This file is part of Riskeer. // @@ -172,7 +172,6 @@ // Assert var listBox = (ListBox) new ControlTester("listBox").TheObject; - Assert.AreEqual(nameof(PipingScenariosViewFailureMechanismSectionViewModel.DisplayName), listBox.DisplayMember); Assert.AreEqual(3, listBox.Items.Count); Assert.AreSame(failureMechanismSection1, ((PipingScenariosViewFailureMechanismSectionViewModel) listBox.Items[0]).Section); Assert.AreSame(failureMechanismSection2, ((PipingScenariosViewFailureMechanismSectionViewModel) listBox.Items[1]).Section);