Fisheye: Tag a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/AssessmentSectionEntityConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs
===================================================================
diff -u -r6a639792869015e8e135a6bd40bdad1893ac2970 -ra87d1792bac08f4ad2b1a5c8eedffe0d5650aca8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs	(.../ProjectEntityPersistor.cs)	(revision 6a639792869015e8e135a6bd40bdad1893ac2970)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs	(.../ProjectEntityPersistor.cs)	(revision a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8)
@@ -39,7 +39,17 @@
         public Project GetEntityAsModel()
         {
             var entry = dbSet.SingleOrDefault();
-            return entry == null ? null : converter.ConvertEntityToModel(entry);
+            if (entry == null)
+            {
+                return null;
+            }
+            var project = converter.ConvertEntityToModel(entry);
+            if (entry.DikeAssessmentSectionEntities.Count > 0)
+            {
+                //var dikeAssessmentSectionEntityPersistor = new DikeAssessmentSectionEntityPersistor(entry.DikeAssessmentSectionEntities);
+            }
+
+            return project;
         }
 
         /// <summary>
Fisheye: Tag a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/ProjectEntityStorage.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r6a639792869015e8e135a6bd40bdad1893ac2970 -ra87d1792bac08f4ad2b1a5c8eedffe0d5650aca8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 6a639792869015e8e135a6bd40bdad1893ac2970)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8)
@@ -63,9 +63,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converter\ProjectEntityConverterTest.cs" />
+    <Compile Include="Converters\ProjectEntityConverterTest.cs" />
     <Compile Include="DbContext\DbTestSet.cs" />
-    <Compile Include="Converter\DikeAssessmentSectionEntityConverterTest.cs" />
+    <Compile Include="Converters\DikeAssessmentSectionEntityConverterTest.cs" />
     <Compile Include="DbContext\ProjectEntityTest.cs" />
     <Compile Include="Exceptions\EntityNotFoundExceptionTest.cs" />
     <Compile Include="Persistors\ProjectEntityPersistorTest.cs" />
Fisheye: Tag a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converter/DikeAssessmentSectionEntityConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converter/ProjectEntityConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converter/ProjectEntityStorageTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/DikeAssessmentSectionEntityConverterTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/DikeAssessmentSectionEntityConverterTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/DikeAssessmentSectionEntityConverterTest.cs	(revision a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8)
@@ -0,0 +1,124 @@
+using System;
+using Application.Ringtoets.Storage.Converters;
+using Application.Ringtoets.Storage.DbContext;
+using NUnit.Framework;
+using Ringtoets.Integration.Data;
+
+namespace Application.Ringtoets.Storage.Test.Converters
+{
+    [TestFixture]
+    public class DikeAssessmentSectionEntityConverterTest
+    {
+        [Test]
+        public void DefaultConstructor_Always_NewDikeAssessmentSectionEntityConverter()
+        {
+            // Call
+            DikeAssessmentSectionEntityConverter converter = new DikeAssessmentSectionEntityConverter();
+
+            // Assert
+            Assert.IsInstanceOf<IEntityConverter<DikeAssessmentSection, DikeAssessmentSectionEntity>>(converter);
+        }
+
+        [Test]
+        public void ConvertEntityToModel_NullEntity_ThrowsArgumentNullException()
+        {
+            // SetUp
+            DikeAssessmentSectionEntityConverter converter = new DikeAssessmentSectionEntityConverter();
+
+            // Call
+            TestDelegate test = () => converter.ConvertEntityToModel(null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
+
+        [Test]
+        public void ConvertEntityToModel_ValidDikeAssessmentSectionEntity_ReturnsTheDikeAssessmentSectionEntityAsDikeAssessmentSection()
+        {
+            // SetUp
+            const long storageId = 1234L;
+            const long projectId = 1L;
+            const int norm = 30000;
+            const string name = "test";
+            DikeAssessmentSectionEntity dikeAssessmentSectionEntity = new DikeAssessmentSectionEntity()
+            {
+                DikeAssessmentSectionEntityId = storageId,
+                Name = name,
+                ProjectEntityId = projectId,
+                Norm = norm
+            };
+            DikeAssessmentSectionEntityConverter converter = new DikeAssessmentSectionEntityConverter();
+
+            // Call
+            DikeAssessmentSection assessmentSection = converter.ConvertEntityToModel(dikeAssessmentSectionEntity);
+
+            // Assert
+            Assert.AreNotEqual(dikeAssessmentSectionEntity, assessmentSection);
+            Assert.AreEqual(storageId, assessmentSection.StorageId);
+            Assert.AreEqual(name, assessmentSection.Name);
+            Assert.AreEqual(norm, assessmentSection.FailureMechanismContribution.Norm);
+        }
+
+        [Test]
+        public void ConvertModelToEntity_NullEntity_ThrowsArgumentNullException()
+        {
+            // SetUp
+            DikeAssessmentSectionEntityConverter converter = new DikeAssessmentSectionEntityConverter();
+            DikeAssessmentSection dikeAssessmentSection = new DikeAssessmentSection();
+
+            // Call
+            TestDelegate test = () => converter.ConvertModelToEntity(dikeAssessmentSection, null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
+
+        [Test]
+        public void ConvertModelToEntity_NullModel_ThrowsArgumentNullException()
+        {
+            // SetUp
+            DikeAssessmentSectionEntityConverter converter = new DikeAssessmentSectionEntityConverter();
+            DikeAssessmentSectionEntity dikeAssessmentSectionEntity = new DikeAssessmentSectionEntity();
+
+            // Call
+            TestDelegate test = () => converter.ConvertModelToEntity(null, dikeAssessmentSectionEntity);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
+
+        [Test]
+        public void ConvertModelToEntity_ValidDikeAssessmentSection_UpdatesTheDikeAssessmentSectionAsDikeAssessmentSectionEntity()
+        {
+            // SetUp
+            const long storageId = 1234L;
+            const long projectId = 1L;
+            const int norm = 30000;
+            const string name = "test";
+            DikeAssessmentSection dikeAssessmentSection = new DikeAssessmentSection
+            {
+                StorageId = storageId,
+                Name = name,
+                FailureMechanismContribution =
+                {
+                    Norm = norm
+                }
+            };
+            DikeAssessmentSectionEntity dikeAssessmentSectionEntity = new DikeAssessmentSectionEntity
+            {
+                ProjectEntityId = projectId
+            };
+            DikeAssessmentSectionEntityConverter converter = new DikeAssessmentSectionEntityConverter();
+
+            // Call
+            converter.ConvertModelToEntity(dikeAssessmentSection, dikeAssessmentSectionEntity);
+
+            // Assert
+            Assert.AreNotEqual(dikeAssessmentSectionEntity, dikeAssessmentSection);
+            Assert.AreEqual(storageId, dikeAssessmentSectionEntity.DikeAssessmentSectionEntityId);
+            Assert.AreEqual(projectId, dikeAssessmentSectionEntity.ProjectEntityId);
+            Assert.AreEqual(name, dikeAssessmentSectionEntity.Name);
+            Assert.AreEqual(norm, dikeAssessmentSectionEntity.Norm);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/ProjectEntityConverterTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/ProjectEntityConverterTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/ProjectEntityConverterTest.cs	(revision a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8)
@@ -0,0 +1,115 @@
+using System;
+using Application.Ringtoets.Storage.Converters;
+using Application.Ringtoets.Storage.DbContext;
+using Core.Common.Base.Data;
+using NUnit.Framework;
+
+namespace Application.Ringtoets.Storage.Test.Converters
+{
+    [TestFixture]
+    public class ProjectEntityConverterTest
+    {
+        [Test]
+        public void DefaultConstructor_Always_NewProjectEntityConverter()
+        {
+            // Call
+            ProjectEntityConverter converter = new ProjectEntityConverter();
+
+            // Assert
+            Assert.IsInstanceOf<IEntityConverter<Project, ProjectEntity>>(converter);
+        }
+
+        [Test]
+        public void ConvertEntityToModel_NullEntity_ThrowsArgumentNullException()
+        {
+            // SetUp
+            ProjectEntityConverter converter = new ProjectEntityConverter();
+
+            // Call
+            TestDelegate test = () => converter.ConvertEntityToModel(null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
+
+        [Test]
+        public void ConvertEntityToModel_ValidProjectEntity_ReturnsTheProjectEntityAsProject()
+        {
+            // SetUp
+            const long storageId = 1234L;
+            const string name = "test";
+            const string description = "Description";
+            ProjectEntity projectEntity = new ProjectEntity()
+            {
+                ProjectEntityId = storageId,
+                Name = name,
+                Description = description
+            };
+            ProjectEntityConverter converter = new ProjectEntityConverter();
+
+            // Call
+            Project project = converter.ConvertEntityToModel(projectEntity);
+
+            // Assert
+            Assert.AreNotEqual(projectEntity, project);
+            Assert.AreEqual(storageId, project.StorageId);
+            Assert.AreEqual(name, project.Name);
+            Assert.AreEqual(description, project.Description);
+        }
+
+        [Test]
+        public void ConvertModelToEntity_NullEntity_ThrowsArgumentNullException()
+        {
+            // SetUp
+            ProjectEntityConverter converter = new ProjectEntityConverter();
+            Project project = new Project();
+
+            // Call
+            TestDelegate test = () => converter.ConvertModelToEntity(project, null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
+
+        [Test]
+        public void ConvertModelToEntity_NullModel_ThrowsArgumentNullException()
+        {
+            // SetUp
+            ProjectEntityConverter converter = new ProjectEntityConverter();
+            ProjectEntity projectEntity = new ProjectEntity();
+
+            // Call
+            TestDelegate test = () => converter.ConvertModelToEntity(null, projectEntity);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
+
+        [Test]
+        public void ConvertModelToEntity_ValidProject_UpdatesTheProjectAsProjectEntity()
+        {
+            // SetUp
+            const long storageId = 1234L;
+            const string name = "test";
+            const string description = "Description";
+            Project project = new Project
+            {
+                StorageId = storageId,
+                Name = name,
+                Description = description
+            };
+            ProjectEntity projectEntity = new ProjectEntity();
+            ProjectEntityConverter converter = new ProjectEntityConverter();
+
+            // Call
+            converter.ConvertModelToEntity(project, projectEntity);
+
+            // Assert
+            Assert.AreNotEqual(projectEntity, project);
+            Assert.AreEqual(storageId, projectEntity.ProjectEntityId);
+            Assert.AreEqual(name, projectEntity.Name);
+            Assert.AreEqual(description, projectEntity.Description);
+            Assert.IsNotNull(projectEntity.LastUpdated);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs
===================================================================
diff -u -r6a639792869015e8e135a6bd40bdad1893ac2970 -ra87d1792bac08f4ad2b1a5c8eedffe0d5650aca8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs	(.../ProjectEntityPersistorTest.cs)	(revision 6a639792869015e8e135a6bd40bdad1893ac2970)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs	(.../ProjectEntityPersistorTest.cs)	(revision a87d1792bac08f4ad2b1a5c8eedffe0d5650aca8)
@@ -13,14 +13,6 @@
     [TestFixture]
     public class ProjectEntityPersistorTest
     {
-        private MockRepository mocksRepository;
-
-        [SetUp]
-        public void SetUp()
-        {
-            mocksRepository = new MockRepository();
-        }
-
         [Test]
         [ExpectedException(typeof(ArgumentNullException))]
         public void Constructor_NullDataSet_ThrowsArgumentNullException()
@@ -110,14 +102,18 @@
         public void AddEntity_NullData_ThrowsArgumentNullException()
         {
             // Setup
+            var dbSetMethodAddWasHit = 0;
             var dbset = DbTestSet.GetDbTestSet(new List<ProjectEntity>());
             ProjectEntityPersistor persistor = new ProjectEntityPersistor(dbset);
+            dbset.Stub(m => m.Add(new ProjectEntity())).IgnoreArguments().Return(new ProjectEntity())
+                 .WhenCalled(invocation => dbSetMethodAddWasHit++);
 
             // Call
             TestDelegate test = () => persistor.AddEntity(null);
 
             // Assert
             Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual(0, dbSetMethodAddWasHit);
         }
 
         [Test]