Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikesPipingFailureMechanismEntityPersistor.cs =================================================================== diff -u -r8080db5682ba9d4c0e8e211c612e64812d6029cb -r503a1871546f1694465c356bf06c167bc67740dd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikesPipingFailureMechanismEntityPersistor.cs (.../DikesPipingFailureMechanismEntityPersistor.cs) (revision 8080db5682ba9d4c0e8e211c612e64812d6029cb) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DikesPipingFailureMechanismEntityPersistor.cs (.../DikesPipingFailureMechanismEntityPersistor.cs) (revision 503a1871546f1694465c356bf06c167bc67740dd) @@ -31,7 +31,7 @@ /// public class DikesPipingFailureMechanismEntityPersistor : FailureMechanismEntityPersistorBase { - private PipingFailureMechanismEntityConverter converter; + private readonly PipingFailureMechanismEntityConverter converter; /// /// New instance of . @@ -46,7 +46,7 @@ /// Loads the as . /// /// to load from. - /// The piping failure mechanism to load data in. + /// The to load data in. /// Thrown when: /// is null. /// is null. Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs =================================================================== diff -u -r8080db5682ba9d4c0e8e211c612e64812d6029cb -r503a1871546f1694465c356bf06c167bc67740dd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs (.../HydraulicLocationEntityPersistor.cs) (revision 8080db5682ba9d4c0e8e211c612e64812d6029cb) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/HydraulicLocationEntityPersistor.cs (.../HydraulicLocationEntityPersistor.cs) (revision 503a1871546f1694465c356bf06c167bc67740dd) @@ -77,10 +77,9 @@ /// /// Ensures that the is set as in the . - /// All other in will be removed. /// /// Collection where objects can be searched and added. - /// Usually, this collection is a navigation property of a . + /// Usually, this collection is a navigation property of a . /// The to be saved in the storage. public void UpdateModel(ICollection parentNavigationProperty, HydraulicBoundaryDatabase model) { @@ -128,28 +127,8 @@ } } - private void InsertLocation(ICollection parentNavigationProperty, HydraulicBoundaryLocation location) - { - if (location == null) - { - throw new ArgumentNullException("location"); - } - - var entity = new HydraulicLocationEntity(); - parentNavigationProperty.Add(entity); - insertedList.Add(entity, location); - - converter.ConvertModelToEntity(location, entity); - - if (location.StorageId > 0) - { - modifiedList.Add(entity); - } - } - /// /// Ensures that the is added as in the . - /// All other in will be removed. /// /// Collection where objects can be added. /// Usually, this collection is a navigation property of a . @@ -208,5 +187,24 @@ } insertedList.Clear(); } + + private void InsertLocation(ICollection parentNavigationProperty, HydraulicBoundaryLocation location) + { + if (location == null) + { + throw new ArgumentNullException("location"); + } + + var entity = new HydraulicLocationEntity(); + parentNavigationProperty.Add(entity); + insertedList.Add(entity, location); + + converter.ConvertModelToEntity(location, entity); + + if (location.StorageId > 0) + { + modifiedList.Add(entity); + } + } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs =================================================================== diff -u -rd242e89e13ef602facae6a1ef91660242bcef340 -r503a1871546f1694465c356bf06c167bc67740dd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs (.../ProjectEntityPersistor.cs) (revision d242e89e13ef602facae6a1ef91660242bcef340) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs (.../ProjectEntityPersistor.cs) (revision 503a1871546f1694465c356bf06c167bc67740dd) @@ -145,7 +145,7 @@ { if (model == null) { - throw new ArgumentNullException("model", "Cannot update databaseSet when no project is set."); + throw new ArgumentNullException("model", @"Cannot update databaseSet when no project is set."); } ProjectEntity entity; try @@ -170,7 +170,7 @@ { if (project == null) { - throw new ArgumentNullException("project", "Cannot update databaseSet when no project is set."); + throw new ArgumentNullException("project", @"Cannot update databaseSet when no project is set."); } var entity = new ProjectEntity(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/HydraulicLocationEntityPersistorTest.cs =================================================================== diff -u -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c -r503a1871546f1694465c356bf06c167bc67740dd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/HydraulicLocationEntityPersistorTest.cs (.../HydraulicLocationEntityPersistorTest.cs) (revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/HydraulicLocationEntityPersistorTest.cs (.../HydraulicLocationEntityPersistorTest.cs) (revision 503a1871546f1694465c356bf06c167bc67740dd) @@ -36,6 +36,14 @@ [TestFixture] public class HydraulicLocationEntityPersistorTest { + private MockRepository mockRepository; + + [SetUp] + public void Setup() + { + mockRepository = new MockRepository(); + } + [Test] public void Constructor_NullDataSet_ThrowsAgrumentNullException() { @@ -48,48 +56,46 @@ } [Test] - public void Constructor_EmtpyDataSet_NewInstance() + public void Constructor_EmptyDataSet_NewInstance() { // Setup - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - mocks.ReplayAll(); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + mockRepository.ReplayAll(); + // Call - HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); // Assert Assert.IsInstanceOf(persistor); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void LoadModel_NullEntity_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); - mocks.ReplayAll(); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.LoadModel(null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("entities", exception.ParamName); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void LoadModel_ValidEntityValidModel_EntityAsModel() { // Setup - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); - mocks.ReplayAll(); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); + mockRepository.ReplayAll(); const string name = "test"; const double designWaterLevel = 15.6; @@ -108,7 +114,10 @@ }; // Call - List locations = persistor.LoadModel(new List{entity}).ToList(); + List locations = persistor.LoadModel(new List + { + entity + }).ToList(); // Assert Assert.AreEqual(1, locations.Count); @@ -120,19 +129,18 @@ Assert.AreEqual(locationY, location.Location.Y); Assert.AreEqual(storageId, location.StorageId); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void InsertModel_NullParentNavigationProperty_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1, 1)); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.InsertModel(null, hydraulicBoundaryDatabase); @@ -141,18 +149,17 @@ var exception = Assert.Throws(test); Assert.AreEqual("parentNavigationProperty", exception.ParamName); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void InsertModel_NullModel_DoesNotAddEntityInParentNavigationProperty() { // Setup - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); var parentNavigationProperty = new List(); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.InsertModel(parentNavigationProperty, null); @@ -161,16 +168,15 @@ Assert.DoesNotThrow(test); CollectionAssert.AreEquivalent(new List(), parentNavigationProperty); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void InsertModel_SingleEntityInParentNavigationPropertyHydraulicLocationWithSameStorageId_HydraulicLocationAsEntityInParentNavigationProperty() { // Setup - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); const long storageId = 1234L; HydraulicLocationEntity entityToDelete = new HydraulicLocationEntity @@ -188,10 +194,10 @@ StorageId = storageId }; - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(model); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call persistor.InsertModel(parentNavigationProperty, hydraulicBoundaryDatabase); @@ -202,47 +208,46 @@ var entity = parentNavigationPropertyList[1]; Assert.AreEqual(storageId, entity.HydraulicLocationEntityId); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void InsertModel_LocationNull_ThrowsArgumentNullException() { - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + // Setup + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); IList parentNavigationProperty = new List(); - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(null); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.InsertModel(parentNavigationProperty, hydraulicBoundaryDatabase); // Assert Assert.Throws(test); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void UpdateModel_NullDatasetValidModel_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); const long storageId = 1234L; - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); - mocks.ReplayAll(); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); + mockRepository.ReplayAll(); HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52) { StorageId = storageId }; - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(model); // Call @@ -252,26 +257,25 @@ var exception = Assert.Throws(test); Assert.AreEqual("parentNavigationProperty", exception.ParamName); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void UpdateModel_EmptyDatasetNullModel_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); IList parentNavigationProperty = new List(); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("model", exception.ParamName); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] @@ -280,39 +284,38 @@ // Setup const long storageId = 1234L; - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); IList parentNavigationProperty = new List(); + var expectedMessage = String.Format("Het object 'HydraulicLocationEntity' met id '{0}' is niet gevonden.", storageId); HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52) { StorageId = storageId }; - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(model); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase); // Assert var exception = Assert.Throws(test); - Assert.AreEqual("Het object 'HydraulicLocationEntity' met id '1234' is niet gevonden.", exception.Message); - mocks.VerifyAll(); + Assert.AreEqual(expectedMessage, exception.Message); + mockRepository.VerifyAll(); } [Test] public void UpdateModel_DuplicateEntityInDataset_ThrowsEntityNotFoundException() { // Setup const long storageId = 1234L; - - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + var expectedMessage = String.Format("Het object 'HydraulicLocationEntity' met id '{0}' is niet gevonden.", storageId); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); IList parentNavigationProperty = new List { new HydraulicLocationEntity @@ -330,18 +333,18 @@ StorageId = storageId }; - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(model); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase); // Assert var exception = Assert.Throws(test); - Assert.AreEqual("Het object 'HydraulicLocationEntity' met id '1234' is niet gevonden.", exception.Message); - mocks.VerifyAll(); + Assert.AreEqual(expectedMessage, exception.Message); + mockRepository.VerifyAll(); } [Test] @@ -350,9 +353,8 @@ // Setup const long storageId = 1234L; - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); IList parentNavigationProperty = new List { new HydraulicLocationEntity @@ -366,10 +368,10 @@ StorageId = storageId }; - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(model); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase); @@ -379,63 +381,63 @@ var parentNavigationPropertyList = parentNavigationProperty.ToList(); var entity = parentNavigationPropertyList[0]; Assert.AreEqual(storageId, entity.HydraulicLocationEntityId); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void UpdateModel_NoStorageIdSet_InsertNewEntity() { - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); - IList parentNavigationProperty = new List(); + // Setup + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); + mockRepository.ReplayAll(); + IList parentNavigationProperty = new List(); HydraulicBoundaryLocation model = new HydraulicBoundaryLocation(13001, "test", 13, 52) { StorageId = 0 }; - - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(model); - mocks.ReplayAll(); + // Precondition + Assert.AreEqual(0, parentNavigationProperty.Count, "Precondition failed: parentNavigationProperty should be empty"); // Call persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase); // Assert Assert.AreEqual(1, parentNavigationProperty.Count); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void UpdateModel_LocationNull_ThrowsArgumentException() { - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + // Setup + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + var persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); IList parentNavigationProperty = new List(); - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(null); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase); // Assert Assert.Throws(test); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void RemoveUnModifiedEntries_SingleEntityInParentNavigationPropertySingleHydraulicLocationWithoutStorageId_UpdatedHydraulicLocationAsEntityInParentNavigationPropertyAndOthersDeletedInDbSet() { // Setup - var mocks = new MockRepository(); const long storageId = 0L; // Newly inserted entities have Id = 0 untill they are saved HydraulicLocationEntity entityToDelete = new HydraulicLocationEntity { @@ -448,36 +450,35 @@ entityToDelete }; - var dbset = DbTestSet.GetDbTestSet(mocks, parentNavigationProperty); + var dbset = DbTestSet.GetDbTestSet(mockRepository, parentNavigationProperty); dbset.Expect(x => x.Remove(entityToDelete)).Return(entityToDelete); - var ringtoetsEntities = mocks.StrictMock(); - ringtoetsEntities.Expect(x => x.HydraulicLocationEntities).Return(dbset); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + ringtoetsEntitiesMock.Expect(x => x.HydraulicLocationEntities).Return(dbset); - HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); HydraulicBoundaryLocation location = new HydraulicBoundaryLocation(13001, "test", 13, 52); - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(location); - mocks.ReplayAll(); + mockRepository.ReplayAll(); // Call persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase); persistor.RemoveUnModifiedEntries(parentNavigationProperty); // Assert Assert.AreEqual(2, parentNavigationProperty.Count); - var entity = parentNavigationProperty.SingleOrDefault(x => x.HydraulicLocationEntityId == storageId); - Assert.IsInstanceOf(entity); + HydraulicLocationEntity entity = parentNavigationProperty.SingleOrDefault(x => x.HydraulicLocationEntityId == storageId); + Assert.IsNotNull(entity); Assert.AreEqual(storageId, entity.HydraulicLocationEntityId); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void RemoveUnModifiedEntries_MultipleEntitiesInParentNavigationPropertySingleModelStorageId_UpdatedHydraulicLocationmAsEntityAndOtherDeletedInDbSet() { // Setup - var mocks = new MockRepository(); const long storageId = 1234L; HydraulicLocationEntity entityToUpdate = new HydraulicLocationEntity { @@ -493,21 +494,21 @@ entityToDelete, entityToUpdate }; - var dbset = DbTestSet.GetDbTestSet(mocks, parentNavigationProperty); + var dbset = DbTestSet.GetDbTestSet(mockRepository, parentNavigationProperty); dbset.Expect(x => x.Remove(entityToDelete)).Return(entityToDelete); - var ringtoetsEntities = mocks.StrictMock(); - ringtoetsEntities.Expect(x => x.HydraulicLocationEntities).Return(dbset); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + ringtoetsEntitiesMock.Expect(x => x.HydraulicLocationEntities).Return(dbset); - HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(13001, "test", 13, 52) { StorageId = storageId }; - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); - mocks.ReplayAll(); + mockRepository.ReplayAll(); TestDelegate updateTest = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase); Assert.DoesNotThrow(updateTest, "Precondition failed: Update should not throw exception."); @@ -520,40 +521,39 @@ Assert.IsInstanceOf(entityToUpdate); Assert.AreEqual(storageId, entityToUpdate.HydraulicLocationEntityId); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void RemoveUnModifiedEntries_MultipleEntitiesInParentNavigationPropertyEmptyHydraulicLocation_EmptyDatabaseSet() { // Setup - var mocks = new MockRepository(); HydraulicLocationEntity firstEntityToDelete = new HydraulicLocationEntity { - HydraulicLocationEntityId = 1234L, + HydraulicLocationEntityId = 1234L }; HydraulicLocationEntity secondEntityToDelete = new HydraulicLocationEntity { - HydraulicLocationEntityId = 4567L, + HydraulicLocationEntityId = 4567L }; ObservableCollection parentNavigationProperty = new ObservableCollection { firstEntityToDelete, secondEntityToDelete }; - var dbset = DbTestSet.GetDbTestSet(mocks, parentNavigationProperty); + var dbset = DbTestSet.GetDbTestSet(mockRepository, parentNavigationProperty); dbset.Expect(x => x.Remove(firstEntityToDelete)).Return(firstEntityToDelete); dbset.Expect(x => x.Remove(secondEntityToDelete)).Return(secondEntityToDelete); - var ringtoetsEntities = mocks.StrictMock(); - ringtoetsEntities.Expect(x => x.HydraulicLocationEntities).Return(dbset).Repeat.Twice(); - HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + ringtoetsEntitiesMock.Expect(x => x.HydraulicLocationEntities).Return(dbset).Repeat.Twice(); + HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(13001, "test", 13, 52); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); - mocks.ReplayAll(); + mockRepository.ReplayAll(); TestDelegate test = () => persistor.UpdateModel(parentNavigationProperty, hydraulicBoundaryDatabase); Assert.DoesNotThrow(test, "Precondition failed: UpdateModel"); @@ -562,25 +562,24 @@ persistor.RemoveUnModifiedEntries(parentNavigationProperty); // Assert - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] public void PerformPostSaveActions_NoInserts_DoesNotThrowException() { // Setup - var mocks = new MockRepository(); - var ringtoetsEntities = mocks.StrictMock(); - HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); - mocks.ReplayAll(); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); + mockRepository.ReplayAll(); // Call TestDelegate test = () => persistor.PerformPostSaveActions(); // Assert Assert.DoesNotThrow(test); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] @@ -590,14 +589,13 @@ public void PerformPostSaveActions_MultipleModelsInsertedWithoutStorageId_ModelsWithStorageId(int numberOfInserts) { // Setup - var mocks = new MockRepository(); var insertedHydraulicLocationEntities = new List(); - var parentNavigationPropertyMock = mocks.StrictMock>(); + var parentNavigationPropertyMock = mockRepository.StrictMock>(); parentNavigationPropertyMock.Expect(m => m.Add(null)).IgnoreArguments().WhenCalled(x => { var insertedDikeAssessmentSectionEntity = x.Arguments.GetValue(0); Assert.IsInstanceOf(insertedDikeAssessmentSectionEntity); - insertedHydraulicLocationEntities.Add((HydraulicLocationEntity)insertedDikeAssessmentSectionEntity); + insertedHydraulicLocationEntities.Add((HydraulicLocationEntity) insertedDikeAssessmentSectionEntity); }).Repeat.Times(numberOfInserts); IList hydraulicLocations = new List(); @@ -609,12 +607,12 @@ }); } - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.AddRange(hydraulicLocations); - var ringtoetsEntities = mocks.StrictMock(); - HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntities); - mocks.ReplayAll(); + var ringtoetsEntitiesMock = mockRepository.StrictMock(); + HydraulicLocationEntityPersistor persistor = new HydraulicLocationEntityPersistor(ringtoetsEntitiesMock); + mockRepository.ReplayAll(); try { @@ -636,11 +634,11 @@ Assert.AreEqual(hydraulicLocations.Count, insertedHydraulicLocationEntities.Count); foreach (var entity in insertedHydraulicLocationEntities) { - var insertedModel = hydraulicLocations.SingleOrDefault(x => x.StorageId == entity.HydraulicLocationEntityId); - Assert.IsInstanceOf(insertedModel); + HydraulicBoundaryLocation insertedModel = hydraulicLocations.SingleOrDefault(x => x.StorageId == entity.HydraulicLocationEntityId); + Assert.IsNotNull(insertedModel); } - mocks.VerifyAll(); + mockRepository.VerifyAll(); } } -} +} \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs =================================================================== diff -u -rcb5d2139148256919e697cc6b25011513ac8d6ad -r503a1871546f1694465c356bf06c167bc67740dd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs (.../RingtoetsProjectHelper.cs) (revision cb5d2139148256919e697cc6b25011513ac8d6ad) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs (.../RingtoetsProjectHelper.cs) (revision 503a1871546f1694465c356bf06c167bc67740dd) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; using Core.Common.Base.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryDatabase.cs =================================================================== diff -u -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c -r503a1871546f1694465c356bf06c167bc67740dd --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryDatabase.cs (.../HydraulicBoundaryDatabase.cs) (revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryDatabase.cs (.../HydraulicBoundaryDatabase.cs) (revision 503a1871546f1694465c356bf06c167bc67740dd) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; using Core.Common.Base; namespace Ringtoets.HydraRing.Data @@ -51,7 +50,7 @@ /// /// Gets the hydraulic boundary locations. /// - public List Locations { get; private set; } + public ObservableList Locations { get; private set; } /// /// Clears all the locations from the . Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs =================================================================== diff -u -r8d0030e18870473808b3606acef2803119ecfc98 -r503a1871546f1694465c356bf06c167bc67740dd --- Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs (.../DikeAssessmentSection.cs) (revision 8d0030e18870473808b3606acef2803119ecfc98) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs (.../DikeAssessmentSection.cs) (revision 503a1871546f1694465c356bf06c167bc67740dd) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using Core.Common.Base.Geometry; using Ringtoets.Common.Data; @@ -162,7 +161,7 @@ yield return ClosingFailureMechanism; yield return FailingOfConstructionFailureMechanism; yield return StoneRevetmentFailureMechanism; - yield return AsphaltRevetmentFailureMechanism; + yield return AsphaltRevetmentFailureMechanism; yield return GrassRevetmentFailureMechanism; } }