Fisheye: Tag a551fd295b22ed3f86afc0ecbd724392f42b8afc refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/IHasGeneralInput.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/SpecificFailureMechanism.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/SpecificFailureMechanism.cs (.../SpecificFailureMechanism.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/SpecificFailureMechanism.cs (.../SpecificFailureMechanism.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -29,8 +29,7 @@
///
/// This class is the implementation for a specific failure mechanism.
///
- public class SpecificFailureMechanism : Observable, IFailureMechanism,
- IHasGeneralInput
+ public class SpecificFailureMechanism : Observable, IFailureMechanism
{
private readonly FailureMechanismSectionCollection sectionCollection;
private readonly ObservableList sectionResults;
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/SpecificFailureMechanismTest.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/SpecificFailureMechanismTest.cs (.../SpecificFailureMechanismTest.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/SpecificFailureMechanismTest.cs (.../SpecificFailureMechanismTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -41,7 +41,6 @@
// Assert
Assert.IsInstanceOf(failureMechanism);
Assert.IsInstanceOf>(failureMechanism);
- Assert.IsInstanceOf(failureMechanism);
Assert.AreEqual("Nieuw faalmechanisme", failureMechanism.Name);
Assert.AreEqual("NIEUW", failureMechanism.Code);
Assert.IsNotNull(failureMechanism.InAssemblyInputComments);
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestCalculatableFailureMechanism.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestCalculatableFailureMechanism.cs (.../TestCalculatableFailureMechanism.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestCalculatableFailureMechanism.cs (.../TestCalculatableFailureMechanism.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -31,7 +31,7 @@
/// Simple calculatable failure mechanism which can be used for testing.
///
public class TestCalculatableFailureMechanism : FailureMechanismBase,
- IHasGeneralInput, ICalculatableFailureMechanism
+ ICalculatableFailureMechanism
{
private const string defaultName = "Test failure mechanism";
private const string defaultCode = "TFM";
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs (.../TestFailureMechanism.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs (.../TestFailureMechanism.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -29,7 +29,7 @@
///
/// Simple failure mechanism which can be used for testing.
///
- public class TestFailureMechanism : Observable, IFailureMechanism, IHasGeneralInput
+ public class TestFailureMechanism : Observable, IFailureMechanism
{
private readonly FailureMechanismSectionCollection sectionCollection;
private readonly ObservableList sectionResults;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7d1de1791f5c266f0236a6d84625261a50918367 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactory.cs (.../FailureMechanismAssemblyFactory.cs) (revision 7d1de1791f5c266f0236a6d84625261a50918367)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactory.cs (.../FailureMechanismAssemblyFactory.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -44,7 +44,7 @@
/// Thrown when any argument is null.
/// Thrown when the section could not be assembled.
public static FailureMechanismSectionAssemblyResultWrapper AssembleSection(NonAdoptableWithProfileProbabilityFailureMechanismSectionResult sectionResult,
- IHasGeneralInput failureMechanism,
+ IFailureMechanism failureMechanism,
IAssessmentSection assessmentSection)
{
if (sectionResult == null)
@@ -63,7 +63,7 @@
}
return FailureMechanismSectionAssemblyResultFactory.AssembleSection(
- sectionResult, assessmentSection, failureMechanism.GeneralInput.ApplyLengthEffectInSection);
+ sectionResult, assessmentSection, false);
}
///
@@ -78,7 +78,7 @@
/// Thrown when the failure mechanism cannot be assembled.
public static FailureMechanismAssemblyResultWrapper AssembleFailureMechanism(TFailureMechanism failureMechanism,
IAssessmentSection assessmentSection)
- where TFailureMechanism : IHasGeneralInput, IFailureMechanism
+ where TFailureMechanism : IFailureMechanism
{
if (failureMechanism == null)
{
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -28,8 +28,7 @@
/// Model containing input and output needed to perform different levels of the
/// Grass Cover Slip Off Inwards failure mechanism.
///
- public class GrassCoverSlipOffInwardsFailureMechanism : FailureMechanismBase,
- IHasGeneralInput
+ public class GrassCoverSlipOffInwardsFailureMechanism : FailureMechanismBase
{
///
/// Initializes a new instance of the class.
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs (.../GrassCoverSlipOffOutwardsFailureMechanism.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs (.../GrassCoverSlipOffOutwardsFailureMechanism.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -28,8 +28,7 @@
/// Model containing input and output needed to perform different levels of the
/// Grass Cover Slip Off Outwards failure mechanism.
///
- public class GrassCoverSlipOffOutwardsFailureMechanism : FailureMechanismBase,
- IHasGeneralInput
+ public class GrassCoverSlipOffOutwardsFailureMechanism : FailureMechanismBase
{
///
/// Initializes a new instance of the class.
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -28,8 +28,7 @@
/// Model containing input and output needed to perform different levels of the
/// Microstability failure mechanism.
///
- public class MicrostabilityFailureMechanism : FailureMechanismBase,
- IHasGeneralInput
+ public class MicrostabilityFailureMechanism : FailureMechanismBase
{
///
/// Initializes a new instance of the class.
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs (.../PipingStructureFailureMechanism.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs (.../PipingStructureFailureMechanism.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -29,7 +29,7 @@
/// Model containing input and output needed to perform different levels of the
/// Piping Structure failure mechanism.
///
- public class PipingStructureFailureMechanism : FailureMechanismBase, IHasGeneralInput
+ public class PipingStructureFailureMechanism : FailureMechanismBase
{
///
/// Initializes a new instance of the class.
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs (.../WaterPressureAsphaltCoverFailureMechanism.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs (.../WaterPressureAsphaltCoverFailureMechanism.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -28,8 +28,7 @@
/// Model containing input and output needed to perform different levels of the
/// Water Pressure on Asphalt failure mechanism.
///
- public class WaterPressureAsphaltCoverFailureMechanism : FailureMechanismBase,
- IHasGeneralInput
+ public class WaterPressureAsphaltCoverFailureMechanism : FailureMechanismBase
{
///
/// Initializes a new instance of the class.
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailureMechanismProperties.cs
===================================================================
diff -u -r78461d034a546d5d75a66f9b3f0b680b9970492a -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailureMechanismProperties.cs (.../StandAloneFailureMechanismProperties.cs) (revision 78461d034a546d5d75a66f9b3f0b680b9970492a)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailureMechanismProperties.cs (.../StandAloneFailureMechanismProperties.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -29,22 +29,20 @@
namespace Riskeer.Integration.Forms.PropertyClasses.StandAlone
{
///
- /// Registration state related ViewModel of for properties panel.
+ /// Registration state related ViewModel of for properties panel.
///
- public class StandAloneFailureMechanismProperties : ObjectProperties
+ public class StandAloneFailureMechanismProperties : ObjectProperties
{
private const int namePropertyIndex = 1;
private const int codePropertyIndex = 2;
private const int inAssemblyPropertyIndex = 3;
- private const int nPropertyIndex = 4;
- private const int applyLengthEffectInSectionPropertyIndex = 5;
///
/// Creates a new instance of .
///
/// The failure mechanism to show the properties for.
/// Thrown when any parameter is null.
- public StandAloneFailureMechanismProperties(IHasGeneralInput failureMechanism)
+ public StandAloneFailureMechanismProperties(IFailureMechanism failureMechanism)
{
if (failureMechanism == null)
{
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -r223ae138d8a173bc2c1e507ad84e1fe60e532690 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 223ae138d8a173bc2c1e507ad84e1fe60e532690)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -359,7 +359,7 @@
}
private FailureMechanismAssemblyResultRow CreateStandAloneFailureMechanismAssemblyResultRow(TFailureMechanism failureMechanism)
- where TFailureMechanism : IHasGeneralInput, IFailureMechanism
+ where TFailureMechanism : IFailureMechanism
{
return FailureMechanismAssemblyResultRowFactory.CreateRow(
failureMechanism, () => FailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, AssessmentSection));
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r112df5b50036736972ee136e359c7d15e6914999 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 112df5b50036736972ee136e359c7d15e6914999)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -257,7 +257,7 @@
context.WrappedData,
new FailureMechanismContributionNormChangeHandler(context.AssessmentSection))
};
- yield return new PropertyInfo, StandAloneFailureMechanismProperties>
+ yield return new PropertyInfo, StandAloneFailureMechanismProperties>
{
CreateInstance = context => new StandAloneFailureMechanismProperties(context.WrappedData)
};
@@ -1144,7 +1144,7 @@
Func getUseLengthEffectFunc,
Func performFailureMechanismAssemblyFunc)
where TContext : FailureMechanismSectionResultContext
- where TFailureMechanism : class, IFailureMechanism, IHasGeneralInput
+ where TFailureMechanism : class, IFailureMechanism
{
return new RiskeerViewInfo<
TContext,
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs (.../FailureMechanismAssemblyFactoryTest.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs (.../FailureMechanismAssemblyFactoryTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -42,8 +42,7 @@
[TestFixture]
public class FailureMechanismAssemblyFactoryTest
{
- private class TestFailureMechanism : FailureMechanismBase,
- IHasGeneralInput
+ private class TestFailureMechanism : FailureMechanismBase
{
public TestFailureMechanism() : base("Test", "Code") {}
}
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffInwardsFailureMechanismTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -36,7 +36,6 @@
// Assert
Assert.IsInstanceOf>(failureMechanism);
- Assert.IsInstanceOf(failureMechanism);
Assert.AreEqual("Grasbekleding afschuiven binnentalud", failureMechanism.Name);
Assert.AreEqual("GABI", failureMechanism.Code);
CollectionAssert.IsEmpty(failureMechanism.Sections);
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/GrassCoverSlipOffOutwardsFailureMechanismTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -36,7 +36,6 @@
// Assert
Assert.IsInstanceOf>(failureMechanism);
- Assert.IsInstanceOf(failureMechanism);
Assert.AreEqual("Grasbekleding afschuiven buitentalud", failureMechanism.Name);
Assert.AreEqual("GABU", failureMechanism.Code);
CollectionAssert.IsEmpty(failureMechanism.Sections);
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/MicrostabilityFailureMechanismTest.cs (.../MicrostabilityFailureMechanismTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -36,7 +36,6 @@
// Assert
Assert.IsInstanceOf>(failureMechanism);
- Assert.IsInstanceOf(failureMechanism);
Assert.AreEqual("Microstabiliteit", failureMechanism.Name);
Assert.AreEqual("STMI", failureMechanism.Code);
CollectionAssert.IsEmpty(failureMechanism.Sections);
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs (.../PipingStructureFailureMechanismTest.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/PipingStructureFailureMechanismTest.cs (.../PipingStructureFailureMechanismTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -36,7 +36,6 @@
// Assert
Assert.IsInstanceOf>(failureMechanism);
- Assert.IsInstanceOf(failureMechanism);
Assert.AreEqual("Piping bij kunstwerk", failureMechanism.Name);
Assert.AreEqual("PKW", failureMechanism.Code);
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs
===================================================================
diff -u -r934cae32f901926fbd1bbda8e6851ceaecbda2e3 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs (.../WaterPressureAsphaltCoverFailureMechanismTest.cs) (revision 934cae32f901926fbd1bbda8e6851ceaecbda2e3)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/WaterPressureAsphaltCoverFailureMechanismTest.cs (.../WaterPressureAsphaltCoverFailureMechanismTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -36,7 +36,6 @@
// Assert
Assert.IsInstanceOf>(failureMechanism);
- Assert.IsInstanceOf(failureMechanism);
Assert.AreEqual("Wateroverdruk bij asfaltbekleding", failureMechanism.Name);
Assert.AreEqual("AWO", failureMechanism.Code);
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/StandAloneFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r78461d034a546d5d75a66f9b3f0b680b9970492a -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/StandAloneFailureMechanismPropertiesTest.cs (.../StandAloneFailureMechanismPropertiesTest.cs) (revision 78461d034a546d5d75a66f9b3f0b680b9970492a)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/StandAloneFailureMechanismPropertiesTest.cs (.../StandAloneFailureMechanismPropertiesTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -37,8 +37,6 @@
private const int namePropertyIndex = 0;
private const int codePropertyIndex = 1;
private const int inAssemblyPropertyIndex = 2;
- private const int nPropertyIndex = 3;
- private const int applyLengthEffectInSectionPropertyIndex = 4;
[Test]
public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
@@ -66,7 +64,7 @@
var properties = new StandAloneFailureMechanismProperties(failureMechanism);
// Assert
- Assert.IsInstanceOf>(properties);
+ Assert.IsInstanceOf>(properties);
Assert.AreSame(failureMechanism, properties.Data);
Assert.AreEqual(failureMechanism.Name, properties.Name);
Assert.AreEqual(failureMechanism.Code, properties.Code);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs
===================================================================
diff -u -r01c40dbdf75bccae38a7728556afe2f8968f55c0 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs (.../StandAloneFailureMechanismPropertyInfoTest.cs) (revision 01c40dbdf75bccae38a7728556afe2f8968f55c0)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/StandAloneFailureMechanismPropertyInfoTest.cs (.../StandAloneFailureMechanismPropertyInfoTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -54,7 +54,7 @@
public void Initialized_Always_ExpectedPropertiesSet()
{
// Assert
- Assert.AreEqual(typeof(IFailureMechanismContext), info.DataType);
+ Assert.AreEqual(typeof(IFailureMechanismContext), info.DataType);
Assert.AreEqual(typeof(StandAloneFailureMechanismProperties), info.PropertyObjectType);
}
@@ -64,7 +64,7 @@
// Setup
var mocks = new MockRepository();
var assessmentSection = mocks.Stub();
- var failureMechanism = mocks.Stub();
+ var failureMechanism = mocks.Stub();
mocks.ReplayAll();
var context = new TestFailureMechanismContext(failureMechanism, assessmentSection);
@@ -78,9 +78,9 @@
mocks.VerifyAll();
}
- private class TestFailureMechanismContext : FailureMechanismContext
+ private class TestFailureMechanismContext : FailureMechanismContext
{
- public TestFailureMechanismContext(IHasGeneralInput wrappedFailureMechanism, IAssessmentSection parent) : base(wrappedFailureMechanism, parent) {}
+ public TestFailureMechanismContext(IFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) : base(wrappedFailureMechanism, parent) {}
}
}
}
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r373d18d4ed837486ade8fc92e2d89609ac64918b -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 373d18d4ed837486ade8fc92e2d89609ac64918b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -146,7 +146,7 @@
PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
- typeof(IFailureMechanismContext),
+ typeof(IFailureMechanismContext),
typeof(StandAloneFailureMechanismProperties));
PluginTestHelper.AssertPropertyInfoDefined(
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r086f83a97089b51a29a20af7c08b8220e2fb1a24 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 086f83a97089b51a29a20af7c08b8220e2fb1a24)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -1212,7 +1212,7 @@
private static void AssertFailureMechanismEqual(bool expectedInAssembly,
FailureMechanismEntity entity,
T failureMechanism)
- where T : IFailureMechanism, IHasGeneralInput
+ where T : IFailureMechanism
{
Assert.AreEqual(expectedInAssembly, failureMechanism.InAssembly);
Assert.AreEqual(entity.InAssemblyInputComments, failureMechanism.InAssemblyInputComments.Body);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r36881fc8e4d292e0afd803303f54b55c696bce67 -ra551fd295b22ed3f86afc0ecbd724392f42b8afc
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 36881fc8e4d292e0afd803303f54b55c696bce67)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision a551fd295b22ed3f86afc0ecbd724392f42b8afc)
@@ -186,27 +186,22 @@
SetSectionResults(stabilityPointStructuresFailureMechanism.SectionResults);
PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure;
- ConfigurePipingStructureFailureMechanism(pipingStructureFailureMechanism);
SetSections(pipingStructureFailureMechanism);
SetSectionResults(pipingStructureFailureMechanism.SectionResults);
MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability;
- SetGeneralInput(microstabilityFailureMechanism, random.Next());
SetSections(microstabilityFailureMechanism);
SetSectionResults(microstabilityFailureMechanism.SectionResults);
WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCoverFailureMechanism = assessmentSection.WaterPressureAsphaltCover;
- SetGeneralInput(waterPressureAsphaltCoverFailureMechanism, random.Next());
SetSections(waterPressureAsphaltCoverFailureMechanism);
SetSectionResults(waterPressureAsphaltCoverFailureMechanism.SectionResults);
GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwardsFailureMechanism = assessmentSection.GrassCoverSlipOffInwards;
- SetGeneralInput(grassCoverSlipOffInwardsFailureMechanism, random.Next());
SetSections(grassCoverSlipOffInwardsFailureMechanism);
SetSectionResults(grassCoverSlipOffInwardsFailureMechanism.SectionResults);
GrassCoverSlipOffOutwardsFailureMechanism grassCoverSlipOffOutwardsFailureMechanism = assessmentSection.GrassCoverSlipOffOutwards;
- SetGeneralInput(grassCoverSlipOffOutwardsFailureMechanism, random.Next());
SetSections(grassCoverSlipOffOutwardsFailureMechanism);
SetSectionResults(grassCoverSlipOffOutwardsFailureMechanism.SectionResults);
@@ -230,12 +225,6 @@
return fullTestProject;
}
- private static void SetGeneralInput(IHasGeneralInput failureMechanism, int seed)
- {
- var random = new Random(seed);
- failureMechanism.GeneralInput.N = random.NextRoundedDouble(1, 20);
- }
-
private static void ConfigureHydraulicLocationConfigurationDatabase(HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase)
{
hydraulicLocationConfigurationDatabase.FilePath = "some\\Path\\ToHlcd";
@@ -531,15 +520,6 @@
}
}
- #region PipingStructure FailureMechanism
-
- private static void ConfigurePipingStructureFailureMechanism(PipingStructureFailureMechanism pipingStructureFailureMechanism)
- {
- pipingStructureFailureMechanism.GeneralInput.N = (RoundedDouble) 12.5;
- }
-
- #endregion
-
#region Specific FailureMechanism
private static void SetSpecificFailureMechanisms(IEnumerable specificFailureMechanisms)
@@ -548,7 +528,6 @@
foreach (SpecificFailureMechanism failureMechanism in specificFailureMechanisms)
{
var random = new Random(i);
- failureMechanism.GeneralInput.N = random.NextRoundedDouble(1, 20);
failureMechanism.Name = $"Path {i}";
failureMechanism.InAssembly = random.NextBoolean();