Fisheye: Tag b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsProbabilityAssessmentOutputFactory.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsScenariosContext.cs
===================================================================
diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsScenariosContext.cs (.../GrassCoverErosionInwardsScenariosContext.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsScenariosContext.cs (.../GrassCoverErosionInwardsScenariosContext.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -21,7 +21,6 @@
using System;
using Core.Common.Controls.PresentationObjects;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Calculation;
using Riskeer.GrassCoverErosionInwards.Data;
@@ -38,35 +37,22 @@
///
/// The wrapped .
/// A forming the context.
- /// The the belongs to.
/// Thrown when any parameter is null.
public GrassCoverErosionInwardsScenariosContext(CalculationGroup wrappedData,
- GrassCoverErosionInwardsFailureMechanism failureMechanism,
- IAssessmentSection assessmentSection)
+ GrassCoverErosionInwardsFailureMechanism failureMechanism)
: base(wrappedData)
{
if (failureMechanism == null)
{
throw new ArgumentNullException(nameof(failureMechanism));
}
- if (assessmentSection == null)
- {
- throw new ArgumentNullException(nameof(assessmentSection));
- }
-
ParentFailureMechanism = failureMechanism;
- AssessmentSection = assessmentSection;
}
///
/// Gets the parent failure mechanism of the calculation group.
///
public GrassCoverErosionInwardsFailureMechanism ParentFailureMechanism { get; }
-
- ///
- /// Gets the of the calculation group.
- ///
- public IAssessmentSection AssessmentSection { get; }
}
}
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenarioRow.cs
===================================================================
diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenarioRow.cs (.../GrassCoverErosionInwardsScenarioRow.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenarioRow.cs (.../GrassCoverErosionInwardsScenarioRow.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Probability;
using Riskeer.Common.Forms.Views;
using Riskeer.GrassCoverErosionInwards.Data;
@@ -33,35 +32,16 @@
///
public class GrassCoverErosionInwardsScenarioRow : ScenarioRow
{
- private readonly GrassCoverErosionInwardsFailureMechanism failureMechanism;
- private readonly IAssessmentSection assessmentSection;
private ProbabilityAssessmentOutput probabilityAssessmentOutput;
///
/// Creates a new instance of .
///
/// The this row contains.
- /// The failure mechanism that the calculation belongs to.
- /// The assessment section that the calculation belongs to.
- /// Thrown when any parameter is null.
- internal GrassCoverErosionInwardsScenarioRow(GrassCoverErosionInwardsCalculationScenario calculationScenario,
- GrassCoverErosionInwardsFailureMechanism failureMechanism,
- IAssessmentSection assessmentSection)
+ /// Thrown when is null.
+ internal GrassCoverErosionInwardsScenarioRow(GrassCoverErosionInwardsCalculationScenario calculationScenario)
: base(calculationScenario)
{
- if (failureMechanism == null)
- {
- throw new ArgumentNullException(nameof(failureMechanism));
- }
-
- if (assessmentSection == null)
- {
- throw new ArgumentNullException(nameof(assessmentSection));
- }
-
- this.failureMechanism = failureMechanism;
- this.assessmentSection = assessmentSection;
-
CreateProbabilityAssessmentOutput();
}
@@ -75,8 +55,7 @@
private void CreateProbabilityAssessmentOutput()
{
probabilityAssessmentOutput = CalculationScenario.HasOutput
- ? GrassCoverErosionInwardsProbabilityAssessmentOutputFactory.Create(
- CalculationScenario.Output.OvertoppingOutput, failureMechanism, assessmentSection)
+ ? ProbabilityAssessmentOutputFactory.Create(CalculationScenario.Output.OvertoppingOutput.Reliability)
: null;
}
}
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs
===================================================================
diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs (.../GrassCoverErosionInwardsScenariosView.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs (.../GrassCoverErosionInwardsScenariosView.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -23,7 +23,6 @@
using System.Collections.Generic;
using System.Linq;
using Core.Common.Base.Geometry;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Calculation;
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Forms.Views;
@@ -36,28 +35,17 @@
///
public class GrassCoverErosionInwardsScenariosView : ScenariosView
{
- private readonly IAssessmentSection assessmentSection;
-
///
/// Creates a new instance of .
///
/// The data to show in this view.
/// The
/// the belongs to.
- /// The assessment section the scenarios belong to.
/// Thrown when any parameter
/// is null.
- public GrassCoverErosionInwardsScenariosView(CalculationGroup calculationGroup, GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
- : base(calculationGroup, failureMechanism)
- {
- if (assessmentSection == null)
- {
- throw new ArgumentNullException(nameof(assessmentSection));
- }
+ public GrassCoverErosionInwardsScenariosView(CalculationGroup calculationGroup, GrassCoverErosionInwardsFailureMechanism failureMechanism)
+ : base(calculationGroup, failureMechanism) {}
- this.assessmentSection = assessmentSection;
- }
-
protected override GrassCoverErosionInwardsInput GetCalculationInput(GrassCoverErosionInwardsCalculationScenario calculationScenario)
{
return calculationScenario.InputParameters;
@@ -69,7 +57,7 @@
IEnumerable calculations = CalculationGroup.GetCalculations().OfType()
.Where(cs => cs.IsDikeProfileIntersectionWithReferenceLineInSection(lineSegments));
- return calculations.Select(c => new GrassCoverErosionInwardsScenarioRow(c, FailureMechanism, assessmentSection)).ToList();
+ return calculations.Select(c => new GrassCoverErosionInwardsScenarioRow(c)).ToList();
}
}
}
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r2844878b34cba10c97aeac1693c25c042a7aa8c1 -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 2844878b34cba10c97aeac1693c25c042a7aa8c1)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -199,7 +199,7 @@
{
GetViewData = context => context.WrappedData,
GetViewName = (view, context) => RiskeerCommonFormsResources.Scenarios_DisplayName,
- CreateInstance = context => new GrassCoverErosionInwardsScenariosView(context.WrappedData, context.ParentFailureMechanism, context.AssessmentSection),
+ CreateInstance = context => new GrassCoverErosionInwardsScenariosView(context.WrappedData, context.ParentFailureMechanism),
CloseForData = CloseScenariosViewForData,
Image = RiskeerCommonFormsResources.ScenariosIcon
};
@@ -606,7 +606,7 @@
return new object[]
{
new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
- new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection),
+ new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
new ProbabilityFailureMechanismSectionResultContext(
failureMechanism.SectionResults, failureMechanism, assessmentSection),
failureMechanism.OutputComments
@@ -816,7 +816,7 @@
private static void AddCalculation(GrassCoverErosionInwardsCalculationGroupContext context)
{
double norm = context.AssessmentSection.FailureMechanismContribution.Norm;
-
+
var calculation = new GrassCoverErosionInwardsCalculationScenario
{
Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RiskeerCommonDataResources.Calculation_DefaultName, c => c.Name),
Fisheye: Tag b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsProbabilityAssessmentOutputFactoryTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/Riskeer.GrassCoverErosionInwards.Data.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/Riskeer.GrassCoverErosionInwards.Data.Test.csproj (.../Riskeer.GrassCoverErosionInwards.Data.Test.csproj) (revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/Riskeer.GrassCoverErosionInwards.Data.Test.csproj (.../Riskeer.GrassCoverErosionInwards.Data.Test.csproj) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -10,19 +10,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsScenariosContextTest.cs
===================================================================
diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsScenariosContextTest.cs (.../GrassCoverErosionInwardsScenariosContextTest.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsScenariosContextTest.cs (.../GrassCoverErosionInwardsScenariosContextTest.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -22,8 +22,6 @@
using System;
using Core.Common.Controls.PresentationObjects;
using NUnit.Framework;
-using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Calculation;
using Riskeer.GrassCoverErosionInwards.Data;
using Riskeer.GrassCoverErosionInwards.Forms.PresentationObjects;
@@ -34,55 +32,33 @@
public class GrassCoverErosionInwardsScenariosContextTest
{
[Test]
- public void Constructor_ExpectedValues()
+ public void Constructor_FailureMechanismNull_ThrowArgumentNullException()
{
// Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
- var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
var calculationGroup = new CalculationGroup();
// Call
- var context = new GrassCoverErosionInwardsScenariosContext(calculationGroup, failureMechanism, assessmentSection);
+ void Call() => new GrassCoverErosionInwardsScenariosContext(calculationGroup, null);
// Assert
- Assert.IsInstanceOf>(context);
- Assert.AreSame(calculationGroup, context.WrappedData);
- Assert.AreSame(failureMechanism, context.ParentFailureMechanism);
- Assert.AreSame(assessmentSection, context.AssessmentSection);
- mocks.VerifyAll();
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("failureMechanism", exception.ParamName);
}
[Test]
- public void Constructor_FailureMechanismNull_ThrowArgumentNullException()
+ public void Constructor_ExpectedValues()
{
// Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
+ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
var calculationGroup = new CalculationGroup();
// Call
- void Call() => new GrassCoverErosionInwardsScenariosContext(calculationGroup, null, assessmentSection);
+ var context = new GrassCoverErosionInwardsScenariosContext(calculationGroup, failureMechanism);
// Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("failureMechanism", exception.ParamName);
- mocks.VerifyAll();
+ Assert.IsInstanceOf>(context);
+ Assert.AreSame(calculationGroup, context.WrappedData);
+ Assert.AreSame(failureMechanism, context.ParentFailureMechanism);
}
-
- [Test]
- public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
- {
- // Call
- void Call() => new GrassCoverErosionInwardsScenariosContext(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism(), null);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("assessmentSection", exception.ParamName);
- }
}
}
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenarioRowTest.cs
===================================================================
diff -u -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenarioRowTest.cs (.../GrassCoverErosionInwardsScenarioRowTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenarioRowTest.cs (.../GrassCoverErosionInwardsScenarioRowTest.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -21,10 +21,7 @@
using System;
using NUnit.Framework;
-using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Probability;
-using Riskeer.Common.Data.TestUtil;
using Riskeer.Common.Forms.Views;
using Riskeer.GrassCoverErosionInwards.Data;
using Riskeer.GrassCoverErosionInwards.Data.TestUtil;
@@ -36,112 +33,56 @@
public class GrassCoverErosionInwardsScenarioRowTest
{
[Test]
- public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
- {
- // Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
- // Call
- void Call() => new GrassCoverErosionInwardsScenarioRow(new GrassCoverErosionInwardsCalculationScenario(),
- null, assessmentSection);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("failureMechanism", exception.ParamName);
- mocks.VerifyAll();
- }
-
- [Test]
- public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
- {
- // Call
- void Call() => new GrassCoverErosionInwardsScenarioRow(new GrassCoverErosionInwardsCalculationScenario(),
- new GrassCoverErosionInwardsFailureMechanism(), 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();
- mocks.ReplayAll();
-
var calculation = new GrassCoverErosionInwardsCalculationScenario();
// Call
- var row = new GrassCoverErosionInwardsScenarioRow(calculation, new GrassCoverErosionInwardsFailureMechanism(), assessmentSection);
+ var row = new GrassCoverErosionInwardsScenarioRow(calculation);
// Assert
Assert.IsInstanceOf>(row);
Assert.AreSame(calculation, row.CalculationScenario);
- mocks.VerifyAll();
}
[Test]
public void Constructor_WithCalculationWithOutput_PropertiesFromCalculation()
{
// Setup
- var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
var calculation = new GrassCoverErosionInwardsCalculationScenario
{
Output = new TestGrassCoverErosionInwardsOutput()
};
// Call
- var row = new GrassCoverErosionInwardsScenarioRow(calculation, failureMechanism, assessmentSection);
+ var row = new GrassCoverErosionInwardsScenarioRow(calculation);
// Assert
- ProbabilityAssessmentOutput expectedDerivedOutput = GrassCoverErosionInwardsProbabilityAssessmentOutputFactory.Create(
- calculation.Output.OvertoppingOutput, failureMechanism, assessmentSection);
+ ProbabilityAssessmentOutput expectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.OvertoppingOutput.Reliability);
Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability);
- mocks.VerifyAll();
}
[Test]
public void Constructor_WithCalculationWithoutOutput_PropertiesFromCalculation()
{
// Setup
- var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
var calculation = new GrassCoverErosionInwardsCalculationScenario();
// Call
- var row = new GrassCoverErosionInwardsScenarioRow(calculation, failureMechanism, assessmentSection);
+ var row = new GrassCoverErosionInwardsScenarioRow(calculation);
// Assert
Assert.IsNaN(row.FailureProbability);
- mocks.VerifyAll();
}
[Test]
public void GivenScenarioRow_WhenOutputSetAndUpdate_ThenDerivedOutputUpdated()
{
// Given
- var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
var calculation = new GrassCoverErosionInwardsCalculationScenario();
- var row = new GrassCoverErosionInwardsScenarioRow(calculation, failureMechanism, assessmentSection);
+ var row = new GrassCoverErosionInwardsScenarioRow(calculation);
// Precondition
Assert.IsNaN(row.FailureProbability);
@@ -151,32 +92,23 @@
row.Update();
// Then
- ProbabilityAssessmentOutput expectedDerivedOutput = GrassCoverErosionInwardsProbabilityAssessmentOutputFactory.Create(
- calculation.Output.OvertoppingOutput, failureMechanism, assessmentSection);
+ ProbabilityAssessmentOutput expectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.OvertoppingOutput.Reliability);
Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability);
- mocks.VerifyAll();
}
[Test]
public void GivenScenarioRow_WhenOutputSetToNullAndUpdate_ThenDerivedOutputUpdated()
{
// Given
- var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
var calculation = new GrassCoverErosionInwardsCalculationScenario
{
Output = new TestGrassCoverErosionInwardsOutput()
};
- var row = new GrassCoverErosionInwardsScenarioRow(calculation, failureMechanism, assessmentSection);
+ var row = new GrassCoverErosionInwardsScenarioRow(calculation);
// Precondition
- ProbabilityAssessmentOutput expectedDerivedOutput = GrassCoverErosionInwardsProbabilityAssessmentOutputFactory.Create(
- calculation.Output.OvertoppingOutput, failureMechanism, assessmentSection);
+ ProbabilityAssessmentOutput expectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.OvertoppingOutput.Reliability);
Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability);
// When
@@ -185,29 +117,21 @@
// Then
Assert.IsNaN(row.FailureProbability);
- mocks.VerifyAll();
}
[Test]
public void GivenScenarioRow_WhenOutputChangedAndUpdate_ThenDerivedOutputUpdated()
{
// Given
- var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
var calculation = new GrassCoverErosionInwardsCalculationScenario
{
Output = new TestGrassCoverErosionInwardsOutput()
};
- var row = new GrassCoverErosionInwardsScenarioRow(calculation, failureMechanism, assessmentSection);
+ var row = new GrassCoverErosionInwardsScenarioRow(calculation);
// Precondition
- ProbabilityAssessmentOutput expectedDerivedOutput = GrassCoverErosionInwardsProbabilityAssessmentOutputFactory.Create(
- calculation.Output.OvertoppingOutput, failureMechanism, assessmentSection);
+ ProbabilityAssessmentOutput expectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.OvertoppingOutput.Reliability);
Assert.AreEqual(expectedDerivedOutput.Probability, row.FailureProbability);
var random = new Random(11);
@@ -217,10 +141,8 @@
row.Update();
// Then
- ProbabilityAssessmentOutput newExpectedDerivedOutput = GrassCoverErosionInwardsProbabilityAssessmentOutputFactory.Create(
- calculation.Output.OvertoppingOutput, failureMechanism, assessmentSection);
+ ProbabilityAssessmentOutput newExpectedDerivedOutput = ProbabilityAssessmentOutputFactory.Create(calculation.Output.OvertoppingOutput.Reliability);
Assert.AreEqual(newExpectedDerivedOutput.Probability, row.FailureProbability);
- mocks.VerifyAll();
}
}
}
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs
===================================================================
diff -u -ra49e7e224f8c2fa217765cc51593eb7a4b30a410 -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision a49e7e224f8c2fa217765cc51593eb7a4b30a410)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsScenariosViewTest.cs (.../GrassCoverErosionInwardsScenariosViewTest.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -25,8 +25,6 @@
using Core.Common.Base.Geometry;
using NUnit.Extensions.Forms;
using NUnit.Framework;
-using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Calculation;
using Riskeer.Common.Data.DikeProfiles;
using Riskeer.Common.Data.FailureMechanism;
@@ -62,35 +60,18 @@
}
[Test]
- public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
- {
- // Call
- void Call() => new GrassCoverErosionInwardsScenariosView(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism(), 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();
- mocks.ReplayAll();
-
var calculationGroup = new CalculationGroup();
// Call
- using (var view = new GrassCoverErosionInwardsScenariosView(calculationGroup, new GrassCoverErosionInwardsFailureMechanism(), assessmentSection))
+ using (var view = new GrassCoverErosionInwardsScenariosView(calculationGroup, new GrassCoverErosionInwardsFailureMechanism()))
{
// Assert
Assert.IsInstanceOf>(view);
Assert.AreSame(calculationGroup, view.Data);
}
-
- mocks.VerifyAll();
}
[Test]
@@ -182,7 +163,7 @@
private void ShowGrassCoverErosionInwardsScenariosView(GrassCoverErosionInwardsFailureMechanism failureMechanism)
{
- var scenariosView = new GrassCoverErosionInwardsScenariosView(failureMechanism.CalculationsGroup, failureMechanism, new AssessmentSectionStub());
+ var scenariosView = new GrassCoverErosionInwardsScenariosView(failureMechanism.CalculationsGroup, failureMechanism);
testForm.Controls.Add(scenariosView);
testForm.Show();
}
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs
===================================================================
diff -u -r5a7d12426493f37ca9a8f5be5899ea7ab281ce2a -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision 5a7d12426493f37ca9a8f5be5899ea7ab281ce2a)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -64,8 +64,7 @@
DataImportHelper.ImportReferenceLine(assessmentSection);
var view = new GrassCoverErosionInwardsScenariosView(assessmentSection.GrassCoverErosionInwards.CalculationsGroup,
- assessmentSection.GrassCoverErosionInwards,
- assessmentSection);
+ assessmentSection.GrassCoverErosionInwards);
form.Controls.Add(view);
form.Show();
@@ -101,8 +100,7 @@
CalculationGroup calculationsGroup = assessmentSection.GrassCoverErosionInwards.CalculationsGroup;
var view = new GrassCoverErosionInwardsScenariosView(assessmentSection.GrassCoverErosionInwards.CalculationsGroup,
- assessmentSection.GrassCoverErosionInwards,
- assessmentSection);
+ assessmentSection.GrassCoverErosionInwards);
form.Controls.Add(view);
form.Show();
@@ -168,8 +166,7 @@
CalculationGroup calculationsGroup = assessmentSection.GrassCoverErosionInwards.CalculationsGroup;
var view = new GrassCoverErosionInwardsScenariosView(assessmentSection.GrassCoverErosionInwards.CalculationsGroup,
- assessmentSection.GrassCoverErosionInwards,
- assessmentSection);
+ assessmentSection.GrassCoverErosionInwards);
form.Controls.Add(view);
form.Show();
@@ -236,8 +233,7 @@
DataImportHelper.ImportFailureMechanismSections(assessmentSection, failureMechanism);
var view = new GrassCoverErosionInwardsScenariosView(assessmentSection.GrassCoverErosionInwards.CalculationsGroup,
- assessmentSection.GrassCoverErosionInwards,
- assessmentSection);
+ assessmentSection.GrassCoverErosionInwards);
form.Controls.Add(view);
form.Show();
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1ba3eebbfe2ac3df531f67700f8f787302d8582c -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs) (revision 1ba3eebbfe2ac3df531f67700f8f787302d8582c)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsScenariosContextTreeNodeInfoTest.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -27,9 +27,7 @@
using Core.Gui.ContextMenu;
using NUnit.Framework;
using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Calculation;
-using Riskeer.Common.Data.TestUtil;
using Riskeer.GrassCoverErosionInwards.Data;
using Riskeer.GrassCoverErosionInwards.Forms.PresentationObjects;
using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
@@ -83,40 +81,30 @@
public void Text_Always_ReturnScenarios()
{
// Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
var group = new CalculationGroup();
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
- var context = new GrassCoverErosionInwardsScenariosContext(group, failureMechanism, assessmentSection);
+ var context = new GrassCoverErosionInwardsScenariosContext(group, failureMechanism);
// Call
string text = info.Text(context);
// Assert
Assert.AreEqual("Scenario's", text);
- mocks.VerifyAll();
}
[Test]
public void Image_Always_ReturnExpectedImage()
{
// Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
var group = new CalculationGroup();
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
- var context = new GrassCoverErosionInwardsScenariosContext(group, failureMechanism, assessmentSection);
+ var context = new GrassCoverErosionInwardsScenariosContext(group, failureMechanism);
// Call
Image image = info.Image(context);
// Assert
TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.ScenariosIcon, image);
- mocks.VerifyAll();
}
[Test]
@@ -125,7 +113,7 @@
// Setup
using (var treeViewControl = new TreeViewControl())
{
- var context = new GrassCoverErosionInwardsScenariosContext(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism(), new AssessmentSectionStub());
+ var context = new GrassCoverErosionInwardsScenariosContext(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism());
var mocks = new MockRepository();
var menuBuilder = mocks.StrictMock();
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs
===================================================================
diff -u -r2503894f449e6a2d24fe0cf15ff1d8a6cd831a3c -rb19e3e1a5ccd0526b80b9a40d51c90e617a44a4d
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs (.../GrassCoverErosionInwardsScenariosViewInfoTest.cs) (revision 2503894f449e6a2d24fe0cf15ff1d8a6cd831a3c)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsScenariosViewInfoTest.cs (.../GrassCoverErosionInwardsScenariosViewInfoTest.cs) (revision b19e3e1a5ccd0526b80b9a40d51c90e617a44a4d)
@@ -77,20 +77,15 @@
public void GetViewData_WithContext_ReturnWrappedData()
{
// Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
var calculationGroup = new CalculationGroup();
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
- var context = new GrassCoverErosionInwardsScenariosContext(calculationGroup, failureMechanism, assessmentSection);
+ var context = new GrassCoverErosionInwardsScenariosContext(calculationGroup, failureMechanism);
// Call
object viewData = info.GetViewData(context);
// Assert
Assert.AreSame(calculationGroup, viewData);
- mocks.VerifyAll();
}
[Test]
@@ -117,7 +112,7 @@
});
mocks.ReplayAll();
- using (var view = new GrassCoverErosionInwardsScenariosView(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism(), assessmentSection))
+ using (var view = new GrassCoverErosionInwardsScenariosView(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism()))
{
// Precondition
Assert.AreNotSame(view.Data, unrelatedFailureMechanism.CalculationsGroup);
@@ -146,7 +141,7 @@
});
mocks.ReplayAll();
- using (var view = new GrassCoverErosionInwardsScenariosView(relatedFailureMechanism.CalculationsGroup, relatedFailureMechanism, assessmentSection))
+ using (var view = new GrassCoverErosionInwardsScenariosView(relatedFailureMechanism.CalculationsGroup, relatedFailureMechanism))
{
// Precondition
Assert.AreSame(view.Data, relatedFailureMechanism.CalculationsGroup);
@@ -170,7 +165,7 @@
assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]);
mocks.ReplayAll();
- using (var view = new GrassCoverErosionInwardsScenariosView(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism(), assessmentSection))
+ using (var view = new GrassCoverErosionInwardsScenariosView(new CalculationGroup(), new GrassCoverErosionInwardsFailureMechanism()))
{
// Call
bool closeForData = info.CloseForData(view, assessmentSection);
@@ -193,7 +188,7 @@
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
var context = new GrassCoverErosionInwardsFailurePathContext(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection);
- using (var view = new GrassCoverErosionInwardsScenariosView(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection))
+ using (var view = new GrassCoverErosionInwardsScenariosView(failureMechanism.CalculationsGroup, failureMechanism))
{
// Call
bool closeForData = info.CloseForData(view, context);
@@ -216,7 +211,7 @@
var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
var context = new GrassCoverErosionInwardsFailurePathContext(failureMechanism, assessmentSection);
- using (var view = new GrassCoverErosionInwardsScenariosView(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection))
+ using (var view = new GrassCoverErosionInwardsScenariosView(failureMechanism.CalculationsGroup, failureMechanism))
{
// Call
bool closeForData = info.CloseForData(view, context);
@@ -232,12 +227,8 @@
public void CreateInstance_WithContext_ReturnsGrassCoverErosionInwardsScenariosView()
{
// Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
var group = new CalculationGroup();
- var context = new GrassCoverErosionInwardsScenariosContext(group, new GrassCoverErosionInwardsFailureMechanism(), assessmentSection);
+ var context = new GrassCoverErosionInwardsScenariosContext(group, new GrassCoverErosionInwardsFailureMechanism());
// Call
using (IView view = info.CreateInstance(context))
@@ -246,8 +237,6 @@
Assert.IsInstanceOf(view);
Assert.AreSame(group, view.Data);
}
-
- mocks.VerifyAll();
}
}
}
\ No newline at end of file