Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/RiskeerProjectCreateExtensionsTest.cs =================================================================== diff -u -r4f362dabd411ea7a47f0c603d36de0b9bf293ff8 -r4a5af5ce261876bdbf2739c251810e2de0e65986 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/RiskeerProjectCreateExtensionsTest.cs (.../RiskeerProjectCreateExtensionsTest.cs) (revision 4f362dabd411ea7a47f0c603d36de0b9bf293ff8) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/RiskeerProjectCreateExtensionsTest.cs (.../RiskeerProjectCreateExtensionsTest.cs) (revision 4a5af5ce261876bdbf2739c251810e2de0e65986) @@ -84,7 +84,7 @@ } [Test] - public void Create_WithAssessmentSections_AddsSectionsToEntity() + public void Create_WithAssessmentSection_AddsSectionToEntity() { // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs =================================================================== diff -u -r4f362dabd411ea7a47f0c603d36de0b9bf293ff8 -r4a5af5ce261876bdbf2739c251810e2de0e65986 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 4f362dabd411ea7a47f0c603d36de0b9bf293ff8) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 4a5af5ce261876bdbf2739c251810e2de0e65986) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Contribution; @@ -51,9 +52,40 @@ { // Setup const string testDescription = "testName"; + + var random = new Random(21); var entity = new ProjectEntity { - Description = testDescription + Description = testDescription, + AssessmentSectionEntities = + { + new AssessmentSectionEntity + { + SignalingNorm = random.NextDouble(0.000001, 0.1), + LowerLimitNorm = random.NextDouble(0.000001, 0.1), + NormativeNormType = Convert.ToByte(NormType.Signaling), + Name = "A", + Composition = Convert.ToByte(AssessmentSectionComposition.Dike), + BackgroundDataEntities = new[] + { + new BackgroundDataEntity + { + Name = "Background A", + Transparency = 0.0, + IsVisible = 1, + BackgroundDataType = 1, + BackgroundDataMetaEntities = new[] + { + new BackgroundDataMetaEntity + { + Key = BackgroundDataIdentifiers.IsConfigured, + Value = "0" + } + } + } + } + } + } }; // Call @@ -62,7 +94,7 @@ // Assert Assert.IsNotNull(project); Assert.AreEqual(testDescription, project.Description); - Assert.IsNull(project.AssessmentSection); + Assert.IsNotNull(project.AssessmentSection); } [Test] Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs =================================================================== diff -u -r4f362dabd411ea7a47f0c603d36de0b9bf293ff8 -r4a5af5ce261876bdbf2739c251810e2de0e65986 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs (.../StorageSqLiteTest.cs) (revision 4f362dabd411ea7a47f0c603d36de0b9bf293ff8) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs (.../StorageSqLiteTest.cs) (revision 4a5af5ce261876bdbf2739c251810e2de0e65986) @@ -259,7 +259,7 @@ string projectName = Path.GetFileNameWithoutExtension(tempProjectFilePath); var storage = new StorageSqLite(); var mockRepository = new MockRepository(); - var project = mockRepository.StrictMock(); + var project = mockRepository.StrictMock(CreateAssessmentSection()); project.Description = ""; // Precondition @@ -512,7 +512,7 @@ { // Setup var mockRepository = new MockRepository(); - var project = mockRepository.StrictMock(); + var project = mockRepository.StrictMock(CreateAssessmentSection()); mockRepository.ReplayAll(); var storage = new StorageSqLite(); string tempProjectFilePath = Path.Combine(workingDirectory, nameof(HasStagedProjectChanges_SavedToEmptyDatabaseFile_ReturnsFalse)); @@ -535,8 +535,13 @@ private static RiskeerProject CreateProject() { + return new RiskeerProject(CreateAssessmentSection()); + } + + private static AssessmentSection CreateAssessmentSection() + { var random = new Random(21); - return new RiskeerProject(new AssessmentSection(random.NextEnumValue())); + return new AssessmentSection(random.NextEnumValue()); } [OneTimeSetUp]