Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r15fda4749eeceea8e584fca6d95514e4e4a9383e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision 15fda4749eeceea8e584fca6d95514e4e4a9383e) @@ -27,7 +27,6 @@ using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.MacroStabilityInwards.Data.TestUtil; @@ -46,12 +45,11 @@ mocks.ReplayAll(); // Call - TestDelegate call = () => MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.GetDetailedAssessmentProbability( - null, Enumerable.Empty(), - new MacroStabilityInwardsFailureMechanism(), assessmentSection); + void Call() => MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.GetDetailedAssessmentProbability( + null, Enumerable.Empty(), new MacroStabilityInwardsFailureMechanism(), assessmentSection); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("sectionResult", exception.ParamName); mocks.VerifyAll(); } @@ -68,10 +66,11 @@ var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => failureMechanismSectionResult.GetDetailedAssessmentProbability(null, new MacroStabilityInwardsFailureMechanism(), assessmentSection); + void Call() => failureMechanismSectionResult.GetDetailedAssessmentProbability(null, new MacroStabilityInwardsFailureMechanism(), + assessmentSection); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("calculations", exception.ParamName); mocks.VerifyAll(); } @@ -88,12 +87,11 @@ var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => failureMechanismSectionResult.GetDetailedAssessmentProbability(Enumerable.Empty(), - null, - assessmentSection); + void Call() => failureMechanismSectionResult.GetDetailedAssessmentProbability(Enumerable.Empty(), + null, assessmentSection); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("failureMechanism", exception.ParamName); mocks.VerifyAll(); } @@ -106,12 +104,11 @@ var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => failureMechanismSectionResult.GetDetailedAssessmentProbability(Enumerable.Empty(), - new MacroStabilityInwardsFailureMechanism(), - null); + void Call() => failureMechanismSectionResult.GetDetailedAssessmentProbability(Enumerable.Empty(), + new MacroStabilityInwardsFailureMechanism(), null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("assessmentSection", exception.ParamName); } @@ -313,10 +310,10 @@ public void GetTotalContribution_SectionResultNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((MacroStabilityInwardsFailureMechanismSectionResult) null).GetTotalContribution(Enumerable.Empty()); + void Call() => ((MacroStabilityInwardsFailureMechanismSectionResult) null).GetTotalContribution(Enumerable.Empty()); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("sectionResult", exception.ParamName); } @@ -328,10 +325,10 @@ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => sectionResult.GetTotalContribution(null); + void Call() => sectionResult.GetTotalContribution(null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("calculationScenarios", exception.ParamName); } @@ -365,135 +362,13 @@ } [Test] - public void GetCalculationScenarioStatus_SectionResultNull_ThrowsArgumentNullException() - { - // Call - TestDelegate call = () => ((MacroStabilityInwardsFailureMechanismSectionResult) null).GetCalculationScenarioStatus(Enumerable.Empty()); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("sectionResult", exception.ParamName); - } - - [Test] - public void GetCalculationScenarioStatus_CalculationScenariosNull_ThrowsArgumentNullException() - { - // Setup - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - - // Call - TestDelegate call = () => sectionResult.GetCalculationScenarioStatus(null); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("calculationScenarios", exception.ParamName); - } - - [Test] - public void GetCalculationScenarioStatus_ScenarioNotCalculated_ReturnsStatusNotCalculated() - { - // Setup - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); - - // Call - CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] - { - macroStabilityInwardsCalculationScenario - }); - - // Assert - Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status); - } - - [Test] - public void GetCalculationScenarioStatus_ScenarioNaNOutput_ReturnsStatusDone() - { - // Setup - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); - - // Call - CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] - { - macroStabilityInwardsCalculationScenario - }); - - // Assert - Assert.AreEqual(CalculationScenarioStatus.Done, status); - } - - [Test] - public void GetCalculationScenarioStatus_ScenariosWithNotCalculatedScenario_ReturnsStatusNotCalculated() - { - // Setup - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); - - MacroStabilityInwardsCalculationScenario[] calculationScenarios = - { - macroStabilityInwardsCalculationScenario, - macroStabilityInwardsCalculationScenario2 - }; - - // Call - CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(calculationScenarios); - - // Assert - Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status); - } - - [Test] - public void GetCalculationScenarioStatus_ScenarioCalculated_ReturnsStatusDone() - { - // Setup - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(0.1, section); - macroStabilityInwardsCalculationScenario.Contribution = (RoundedDouble) 1.0; - - // Call - CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] - { - macroStabilityInwardsCalculationScenario - }); - - // Assert - Assert.AreEqual(CalculationScenarioStatus.Done, status); - } - - [Test] - public void GetCalculationScenarioStatus_NoScenarios_ReturnsStatusDone() - { - // Setup - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - - // Call - CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(Enumerable.Empty()); - - // Assert - Assert.AreEqual(CalculationScenarioStatus.Done, status); - } - - [Test] public void GetCalculationScenarios_SectionResultNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((MacroStabilityInwardsFailureMechanismSectionResult) null).GetCalculationScenarios( - Enumerable.Empty()); + void Call() => ((MacroStabilityInwardsFailureMechanismSectionResult) null).GetCalculationScenarios(Enumerable.Empty()); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("sectionResult", exception.ParamName); } @@ -505,10 +380,10 @@ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => sectionResult.GetCalculationScenarios(null); + void Call() => sectionResult.GetCalculationScenarios(null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("calculationScenarios", exception.ParamName); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r77f595651b934a75a5625828a9027d7c48e8e5f9 -r15fda4749eeceea8e584fca6d95514e4e4a9383e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision 77f595651b934a75a5625828a9027d7c48e8e5f9) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision 15fda4749eeceea8e584fca6d95514e4e4a9383e) @@ -34,7 +34,6 @@ using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.Helpers; @@ -51,26 +50,21 @@ [TestFixture] public class MacroStabilityInwardsFailureMechanismSectionResultRowTest { - private static MacroStabilityInwardsFailureMechanismSectionResultRow.ConstructionProperties ConstructionProperties - { - get + private static MacroStabilityInwardsFailureMechanismSectionResultRow.ConstructionProperties ConstructionProperties => + new MacroStabilityInwardsFailureMechanismSectionResultRow.ConstructionProperties { - return new MacroStabilityInwardsFailureMechanismSectionResultRow.ConstructionProperties - { - SimpleAssessmentResultIndex = 1, - DetailedAssessmentResultIndex = 2, - DetailedAssessmentProbabilityIndex = 3, - TailorMadeAssessmentResultIndex = 4, - TailorMadeAssessmentProbabilityIndex = 5, - SimpleAssemblyCategoryGroupIndex = 6, - DetailedAssemblyCategoryGroupIndex = 7, - TailorMadeAssemblyCategoryGroupIndex = 8, - CombinedAssemblyCategoryGroupIndex = 9, - CombinedAssemblyProbabilityIndex = 10, - ManualAssemblyProbabilityIndex = 11 - }; - } - } + SimpleAssessmentResultIndex = 1, + DetailedAssessmentResultIndex = 2, + DetailedAssessmentProbabilityIndex = 3, + TailorMadeAssessmentResultIndex = 4, + TailorMadeAssessmentProbabilityIndex = 5, + SimpleAssemblyCategoryGroupIndex = 6, + DetailedAssemblyCategoryGroupIndex = 7, + TailorMadeAssemblyCategoryGroupIndex = 8, + CombinedAssemblyCategoryGroupIndex = 9, + CombinedAssemblyProbabilityIndex = 10, + ManualAssemblyProbabilityIndex = 11 + }; [Test] public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() @@ -84,14 +78,11 @@ var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => new MacroStabilityInwardsFailureMechanismSectionResultRow(result, - Enumerable.Empty(), - null, - assessmentSection, - ConstructionProperties); + void Call() => new MacroStabilityInwardsFailureMechanismSectionResultRow(result, Enumerable.Empty(), + null, assessmentSection, ConstructionProperties); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("failureMechanism", exception.ParamName); mocks.VerifyAll(); } @@ -104,14 +95,11 @@ var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => new MacroStabilityInwardsFailureMechanismSectionResultRow(result, - Enumerable.Empty(), - new MacroStabilityInwardsFailureMechanism(), - null, - ConstructionProperties); + void Call() => new MacroStabilityInwardsFailureMechanismSectionResultRow(result, Enumerable.Empty(), + new MacroStabilityInwardsFailureMechanism(), null, ConstructionProperties); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("assessmentSection", exception.ParamName); } @@ -127,14 +115,11 @@ var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => new MacroStabilityInwardsFailureMechanismSectionResultRow(result, - Enumerable.Empty(), - new MacroStabilityInwardsFailureMechanism(), - assessmentSection, - null); + void Call() => new MacroStabilityInwardsFailureMechanismSectionResultRow(result, Enumerable.Empty(), + new MacroStabilityInwardsFailureMechanism(), assessmentSection, null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("constructionProperties", exception.ParamName); mocks.VerifyAll(); } @@ -151,14 +136,11 @@ var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); // Call - TestDelegate call = () => new MacroStabilityInwardsFailureMechanismSectionResultRow(result, - null, - new MacroStabilityInwardsFailureMechanism(), - assessmentSection, - ConstructionProperties); + void Call() => new MacroStabilityInwardsFailureMechanismSectionResultRow(result, null, new MacroStabilityInwardsFailureMechanism(), + assessmentSection, ConstructionProperties); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("calculations", exception.ParamName); mocks.VerifyAll(); } @@ -370,11 +352,11 @@ result, Enumerable.Empty(), failureMechanism, assessmentSection, ConstructionProperties); // Call - TestDelegate test = () => row.ManualAssemblyProbability = value; + void Call() => row.ManualAssemblyProbability = value; // Assert const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); mocks.VerifyAll(); } } @@ -1038,9 +1020,7 @@ } [Test] - [TestCase(CalculationScenarioStatus.Failed)] - [TestCase(CalculationScenarioStatus.NotCalculated)] - public void DetailedAssessmentProbability_CalculationNotDone_ReturnNaN(CalculationScenarioStatus status) + public void DetailedAssessmentProbability_CalculationWithoutOutput_ReturnNaN() { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); @@ -1054,10 +1034,6 @@ MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); - if (status == CalculationScenarioStatus.Failed) - { - scenario.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); - } using (new AssemblyToolCalculatorFactoryConfig()) { @@ -1210,11 +1186,11 @@ result, Enumerable.Empty(), failureMechanism, assessmentSection, ConstructionProperties); // Call - TestDelegate test = () => row.TailorMadeAssessmentProbability = value; + void Call() => row.TailorMadeAssessmentProbability = value; // Assert const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); mocks.VerifyAll(); } }