Index: Riskeer/Integration/src/Riskeer.Integration.Data/FailurePath/SpecificFailurePath.cs =================================================================== diff -u -r9141a663180003d745d91f35818a25102949dd2a -rce856565876c408cccd5edfa2d3963dc1280818f --- Riskeer/Integration/src/Riskeer.Integration.Data/FailurePath/SpecificFailurePath.cs (.../SpecificFailurePath.cs) (revision 9141a663180003d745d91f35818a25102949dd2a) +++ Riskeer/Integration/src/Riskeer.Integration.Data/FailurePath/SpecificFailurePath.cs (.../SpecificFailurePath.cs) (revision ce856565876c408cccd5edfa2d3963dc1280818f) @@ -45,7 +45,7 @@ sectionCollection = new FailureMechanismSectionCollection(); InAssembly = true; - Input = new SpecificFailurePathInput(); + Input = new GeneralInput(); InAssemblyInputComments = new Comment(); InAssemblyOutputComments = new Comment(); NotInAssemblyComments = new Comment(); @@ -56,7 +56,7 @@ /// /// Gets the input that applies to the specific failure path. /// - public SpecificFailurePathInput Input { get; } + public GeneralInput Input { get; } public string Name { get; set; } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/SpecificFailurePathPropertiesTest.cs =================================================================== diff -u -r1f0f96ca361685373cd5f7457d6cb05884b624b4 -rce856565876c408cccd5edfa2d3963dc1280818f --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/SpecificFailurePathPropertiesTest.cs (.../SpecificFailurePathPropertiesTest.cs) (revision 1f0f96ca361685373cd5f7457d6cb05884b624b4) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/SpecificFailurePathPropertiesTest.cs (.../SpecificFailurePathPropertiesTest.cs) (revision ce856565876c408cccd5edfa2d3963dc1280818f) @@ -28,6 +28,7 @@ using Core.Gui.TestUtil; using NUnit.Framework; using Rhino.Mocks; +using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.FailurePath; using Riskeer.Integration.Forms.PropertyClasses; @@ -51,7 +52,7 @@ string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("data", paramName); } - + [Test] public void Constructor_ExpectedValues() { @@ -61,16 +62,16 @@ { InAssembly = random.NextBoolean() }; - + // Call var properties = new SpecificFailurePathProperties(failurePath); // Assert Assert.IsInstanceOf>(properties); Assert.AreEqual(failurePath.Name, properties.Name); Assert.AreEqual(failurePath.InAssembly, properties.InAssembly); - - SpecificFailurePathInput input = failurePath.Input; + + GeneralInput input = failurePath.Input; Assert.AreEqual(2, properties.N.NumberOfDecimalPlaces); Assert.AreEqual(input.N, properties.N, properties.N.GetAccuracy()); } @@ -106,14 +107,14 @@ "In assemblage", "Geeft aan of dit faalpad wordt meegenomen in de assemblage.", true); - + PropertyDescriptor nProperty = dynamicProperties[nPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nProperty, lengthEffectCategory, "N [-]", "De parameter 'N' die gebruikt wordt om het lengte-effect mee te nemen in de beoordeling."); - } - + } + [Test] public void Constructor_InAssemblyFalse_PropertiesHaveExpectedAttributesValues() { @@ -144,8 +145,8 @@ "In assemblage", "Geeft aan of dit faalpad wordt meegenomen in de assemblage.", true); - } - + } + [Test] public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers() { @@ -176,7 +177,7 @@ // Assert Assert.AreEqual(newName, failurePath.Name); - SpecificFailurePathInput input = failurePath.Input; + GeneralInput input = failurePath.Input; Assert.AreEqual(newN, input.N, input.N.GetAccuracy()); mocks.VerifyAll(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/SpecificFailurePaths/SpecificFailurePathCreateExtensionsTest.cs =================================================================== diff -u -r37329c0792c0630f19b54d90d3abf5c6df849119 -rce856565876c408cccd5edfa2d3963dc1280818f --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/SpecificFailurePaths/SpecificFailurePathCreateExtensionsTest.cs (.../SpecificFailurePathCreateExtensionsTest.cs) (revision 37329c0792c0630f19b54d90d3abf5c6df849119) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/SpecificFailurePaths/SpecificFailurePathCreateExtensionsTest.cs (.../SpecificFailurePathCreateExtensionsTest.cs) (revision ce856565876c408cccd5edfa2d3963dc1280818f) @@ -24,6 +24,7 @@ using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; +using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Integration.Data.FailurePath; using Riskeer.Storage.Core.Create; @@ -70,7 +71,7 @@ SpecificFailurePathEntity entity = specificFailurePath.Create(registry, order); // Assert - SpecificFailurePathInput expectedInput = specificFailurePath.Input; + GeneralInput expectedInput = specificFailurePath.Input; Assert.AreEqual(expectedInput.N, entity.N, expectedInput.N.GetAccuracy()); CollectionAssert.IsEmpty(entity.FailureMechanismSectionEntities); @@ -98,16 +99,16 @@ specificFailurePath.SetSections(new[] { - FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new [] + FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(0, 0), new Point2D(1, 0) }), - FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new [] + FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[] { new Point2D(1, 0), new Point2D(2, 0) - }) + }) }, specificFailurePathSectionsSourcePath); var registry = new PersistenceRegistry();