Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs =================================================================== diff -u -rb5d51844f927edaf5cf161192806f746b07283c3 -r405aed547c2d2405dbb22fb8524e7715336cf671 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs (.../PipingFailurePathProperties.cs) (revision b5d51844f927edaf5cf161192806f746b07283c3) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs (.../PipingFailurePathProperties.cs) (revision 405aed547c2d2405dbb22fb8524e7715336cf671) @@ -100,6 +100,7 @@ } [DynamicVisible] + [PropertyOrder(contributionPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))] @@ -116,6 +117,7 @@ #region Length effect parameters [DynamicVisible] + [PropertyOrder(aPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_A_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_A_Description))] @@ -133,6 +135,7 @@ } [DynamicVisible] + [PropertyOrder(bPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_B_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_ProbabilityAssessmentInput_B_Description))] @@ -145,6 +148,7 @@ } [DynamicVisible] + [PropertyOrder(sectionLengthPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.ReferenceLine_Length_Rounded_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.ReferenceLine_Length_Rounded_Description))] @@ -157,6 +161,7 @@ } [DynamicVisible] + [PropertyOrder(nPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))] [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_DisplayName))] [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_Description))] Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingCalculationsPropertiesTest.cs =================================================================== diff -u -r5c9c7dfdad2e99809b59108dba1dcec480292312 -r405aed547c2d2405dbb22fb8524e7715336cf671 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingCalculationsPropertiesTest.cs (.../PipingCalculationsPropertiesTest.cs) (revision 5c9c7dfdad2e99809b59108dba1dcec480292312) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingCalculationsPropertiesTest.cs (.../PipingCalculationsPropertiesTest.cs) (revision 405aed547c2d2405dbb22fb8524e7715336cf671) @@ -75,22 +75,22 @@ // Assert var exception = Assert.Throws(Call); Assert.AreEqual("handler", exception.ParamName); - + mocks.VerifyAll(); } [Test] public void Constructor_ExpectedValues() { // Setup - var failureMechanism = new PipingFailureMechanism(); - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); var handler = mocks.Stub>(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + // Call var properties = new PipingCalculationsProperties(failureMechanism, assessmentSection, handler); @@ -139,21 +139,21 @@ Assert.AreEqual(assessmentSection.ReferenceLine.Length, properties.SectionLength, properties.SectionLength.GetAccuracy()); - + mocks.VerifyAll(); } [Test] public void Constructor_Always_PropertiesHaveExpectedAttributeValues() { // Setup - var failureMechanism = new PipingFailureMechanism(); - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); var handler = mocks.Stub>(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + // Call var properties = new PipingCalculationsProperties(failureMechanism, assessmentSection, handler); @@ -330,7 +330,7 @@ // Assert const string expectedMessage = "De waarde voor 'a' moet in het bereik [0,0, 1,0] liggen."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - + mocks.VerifyAll(); } @@ -360,7 +360,7 @@ // Assert Assert.AreEqual(value, failureMechanism.PipingProbabilityAssessmentInput.A); - + mocks.VerifyAll(); } @@ -374,14 +374,14 @@ public void WaterVolumetricWeight_SetInvalidValue_ThrowArgumentExceptionAndDoesNotUpdateObservers(double value) { // Setup - var failureMechanism = new PipingFailureMechanism(); - var roundedValue = (RoundedDouble) value; - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); var observable = mocks.StrictMock(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var roundedValue = (RoundedDouble) value; + var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( failureMechanism, roundedValue, @@ -400,7 +400,7 @@ const string expectedMessage = "De waarde moet binnen het bereik [0,00, 20,00] liggen."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); Assert.IsTrue(changeHandler.Called); - + mocks.VerifyAll(); // Does not expect notify observers. } @@ -411,15 +411,15 @@ public void WaterVolumetricWeight_SetValidValue_SetsValueRoundedAndUpdatesObservers(double value) { // Setup - var failureMechanism = new PipingFailureMechanism(); - var roundedValue = (RoundedDouble) value; - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); var observable = mocks.StrictMock(); observable.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var roundedValue = (RoundedDouble) value; + var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester( failureMechanism, roundedValue, @@ -437,7 +437,7 @@ Assert.AreEqual(value, failureMechanism.GeneralInput.WaterVolumetricWeight, failureMechanism.GeneralInput.WaterVolumetricWeight.GetAccuracy()); Assert.IsTrue(changeHandler.Called); - + mocks.VerifyAll(); } } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs =================================================================== diff -u -r1ba626831423fb5a7e00ef1b70fdc0f306324b5f -r405aed547c2d2405dbb22fb8524e7715336cf671 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision 1ba626831423fb5a7e00ef1b70fdc0f306324b5f) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision 405aed547c2d2405dbb22fb8524e7715336cf671) @@ -98,12 +98,12 @@ public void Constructor_ExpectedValues() { // Setup - var failureMechanism = new PipingFailureMechanism(); - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); mocks.ReplayAll(); + + var failureMechanism = new PipingFailureMechanism(); // Call var properties = new PipingFailureMechanismProperties(failureMechanism, new PipingFailureMechanismProperties.ConstructionProperties(), assessmentSection); @@ -134,11 +134,12 @@ public void Constructor_Always_PropertiesHaveExpectedAttributeValues() { // Setup - var failureMechanism = new PipingFailureMechanism(); - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); mocks.ReplayAll(); + + var failureMechanism = new PipingFailureMechanism(); // Call var properties = new PipingFailureMechanismProperties(failureMechanism, new PipingFailureMechanismProperties.ConstructionProperties Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailurePathPropertiesTest.cs =================================================================== diff -u -r5c9c7dfdad2e99809b59108dba1dcec480292312 -r405aed547c2d2405dbb22fb8524e7715336cf671 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailurePathPropertiesTest.cs (.../PipingFailurePathPropertiesTest.cs) (revision 5c9c7dfdad2e99809b59108dba1dcec480292312) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailurePathPropertiesTest.cs (.../PipingFailurePathPropertiesTest.cs) (revision 405aed547c2d2405dbb22fb8524e7715336cf671) @@ -46,23 +46,35 @@ private const int bPropertyIndex = 6; private const int sectionLengthPropertyIndex = 7; private const int nPropertyIndex = 8; + private MockRepository mocks; + [SetUp] + public void SetUp() + { + mocks = new MockRepository(); + } + + [TearDown] + public void TearDown() + { + mocks.VerifyAll(); + } + [Test] [TestCase(true)] [TestCase(false)] public void Constructor_ExpectedValues(bool isRelevant) { // Setup + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); + mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism { IsRelevant = isRelevant }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine()); - mocks.ReplayAll(); - // Call var properties = new PipingFailurePathProperties(failureMechanism, assessmentSection); @@ -85,23 +97,20 @@ Assert.AreEqual(assessmentSection.ReferenceLine.Length, properties.SectionLength, properties.SectionLength.GetAccuracy()); - - mocks.VerifyAll(); } [Test] public void Constructor_IsRelevantTrue_PropertiesHaveExpectedAttributesValues() { // Setup + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism { IsRelevant = true }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call var properties = new PipingFailurePathProperties(failureMechanism, assessmentSection); @@ -173,23 +182,20 @@ "N* [-]", "De parameter 'N' die gebruikt wordt om het lengte-effect mee te nemen in de beoordeling (afgerond).", true); - - mocks.VerifyAll(); } [Test] public void Constructor_IsRelevantFalse_PropertiesHaveExpectedAttributesValues() { // Setup + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism { IsRelevant = false }; - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call var properties = new PipingFailurePathProperties(failureMechanism, assessmentSection); @@ -226,8 +232,6 @@ "Is relevant", "Geeft aan of dit toetsspoor relevant is of niet.", true); - - mocks.VerifyAll(); } [Test] @@ -239,7 +243,6 @@ public void A_SetInvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double value) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); var observer = mocks.StrictMock(); mocks.ReplayAll(); @@ -255,7 +258,6 @@ // Assert const string expectedMessage = "De waarde voor 'a' moet in het bereik [0,0, 1,0] liggen."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - mocks.VerifyAll(); } [Test] @@ -267,7 +269,6 @@ public void A_SetValidValue_SetsValueAndUpdatesObservers(double value) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); @@ -283,8 +284,6 @@ // Assert Assert.AreEqual(value, failureMechanism.PipingProbabilityAssessmentInput.A); - - mocks.VerifyAll(); } [Test] @@ -293,14 +292,14 @@ public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant) { // Setup - var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); var pipingFailureMechanism = new PipingFailureMechanism { IsRelevant = isRelevant }; + var properties = new PipingFailurePathProperties(pipingFailureMechanism, assessmentSection); // Assert @@ -316,8 +315,6 @@ Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.N))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); - - mocks.VerifyAll(); } } } \ No newline at end of file