Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/RegistrationState/WaveImpactAsphaltCoverFailureMechanismProperties.cs
===================================================================
diff -u -r5662e5293f63c637d10f674e61c332b499614608 -r85f74524416ecf940bdbc51199695ac40763ccb4
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/RegistrationState/WaveImpactAsphaltCoverFailureMechanismProperties.cs (.../WaveImpactAsphaltCoverFailureMechanismProperties.cs) (revision 5662e5293f63c637d10f674e61c332b499614608)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/RegistrationState/WaveImpactAsphaltCoverFailureMechanismProperties.cs (.../WaveImpactAsphaltCoverFailureMechanismProperties.cs) (revision 85f74524416ecf940bdbc51199695ac40763ccb4)
@@ -22,7 +22,6 @@
using System;
using Core.Common.Util.Attributes;
using Core.Gui.Attributes;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.WaveImpactAsphaltCover.Data;
using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
using RiskeerRevetmentFormsResources = Riskeer.Revetment.Forms.Properties.Resources;
@@ -42,9 +41,8 @@
/// Creates a new instance of .
///
/// The instance to show the properties of.
- /// The assessment section the failure mechanism belongs to.
/// Thrown when any is null.
- public WaveImpactAsphaltCoverFailureMechanismProperties(WaveImpactAsphaltCoverFailureMechanism data, IAssessmentSection assessmentSection)
+ public WaveImpactAsphaltCoverFailureMechanismProperties(WaveImpactAsphaltCoverFailureMechanism data)
: base(data, new ConstructionProperties
{
NamePropertyIndex = namePropertyIndex,
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r4760082d16f6b1577c4c70b4ea89e3153d60346a -r85f74524416ecf940bdbc51199695ac40763ccb4
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 4760082d16f6b1577c4c70b4ea89e3153d60346a)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 85f74524416ecf940bdbc51199695ac40763ccb4)
@@ -83,7 +83,7 @@
};
yield return new PropertyInfo
{
- CreateInstance = context => new RegistrationStateFailureMechanismProperties(context.WrappedData, context.Parent)
+ CreateInstance = context => new RegistrationStateFailureMechanismProperties(context.WrappedData)
};
yield return new PropertyInfo();
yield return new PropertyInfo
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/RegistrationState/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r5662e5293f63c637d10f674e61c332b499614608 -r85f74524416ecf940bdbc51199695ac40763ccb4
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/RegistrationState/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs (.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs) (revision 5662e5293f63c637d10f674e61c332b499614608)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/RegistrationState/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs (.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs) (revision 85f74524416ecf940bdbc51199695ac40763ccb4)
@@ -24,8 +24,6 @@
using Core.Common.TestUtil;
using Core.Gui.TestUtil;
using NUnit.Framework;
-using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.WaveImpactAsphaltCover.Data;
using Riskeer.WaveImpactAsphaltCover.Forms.PropertyClasses;
using Riskeer.WaveImpactAsphaltCover.Forms.PropertyClasses.RegistrationState;
@@ -40,54 +38,31 @@
private const int inAssemblyPropertyIndex = 2;
[Test]
- public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
- {
- // Call
- void Call() => new WaveImpactAsphaltCoverFailureMechanismProperties(new WaveImpactAsphaltCoverFailureMechanism(), 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 WaveImpactAsphaltCoverFailureMechanism
{
InAssembly = random.NextBoolean()
};
// Call
- var properties = new WaveImpactAsphaltCoverFailureMechanismProperties(failureMechanism, assessmentSection);
+ var properties = new WaveImpactAsphaltCoverFailureMechanismProperties(failureMechanism);
// Assert
Assert.IsInstanceOf(properties);
Assert.AreSame(failureMechanism, properties.Data);
Assert.AreEqual(failureMechanism.Name, properties.Name);
Assert.AreEqual(failureMechanism.Code, properties.Code);
Assert.AreEqual(failureMechanism.InAssembly, properties.InAssembly);
-
- mocks.VerifyAll();
}
[Test]
public void Constructor_PropertiesHaveExpectedAttributesValues()
{
- // Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
// Call
- var properties = new WaveImpactAsphaltCoverFailureMechanismProperties(new WaveImpactAsphaltCoverFailureMechanism(), assessmentSection);
+ var properties = new WaveImpactAsphaltCoverFailureMechanismProperties(new WaveImpactAsphaltCoverFailureMechanism());
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -115,8 +90,6 @@
"In assemblage",
"Geeft aan of dit faalmechanisme wordt meegenomen in de assemblage.",
true);
-
- mocks.VerifyAll();
}
}
}
\ No newline at end of file