Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r20d4f34dd7ab2d73e304a0460a1d7ac31c179050 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs (.../MicrostabilityFailureMechanismAssemblyFactory.cs) (revision 20d4f34dd7ab2d73e304a0460a1d7ac31c179050)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs (.../MicrostabilityFailureMechanismAssemblyFactory.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -197,7 +197,7 @@
}
return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
- ? failureMechanismSectionResult.ManualAssemblyCategoryGroup
+ ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
: AssembleCombinedAssessment(failureMechanismSectionResult);
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResult.cs
===================================================================
diff -u -rd3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResult.cs (.../MicrostabilityFailureMechanismSectionResult.cs) (revision d3404f1930061f9fbf321c7ddb7f8a9e6fff4bc1)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResult.cs (.../MicrostabilityFailureMechanismSectionResult.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -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;
@@ -40,7 +39,7 @@
SimpleAssessmentResult = SimpleAssessmentResultType.None;
DetailedAssessmentResult = DetailedAssessmentResultType.None;
TailorMadeAssessmentResult = TailorMadeAssessmentResultType.None;
- ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None;
+ ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.None;
}
///
@@ -66,6 +65,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/MicrostabilitySectionResultRow.cs
===================================================================
diff -u -r4613f112c78c8a1ea1c69d07a0e08e5a69b3689e -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MicrostabilitySectionResultRow.cs (.../MicrostabilitySectionResultRow.cs) (revision 4613f112c78c8a1ea1c69d07a0e08e5a69b3689e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MicrostabilitySectionResultRow.cs (.../MicrostabilitySectionResultRow.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -206,15 +206,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/MicrostabilityResultView.cs
===================================================================
diff -u -r352b81d92f568dbe5e072a2c00b4e518ee1605d3 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision 352b81d92f568dbe5e072a2c00b4e518ee1605d3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs (.../MicrostabilityResultView.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -110,7 +110,7 @@
DataGridViewControl,
nameof(MicrostabilitySectionResultRow.UseManualAssemblyCategoryGroup));
- FailureMechanismSectionResultViewColumnBuilder.AddSelectableAssemblyCategoryGroupColumn(
+ FailureMechanismSectionResultViewColumnBuilder.AddManualAssemblyCategoryGroupColumn(
DataGridViewControl,
nameof(MicrostabilitySectionResultRow.ManualAssemblyCategoryGroup));
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs (.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs (.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -475,15 +475,16 @@
var sectionResult = new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
{
UseManualAssemblyCategoryGroup = true,
- ManualAssemblyCategoryGroup = new Random(39).NextEnumValue()
+ ManualAssemblyCategoryGroup = new Random(39).NextEnumValue()
};
// Call
FailureMechanismSectionAssemblyCategoryGroup categoryGroup = MicrostabilityFailureMechanismAssemblyFactory.GetSectionAssemblyCategoryGroup(
sectionResult);
// Assert
- Assert.AreEqual(categoryGroup, sectionResult.ManualAssemblyCategoryGroup);
+ Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(sectionResult.ManualAssemblyCategoryGroup),
+ categoryGroup);
}
[Test]
@@ -577,7 +578,7 @@
});
MicrostabilityFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
sectionResult.UseManualAssemblyCategoryGroup = true;
- sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue();
+ sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue();
using (new AssemblyToolCalculatorFactoryConfig())
{
@@ -588,7 +589,8 @@
MicrostabilityFailureMechanismAssemblyFactory.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/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r82b8862bd698e0a289f4f6121b0cc8cdecd20cd2 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultTest.cs) (revision 82b8862bd698e0a289f4f6121b0cc8cdecd20cd2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultTest.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -51,7 +51,7 @@
Assert.AreEqual(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, result.TailorMadeAssessmentResult);
Assert.IsNaN(result.TailorMadeAssessmentProbability);
Assert.IsFalse(result.UseManualAssemblyCategoryGroup);
- Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup);
+ Assert.AreEqual(ManualFailureMechanismSectionAssemblyCategoryGroup.None, result.ManualAssemblyCategoryGroup);
}
[Test]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r4503f687155622bb1b19155d27f8e3f9a5842fb0 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs (.../MicrostabilityFailureMechanismSectionResultTest.cs) (revision 4503f687155622bb1b19155d27f8e3f9a5842fb0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MicrostabilityFailureMechanismSectionResultTest.cs (.../MicrostabilityFailureMechanismSectionResultTest.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -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;
@@ -47,7 +46,7 @@
Assert.AreEqual(DetailedAssessmentResultType.None, result.DetailedAssessmentResult);
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/MicrostabilitySectionResultRowTest.cs
===================================================================
diff -u -r37d015e59a004f7deb5f1a9657016bd9c13c6539 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MicrostabilitySectionResultRowTest.cs (.../MicrostabilitySectionResultRowTest.cs) (revision 37d015e59a004f7deb5f1a9657016bd9c13c6539)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MicrostabilitySectionResultRowTest.cs (.../MicrostabilitySectionResultRowTest.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -98,8 +98,7 @@
Assert.AreEqual(result.DetailedAssessmentResult, row.DetailedAssessmentResult);
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(8, columnStateDefinitions.Count);
@@ -217,7 +216,7 @@
mocks.ReplayAll();
var random = new Random(39);
- var newValue = random.NextEnumValue();
+ var newValue = random.NextEnumValue();
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var result = new MicrostabilityFailureMechanismSectionResult(section);
@@ -231,8 +230,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/MicrostabilityResultViewTest.cs
===================================================================
diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -160,7 +160,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 -r5157c0cfbc606566e79c509dd46f9b6f67c69d84 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 5157c0cfbc606566e79c509dd46f9b6f67c69d84)
+++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 03-Aug-2018 09:58:57 */
+/* Created On : 03-Aug-2018 12:51:59 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -1002,7 +1002,7 @@
'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed
'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_MicrostabilitySectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MicrostabilitySectionResultEntityReadExtensions.cs
===================================================================
diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MicrostabilitySectionResultEntityReadExtensions.cs (.../MicrostabilitySectionResultEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MicrostabilitySectionResultEntityReadExtensions.cs (.../MicrostabilitySectionResultEntityReadExtensions.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -56,7 +56,7 @@
sectionResult.DetailedAssessmentResult = (DetailedAssessmentResultType) entity.DetailedAssessmentResult;
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/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs (.../MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs (.../MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -54,7 +54,7 @@
var detailedAssessmentResult = random.NextEnumValue();
var tailorMadeAssessmentResult = random.NextEnumValue();
bool useManualAssemblyCategoryGroup = random.NextBoolean();
- var manualAssemblyCategoryGroup = random.NextEnumValue();
+ var manualAssemblyCategoryGroup = random.NextEnumValue();
var sectionResult = new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())
{
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs (.../MicrostabilitySectionResultEntityReadExtensionsTest.cs) (revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs (.../MicrostabilitySectionResultEntityReadExtensionsTest.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -71,7 +71,7 @@
var detailedAssessmentResult = random.NextEnumValue();
var tailorMadeAssessmentResult = random.NextEnumValue();
bool useManualAssemblyCategoryGroup = random.NextBoolean();
- var manualAssemblyCategoryGroup = random.NextEnumValue();
+ var manualAssemblyCategoryGroup = random.NextEnumValue();
var entity = new MicrostabilitySectionResultEntity
{
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r5157c0cfbc606566e79c509dd46f9b6f67c69d84 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 5157c0cfbc606566e79c509dd46f9b6f67c69d84)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -285,7 +285,7 @@
sectionResult.DetailedAssessmentResult = random.NextEnumValue();
sectionResult.TailorMadeAssessmentResult = random.NextEnumValue();
sectionResult.UseManualAssemblyCategoryGroup = random.NextBoolean();
- sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue();
+ sectionResult.ManualAssemblyCategoryGroup = random.NextEnumValue();
}
}
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r5157c0cfbc606566e79c509dd46f9b6f67c69d84 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 5157c0cfbc606566e79c509dd46f9b6f67c69d84)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 03-Aug-2018 09:58:57 */
+/* Created On : 03-Aug-2018 12:51:59 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -1002,7 +1002,7 @@
'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = Sufficient, 3 = Insufficient, 4 = NotAssessed
'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_MicrostabilitySectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
Index: design/DatabaseDesign.eap
===================================================================
diff -u -r5157c0cfbc606566e79c509dd46f9b6f67c69d84 -r155b57bdd33a2432fb26c0aa89b27b4da0fbd1e0
Binary files differ