Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r749041cd705445f067934c94b6be14c4ef5fc793 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs) (revision 749041cd705445f067934c94b6be14c4ef5fc793) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -325,7 +325,7 @@ bool useManual) { FailureMechanismSectionAssembly sectionAssembly; - if (failureMechanismSectionResult.UseManualAssemblyProbability && useManual) + if (failureMechanismSectionResult.UseManualAssembly && useManual) { sectionAssembly = AssembleManualAssessment(failureMechanismSectionResult, CreateAssemblyCategoriesInput(failureMechanism, assessmentSection)); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismHelper.cs =================================================================== diff -u -rfe04c069b2310e068ae0752393fef6a2fb783842 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismHelper.cs (.../GrassCoverErosionInwardsFailureMechanismHelper.cs) (revision fe04c069b2310e068ae0752393fef6a2fb783842) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismHelper.cs (.../GrassCoverErosionInwardsFailureMechanismHelper.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -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/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs =================================================================== diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -92,7 +92,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/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -r683af9236e18614fe6815cf6d7ac1b8cda22b57b -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 683af9236e18614fe6815cf6d7ac1b8cda22b57b) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -168,9 +168,9 @@ DataGridViewControl, nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.CombinedAssemblyProbability)); - FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyColumn( DataGridViewControl, - nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.UseManualAssemblyProbability)); + nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.UseManualAssembly)); FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyProbabilityColumn( DataGridViewControl, Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -rcd19eb98ca319a27489e518ce92f20e8ff633401 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision cd19eb98ca319a27489e518ce92f20e8ff633401) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -254,15 +254,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(); } } @@ -292,7 +292,7 @@ { if (FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult) || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) - || UseManualAssemblyProbability) + || UseManualAssembly) { ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = string.Empty; } @@ -420,12 +420,12 @@ { bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); - FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssemblyProbability); + FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultIndex], - simpleAssessmentSufficient || UseManualAssemblyProbability); + simpleAssessmentSufficient || UseManualAssembly); if (simpleAssessmentSufficient || !FailureMechanismSectionResultRowHelper.DetailedAssessmentResultIsProbability(DetailedAssessmentResult) - || UseManualAssemblyProbability) + || UseManualAssembly) { FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[detailedAssessmentProbabilityIndex]); } @@ -435,13 +435,13 @@ } FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentResultIndex], - simpleAssessmentSufficient || UseManualAssemblyProbability); + simpleAssessmentSufficient || 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/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy.cs =================================================================== diff -u -r5a890dc1600bd7e5e060405df22c757daaedd885 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy.cs) (revision 5a890dc1600bd7e5e060405df22c757daaedd885) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -48,7 +48,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/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -761,7 +761,7 @@ // Setup var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = new Random(39).NextDouble() }; @@ -798,7 +798,7 @@ var random = new Random(39); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = random.NextDouble(), TailorMadeAssessmentResult = random.NextEnumValue(), TailorMadeAssessmentProbability = random.NextDouble() @@ -866,7 +866,7 @@ // Setup var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = new Random(39).NextDouble() }; @@ -903,7 +903,7 @@ // Setup var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = new Random(39).NextDouble() }; @@ -940,7 +940,7 @@ // Setup var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyProbability = useManualAssembly + UseManualAssembly = useManualAssembly }; var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -1084,7 +1084,7 @@ FailureMechanismSectionTestFactory.CreateFailureMechanismSection() }); GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); - sectionResult.UseManualAssemblyProbability = true; + sectionResult.UseManualAssembly = true; sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); @@ -1122,7 +1122,7 @@ FailureMechanismSectionTestFactory.CreateFailureMechanismSection() }); GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); - sectionResult.UseManualAssemblyProbability = true; + sectionResult.UseManualAssembly = true; sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); var mocks = new MockRepository(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismHelperTest.cs =================================================================== diff -u -rfe04c069b2310e068ae0752393fef6a2fb783842 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismHelperTest.cs (.../GrassCoverErosionInwardsFailureMechanismHelperTest.cs) (revision fe04c069b2310e068ae0752393fef6a2fb783842) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismHelperTest.cs (.../GrassCoverErosionInwardsFailureMechanismHelperTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -57,7 +57,7 @@ new Point2D(0, 0) }) }); - failureMechanism.SectionResults.First().UseManualAssemblyProbability = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; // Call bool hasManualAssemblyResults = GrassCoverErosionInwardsFailureMechanismHelper.HasManualAssemblyResults(failureMechanism); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -47,7 +47,7 @@ Assert.AreEqual(DetailedAssessmentProbabilityOnlyResultType.Probability, result.DetailedAssessmentResult); Assert.AreEqual(TailorMadeAssessmentProbabilityCalculationResultType.None, result.TailorMadeAssessmentResult); Assert.IsNaN(result.TailorMadeAssessmentProbability); - Assert.IsFalse(result.UseManualAssemblyProbability); + Assert.IsFalse(result.UseManualAssembly); Assert.IsNaN(result.ManualAssemblyProbability); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -rff6c7198c6094bd341c2c7d7f90431328764f50f -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision ff6c7198c6094bd341c2c7d7f90431328764f50f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -55,7 +55,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; @@ -134,7 +134,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); @@ -148,7 +148,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); @@ -162,7 +162,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); @@ -203,7 +203,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); } } @@ -214,7 +214,7 @@ // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); FailureMechanismTestHelper.AddSections(failureMechanism, 2); - failureMechanism.SectionResults.First().UseManualAssemblyProbability = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; using (ShowFailureMechanismResultsView(failureMechanism)) { @@ -235,7 +235,7 @@ // Given var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); FailureMechanismTestHelper.AddSections(failureMechanism, 2); - failureMechanism.SectionResults.First().UseManualAssemblyProbability = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; using (ShowFailureMechanismResultsView(failureMechanism)) { @@ -246,7 +246,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 @@ -266,7 +266,7 @@ GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); sectionResult.ManualAssemblyProbability = new Random(39).NextDouble(); - sectionResult.UseManualAssemblyProbability = true; + sectionResult.UseManualAssembly = true; // When using (new AssemblyToolCalculatorFactoryConfig()) Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -156,7 +156,7 @@ Assert.AreEqual(result.DetailedAssessmentResult, row.DetailedAssessmentResult); 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 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]); @@ -579,9 +579,9 @@ } DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.CombinedAssemblyProbabilityIndex], - !useManualAssemblyProbability, true); + !useManualAssembly, true); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyProbabilityIndex], - useManualAssemblyProbability); + useManualAssembly); mocks.VerifyAll(); } @@ -781,7 +781,7 @@ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new GrassCoverErosionInwardsCalculation(), - UseManualAssemblyProbability = true + UseManualAssembly = true }; using (new AssemblyToolCalculatorFactoryConfig()) Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -48,7 +48,7 @@ DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed, TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability, TailorMadeAssessmentProbability = random.NextDouble(), - UseManualAssemblyProbability = true, + UseManualAssembly = true, ManualAssemblyProbability = random.NextDouble() }; } @@ -61,7 +61,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/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r749041cd705445f067934c94b6be14c4ef5fc793 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs) (revision 749041cd705445f067934c94b6be14c4ef5fc793) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -199,7 +199,7 @@ throw new ArgumentNullException(nameof(failureMechanismSectionResult)); } - return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual + return failureMechanismSectionResult.UseManualAssembly && useManual ? failureMechanismSectionResult.ManualAssemblyCategoryGroup : AssembleCombinedAssessment(failureMechanismSectionResult); } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismHelper.cs =================================================================== diff -u -r13ba5757d5c7920c6070203275bf86adae620562 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismHelper.cs (.../GrassCoverErosionOutwardsFailureMechanismHelper.cs) (revision 13ba5757d5c7920c6070203275bf86adae620562) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismHelper.cs (.../GrassCoverErosionOutwardsFailureMechanismHelper.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -43,7 +43,7 @@ throw new ArgumentNullException(nameof(failureMechanism)); } - return failureMechanism.SectionResults.Any(sr => sr.UseManualAssemblyCategoryGroup); + return failureMechanism.SectionResults.Any(sr => sr.UseManualAssembly); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResult.cs =================================================================== diff -u -r6b5b4d5c4433294d5fc53dab82afdcbcefd91d41 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResult.cs) (revision 6b5b4d5c4433294d5fc53dab82afdcbcefd91d41) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResult.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -90,7 +90,7 @@ /// /// Gets or sets the indicator whether the combined assembly should be overwritten by . /// - public bool UseManualAssemblyCategoryGroup { get; set; } + public bool UseManualAssembly { get; set; } /// /// Gets or sets the manually selected assembly category group. Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs =================================================================== diff -u -r870c266bfd1ee7264a30aa60c8556ac353aa1db9 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision 870c266bfd1ee7264a30aa60c8556ac353aa1db9) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -128,9 +128,9 @@ DataGridViewControl, nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.CombinedAssemblyCategoryGroup)); - FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddUseManualAssemblyColumn( DataGridViewControl, - nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.UseManualAssemblyCategoryGroup)); + nameof(GrassCoverErosionOutwardsFailureMechanismSectionResultRow.UseManualAssembly)); FailureMechanismSectionResultViewColumnBuilder.AddSelectableAssemblyCategoryGroupColumn( DataGridViewControl, Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -r6b5b4d5c4433294d5fc53dab82afdcbcefd91d41 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs) (revision 6b5b4d5c4433294d5fc53dab82afdcbcefd91d41) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRow.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -271,15 +271,15 @@ /// /// Thrown when /// is a valid value, but unsupported. - public bool UseManualAssemblyCategoryGroup + public bool UseManualAssembly { get { - return SectionResult.UseManualAssemblyCategoryGroup; + return SectionResult.UseManualAssembly; } set { - SectionResult.UseManualAssemblyCategoryGroup = value; + SectionResult.UseManualAssembly = value; UpdateInternalData(); } } @@ -403,21 +403,21 @@ { bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); - FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssemblyCategoryGroup); + FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[simpleAssessmentResultIndex], UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForFactorizedSignalingNormIndex], - simpleAssessmentSufficient || UseManualAssemblyCategoryGroup); + simpleAssessmentSufficient || UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForSignalingNormIndex], - simpleAssessmentSufficient || UseManualAssemblyCategoryGroup); + simpleAssessmentSufficient || UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex], - simpleAssessmentSufficient || UseManualAssemblyCategoryGroup); + simpleAssessmentSufficient || UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForLowerLimitNormIndex], - simpleAssessmentSufficient || UseManualAssemblyCategoryGroup); + simpleAssessmentSufficient || UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[detailedAssessmentResultForFactorizedLowerLimitNormIndex], - simpleAssessmentSufficient || UseManualAssemblyCategoryGroup); + simpleAssessmentSufficient || UseManualAssembly); FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[tailorMadeAssessmentResultIndex], - simpleAssessmentSufficient || UseManualAssemblyCategoryGroup); + simpleAssessmentSufficient || UseManualAssembly); - if (UseManualAssemblyCategoryGroup) + if (UseManualAssembly) { FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[simpleAssemblyCategoryGroupIndex]); FailureMechanismSectionResultRowHelper.DisableColumn(ColumnStateDefinitions[detailedAssemblyCategoryGroupIndex]); @@ -436,7 +436,7 @@ combinedAssemblyCategoryGroup); } - FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[manualAssemblyCategoryGroupIndex], !UseManualAssemblyCategoryGroup); + FailureMechanismSectionResultRowHelper.SetColumnState(ColumnStateDefinitions[manualAssemblyCategoryGroupIndex], !UseManualAssembly); } /// Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs =================================================================== diff -u -r3e77cae3d2a991e50ee6545f4de36ff84285e754 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs) (revision 3e77cae3d2a991e50ee6545f4de36ff84285e754) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -51,7 +51,7 @@ target.DetailedAssessmentResultForLowerLimitNorm = origin.DetailedAssessmentResultForLowerLimitNorm; target.DetailedAssessmentResultForFactorizedLowerLimitNorm = origin.DetailedAssessmentResultForFactorizedLowerLimitNorm; target.TailorMadeAssessmentResult = origin.TailorMadeAssessmentResult; - target.UseManualAssemblyCategoryGroup = origin.UseManualAssemblyCategoryGroup; + target.UseManualAssembly = origin.UseManualAssembly; target.ManualAssemblyCategoryGroup = origin.ManualAssemblyCategoryGroup; } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r870c266bfd1ee7264a30aa60c8556ac353aa1db9 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 870c266bfd1ee7264a30aa60c8556ac353aa1db9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -496,7 +496,7 @@ // Setup var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyCategoryGroup = true, + UseManualAssembly = true, ManualAssemblyCategoryGroup = new Random(39).NextEnumValue() }; @@ -516,7 +516,7 @@ var random = new Random(39); var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - UseManualAssemblyCategoryGroup = true, + UseManualAssembly = true, ManualAssemblyCategoryGroup = random.NextEnumValue(), TailorMadeAssessmentResult = random.NextEnumValue() }; @@ -623,7 +623,7 @@ FailureMechanismSectionTestFactory.CreateFailureMechanismSection() }); GrassCoverErosionOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); - sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.UseManualAssembly = true; sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue(); using (new AssemblyToolCalculatorFactoryConfig()) @@ -649,7 +649,7 @@ FailureMechanismSectionTestFactory.CreateFailureMechanismSection() }); GrassCoverErosionOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); - sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.UseManualAssembly = true; sectionResult.ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.IIv; using (new AssemblyToolCalculatorFactoryConfig()) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismHelperTest.cs =================================================================== diff -u -r13ba5757d5c7920c6070203275bf86adae620562 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismHelperTest.cs (.../GrassCoverErosionOutwardsFailureMechanismHelperTest.cs) (revision 13ba5757d5c7920c6070203275bf86adae620562) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismHelperTest.cs (.../GrassCoverErosionOutwardsFailureMechanismHelperTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -57,7 +57,7 @@ new Point2D(0, 0) }) }); - failureMechanism.SectionResults.First().UseManualAssemblyCategoryGroup = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; // Call bool hasManualAssemblyResults = GrassCoverErosionOutwardsFailureMechanismHelper.HasManualAssemblyResults(failureMechanism); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r81fd8acef376c0e4bcceab16676c1313e4293e83 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs) (revision 81fd8acef376c0e4bcceab16676c1313e4293e83) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -49,7 +49,7 @@ Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForLowerLimitNorm); Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResultForFactorizedLowerLimitNorm); Assert.AreEqual(TailorMadeAssessmentCategoryGroupResultType.None, result.TailorMadeAssessmentResult); - Assert.IsFalse(result.UseManualAssemblyCategoryGroup); + Assert.IsFalse(result.UseManualAssembly); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -rff6c7198c6094bd341c2c7d7f90431328764f50f -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision ff6c7198c6094bd341c2c7d7f90431328764f50f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -55,7 +55,7 @@ private const int detailedAssemblyCategoryGroupIndex = 9; private const int tailorMadeAssemblyCategoryGroupIndex = 10; private const int combinedAssemblyCategoryGroupIndex = 11; - private const int useManualAssemblyCategoryGroupIndex = 12; + private const int useManualAssemblyIndex = 12; private const int manualAssemblyCategoryGroupIndex = 13; private const int columnCount = 14; @@ -115,7 +115,7 @@ Assert.IsInstanceOf(dataGridView.Columns[detailedAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex]); Assert.IsInstanceOf(dataGridView.Columns[combinedAssemblyCategoryGroupIndex]); - Assert.IsInstanceOf(dataGridView.Columns[useManualAssemblyCategoryGroupIndex]); + Assert.IsInstanceOf(dataGridView.Columns[useManualAssemblyIndex]); Assert.IsInstanceOf(dataGridView.Columns[manualAssemblyCategoryGroupIndex]); Assert.AreEqual("Vak", dataGridView.Columns[nameColumnIndex].HeaderText); @@ -130,7 +130,7 @@ Assert.AreEqual("Toetsoordeel\r\ngedetailleerde toets per vak", dataGridView.Columns[detailedAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Toetsoordeel\r\ntoets op maat", dataGridView.Columns[tailorMadeAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual("Toetsoordeel\r\ngecombineerd", dataGridView.Columns[combinedAssemblyCategoryGroupIndex].HeaderText); - Assert.AreEqual("Overschrijf\r\ntoetsoordeel", dataGridView.Columns[useManualAssemblyCategoryGroupIndex].HeaderText); + Assert.AreEqual("Overschrijf\r\ntoetsoordeel", dataGridView.Columns[useManualAssemblyIndex].HeaderText); Assert.AreEqual("Toetsoordeel\r\nhandmatig", dataGridView.Columns[manualAssemblyCategoryGroupIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); @@ -172,7 +172,7 @@ Assert.AreEqual("IIv", cells[detailedAssemblyCategoryGroupIndex].Value); Assert.AreEqual("Iv", cells[tailorMadeAssemblyCategoryGroupIndex].Value); Assert.AreEqual("Iv", cells[combinedAssemblyCategoryGroupIndex].Value); - Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(false, cells[useManualAssemblyIndex].Value); Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value); } } @@ -183,7 +183,7 @@ // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); FailureMechanismTestHelper.AddSections(failureMechanism, 2); - failureMechanism.SectionResults.First().UseManualAssemblyCategoryGroup = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; using (var form = new Form()) using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults, @@ -209,7 +209,7 @@ // Given var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); FailureMechanismTestHelper.AddSections(failureMechanism, 2); - failureMechanism.SectionResults.First().UseManualAssemblyCategoryGroup = true; + failureMechanism.SectionResults.First().UseManualAssembly = true; using (var form = new Form()) using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults, @@ -225,7 +225,7 @@ Assert.AreEqual("Toetsoordeel is (deels) gebaseerd op handmatig overschreven toetsoordelen.", manualAssemblyWarningProvider.GetError(failureMechanismAssemblyControl)); // When - failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssemblyCategoryGroup = false); + failureMechanism.SectionResults.ForEachElementDo(sr => sr.UseManualAssembly = false); failureMechanism.NotifyObservers(); // Assert @@ -246,7 +246,7 @@ GrassCoverErosionOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); const FailureMechanismSectionAssemblyCategoryGroup categoryGroup = FailureMechanismSectionAssemblyCategoryGroup.IIIv; sectionResult.ManualAssemblyCategoryGroup = categoryGroup; - sectionResult.UseManualAssemblyCategoryGroup = true; + sectionResult.UseManualAssembly = true; // When using (new AssemblyToolCalculatorFactoryConfig()) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r846d2015c3cb0995cc7badac536c3abf9954fe62 -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs) (revision 846d2015c3cb0995cc7badac536c3abf9954fe62) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultRowTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -89,7 +89,7 @@ Assert.AreEqual(result.DetailedAssessmentResultForLowerLimitNorm, row.DetailedAssessmentResultForLowerLimitNorm); Assert.AreEqual(result.DetailedAssessmentResultForFactorizedLowerLimitNorm, row.DetailedAssessmentResultForFactorizedLowerLimitNorm); Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult); - Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup); + Assert.AreEqual(result.UseManualAssembly, row.UseManualAssembly); Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup), row.ManualAssemblyCategoryGroup); @@ -173,7 +173,7 @@ } [Test] - public void UseManualAssemblyCategoryGroup_SetNewValue_NotifyObserversAndPropertyChanged() + public void UseManualAssembly_SetNewValue_NotifyObserversAndPropertyChanged() { // Setup var mocks = new MockRepository(); @@ -185,20 +185,20 @@ var result = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section); result.Attach(observer); - bool newValue = !result.UseManualAssemblyCategoryGroup; + bool newValue = !result.UseManualAssembly; using (new AssemblyToolCalculatorFactoryConfig()) { var row = new GrassCoverErosionOutwardsFailureMechanismSectionResultRow(result, ConstructionProperties); // Precondition - Assert.IsFalse(result.UseManualAssemblyCategoryGroup); + Assert.IsFalse(result.UseManualAssembly); // Call - row.UseManualAssemblyCategoryGroup = newValue; + row.UseManualAssembly = newValue; // Assert - Assert.AreEqual(newValue, result.UseManualAssemblyCategoryGroup); + Assert.AreEqual(newValue, result.UseManualAssembly); mocks.VerifyAll(); } } @@ -356,13 +356,13 @@ [Test] [TestCase(true)] [TestCase(false)] - public void Constructor_WithUseManualAssemblyCategoryGroupSet_ExpectedColumnStates(bool useManualAssemblyCategoryGroup) + public void Constructor_WithUseManualAssemblySet_ExpectedColumnStates(bool useManualAssembly) { // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section) { - UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup + UseManualAssembly = useManualAssembly }; using (new AssemblyToolCalculatorFactoryConfig()) @@ -374,21 +374,21 @@ IDictionary columnStateDefinitions = row.ColumnStateDefinitions; DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.SimpleAssessmentResultIndex], - !useManualAssemblyCategoryGroup); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultForFactorizedSignalingNormIndex], - !useManualAssemblyCategoryGroup); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultForSignalingNormIndex], - !useManualAssemblyCategoryGroup); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultForMechanismSpecificLowerLimitNormIndex], - !useManualAssemblyCategoryGroup); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultForLowerLimitNormIndex], - !useManualAssemblyCategoryGroup); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultForFactorizedLowerLimitNormIndex], - !useManualAssemblyCategoryGroup); + !useManualAssembly); DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], - !useManualAssemblyCategoryGroup); + !useManualAssembly); - if (useManualAssemblyCategoryGroup) + if (useManualAssembly) { DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateIsDisabled( columnStateDefinitions[ConstructionProperties.SimpleAssemblyCategoryGroupIndex]); @@ -401,7 +401,7 @@ } DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyCategoryGroupIndex], - useManualAssemblyCategoryGroup); + useManualAssembly); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f -rc3d939772601830fd0a15ee54b80d22be25d32f2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision c3d939772601830fd0a15ee54b80d22be25d32f2) @@ -49,7 +49,7 @@ DetailedAssessmentResultForMechanismSpecificLowerLimitNorm = DetailedAssessmentResultType.Sufficient, DetailedAssessmentResultForFactorizedLowerLimitNorm = DetailedAssessmentResultType.Sufficient, TailorMadeAssessmentResult = TailorMadeAssessmentCategoryGroupResultType.IIIv, - UseManualAssemblyCategoryGroup = true, + UseManualAssembly = true, ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIv }; } @@ -64,7 +64,7 @@ Assert.AreEqual(originResult.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm, targetResult.DetailedAssessmentResultForMechanismSpecificLowerLimitNorm); Assert.AreEqual(originResult.DetailedAssessmentResultForFactorizedLowerLimitNorm, targetResult.DetailedAssessmentResultForFactorizedLowerLimitNorm); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); - Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); + Assert.AreEqual(originResult.UseManualAssembly, targetResult.UseManualAssembly); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); } }