Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs =================================================================== diff -u -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c -rc6008af63ec14ed14cbcbb45c3b58cae88f1c07f --- Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs (.../CommonToolsPluginTest.cs) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) +++ Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs (.../CommonToolsPluginTest.cs) (revision c6008af63ec14ed14cbcbb45c3b58cae88f1c07f) @@ -34,55 +34,58 @@ public void GetCommonToolsPluginProperties_Always_ReturnViews() { // Setup - var plugin = new CommonToolsPlugin(); + using (var plugin = new CommonToolsPlugin()) + { + // Call + var viewInfos = plugin.GetViewInfos().ToArray(); - // Call - var viewInfos = plugin.GetViewInfos().ToArray(); + // Assert + Assert.NotNull(viewInfos); + Assert.AreEqual(1, viewInfos.Length); - // Assert - Assert.NotNull(viewInfos); - Assert.AreEqual(1, viewInfos.Length); + var richTextFileInfo = viewInfos.First(vi => vi.DataType == typeof(RichTextFile)); - var richTextFileInfo = viewInfos.First(vi => vi.DataType == typeof(RichTextFile)); - - Assert.AreEqual(richTextFileInfo.ViewType, typeof(RichTextView)); - Assert.IsNull(richTextFileInfo.Description); - TestHelper.AssertImagesAreEqual(Resources.key, richTextFileInfo.Image); + Assert.AreEqual(richTextFileInfo.ViewType, typeof(RichTextView)); + Assert.IsNull(richTextFileInfo.Description); + TestHelper.AssertImagesAreEqual(Resources.key, richTextFileInfo.Image); + } } [Test] public void RichTextFileViewInfoName_WithoutData_EmptyString() { // Setup - var plugin = new CommonToolsPlugin(); + using (var plugin = new CommonToolsPlugin()) + { + var info = plugin.GetViewInfos().First(vi => vi.DataType == typeof(RichTextFile)); - var info = plugin.GetViewInfos().First(vi => vi.DataType == typeof(RichTextFile)); + // Call + var name = info.GetViewName(null, null); - // Call - var name = info.GetViewName(null, null); - - // Assert - Assert.IsEmpty(name); + // Assert + Assert.IsEmpty(name); + } } [Test] public void RichTextFileViewInfoName_WithData_NameOfData() { // Setup var expected = "SomeName"; - var plugin = new CommonToolsPlugin(); - - var info = plugin.GetViewInfos().First(vi => vi.DataType == typeof(RichTextFile)); - var richTextFile = new RichTextFile + using (var plugin = new CommonToolsPlugin()) { - Name = expected - }; + var info = plugin.GetViewInfos().First(vi => vi.DataType == typeof(RichTextFile)); + var richTextFile = new RichTextFile + { + Name = expected + }; - // Call - var name = info.GetViewName(null, richTextFile); + // Call + var name = info.GetViewName(null, richTextFile); - // Assert - Assert.AreEqual(expected, name); + // Assert + Assert.AreEqual(expected, name); + } } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rc6008af63ec14ed14cbcbb45c3b58cae88f1c07f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision c6008af63ec14ed14cbcbb45c3b58cae88f1c07f) @@ -444,16 +444,17 @@ var assessmentSectionMock = mocks.Stub(); mocks.ReplayAll(); - var plugin = new RingtoetsPlugin(); - - // Call - var childrenWithViewDefinitions = plugin.GetChildDataWithViewDefinitions(assessmentSectionMock); - - // Assert - CollectionAssert.AreEqual(new object[] + using (var plugin = new RingtoetsPlugin()) { - assessmentSectionMock.FailureMechanismContribution - }, childrenWithViewDefinitions); + // Call + var childrenWithViewDefinitions = plugin.GetChildDataWithViewDefinitions(assessmentSectionMock); + + // Assert + CollectionAssert.AreEqual(new object[] + { + assessmentSectionMock.FailureMechanismContribution + }, childrenWithViewDefinitions); + } mocks.VerifyAll(); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs =================================================================== diff -u -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c -rc6008af63ec14ed14cbcbb45c3b58cae88f1c07f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs (.../PipingSemiProbabilisticOutputPropertiesTest.cs) (revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs (.../PipingSemiProbabilisticOutputPropertiesTest.cs) (revision c6008af63ec14ed14cbcbb45c3b58cae88f1c07f) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.ComponentModel; using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; @@ -148,5 +149,151 @@ Assert.AreEqual(probability, properties.RequiredProbability); Assert.AreEqual(probability, properties.PipingProbability); } + + [Test] + public void PropertyAttributes_ReturnExpectedValues() + { + // Setup + var random = new Random(22); + double upliftFactorOfSafety = random.NextDouble(); + double upliftProbability = random.NextDouble(); + double heaveFactorOfSafety = random.NextDouble(); + double heaveReliability = random.NextDouble(); + double heaveProbability = random.NextDouble(); + double sellmeijerFactorOfSafety = random.NextDouble(); + double sellmeijerReliability = random.NextDouble(); + double sellmeijerProbability = random.NextDouble(); + double requiredProbability = random.NextDouble(); + double requiredReliability = random.NextDouble(); + double pipingProbability = random.NextDouble(); + double pipingReliability = random.NextDouble(); + double pipingFactorOfSafety = random.NextDouble(); + + // Call + var semiProbabilisticOutput = new PipingSemiProbabilisticOutput( + upliftFactorOfSafety, + upliftProbability, + heaveFactorOfSafety, + heaveReliability, + heaveProbability, + sellmeijerFactorOfSafety, + sellmeijerReliability, + sellmeijerProbability, + requiredProbability, + requiredReliability, + pipingProbability, + pipingReliability, + pipingFactorOfSafety); + + // Call + var properties = new PipingSemiProbabilisticOutputProperties + { + Data = semiProbabilisticOutput + }; + + // Assert + var dynamicPropertyBag = new DynamicPropertyBag(properties); + PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[] + { + BrowsableAttribute.Yes + }); + Assert.AreEqual(13, dynamicProperties.Count); + + var heaveCategory = "\t\tHeave"; + var upliftCategory = "\t\t\tOpbarsten"; + var sellmeijerCategory = "\tTerugschrijdende erosie (Sellmeijer)"; + var pipingCategory = "Piping"; + + PropertyDescriptor upliftFactorOfSafetyProperty = dynamicProperties[0]; + Assert.IsNotNull(upliftFactorOfSafetyProperty); + Assert.IsTrue(upliftFactorOfSafetyProperty.IsReadOnly); + Assert.AreEqual(upliftCategory, upliftFactorOfSafetyProperty.Category); + Assert.AreEqual("Veiligheidsfactor [-]", upliftFactorOfSafetyProperty.DisplayName); + Assert.AreEqual("De veiligheidsfactor voor het submechanisme Opbarsten voor deze berekening.", upliftFactorOfSafetyProperty.Description); + + PropertyDescriptor upliftProbabilityProperty = dynamicProperties[1]; + Assert.IsNotNull(upliftProbabilityProperty); + Assert.IsTrue(upliftProbabilityProperty.IsReadOnly); + Assert.AreEqual(upliftCategory, upliftProbabilityProperty.Category); + Assert.AreEqual("Kans van voorkomen [1/jaar]", upliftProbabilityProperty.DisplayName); + Assert.AreEqual("De kans dat het submechanisme Opbarsten optreedt voor deze berekening.", upliftProbabilityProperty.Description); + + PropertyDescriptor heaveFactorOfSafetyProperty = dynamicProperties[2]; + Assert.IsNotNull(heaveFactorOfSafetyProperty); + Assert.IsTrue(heaveFactorOfSafetyProperty.IsReadOnly); + Assert.AreEqual(heaveCategory, heaveFactorOfSafetyProperty.Category); + Assert.AreEqual("Veiligheidsfactor [-]", heaveFactorOfSafetyProperty.DisplayName); + Assert.AreEqual("De veiligheidsfactor voor het submechanisme Heave voor deze berekening.", heaveFactorOfSafetyProperty.Description); + + PropertyDescriptor heaveReliabilityProperty = dynamicProperties[3]; + Assert.IsNotNull(heaveReliabilityProperty); + Assert.IsTrue(heaveReliabilityProperty.IsReadOnly); + Assert.AreEqual(heaveCategory, heaveReliabilityProperty.Category); + Assert.AreEqual("Betrouwbaarheidsindex [-]", heaveReliabilityProperty.DisplayName); + Assert.AreEqual("De betrouwbaarheidsindex voor het submechanisme Heave voor deze berekening.", heaveReliabilityProperty.Description); + + PropertyDescriptor heaveProbabilityProperty = dynamicProperties[4]; + Assert.IsNotNull(heaveProbabilityProperty); + Assert.IsTrue(heaveProbabilityProperty.IsReadOnly); + Assert.AreEqual(heaveCategory, heaveProbabilityProperty.Category); + Assert.AreEqual("Kans van voorkomen [1/jaar]", heaveProbabilityProperty.DisplayName); + Assert.AreEqual("De kans dat het submechanisme Heave optreedt voor deze berekening.", heaveProbabilityProperty.Description); + + PropertyDescriptor sellmeijerFactorOfSafetyProperty = dynamicProperties[5]; + Assert.IsNotNull(sellmeijerFactorOfSafetyProperty); + Assert.IsTrue(sellmeijerFactorOfSafetyProperty.IsReadOnly); + Assert.AreEqual(sellmeijerCategory, sellmeijerFactorOfSafetyProperty.Category); + Assert.AreEqual("Veiligheidsfactor [-]", sellmeijerFactorOfSafetyProperty.DisplayName); + Assert.AreEqual("De veiligheidsfactor voor het submechanisme Sellmeijer voor deze berekening.", sellmeijerFactorOfSafetyProperty.Description); + + PropertyDescriptor sellmeijerReliabilityProperty = dynamicProperties[6]; + Assert.IsNotNull(sellmeijerReliabilityProperty); + Assert.IsTrue(sellmeijerReliabilityProperty.IsReadOnly); + Assert.AreEqual(sellmeijerCategory, sellmeijerReliabilityProperty.Category); + Assert.AreEqual("Betrouwbaarheidsindex [-]", sellmeijerReliabilityProperty.DisplayName); + Assert.AreEqual("De betrouwbaarheidsindex voor het submechanisme Sellmeijer voor deze berekening.", sellmeijerReliabilityProperty.Description); + + PropertyDescriptor sellmeijerProbabilityProperty = dynamicProperties[7]; + Assert.IsNotNull(sellmeijerProbabilityProperty); + Assert.IsTrue(sellmeijerProbabilityProperty.IsReadOnly); + Assert.AreEqual(sellmeijerCategory, sellmeijerProbabilityProperty.Category); + Assert.AreEqual("Kans van voorkomen [1/jaar]", sellmeijerProbabilityProperty.DisplayName); + Assert.AreEqual("De kans dat het submechanisme Sellmeijer optreedt voor deze berekening.", sellmeijerProbabilityProperty.Description); + + PropertyDescriptor requiredProbabilityProperty = dynamicProperties[8]; + Assert.IsNotNull(requiredProbabilityProperty); + Assert.IsTrue(requiredProbabilityProperty.IsReadOnly); + Assert.AreEqual(pipingCategory, requiredProbabilityProperty.Category); + Assert.AreEqual("Faalkanseis [1/jaar]", requiredProbabilityProperty.DisplayName); + Assert.AreEqual("De maximaal toegestane kans dat het toetsspoor piping optreedt.", requiredProbabilityProperty.Description); + + PropertyDescriptor requiredReliabilityProperty = dynamicProperties[9]; + Assert.IsNotNull(requiredReliabilityProperty); + Assert.IsTrue(requiredReliabilityProperty.IsReadOnly); + Assert.AreEqual(pipingCategory, requiredReliabilityProperty.Category); + Assert.AreEqual("Betrouwbaarheidsindex faalkanseis [-]", requiredReliabilityProperty.DisplayName); + Assert.AreEqual("De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor piping.", requiredReliabilityProperty.Description); + + PropertyDescriptor pipingProbabilityProperty = dynamicProperties[10]; + Assert.IsNotNull(pipingProbabilityProperty); + Assert.IsTrue(pipingProbabilityProperty.IsReadOnly); + Assert.AreEqual(pipingCategory, pipingProbabilityProperty.Category); + Assert.AreEqual("Benaderde faalkans [1/jaar]", pipingProbabilityProperty.DisplayName); + Assert.AreEqual("De benaderde kans dat het toetsspoor piping optreedt voor deze berekening.", pipingProbabilityProperty.Description); + + PropertyDescriptor pipingReliabilityProperty = dynamicProperties[11]; + Assert.IsNotNull(pipingReliabilityProperty); + Assert.IsTrue(pipingReliabilityProperty.IsReadOnly); + Assert.AreEqual(pipingCategory, pipingReliabilityProperty.Category); + Assert.AreEqual("Betrouwbaarheidsindex faalkans [-]", pipingReliabilityProperty.DisplayName); + Assert.AreEqual("De betrouwbaarheidsindex van de faalkans voor deze berekening.", pipingReliabilityProperty.Description); + + PropertyDescriptor pipingFactorOfSafetyProperty = dynamicProperties[12]; + Assert.IsNotNull(pipingFactorOfSafetyProperty); + Assert.IsTrue(pipingFactorOfSafetyProperty.IsReadOnly); + Assert.AreEqual(pipingCategory, pipingFactorOfSafetyProperty.Category); + Assert.AreEqual("Veiligheidsfactor [-]", pipingFactorOfSafetyProperty.DisplayName); + Assert.AreEqual("De veiligheidsfactor voor deze berekening.", pipingFactorOfSafetyProperty.Description); + } } } \ No newline at end of file