Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs =================================================================== diff -u -ra21db24da55c7451299022b2424cca61164b047b -r98dfbea73193ead6d8760747b8e5a688d1ad2fe2 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision a21db24da55c7451299022b2424cca61164b047b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs) (revision 98dfbea73193ead6d8760747b8e5a688d1ad2fe2) @@ -44,6 +44,17 @@ [TestFixture] public class MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest { + private static void AssertCategoryCalculatorInput(IAssessmentSection assessmentSection, + AssemblyCategoriesCalculatorStub categoryCalculator, + MacroStabilityOutwardsFailureMechanism failureMechanism) + { + Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); + Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); + Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); + Assert.AreEqual(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( + failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength), categoryCalculator.N); + } + #region Simple Assessment [Test] @@ -212,11 +223,7 @@ // Assert Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentResultInput); Assert.AreEqual(sectionResult.DetailedAssessmentProbability, calculator.DetailedAssessmentProbabilityInput); - Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); - Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); - Assert.AreEqual(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( - failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength), categoryCalculator.N); + AssertCategoryCalculatorInput(assessmentSection, categoryCalculator, failureMechanism); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.DetailedAssessmentCategoriesInput); mocks.VerifyAll(); } @@ -371,12 +378,7 @@ // Assert Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput); - - Assert.AreEqual(assessmentSection.FailureMechanismContribution.SignalingNorm, categoryCalculator.SignalingNorm); - Assert.AreEqual(assessmentSection.FailureMechanismContribution.LowerLimitNorm, categoryCalculator.LowerLimitNorm); - Assert.AreEqual(failureMechanism.Contribution, categoryCalculator.FailureMechanismContribution); - Assert.AreEqual(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( - failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength), categoryCalculator.N); + AssertCategoryCalculatorInput(assessmentSection, categoryCalculator, failureMechanism); Assert.AreSame(categoryCalculator.FailureMechanismSectionCategoriesOutput, calculator.TailorMadeAssessmentCategoriesInput); mocks.VerifyAll(); } @@ -518,7 +520,7 @@ using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorFactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance; + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -560,7 +562,7 @@ using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorFactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance; + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; // Call @@ -591,7 +593,7 @@ using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorfactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance; + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator; calculator.ThrowExceptionOnCalculateCombinedAssembly = true; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs =================================================================== diff -u -rb29487c198d87b176783f2396c2b59cd76b9f246 -r98dfbea73193ead6d8760747b8e5a688d1ad2fe2 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision b29487c198d87b176783f2396c2b59cd76b9f246) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs (.../MacroStabilityOutwardsSectionResultRowTest.cs) (revision 98dfbea73193ead6d8760747b8e5a688d1ad2fe2) @@ -287,6 +287,8 @@ var result = new MacroStabilityOutwardsFailureMechanismSectionResult(section); result.Attach(observer); + bool newValue = !result.UseManualAssemblyCategoryGroup; + using (new AssemblyToolCalculatorFactoryConfig()) { var row = new MacroStabilityOutwardsSectionResultRow(result, failureMechanism, assessmentSection, @@ -296,10 +298,10 @@ Assert.IsFalse(result.UseManualAssemblyCategoryGroup); // Call - row.UseManualAssemblyCategoryGroup = true; + row.UseManualAssemblyCategoryGroup = newValue; // Assert - Assert.IsTrue(result.UseManualAssemblyCategoryGroup); + Assert.AreEqual(newValue, result.UseManualAssemblyCategoryGroup); mocks.VerifyAll(); } } @@ -390,10 +392,9 @@ } [Test] - public void GivenRowWithAssemblyErrors_WhenUpdatingAndAssemblyDoesNotThrowException_ExpectedColumnStates() + public void GivenRowWithAssemblyErrors_WhenUpdatingAndAssemblyDoesNotThrowException_ThenExpectedColumnStates() { // Given - var random = new Random(39); var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); var mocks = new MockRepository(); @@ -408,16 +409,6 @@ var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true; - calculator.SimpleAssessmentAssemblyOutput = new FailureMechanismSectionAssembly( - random.NextDouble(), - random.NextEnumValue()); - calculator.DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly( - random.NextDouble(), - random.NextEnumValue()); - calculator.TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly( - random.NextDouble(), - random.NextEnumValue()); - calculator.CombinedAssemblyCategoryOutput = random.NextEnumValue(); var row = new MacroStabilityOutwardsSectionResultRow(result, failureMechanism, assessmentSection, ConstructionProperties); @@ -466,14 +457,14 @@ private static void AssertColumnStateIsDisabled(DataGridViewColumnStateDefinition columnStateDefinition) { - Assert.AreEqual(CellStyle.Disabled, columnStateDefinition.Style); + Assert.AreSame(CellStyle.Disabled, columnStateDefinition.Style); Assert.IsTrue(columnStateDefinition.ReadOnly); Assert.AreEqual(string.Empty, columnStateDefinition.ErrorText); } private static void AssertColumnStateIsEnabled(DataGridViewColumnStateDefinition columnStateDefinition) { - Assert.AreEqual(CellStyle.Enabled, columnStateDefinition.Style); + Assert.AreSame(CellStyle.Enabled, columnStateDefinition.Style); Assert.IsFalse(columnStateDefinition.ReadOnly); Assert.AreEqual(string.Empty, columnStateDefinition.ErrorText); } @@ -485,7 +476,7 @@ [TestCase(SimpleAssessmentResultType.AssessFurther, true)] [TestCase(SimpleAssessmentResultType.NotApplicable, false)] [TestCase(SimpleAssessmentResultType.ProbabilityNegligible, false)] - public void Constructor_WithSimpleAssessmentSufficient_ExpectedColumnStates(SimpleAssessmentResultType simpleAssessmentResult, + public void Constructor_WithSimpleAssessmentResultSet_ExpectedColumnStates(SimpleAssessmentResultType simpleAssessmentResult, bool cellsEnabled) { // Setup Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs =================================================================== diff -u -r69983e8f23487459a32c1415bfc36a19caa5aafe -r98dfbea73193ead6d8760747b8e5a688d1ad2fe2 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision 69983e8f23487459a32c1415bfc36a19caa5aafe) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision 98dfbea73193ead6d8760747b8e5a688d1ad2fe2) @@ -25,8 +25,12 @@ using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.AssemblyTool.Data; +using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Views; +using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultRows; @@ -134,10 +138,64 @@ Assert.AreEqual("Overschrijf\r\nassemblageresultaat", dataGridView.Columns[useManualAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Assemblageresultaat\r\nhandmatig", dataGridView.Columns[manualAssemblyCategoryGroupIndex].HeaderText); + Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[simpleAssessmentResultIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[detailedAssessmentResultIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[detailedAssessmentProbabilityIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[tailorMadeAssessmentResultIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[tailorMadeAssessmentProbabilityIndex].ReadOnly); + Assert.IsTrue(dataGridView.Columns[simpleAssemblyCategoryGroupIndex].ReadOnly); + Assert.IsTrue(dataGridView.Columns[detailedAssemblyCategoryGroupIndex].ReadOnly); + Assert.IsTrue(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].ReadOnly); + Assert.IsTrue(dataGridView.Columns[combinedAssemblyCategoryGroupIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[useManualAssemblyCategoryGroupIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[manualAssemblyCategoryGroupIndex].ReadOnly); + Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment); mocks.VerifyAll(); } } + + [Test] + public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized() + { + // Setup + var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1")); + + var mocks = new MockRepository(); + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); + mocks.ReplayAll(); + + // Call + using (var form = new Form()) + using (new AssemblyToolCalculatorFactoryConfig()) + using (var view = new MacroStabilityOutwardsResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection)) + { + form.Controls.Add(view); + form.Show(); + var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + + // Assert + Assert.AreEqual(columnCount, dataGridView.ColumnCount); + + DataGridViewRowCollection rows = dataGridView.Rows; + Assert.AreEqual(1, rows.Count); + + DataGridViewCellCollection cells = rows[0].Cells; + Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); + Assert.AreEqual(SimpleAssessmentResultType.None, cells[simpleAssessmentResultIndex].Value); + Assert.AreEqual(DetailedAssessmentResultType.Probability, cells[detailedAssessmentResultIndex].Value); + Assert.AreEqual("-", cells[detailedAssessmentProbabilityIndex].FormattedValue); + Assert.AreEqual(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, cells[tailorMadeAssessmentResultIndex].Value); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.Iv, cells[simpleAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.VIv, cells[detailedAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.VIv, cells[tailorMadeAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.VIv, cells[combinedAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value); + } + } } } \ No newline at end of file