Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r749041cd705445f067934c94b6be14c4ef5fc793 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs (.../ClosingStructuresFailureMechanismAssemblyFactory.cs) (revision 749041cd705445f067934c94b6be14c4ef5fc793) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs (.../ClosingStructuresFailureMechanismAssemblyFactory.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -326,7 +326,7 @@ bool useManual) { FailureMechanismSectionAssembly sectionAssembly; - if (failureMechanismSectionResult.UseManualAssemblyProbability && useManual) + if (failureMechanismSectionResult.UseManualAssembly && useManual) { sectionAssembly = AssembleManualAssessment(failureMechanismSectionResult, CreateAssemblyCategoriesInput(failureMechanism, assessmentSection)); Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismHelper.cs =================================================================== diff -u -rfe04c069b2310e068ae0752393fef6a2fb783842 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismHelper.cs (.../ClosingStructuresFailureMechanismHelper.cs) (revision fe04c069b2310e068ae0752393fef6a2fb783842) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismHelper.cs (.../ClosingStructuresFailureMechanismHelper.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -43,7 +43,7 @@ throw new ArgumentNullException(nameof(failureMechanism)); } - return failureMechanism.SectionResults.Any(sr => sr.UseManualAssemblyProbability); + return failureMechanism.SectionResults.Any(sr => sr.UseManualAssembly); } } } \ No newline at end of file Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs =================================================================== diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs (.../ClosingStructuresFailureMechanismSectionResult.cs) (revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs (.../ClosingStructuresFailureMechanismSectionResult.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -93,7 +93,7 @@ /// /// Gets or sets the indicator whether the combined assembly should be overwritten by . /// - public bool UseManualAssemblyProbability { get; set; } + public bool UseManualAssembly { get; set; } /// /// Gets or sets the manually entered assembly probability. Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs =================================================================== diff -u -rb6aef8024f47ca91daacd5f5da44d73751f27545 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision b6aef8024f47ca91daacd5f5da44d73751f27545) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -168,9 +168,9 @@ DataGridViewControl, nameof(ClosingStructuresFailureMechanismSectionResultRow.CombinedAssemblyProbability)); - FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyColumn( DataGridViewControl, - nameof(ClosingStructuresFailureMechanismSectionResultRow.UseManualAssemblyProbability)); + nameof(ClosingStructuresFailureMechanismSectionResultRow.UseManualAssembly)); FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyProbabilityColumn( DataGridViewControl, Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -r21793a296d0cd97d04a07d8287878a7b9ae16145 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision 21793a296d0cd97d04a07d8287878a7b9ae16145) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -253,15 +253,15 @@ /// /// Thrown when /// is a valid value, but unsupported. - public bool UseManualAssemblyProbability + public bool UseManualAssembly { get { - return SectionResult.UseManualAssemblyProbability; + return SectionResult.UseManualAssembly; } set { - SectionResult.UseManualAssemblyProbability = value; + SectionResult.UseManualAssembly = value; UpdateInternalData(); } } @@ -298,7 +298,7 @@ { if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult) || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) - || UseManualAssemblyProbability) + || UseManualAssembly) { ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty; } @@ -419,12 +419,12 @@ { bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); - FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssemblyProbability); + FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], simpleAssessmentSufficient - || UseManualAssemblyProbability); + || UseManualAssembly); if (simpleAssessmentSufficient || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) - || UseManualAssemblyProbability) + || UseManualAssembly) { FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]); } @@ -435,13 +435,13 @@ FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentResultIndex], simpleAssessmentSufficient - || UseManualAssemblyProbability); + || UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentProbabilityIndex], simpleAssessmentSufficient || !FailureMechanismSectionResultRowHelper.TailorMadeAssessmentResultIsProbability(TailorMadeAssessmentResult) - || UseManualAssemblyProbability); + || UseManualAssembly); - if (UseManualAssemblyProbability) + if (UseManualAssembly) { FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex]); FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex]); @@ -462,7 +462,7 @@ FailureMechanismSectionResultRowHelper.EnableColumn(ColumnStateDefinitions[combinedAssemblyProbabilityIndex], true); } - FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[manualAssemblyProbabilityIndex], !UseManualAssemblyProbability); + FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[manualAssemblyProbabilityIndex], !UseManualAssembly); } /// Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategy.cs =================================================================== diff -u -r0c80386e4c06dd8832cfe86ce6bd2201f185cde1 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategy.cs (.../ClosingStructuresFailureMechanismSectionResultUpdateStrategy.cs) (revision 0c80386e4c06dd8832cfe86ce6bd2201f185cde1) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategy.cs (.../ClosingStructuresFailureMechanismSectionResultUpdateStrategy.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -49,7 +49,7 @@ target.DetailedAssessmentResult = origin.DetailedAssessmentResult; target.TailorMadeAssessmentResult = origin.TailorMadeAssessmentResult; target.TailorMadeAssessmentProbability = origin.TailorMadeAssessmentProbability; - target.UseManualAssemblyProbability = origin.UseManualAssemblyProbability; + target.UseManualAssembly = origin.UseManualAssembly; target.ManualAssemblyProbability = origin.ManualAssemblyProbability; } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs (.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -763,7 +763,7 @@ // Setup var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = new Random(39).NextDouble() }; @@ -800,7 +800,7 @@ var random = new Random(39); var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = random.NextDouble(), TailorMadeAssessmentResult = random.NextEnumValue(), TailorMadeAssessmentProbability = random.NextDouble() @@ -868,7 +868,7 @@ // Setup var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = new Random(39).NextDouble() }; @@ -905,7 +905,7 @@ // Setup var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = new Random(39).NextDouble() }; @@ -942,7 +942,7 @@ // Setup var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = useManualAssembly + UseManualAssembly = useManualAssembly }; var failureMechanism = new ClosingStructuresFailureMechanism(); @@ -1086,7 +1086,7 @@ FailureMechanismSectionTestFactory.CreateFailureMechanismSection() }); ClosingStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); - sectionResult.UseManualAssemblyProbability = true; + sectionResult.UseManualAssembly = true; sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); @@ -1124,7 +1124,7 @@ FailureMechanismSectionTestFactory.CreateFailureMechanismSection() }); ClosingStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); - sectionResult.UseManualAssemblyProbability = true; + sectionResult.UseManualAssembly = true; sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismHelperTest.cs =================================================================== diff -u -rfe04c069b2310e068ae0752393fef6a2fb783842 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismHelperTest.cs (.../ClosingStructuresFailureMechanismHelperTest.cs) (revision fe04c069b2310e068ae0752393fef6a2fb783842) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismHelperTest.cs (.../ClosingStructuresFailureMechanismHelperTest.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -57,7 +57,7 @@ new Point2D(0, 0) }) }); - failureMechanism.SectionResults.First().UseManualAssemblyProbability = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; // Call bool hasManualAssemblyResults = ClosingStructuresFailureMechanismHelper.HasManualAssemblyResults(failureMechanism); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs (.../ClosingStructuresFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs (.../ClosingStructuresFailureMechanismSectionResultTest.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -48,7 +48,7 @@ Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, sectionResult.TailorMadeAssessmentResult); Assert.IsNaN(sectionResult.TailorMadeAssessmentProbability); Assert.AreSame(section, sectionResult.Section); - Assert.IsFalse(sectionResult.UseManualAssemblyProbability); + Assert.IsFalse(sectionResult.UseManualAssembly); Assert.IsNaN(sectionResult.ManualAssemblyProbability); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -rff6c7198c6094bd341c2c7d7f90431328764f50f -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision ff6c7198c6094bd341c2c7d7f90431328764f50f) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -56,7 +56,7 @@ private const int tailorMadeAssemblyCategoryGroupIndex = 8; private const int combinedAssemblyCategoryGroupIndex = 9; private const int combinedAssemblyProbabilityIndex = 10; - private const int useManualAssemblyProbabilityIndex = 11; + private const int useManualAssemblyIndex = 11; private const int manualAssemblyProbabilityIndex = 12; private const int columnCount = 13; @@ -136,7 +136,7 @@ Assert.IsInstanceOf(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[combinedAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[combinedAssemblyProbabilityIndex]); - Assert.IsInstanceOf(dataGridView.Columns[useManualAssemblyProbabilityIndex]); + Assert.IsInstanceOf(dataGridView.Columns[useManualAssemblyIndex]); Assert.IsInstanceOf(dataGridView.Columns[manualAssemblyProbabilityIndex]); Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText); @@ -150,7 +150,7 @@ Assert.AreEqual("Toetsoordeel\r\ntoets op maat", dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Toetsoordeel\r\ngecombineerd", dataGridView.Columns[combinedAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Toetsoordeel\r\ngecombineerde\r\nfaalkansschatting", dataGridView.Columns[combinedAssemblyProbabilityIndex].HeaderText); - Assert.AreEqual("Overschrijf\r\ntoetsoordeel", dataGridView.Columns[useManualAssemblyProbabilityIndex].HeaderText); + Assert.AreEqual("Overschrijf\r\ntoetsoordeel", dataGridView.Columns[useManualAssemblyIndex].HeaderText); Assert.AreEqual("Toetsoordeel\r\nhandmatig", dataGridView.Columns[manualAssemblyProbabilityIndex].HeaderText); Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly); @@ -164,7 +164,7 @@ Assert.IsTrue(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].ReadOnly); Assert.IsTrue(dataGridView.Columns[combinedAssemblyCategoryGroupIndex].ReadOnly); Assert.IsTrue(dataGridView.Columns[combinedAssemblyProbabilityIndex].ReadOnly); - Assert.IsFalse(dataGridView.Columns[useManualAssemblyProbabilityIndex].ReadOnly); + Assert.IsFalse(dataGridView.Columns[useManualAssemblyIndex].ReadOnly); Assert.IsFalse(dataGridView.Columns[manualAssemblyProbabilityIndex].ReadOnly); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); @@ -205,7 +205,7 @@ Assert.AreEqual("VIv", cells[tailorMadeAssemblyCategoryGroupIndex].Value); Assert.AreEqual("VIv", cells[combinedAssemblyCategoryGroupIndex].Value); Assert.AreEqual("1/1", cells[combinedAssemblyProbabilityIndex].FormattedValue); - Assert.AreEqual(false, cells[useManualAssemblyProbabilityIndex].Value); + Assert.AreEqual(false, cells[useManualAssemblyIndex].Value); Assert.AreEqual("-", cells[manualAssemblyProbabilityIndex].FormattedValue); } } @@ -216,7 +216,7 @@ // Setup var failureMechanism = new ClosingStructuresFailureMechanism(); FailureMechanismTestHelper.AddSections(failureMechanism, 2); - failureMechanism.SectionResults.First().UseManualAssemblyProbability = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; using (ShowFailureMechanismResultsView(failureMechanism)) { @@ -237,7 +237,7 @@ // Given var failureMechanism = new ClosingStructuresFailureMechanism(); FailureMechanismTestHelper.AddSections(failureMechanism, 2); - failureMechanism.SectionResults.First().UseManualAssemblyProbability = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; using (ShowFailureMechanismResultsView(failureMechanism)) { @@ -248,7 +248,7 @@ Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl)); // When - failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyProbability = false); + failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssembly = false); failureMechanism.NotifyObservers(); // Then @@ -268,7 +268,7 @@ ClosingStructuresFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); - sectionResult.UseManualAssemblyProbability = true; + sectionResult.UseManualAssembly = true; // When using (new AssemblyToolCalculatorFactoryConfig()) Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -163,7 +163,7 @@ Assert.AreEqual(result.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), row.DetailedAssessmentProbability); Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult); Assert.AreEqual(result.TailorMadeAssessmentProbability, row.TailorMadeAssessmentProbability); - Assert.AreEqual(result.UseManualAssemblyProbability, row.UseManualAssemblyProbability); + Assert.AreEqual(result.UseManualAssembly, row.UseManualAssembly); Assert.AreEqual(result.ManualAssemblyProbability, row.ManualAssemblyProbability); TestHelper.AssertTypeConverter( @@ -242,7 +242,7 @@ } [Test] - public void UseManualAssemblyProbability_SetNewValue_NotifyObserversAndPropertyChanged() + public void UseManualAssembly_SetNewValue_NotifyObserversAndPropertyChanged() { // Setup var failureMechanism = new ClosingStructuresFailureMechanism(); @@ -261,14 +261,14 @@ { var row = new ClosingStructuresFailureMechanismSectionResultRow( result, failureMechanism, assessmentSection, ConstructionProperties); - bool originalValue = result.UseManualAssemblyProbability; + bool originalValue = result.UseManualAssembly; bool newValue = !originalValue; // Call - row.UseManualAssemblyProbability = newValue; + row.UseManualAssembly = newValue; // Assert - Assert.AreEqual(newValue, result.UseManualAssemblyProbability); + Assert.AreEqual(newValue, result.UseManualAssembly); mocks.VerifyAll(); } } @@ -579,7 +579,7 @@ [Test] [TestCase(true)] [TestCase(false)] - public void Constructor_WithUseManualAssemblyProbability_ExpectedColumnStates(bool useManualAssemblyProbability) + public void Constructor_WithUseManualAssembly_ExpectedColumnStates(bool useManualAssembly) { // Setup var failureMechanism = new ClosingStructuresFailureMechanism(); @@ -593,7 +593,7 @@ { Calculation = CreateCalculationWithOutput(), TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability, - UseManualAssemblyProbability = useManualAssemblyProbability + UseManualAssembly = useManualAssembly }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -606,17 +606,17 @@ IDictionary columnStateDefinitions = row.ColumnStateDefinitions; DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex], - !useManualAssemblyProbability); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], - !useManualAssemblyProbability); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], - !useManualAssemblyProbability, true); + !useManualAssembly, true); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], - !useManualAssemblyProbability); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], - !useManualAssemblyProbability); + !useManualAssembly); - if (useManualAssemblyProbability) + if (useManualAssembly) { DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateIsDisabled( columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex]); @@ -629,9 +629,9 @@ } DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.CombinedAssemblyProbabilityIndex], - !useManualAssemblyProbability, true); + !useManualAssembly, true); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyProbabilityIndex], - useManualAssemblyProbability); + useManualAssembly); mocks.VerifyAll(); } @@ -831,7 +831,7 @@ var sectionResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new TestClosingStructuresCalculation(), - UseManualAssemblyProbability = true + UseManualAssembly = true }; using (new AssemblyToolCalculatorFactoryConfig()) Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -49,7 +49,7 @@ DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed, TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability, TailorMadeAssessmentProbability = random.NextDouble(), - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = random.NextDouble() }; } @@ -62,7 +62,7 @@ Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability); - Assert.AreEqual(originResult.UseManualAssemblyProbability, targetResult.UseManualAssemblyProbability); + Assert.AreEqual(originResult.UseManualAssembly, targetResult.UseManualAssembly); Assert.AreEqual(originResult.ManualAssemblyProbability, targetResult.ManualAssemblyProbability); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs =================================================================== diff -u -r6b5b4d5c4433294d5fc53dab82afdcbcefd91d41 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision 6b5b4d5c4433294d5fc53dab82afdcbcefd91d41) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultViewColumnBuilder.cs (.../FailureMechanismSectionResultViewColumnBuilder.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -568,7 +568,7 @@ /// The to add the column to. /// The data property name of the column. /// Thrown when any parameter is null. - public static void AddUseManualAssemblyCategoryGroupColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) + public static void AddUseManualAssemblyColumn(DataGridViewControl dataGridViewControl, string dataPropertyName) { if (dataGridViewControl == null) { @@ -582,7 +582,7 @@ dataGridViewControl.AddCheckBoxColumn( dataPropertyName, - Resources.FailureMechanismResultView_UseManualAssemblyCategoryGroup_DisplayName); + Resources.FailureMechanismResultView_UseManualAssembly_DisplayName); } /// Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r9d7f2272c40e0db6fbfbffa5f763933ec35672a7 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9d7f2272c40e0db6fbfbffa5f763933ec35672a7) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -1776,9 +1776,9 @@ /// Looks up a localized string similar to Overschrijf ///toetsoordeel. /// - public static string FailureMechanismResultView_UseManualAssemblyCategoryGroup_DisplayName { + public static string FailureMechanismResultView_UseManualAssembly_DisplayName { get { - return ResourceManager.GetString("FailureMechanismResultView_UseManualAssemblyCategoryGroup_DisplayName", resourceCulture); + return ResourceManager.GetString("FailureMechanismResultView_UseManualAssembly_DisplayName", resourceCulture); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r9d7f2272c40e0db6fbfbffa5f763933ec35672a7 -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9d7f2272c40e0db6fbfbffa5f763933ec35672a7) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -261,7 +261,7 @@ gecombineerde faalkansschatting - + Overschrijf toetsoordeel Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs =================================================================== diff -u -re307926e2a3a356a01bb80c1333738719ef09d4d -ra44626d7643a525473cdf8bf203b2600c2caf42f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision e307926e2a3a356a01bb80c1333738719ef09d4d) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultViewColumnBuilderTest.cs (.../FailureMechanismSectionResultViewColumnBuilderTest.cs) (revision a44626d7643a525473cdf8bf203b2600c2caf42f) @@ -1180,29 +1180,29 @@ #region Manual Assembly [Test] - public void AddUseManualAssemblyCategoryGroupColumn_DataGridViewControlNull_ThrowsArgumentNullException() + public void AddUseManualAssemblyColumn_DataGridViewControlNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn(null, "property"); + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyColumn(null, "property"); // Assert var exception = Assert.Throws(test); Assert.AreEqual("dataGridViewControl", exception.ParamName); } [Test] - public void AddUseManualAssemblyCategoryGroupColumn_DataPropertyNameNull_ThrowsArgumentNullException() + public void AddUseManualAssemblyColumn_DataPropertyNameNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn(new DataGridViewControl(), null); + TestDelegate test = () => FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyColumn(new DataGridViewControl(), null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("dataPropertyName", exception.ParamName); } [Test] - public void AddUseManualAssemblyCategoryGroupColumn_WithParameters_AddsColumnToDataGridViewControl() + public void AddUseManualAssemblyColumn_WithParameters_AddsColumnToDataGridViewControl() { // Setup using (var form = new Form()) @@ -1216,7 +1216,7 @@ Assert.AreEqual(0, dataGridView.ColumnCount); // Call - FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn(control, dataPropertyName); + FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyColumn(control, dataPropertyName); // Assert Assert.AreEqual(1, dataGridView.ColumnCount);