Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r51628a93da48d3c3e2070fe9d9cd60bf24074853 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs) (revision 51628a93da48d3c3e2070fe9d9cd60bf24074853) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -163,7 +163,7 @@ } return failureMechanismSectionResult.UseManualAssemblyCategoryGroup - ? failureMechanismSectionResult.ManualAssemblyCategoryGroup + ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup) : AssembleCombinedAssessment(failureMechanismSectionResult); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult.cs =================================================================== diff -u -r802d3cd39b925ac9873ea277588ecd1933e374f6 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult.cs) (revision 802d3cd39b925ac9873ea277588ecd1933e374f6) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Primitives; @@ -39,7 +38,7 @@ { SimpleAssessmentResult = SimpleAssessmentResultType.None; TailorMadeAssessmentResult = TailorMadeAssessmentResultType.None; - ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None; + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.None; } /// @@ -60,6 +59,6 @@ /// /// Gets or sets the manually selected assembly category group. /// - public FailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get; set; } + public ManualFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get; set; } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRow.cs =================================================================== diff -u -r4613f112c78c8a1ea1c69d07a0e08e5a69b3689e -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRow.cs (.../StrengthStabilityLengthwiseConstructionSectionResultRow.cs) (revision 4613f112c78c8a1ea1c69d07a0e08e5a69b3689e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRow.cs (.../StrengthStabilityLengthwiseConstructionSectionResultRow.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -22,7 +22,6 @@ using System; using Core.Common.Controls.DataGrid; using Ringtoets.AssemblyTool.Data; -using Ringtoets.AssemblyTool.Forms; using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.Views; @@ -35,7 +34,7 @@ /// /// Class for displaying as a row in a grid view. /// - public class StrengthStabilityLengthwiseConstructionSectionResultRow + public class StrengthStabilityLengthwiseConstructionSectionResultRow : FailureMechanismSectionResultRow { private readonly int simpleAssessmentResultIndex; @@ -172,15 +171,15 @@ /// /// Thrown when /// is a valid value, but unsupported. - public SelectableFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup + public ManualFailureMechanismSectionAssemblyCategoryGroup ManualAssemblyCategoryGroup { get { - return SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(SectionResult.ManualAssemblyCategoryGroup); + return SectionResult.ManualAssemblyCategoryGroup; } set { - SectionResult.ManualAssemblyCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(value); + SectionResult.ManualAssemblyCategoryGroup = value; UpdateInternalData(); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs =================================================================== diff -u -r352b81d92f568dbe5e072a2c00b4e518ee1605d3 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision 352b81d92f568dbe5e072a2c00b4e518ee1605d3) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs (.../StrengthStabilityLengthwiseConstructionResultView.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -101,7 +101,7 @@ DataGridViewControl, nameof(StrengthStabilityLengthwiseConstructionSectionResultRow.UseManualAssemblyCategoryGroup)); - FailureMechanismSectionResultViewColumnBuilder.AddSelectableAssemblyCategoryGroupColumn( + FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn( DataGridViewControl, nameof(StrengthStabilityLengthwiseConstructionSectionResultRow.ManualAssemblyCategoryGroup)); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -393,15 +393,16 @@ var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = new Random(39).NextEnumValue() + ManualAssemblyCategoryGroup = new Random(39).NextEnumValue() }; // Call FailureMechanismSectionAssemblyCategoryGroup categoryGroup = StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup( sectionResult); // Assert - Assert.AreEqual(categoryGroup, sectionResult.ManualAssemblyCategoryGroup); + Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), + categoryGroup); } [Test] @@ -496,7 +497,7 @@ }); StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single(); sectionResult.UseManualAssemblyCategoryGroup = true; - sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue(); + sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue(); using (new AssemblyToolCalculatorFactoryConfig()) { @@ -507,7 +508,8 @@ StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism); // Assert - Assert.AreEqual(sectionResult.ManualAssemblyCategoryGroup, calculator.FailureMechanismSectionCategories.Single()); + Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup), + calculator.FailureMechanismSectionCategories.Single()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs =================================================================== diff -u -r802d3cd39b925ac9873ea277588ecd1933e374f6 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs) (revision 802d3cd39b925ac9873ea277588ecd1933e374f6) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultTest.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -20,7 +20,6 @@ // All rights reserved. using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Primitives; @@ -46,7 +45,7 @@ Assert.AreEqual(SimpleAssessmentResultType.None, result.SimpleAssessmentResult); Assert.AreEqual(TailorMadeAssessmentResultType.None, result.TailorMadeAssessmentResult); Assert.IsFalse(result.UseManualAssemblyCategoryGroup); - Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup); + Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs =================================================================== diff -u -r37d015e59a004f7deb5f1a9657016bd9c13c6539 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs) (revision 37d015e59a004f7deb5f1a9657016bd9c13c6539) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultRowTest.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -28,7 +28,6 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.AssemblyTool.Data; -using Ringtoets.AssemblyTool.Forms; using Ringtoets.AssemblyTool.KernelWrapper.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; @@ -94,8 +93,7 @@ Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult); Assert.AreEqual(result.TailorMadeAssessmentResult, row.TailorMadeAssessmentResult); Assert.AreEqual(result.UseManualAssemblyCategoryGroup, row.UseManualAssemblyCategoryGroup); - Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertTo(result.ManualAssemblyCategoryGroup), - row.ManualAssemblyCategoryGroup); + Assert.AreEqual(result.ManualAssemblyCategoryGroup, row.ManualAssemblyCategoryGroup); IDictionary columnStateDefinitions = row.ColumnStateDefinitions; Assert.AreEqual(6, columnStateDefinitions.Count); @@ -207,7 +205,7 @@ mocks.ReplayAll(); var random = new Random(39); - var newValue = random.NextEnumValue(); + var newValue = random.NextEnumValue(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var result = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(section); @@ -221,8 +219,7 @@ row.ManualAssemblyCategoryGroup = newValue; // Assert - FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup = SelectableFailureMechanismSectionAssemblyCategoryGroupConverter.ConvertFrom(newValue); - Assert.AreEqual(expectedCategoryGroup, result.ManualAssemblyCategoryGroup); + Assert.AreEqual(newValue, result.ManualAssemblyCategoryGroup); mocks.VerifyAll(); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -23,7 +23,6 @@ using Core.Common.Base; using NUnit.Extensions.Forms; using NUnit.Framework; -using Ringtoets.AssemblyTool.Forms; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Controls; @@ -149,7 +148,7 @@ Assert.AreEqual("IIv", cells[tailorMadeAssemblyCategoryGroupIndex].Value); Assert.AreEqual("IIv", cells[combinedAssemblyCategoryGroupIndex].Value); Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value); - Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value); + Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value); } } Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -r0a0efdb6629e1ba905bcfae3da484a9448d3c5ed -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 0a0efdb6629e1ba905bcfae3da484a9448d3c5ed) +++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 03-Aug-2018 14:43:33 */ +/* Created On : 03-Aug-2018 15:05:35 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -850,7 +850,7 @@ 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible, 4 = AssessFurther 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Sufficient, 4 = Insufficient, 5 = NotAssessed 'UseManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- true or false - 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = IIIv, 6 = IVv, 7 = Vv, 8 = VIv, 9 = VIIv + 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv CONSTRAINT 'FK_StrengthStabilityLengthwiseConstructionSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Storage.Core.DbContext; @@ -56,7 +55,7 @@ sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult; sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult; sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup); - sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.ManualAssemblyCategoryGroup; + sectionResult.ManualAssemblyCategoryGroup = (ManualFailureMechanismSectionAssemblyCategoryGroup) entity.ManualAssemblyCategoryGroup; } } } \ No newline at end of file Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -22,7 +22,6 @@ using System; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -53,7 +52,7 @@ var simpleAssessmentResult = random.NextEnumValue(); var tailorMadeAssessmentResult = random.NextEnumValue(); bool useManualAssemblyCategoryGroup = random.NextBoolean(); - var manualAssemblyCategoryGroup = random.NextEnumValue(); + var manualAssemblyCategoryGroup = random.NextEnumValue(); var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs) (revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -22,7 +22,6 @@ using System; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; @@ -70,7 +69,7 @@ var simpleAssessmentResult = random.NextEnumValue(); var tailorMadeAssessmentResult = random.NextEnumValue(); bool useManualAssemblyCategoryGroup = random.NextBoolean(); - var manualAssemblyCategoryGroup = random.NextEnumValue(); + var manualAssemblyCategoryGroup = random.NextEnumValue(); var entity = new StrengthStabilityLengthwiseConstructionSectionResultEntity { Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r0a0efdb6629e1ba905bcfae3da484a9448d3c5ed -r2a4390996dcafa47b869be130b46a395c90b5abb --- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 0a0efdb6629e1ba905bcfae3da484a9448d3c5ed) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -207,7 +207,7 @@ sectionResult.SimpleAssessmentResult = random.NextEnumValue(); sectionResult.TailorMadeAssessmentResult = random.NextEnumValue(); sectionResult.UseManualAssemblyCategoryGroup = random.NextBoolean(); - sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue(); + sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue(); } } Index: build/DatabaseStructure.sql =================================================================== diff -u -r0a0efdb6629e1ba905bcfae3da484a9448d3c5ed -r2a4390996dcafa47b869be130b46a395c90b5abb --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 0a0efdb6629e1ba905bcfae3da484a9448d3c5ed) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 2a4390996dcafa47b869be130b46a395c90b5abb) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 03-Aug-2018 14:43:33 */ +/* Created On : 03-Aug-2018 15:05:35 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -850,7 +850,7 @@ 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible, 4 = AssessFurther 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Sufficient, 4 = Insufficient, 5 = NotAssessed 'UseManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- true or false - 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = IIIv, 6 = IVv, 7 = Vv, 8 = VIv, 9 = VIIv + 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv CONSTRAINT 'FK_StrengthStabilityLengthwiseConstructionSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; Index: design/DatabaseDesign.eap =================================================================== diff -u -r0a0efdb6629e1ba905bcfae3da484a9448d3c5ed -r2a4390996dcafa47b869be130b46a395c90b5abb Binary files differ