Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe -r9a206431688e4ad746e58dfdef5742f76bcf4d08 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 9a206431688e4ad746e58dfdef5742f76bcf4d08) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.Linq; using Core.Common.Base; using Core.Common.Controls.DataGrid; using Core.Common.TestUtil; @@ -66,6 +67,28 @@ }; [Test] + public void Constructor_CalculationScenariosNull_ThrowsArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var result = new StabilityPointStructuresFailureMechanismSectionResult(section); + + // Call + void Call() => new StabilityPointStructuresFailureMechanismSectionResultRow( + result, null, new StabilityPointStructuresFailureMechanism(), + assessmentSection, ConstructionProperties); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("calculationScenarios", exception.ParamName); + mocks.VerifyAll(); + } + + [Test] public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { // Setup @@ -77,7 +100,9 @@ var result = new StabilityPointStructuresFailureMechanismSectionResult(section); // Call - void Call() => new StabilityPointStructuresFailureMechanismSectionResultRow(result, null, assessmentSection, ConstructionProperties); + void Call() => new StabilityPointStructuresFailureMechanismSectionResultRow( + result, Enumerable.Empty>(), + null, assessmentSection, ConstructionProperties); // Assert var exception = Assert.Throws(Call); @@ -93,8 +118,9 @@ var result = new StabilityPointStructuresFailureMechanismSectionResult(section); // Call - void Call() => new StabilityPointStructuresFailureMechanismSectionResultRow(result, new StabilityPointStructuresFailureMechanism(), - null, ConstructionProperties); + void Call() => new StabilityPointStructuresFailureMechanismSectionResultRow( + result, Enumerable.Empty>(), + new StabilityPointStructuresFailureMechanism(), null, ConstructionProperties); // Assert var exception = Assert.Throws(Call); @@ -113,8 +139,9 @@ var result = new StabilityPointStructuresFailureMechanismSectionResult(section); // Call - void Call() => new StabilityPointStructuresFailureMechanismSectionResultRow(result, new StabilityPointStructuresFailureMechanism(), - assessmentSection, null); + void Call() => new StabilityPointStructuresFailureMechanismSectionResultRow( + result, Enumerable.Empty>(), + new StabilityPointStructuresFailureMechanism(), assessmentSection, null); // Assert var exception = Assert.Throws(Call); @@ -135,11 +162,16 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StabilityPointStructuresFailureMechanismSectionResult(section); + StructuresCalculationScenario[] calculationScenarios = + { + StabilityPointStructuresCalculationScenarioTestFactory.CreateStabilityPointStructuresCalculationScenario(section) + }; + // Call using (new AssemblyToolCalculatorFactoryConfig()) { - var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection, - ConstructionProperties); + var row = new StabilityPointStructuresFailureMechanismSectionResultRow( + result, calculationScenarios, failureMechanism, assessmentSection, ConstructionProperties); // Assert Assert.IsInstanceOf>(row); @@ -161,7 +193,7 @@ Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult); Assert.AreEqual(result.DetailedAssessmentResult, row.DetailedAssessmentResult); - Assert.AreEqual(result.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), row.DetailedAssessmentProbability); + Assert.AreEqual(result.GetDetailedAssessmentProbability(calculationScenarios, failureMechanism, assessmentSection), row.DetailedAssessmentProbability); Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult); Assert.AreEqual(row.TailorMadeAssessmentProbability, result.TailorMadeAssessmentProbability); Assert.AreEqual(result.UseManualAssembly, row.UseManualAssembly); @@ -209,8 +241,9 @@ random.NextEnumValue()); // Call - var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection, - ConstructionProperties); + var row = new StabilityPointStructuresFailureMechanismSectionResultRow( + result, Enumerable.Empty>(), + failureMechanism, assessmentSection, ConstructionProperties); // Assert Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.SimpleAssessmentAssemblyOutput.Group), @@ -256,8 +289,9 @@ calculator.CombinedAssemblyOutput = new FailureMechanismSectionAssembly( random.NextDouble(), random.NextEnumValue()); - var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection, - ConstructionProperties); + var row = new StabilityPointStructuresFailureMechanismSectionResultRow( + result, Enumerable.Empty>(), + failureMechanism, assessmentSection, ConstructionProperties); // Precondition Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayName(calculator.SimpleAssessmentAssemblyOutput.Group), @@ -305,8 +339,9 @@ FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; - var row = new StabilityPointStructuresFailureMechanismSectionResultRow(result, failureMechanism, assessmentSection, - ConstructionProperties); + var row = new StabilityPointStructuresFailureMechanismSectionResultRow( + result, Enumerable.Empty>(), + failureMechanism, assessmentSection, ConstructionProperties); // Precondition IDictionary columnStateDefinitions = row.ColumnStateDefinitions; @@ -352,7 +387,8 @@ using (new AssemblyToolCalculatorFactoryConfig()) { var row = new StabilityPointStructuresFailureMechanismSectionResultRow( - result, failureMechanism, assessmentSection, ConstructionProperties); + result, Enumerable.Empty>(), + failureMechanism, assessmentSection, ConstructionProperties); bool originalValue = result.UseManualAssembly; bool newValue = !originalValue; @@ -389,7 +425,8 @@ using (new AssemblyToolCalculatorFactoryConfig()) { var row = new StabilityPointStructuresFailureMechanismSectionResultRow( - result, failureMechanism, assessmentSection, ConstructionProperties); + result, Enumerable.Empty>(), + failureMechanism, assessmentSection, ConstructionProperties); // Call row.ManualAssemblyProbability = value; @@ -421,7 +458,8 @@ using (new AssemblyToolCalculatorFactoryConfig()) { var row = new StabilityPointStructuresFailureMechanismSectionResultRow( - result, failureMechanism, assessmentSection, ConstructionProperties); + result, Enumerable.Empty>(), + failureMechanism, assessmentSection, ConstructionProperties); // Call void Call() => row.ManualAssemblyProbability = value; @@ -433,14 +471,6 @@ } } - private static TestStabilityPointStructuresCalculationScenario CreateCalculationWithOutput() - { - return new TestStabilityPointStructuresCalculationScenario - { - Output = new TestStructuresOutput() - }; - } - #region Column States [Test]