Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/RegistrationState/PipingFailureMechanismProperties.cs =================================================================== diff -u -r48a836a7ffca1cd39e89e8d88d19f849c3b498f9 -r5f65cb6d602ef04bf165007f4ddf8eeeaa87451b --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/RegistrationState/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision 48a836a7ffca1cd39e89e8d88d19f849c3b498f9) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/RegistrationState/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision 5f65cb6d602ef04bf165007f4ddf8eeeaa87451b) @@ -22,7 +22,6 @@ using System; using Core.Common.Util.Attributes; using Core.Gui.Attributes; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Piping.Data; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -39,29 +38,18 @@ private const int aPropertyIndex = 4; private const int bPropertyIndex = 5; - private readonly IAssessmentSection assessmentSection; - /// /// Creates a new instance of . /// /// The instance to show the properties of. - /// The assessment section the data belongs to. - /// Thrown when any parameter is null. - public PipingFailureMechanismProperties(PipingFailureMechanism data, IAssessmentSection assessmentSection) + /// Thrown when any is null. + public PipingFailureMechanismProperties(PipingFailureMechanism data) : base(data, new ConstructionProperties { NamePropertyIndex = namePropertyIndex, CodePropertyIndex = codePropertyIndex - }) - { - if (assessmentSection == null) - { - throw new ArgumentNullException(nameof(assessmentSection)); - } + }) {} - this.assessmentSection = assessmentSection; - } - #region General [PropertyOrder(inAssemblyPropertyIndex)] Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r5447d74a2dd344fcde21e3e0b54069faa38153bd -r5f65cb6d602ef04bf165007f4ddf8eeeaa87451b --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 5447d74a2dd344fcde21e3e0b54069faa38153bd) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 5f65cb6d602ef04bf165007f4ddf8eeeaa87451b) @@ -97,7 +97,7 @@ }; yield return new PropertyInfo { - CreateInstance = context => new RegistrationStateFailureMechanismProperties(context.WrappedData, context.Parent) + CreateInstance = context => new RegistrationStateFailureMechanismProperties(context.WrappedData) }; yield return new PropertyInfo { Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/RegistrationState/PipingFailureMechanismPropertiesTest.cs =================================================================== diff -u -r48a836a7ffca1cd39e89e8d88d19f849c3b498f9 -r5f65cb6d602ef04bf165007f4ddf8eeeaa87451b --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/RegistrationState/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision 48a836a7ffca1cd39e89e8d88d19f849c3b498f9) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/RegistrationState/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision 5f65cb6d602ef04bf165007f4ddf8eeeaa87451b) @@ -26,7 +26,6 @@ using Core.Gui.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Piping.Data; using Riskeer.Piping.Forms.PropertyClasses; using Riskeer.Piping.Forms.PropertyClasses.RegistrationState; @@ -43,33 +42,17 @@ private const int bPropertyIndex = 4; [Test] - public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() - { - // Call - void Call() => new PipingFailureMechanismProperties(new PipingFailureMechanism(), null); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("assessmentSection", exception.ParamName); - } - - [Test] public void Constructor_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); - mocks.ReplayAll(); - var random = new Random(21); var failureMechanism = new PipingFailureMechanism { InAssembly = random.NextBoolean() }; // Call - var properties = new PipingFailureMechanismProperties(failureMechanism, assessmentSection); + var properties = new PipingFailureMechanismProperties(failureMechanism); // Assert Assert.IsInstanceOf(properties); @@ -80,22 +63,16 @@ PipingProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.PipingProbabilityAssessmentInput; Assert.AreEqual(probabilityAssessmentInput.A, properties.A); Assert.AreEqual(probabilityAssessmentInput.B, properties.B); - - mocks.VerifyAll(); } [Test] public void Constructor_InAssemblyTrue_PropertiesHaveExpectedAttributesValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - var failureMechanism = new PipingFailureMechanism(); // Call - var properties = new PipingFailureMechanismProperties(failureMechanism, assessmentSection); + var properties = new PipingFailureMechanismProperties(failureMechanism); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -137,25 +114,19 @@ "b [m]", "De parameter 'b' die gebruikt wordt voor het lengte-effect in berekening van de maximaal toelaatbare faalkans.", true); - - mocks.VerifyAll(); } [Test] public void Constructor_InAssemblyFalse_PropertiesHaveExpectedAttributesValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - var failureMechanism = new PipingFailureMechanism { InAssembly = false }; // Call - var properties = new PipingFailureMechanismProperties(failureMechanism, assessmentSection); + var properties = new PipingFailureMechanismProperties(failureMechanism); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -183,8 +154,6 @@ "In assemblage", "Geeft aan of dit faalmechanisme wordt meegenomen in de assemblage.", true); - - mocks.VerifyAll(); } [Test] @@ -197,14 +166,13 @@ { // Setup var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); var observer = mocks.StrictMock(); mocks.ReplayAll(); var failureMechanism = new PipingFailureMechanism(); failureMechanism.Attach(observer); - var properties = new PipingFailureMechanismProperties(failureMechanism, assessmentSection); + var properties = new PipingFailureMechanismProperties(failureMechanism); // Call void Call() => properties.A = value; @@ -226,15 +194,14 @@ { // Setup var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); var failureMechanism = new PipingFailureMechanism(); failureMechanism.Attach(observer); - var properties = new PipingFailureMechanismProperties(failureMechanism, assessmentSection); + var properties = new PipingFailureMechanismProperties(failureMechanism); // Call properties.A = value; @@ -251,16 +218,12 @@ public void DynamicVisibleValidationMethod_DependingOnInAssembly_ReturnExpectedVisibility(bool inAssembly) { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - var pipingFailureMechanism = new PipingFailureMechanism { InAssembly = inAssembly }; - var properties = new PipingFailureMechanismProperties(pipingFailureMechanism, assessmentSection); + var properties = new PipingFailureMechanismProperties(pipingFailureMechanism); // Assert Assert.IsTrue(properties.DynamicVisibleValidationMethod(nameof(properties.Name))); @@ -271,8 +234,6 @@ Assert.AreEqual(inAssembly, properties.DynamicVisibleValidationMethod(nameof(properties.B))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); - - mocks.VerifyAll(); } } } \ No newline at end of file