Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionResultRow.cs =================================================================== diff -u -ra72a0c1fefeb2474c6838b6ffd504a8a7b6ac5a0 -r28a403716edb44152aa438d99ce0d7a686bdb775 --- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionResultRow.cs (.../FailureMechanismSectionResultRow.cs) (revision a72a0c1fefeb2474c6838b6ffd504a8a7b6ac5a0) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismSectionResultRow.cs (.../FailureMechanismSectionResultRow.cs) (revision 28a403716edb44152aa438d99ce0d7a686bdb775) @@ -84,7 +84,7 @@ /// /// Gets the assembly result of the failure mechanism section. /// - public FailureMechanismSectionAssemblyResult AssemblyResult { get; protected set; } + protected FailureMechanismSectionAssemblyResult AssemblyResult { get; set; } /// /// Updates all data and notifies the wrapped section result. Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r0df4117d473d18cdc06648036fdb1580591acd0e -r28a403716edb44152aa438d99ce0d7a686bdb775 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs (.../AdoptableFailureMechanismSectionResultRowTest.cs) (revision 0df4117d473d18cdc06648036fdb1580591acd0e) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableFailureMechanismSectionResultRowTest.cs (.../AdoptableFailureMechanismSectionResultRowTest.cs) (revision 28a403716edb44152aa438d99ce0d7a686bdb775) @@ -536,11 +536,8 @@ performAssemblyFunc, ConstructionProperties); // Assert - FailureMechanismSectionAssemblyResult rowAssemblyResult = row.AssemblyResult; - Assert.AreSame(assemblyResult, rowAssemblyResult); - - Assert.AreEqual(rowAssemblyResult.SectionProbability, row.SectionProbability); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(rowAssemblyResult.FailureMechanismSectionAssemblyGroup), + Assert.AreEqual(assemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(assemblyResult.FailureMechanismSectionAssemblyGroup), row.AssemblyGroup); mocks.VerifyAll(); @@ -574,19 +571,19 @@ performAssemblyFunc, ConstructionProperties); // Precondition - Assert.AreSame(assemblyResult, row.AssemblyResult); + Assert.AreEqual(assemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(assemblyResult.FailureMechanismSectionAssemblyGroup), + row.AssemblyGroup); // When row.InitialFailureMechanismResultType = AdoptableInitialFailureMechanismResultType.Manual; // Then var expectedAssemblyResult = new DefaultFailureMechanismSectionAssemblyResult(); - FailureMechanismSectionAssemblyResult actualAssemblyResult = row.AssemblyResult; - Assert.AreEqual(expectedAssemblyResult.N, actualAssemblyResult.N); - Assert.AreEqual(expectedAssemblyResult.SectionProbability, actualAssemblyResult.SectionProbability); - Assert.AreEqual(expectedAssemblyResult.ProfileProbability, actualAssemblyResult.ProfileProbability); - Assert.AreEqual(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup, actualAssemblyResult.FailureMechanismSectionAssemblyGroup); - + Assert.AreEqual(expectedAssemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup), + row.AssemblyGroup); + mocks.VerifyAll(); } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r0df4117d473d18cdc06648036fdb1580591acd0e -r28a403716edb44152aa438d99ce0d7a686bdb775 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs) (revision 0df4117d473d18cdc06648036fdb1580591acd0e) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs) (revision 28a403716edb44152aa438d99ce0d7a686bdb775) @@ -758,14 +758,11 @@ var row = new AdoptableWithProfileProbabilityFailureMechanismSectionResultRow(result, calculateStrategy, errorProvider, performAssemblyFunc, ConstructionProperties); // Assert - FailureMechanismSectionAssemblyResult rowAssemblyResult = row.AssemblyResult; - Assert.AreSame(assemblyResult, rowAssemblyResult); - - Assert.AreEqual(rowAssemblyResult.ProfileProbability, row.ProfileProbability); - Assert.AreEqual(rowAssemblyResult.SectionProbability, row.SectionProbability); - Assert.AreEqual(rowAssemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); + Assert.AreEqual(assemblyResult.ProfileProbability, row.ProfileProbability); + Assert.AreEqual(assemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(assemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); Assert.AreEqual(2, row.SectionN.NumberOfDecimalPlaces); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(rowAssemblyResult.FailureMechanismSectionAssemblyGroup), + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(assemblyResult.FailureMechanismSectionAssemblyGroup), row.AssemblyGroup); mocks.VerifyAll(); @@ -799,19 +796,25 @@ var row = new AdoptableWithProfileProbabilityFailureMechanismSectionResultRow(result, calculateStrategy, errorProvider, performAssemblyFunc, ConstructionProperties); // Precondition - Assert.AreSame(assemblyResult, row.AssemblyResult); + Assert.AreEqual(assemblyResult.ProfileProbability, row.ProfileProbability); + Assert.AreEqual(assemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(assemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(assemblyResult.FailureMechanismSectionAssemblyGroup), + row.AssemblyGroup); // When row.InitialFailureMechanismResultType = AdoptableInitialFailureMechanismResultType.Manual; // Then var expectedAssemblyResult = new DefaultFailureMechanismSectionAssemblyResult(); - FailureMechanismSectionAssemblyResult actualAssemblyResult = row.AssemblyResult; - Assert.AreEqual(expectedAssemblyResult.N, actualAssemblyResult.N); - Assert.AreEqual(expectedAssemblyResult.SectionProbability, actualAssemblyResult.SectionProbability); - Assert.AreEqual(expectedAssemblyResult.ProfileProbability, actualAssemblyResult.ProfileProbability); - Assert.AreEqual(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup, actualAssemblyResult.FailureMechanismSectionAssemblyGroup); + Assert.AreEqual(expectedAssemblyResult.ProfileProbability, row.ProfileProbability); + Assert.AreEqual(expectedAssemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(expectedAssemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); + Assert.AreEqual(2, row.SectionN.NumberOfDecimalPlaces); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup), + row.AssemblyGroup); + mocks.VerifyAll(); } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r0df4117d473d18cdc06648036fdb1580591acd0e -r28a403716edb44152aa438d99ce0d7a686bdb775 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs (.../NonAdoptableFailureMechanismSectionResultRowTest.cs) (revision 0df4117d473d18cdc06648036fdb1580591acd0e) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismSectionResultRowTest.cs (.../NonAdoptableFailureMechanismSectionResultRowTest.cs) (revision 28a403716edb44152aa438d99ce0d7a686bdb775) @@ -492,11 +492,8 @@ // Assert FailureMechanismSectionAssemblyResult calculatorOutput = calculator.FailureMechanismSectionAssemblyResultOutput; - FailureMechanismSectionAssemblyResult rowAssemblyResult = row.AssemblyResult; - Assert.AreSame(calculatorOutput, row.AssemblyResult); - - Assert.AreEqual(rowAssemblyResult.SectionProbability, row.SectionProbability); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(rowAssemblyResult.FailureMechanismSectionAssemblyGroup), + Assert.AreEqual(calculatorOutput.SectionProbability, row.SectionProbability); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(calculatorOutput.FailureMechanismSectionAssemblyGroup), row.AssemblyGroup); } @@ -527,19 +524,19 @@ // Precondition FailureMechanismSectionAssemblyResult calculatorOutput = calculator.FailureMechanismSectionAssemblyResultOutput; - Assert.AreSame(calculatorOutput, row.AssemblyResult); + Assert.AreEqual(calculatorOutput.SectionProbability, row.SectionProbability); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(calculatorOutput.FailureMechanismSectionAssemblyGroup), + row.AssemblyGroup); // When calculator.ThrowExceptionOnCalculate = true; row.InitialFailureMechanismResultType = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; // Then var expectedAssemblyResult = new DefaultFailureMechanismSectionAssemblyResult(); - FailureMechanismSectionAssemblyResult actualAssemblyResult = row.AssemblyResult; - Assert.AreEqual(expectedAssemblyResult.N, actualAssemblyResult.N); - Assert.AreEqual(expectedAssemblyResult.SectionProbability, actualAssemblyResult.SectionProbability); - Assert.AreEqual(expectedAssemblyResult.ProfileProbability, actualAssemblyResult.ProfileProbability); - Assert.AreEqual(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup, actualAssemblyResult.FailureMechanismSectionAssemblyGroup); + Assert.AreEqual(expectedAssemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup), + row.AssemblyGroup); } mocks.VerifyAll(); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r0df4117d473d18cdc06648036fdb1580591acd0e -r28a403716edb44152aa438d99ce0d7a686bdb775 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs) (revision 0df4117d473d18cdc06648036fdb1580591acd0e) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRowTest.cs) (revision 28a403716edb44152aa438d99ce0d7a686bdb775) @@ -509,14 +509,11 @@ var row = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRow(result, errorProvider, performAssemblyFunc, ConstructionProperties); // Assert - FailureMechanismSectionAssemblyResult rowAssemblyResult = row.AssemblyResult; - Assert.AreSame(assemblyResult, rowAssemblyResult); - - Assert.AreEqual(rowAssemblyResult.ProfileProbability, row.ProfileProbability); - Assert.AreEqual(rowAssemblyResult.SectionProbability, row.SectionProbability); - Assert.AreEqual(rowAssemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); + Assert.AreEqual(assemblyResult.ProfileProbability, row.ProfileProbability); + Assert.AreEqual(assemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(assemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); Assert.AreEqual(2, row.SectionN.NumberOfDecimalPlaces); - Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(rowAssemblyResult.FailureMechanismSectionAssemblyGroup), + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(assemblyResult.FailureMechanismSectionAssemblyGroup), row.AssemblyGroup); mocks.VerifyAll(); @@ -526,8 +523,6 @@ public void GivenRowWithoutAssemblyErrors_WhenUpdatingAndPerformAssemblyThrowsException_ThenShowError() { // Given - var random = new Random(39); - var mocks = new MockRepository(); var errorProvider = mocks.Stub(); mocks.ReplayAll(); @@ -551,18 +546,24 @@ var row = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRow(result, errorProvider, performAssemblyFunc, ConstructionProperties); // Precondition - Assert.AreSame(assemblyResult, row.AssemblyResult); + Assert.AreEqual(assemblyResult.ProfileProbability, row.ProfileProbability); + Assert.AreEqual(assemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(assemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); + Assert.AreEqual(2, row.SectionN.NumberOfDecimalPlaces); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(assemblyResult.FailureMechanismSectionAssemblyGroup), + row.AssemblyGroup); // When row.InitialFailureMechanismResultType = NonAdoptableInitialFailureMechanismResultType.NoFailureProbability; // Then var expectedAssemblyResult = new DefaultFailureMechanismSectionAssemblyResult(); - FailureMechanismSectionAssemblyResult actualAssemblyResult = row.AssemblyResult; - Assert.AreEqual(expectedAssemblyResult.N, actualAssemblyResult.N); - Assert.AreEqual(expectedAssemblyResult.SectionProbability, actualAssemblyResult.SectionProbability); - Assert.AreEqual(expectedAssemblyResult.ProfileProbability, actualAssemblyResult.ProfileProbability); - Assert.AreEqual(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup, actualAssemblyResult.FailureMechanismSectionAssemblyGroup); + Assert.AreEqual(expectedAssemblyResult.ProfileProbability, row.ProfileProbability); + Assert.AreEqual(expectedAssemblyResult.SectionProbability, row.SectionProbability); + Assert.AreEqual(expectedAssemblyResult.N, row.SectionN, row.SectionN.GetAccuracy()); + Assert.AreEqual(2, row.SectionN.NumberOfDecimalPlaces); + Assert.AreEqual(EnumDisplayNameHelper.GetDisplayName(expectedAssemblyResult.FailureMechanismSectionAssemblyGroup), + row.AssemblyGroup); mocks.VerifyAll(); }