Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/PipingFailureMechanismConverter.cs =================================================================== diff -u -rc4d2af65ad23757fb3bd11f93458839bc1787ded -r35dd019140ab3d11241908744c43ddac43a8989e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/PipingFailureMechanismConverter.cs (.../PipingFailureMechanismConverter.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/PipingFailureMechanismConverter.cs (.../PipingFailureMechanismConverter.cs) (revision 35dd019140ab3d11241908744c43ddac43a8989e) @@ -45,7 +45,8 @@ var failureMechanism = new PipingFailureMechanism { - StorageId = entity.FailureMechanismEntityId + StorageId = entity.FailureMechanismEntityId, + IsRelevant = entity.IsRelevant == 1 }; return failureMechanism; @@ -65,6 +66,7 @@ entity.FailureMechanismEntityId = modelObject.StorageId; entity.FailureMechanismType = (int) FailureMechanismType.PipingFailureMechanism; + entity.IsRelevant = modelObject.IsRelevant ? (byte)1 : (byte)0; } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismPersistorBase.cs =================================================================== diff -u -r6d514ec60f68620d78015ac58ba6a966ef6b14e3 -r35dd019140ab3d11241908744c43ddac43a8989e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismPersistorBase.cs (.../FailureMechanismPersistorBase.cs) (revision 6d514ec60f68620d78015ac58ba6a966ef6b14e3) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/FailureMechanismPersistorBase.cs (.../FailureMechanismPersistorBase.cs) (revision 35dd019140ab3d11241908744c43ddac43a8989e) @@ -78,9 +78,10 @@ throw new ArgumentNullException("failureMechanism"); } - var model = converter.ConvertEntityToModel(entity); + T model = converter.ConvertEntityToModel(entity); failureMechanism.StorageId = model.StorageId; + failureMechanism.IsRelevant = model.IsRelevant; LoadChildren(failureMechanism, entity); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/PipingFailureMechanismConverterTest.cs =================================================================== diff -u -rc4d2af65ad23757fb3bd11f93458839bc1787ded -r35dd019140ab3d11241908744c43ddac43a8989e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/PipingFailureMechanismConverterTest.cs (.../PipingFailureMechanismConverterTest.cs) (revision c4d2af65ad23757fb3bd11f93458839bc1787ded) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/PipingFailureMechanismConverterTest.cs (.../PipingFailureMechanismConverterTest.cs) (revision 35dd019140ab3d11241908744c43ddac43a8989e) @@ -23,9 +23,7 @@ using Application.Ringtoets.Storage.Converters; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; -using Rhino.Mocks; -using Ringtoets.Common.Data; -using Ringtoets.Common.Data.FailureMechanism; + using Ringtoets.Piping.Data; namespace Application.Ringtoets.Storage.Test.Converters @@ -47,22 +45,20 @@ public void ConvertEntityToModel_NullEntity_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); PipingFailureMechanismConverter converter = new PipingFailureMechanismConverter(); - mocks.ReplayAll(); // Call TestDelegate test = () => converter.ConvertEntityToModel(null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("entity", exception.ParamName); - mocks.VerifyAll(); } [Test] - public void ConvertEntityToModel_ValidEntityValidModel_ReturnsEntityAsModel() + [TestCase(1)] + [TestCase(0)] + public void ConvertEntityToModel_ValidEntityValidModel_ReturnsEntityAsModel(byte isRelevant) { // Setup PipingFailureMechanismConverter converter = new PipingFailureMechanismConverter(); @@ -72,13 +68,16 @@ { FailureMechanismEntityId = storageId, FailureMechanismType = (int) FailureMechanismType.PipingFailureMechanism, + IsRelevant = isRelevant }; // Call PipingFailureMechanism failureMechanism = converter.ConvertEntityToModel(entity); // Assert Assert.AreEqual(entity.FailureMechanismEntityId, failureMechanism.StorageId); + var expectedIsRelevant = isRelevant == 1; + Assert.AreEqual(expectedIsRelevant, failureMechanism.IsRelevant); } [Test] @@ -92,6 +91,7 @@ { FailureMechanismEntityId = storageId, FailureMechanismType = (int) FailureMechanismType.MacrostabilityInwardsFailureMechanism, + IsRelevant = 1 }; // Call @@ -130,7 +130,9 @@ } [Test] - public void ConvertModelToEntity_ValidModelValidEntity_ReturnsModelAsEntity() + [TestCase(true)] + [TestCase(false)] + public void ConvertModelToEntity_ValidModelValidEntity_ReturnsModelAsEntity(bool isRelevant) { // Setup PipingFailureMechanismConverter converter = new PipingFailureMechanismConverter(); @@ -140,14 +142,17 @@ var model = new PipingFailureMechanism { - StorageId = storageId + StorageId = storageId, + IsRelevant = isRelevant }; // Call converter.ConvertModelToEntity(model, entity); // Assert Assert.AreEqual(model.StorageId, entity.FailureMechanismEntityId); + byte expectedIsRelevantValue = isRelevant ? (byte)1 : (byte)0; + Assert.AreEqual(expectedIsRelevantValue, entity.IsRelevant); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/PipingFailureMechanismPersistorTest.cs =================================================================== diff -u -r6d514ec60f68620d78015ac58ba6a966ef6b14e3 -r35dd019140ab3d11241908744c43ddac43a8989e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/PipingFailureMechanismPersistorTest.cs (.../PipingFailureMechanismPersistorTest.cs) (revision 6d514ec60f68620d78015ac58ba6a966ef6b14e3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/PipingFailureMechanismPersistorTest.cs (.../PipingFailureMechanismPersistorTest.cs) (revision 35dd019140ab3d11241908744c43ddac43a8989e) @@ -153,6 +153,7 @@ { FailureMechanismEntityId = storageId, FailureMechanismType = (int) FailureMechanismType.PipingFailureMechanism, + IsRelevant = 0 }; PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities); @@ -166,6 +167,7 @@ Assert.IsInstanceOf(loadedModel); Assert.AreEqual(loadedModel.StorageId, entity.FailureMechanismEntityId); Assert.AreEqual(model.StorageId, loadedModel.StorageId); + Assert.IsFalse(loadedModel.IsRelevant); mockRepository.VerifyAll(); } @@ -266,9 +268,10 @@ // Assert Assert.AreEqual(1, parentNavigationProperty.Count); - var entity = parentNavigationProperty[0]; + FailureMechanismEntity entity = parentNavigationProperty[0]; Assert.AreNotEqual(model, entity); Assert.AreEqual((int) FailureMechanismType.PipingFailureMechanism, entity.FailureMechanismType); + Assert.AreEqual(1, entity.IsRelevant); mockRepository.VerifyAll(); } @@ -293,17 +296,19 @@ PipingFailureMechanismPersistor persistor = new PipingFailureMechanismPersistor(ringtoetsEntities); PipingFailureMechanism pipingFailureMechanism = new PipingFailureMechanism { - StorageId = storageId + StorageId = storageId, + IsRelevant = false }; // Call persistor.InsertModel(parentNavigationProperty, pipingFailureMechanism); // Assert Assert.AreEqual(2, parentNavigationProperty.Count); - var parentNavigationPropertyList = parentNavigationProperty.ToList(); - var entity = parentNavigationPropertyList[1]; + List parentNavigationPropertyList = parentNavigationProperty.ToList(); + FailureMechanismEntity entity = parentNavigationPropertyList[1]; Assert.AreEqual(storageId, entity.FailureMechanismEntityId); + Assert.AreEqual(0, entity.IsRelevant); mockRepository.VerifyAll(); } @@ -450,12 +455,14 @@ new FailureMechanismEntity { FailureMechanismEntityId = storageId, - FailureMechanismType = (int) FailureMechanismType.PipingFailureMechanism + FailureMechanismType = (int) FailureMechanismType.PipingFailureMechanism, + IsRelevant = 1 } }; PipingFailureMechanism model = new PipingFailureMechanism { - StorageId = storageId + StorageId = storageId, + IsRelevant = false }; // Call @@ -466,7 +473,7 @@ var parentNavigationPropertyList = parentNavigationProperty.ToList(); var entity = parentNavigationPropertyList[0]; Assert.AreEqual(storageId, entity.FailureMechanismEntityId); - + Assert.AreEqual(0, entity.IsRelevant); mockRepository.VerifyAll(); }