Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs =================================================================== diff -u -r447cc6c0cd43f48004d67c0ff9e2b7d0bb5a17a4 -r73f114aa643424ff702201c036020e3c5ee85bbd --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs (.../PersistableStageFactory.cs) (revision 447cc6c0cd43f48004d67c0ff9e2b7d0bb5a17a4) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs (.../PersistableStageFactory.cs) (revision 73f114aa643424ff702201c036020e3c5ee85bbd) @@ -65,7 +65,8 @@ Id = idFactory.Create(), CalculationSettingsId = registry.Settings[stageType], GeometryId = registry.Geometries[stageType], - SoilLayersId = registry.SoilLayers[stageType] + SoilLayersId = registry.SoilLayers[stageType], + WaternetId = registry.Waternets[stageType] }; } } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStageFactoryTest.cs =================================================================== diff -u -r447cc6c0cd43f48004d67c0ff9e2b7d0bb5a17a4 -r73f114aa643424ff702201c036020e3c5ee85bbd --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStageFactoryTest.cs (.../PersistableStageFactoryTest.cs) (revision 447cc6c0cd43f48004d67c0ff9e2b7d0bb5a17a4) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStageFactoryTest.cs (.../PersistableStageFactoryTest.cs) (revision 73f114aa643424ff702201c036020e3c5ee85bbd) @@ -69,6 +69,7 @@ var settingsList = new List(); var geometryList = new List(); var soilLayersList = new List(); + var waternetList = new List(); foreach (MacroStabilityInwardsExportStageType stageType in stageTypes) { @@ -90,16 +91,23 @@ }; soilLayersList.Add(persistableSoilLayerCollection); + var waternet = new PersistableWaternet + { + Id = idFactory.Create() + }; + waternetList.Add(waternet); + registry.AddSettings(stageType, settings.Id); registry.AddGeometry(stageType, geometry.Id); registry.AddSoilLayer(stageType, persistableSoilLayerCollection.Id); + registry.AddWaternet(stageType, waternet.Id); } // Call IEnumerable stages = PersistableStageFactory.Create(idFactory, registry); // Assert - PersistableDataModelTestHelper.AssertStages(stages, settingsList, geometryList, soilLayersList); + PersistableDataModelTestHelper.AssertStages(stages, settingsList, geometryList, soilLayersList, waternetList); } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs =================================================================== diff -u -rab88ba7ce55a0b63a76889cd3c8fbc133b0d23f6 -r73f114aa643424ff702201c036020e3c5ee85bbd --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs (.../PersistableDataModelTestHelper.cs) (revision ab88ba7ce55a0b63a76889cd3c8fbc133b0d23f6) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs (.../PersistableDataModelTestHelper.cs) (revision 73f114aa643424ff702201c036020e3c5ee85bbd) @@ -75,7 +75,8 @@ Assert.IsNull(persistableDataModel.StateCorrelations); Assert.IsNull(persistableDataModel.States); - AssertStages(persistableDataModel.Stages, persistableDataModel.CalculationSettings, persistableDataModel.Geometry, persistableDataModel.SoilLayers); + AssertStages(persistableDataModel.Stages, persistableDataModel.CalculationSettings, persistableDataModel.Geometry, persistableDataModel.SoilLayers, + persistableDataModel.Waternets); } /// @@ -332,10 +333,12 @@ /// The calculation settings that are used. /// The geometries that are used. /// The soil layers that are used. + /// The waternets that are used. /// Thrown when the data in /// is not correct. public static void AssertStages(IEnumerable stages, IEnumerable calculationSettings, - IEnumerable geometries, IEnumerable soilLayers) + IEnumerable geometries, IEnumerable soilLayers, + IEnumerable waternets) { Assert.AreEqual(2, stages.Count()); @@ -346,6 +349,7 @@ Assert.AreEqual(calculationSettings.ElementAt(i).Id, stage.CalculationSettingsId); Assert.AreEqual(geometries.ElementAt(i).Id, stage.GeometryId); Assert.AreEqual(soilLayers.ElementAt(i).Id, stage.SoilLayersId); + Assert.AreEqual(waternets.ElementAt(i).Id, stage.WaternetId); } }