Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs =================================================================== diff -u -r62a7251bc3af8d2358abc6f563ac7597a24e6355 -rab73638550f443ee7841f9d5619cd3bf3fa99bcb --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs (.../PersistableStageFactory.cs) (revision 62a7251bc3af8d2358abc6f563ac7597a24e6355) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs (.../PersistableStageFactory.cs) (revision ab73638550f443ee7841f9d5619cd3bf3fa99bcb) @@ -67,7 +67,8 @@ GeometryId = registry.Geometries[stageType], SoilLayersId = registry.SoilLayers[stageType], WaternetId = registry.Waternets[stageType], - WaternetCreatorSettingsId = registry.WaternetCreatorSettings[stageType] + WaternetCreatorSettingsId = registry.WaternetCreatorSettings[stageType], + StateId = registry.States[stageType] }; } } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStageFactoryTest.cs =================================================================== diff -u -r62a7251bc3af8d2358abc6f563ac7597a24e6355 -rab73638550f443ee7841f9d5619cd3bf3fa99bcb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStageFactoryTest.cs (.../PersistableStageFactoryTest.cs) (revision 62a7251bc3af8d2358abc6f563ac7597a24e6355) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStageFactoryTest.cs (.../PersistableStageFactoryTest.cs) (revision ab73638550f443ee7841f9d5619cd3bf3fa99bcb) @@ -71,6 +71,7 @@ var soilLayersList = new List(); var waternetList = new List(); var waternetCreatorSettingsList = new List(); + var stateList = new List(); foreach (MacroStabilityInwardsExportStageType stageType in stageTypes) { @@ -104,18 +105,25 @@ }; waternetCreatorSettingsList.Add(waternetCreatorSettings); + var state = new PersistableState + { + Id = idFactory.Create() + }; + stateList.Add(state); + registry.AddSettings(stageType, settings.Id); registry.AddGeometry(stageType, geometry.Id); registry.AddSoilLayer(stageType, persistableSoilLayerCollection.Id); registry.AddWaternet(stageType, waternet.Id); registry.AddWaternetCreatorSettings(stageType, waternetCreatorSettings.Id); + registry.AddState(stageType, state.Id); } // Call IEnumerable stages = PersistableStageFactory.Create(idFactory, registry); // Assert - PersistableDataModelTestHelper.AssertStages(stages, settingsList, geometryList, soilLayersList, waternetList, waternetCreatorSettingsList); + PersistableDataModelTestHelper.AssertStages(stages, settingsList, geometryList, soilLayersList, waternetList, waternetCreatorSettingsList, stateList); } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs =================================================================== diff -u -r6ff01e7ca7bcb0fefcef033ae31738c401bcf24f -rab73638550f443ee7841f9d5619cd3bf3fa99bcb --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs (.../PersistableDataModelTestHelper.cs) (revision 6ff01e7ca7bcb0fefcef033ae31738c401bcf24f) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs (.../PersistableDataModelTestHelper.cs) (revision ab73638550f443ee7841f9d5619cd3bf3fa99bcb) @@ -84,7 +84,7 @@ Assert.IsNull(persistableDataModel.StateCorrelations); AssertStages(persistableDataModel.Stages, persistableDataModel.CalculationSettings, persistableDataModel.Geometry, persistableDataModel.SoilLayers, - persistableDataModel.Waternets, persistableDataModel.WaternetCreatorSettings); + persistableDataModel.Waternets, persistableDataModel.WaternetCreatorSettings, persistableDataModel.States); } /// @@ -446,11 +446,13 @@ /// The soil layers that are used. /// The waternets that are used. /// The waternet creator settings that are used. + /// The states that are used. /// Thrown when the data in /// is not correct. public static void AssertStages(IEnumerable stages, IEnumerable calculationSettings, IEnumerable geometries, IEnumerable soilLayers, - IEnumerable waternets, IEnumerable waternetCreatorSettings) + IEnumerable waternets, IEnumerable waternetCreatorSettings, + IEnumerable states) { Assert.AreEqual(2, stages.Count()); @@ -463,6 +465,7 @@ Assert.AreEqual(soilLayers.ElementAt(i).Id, stage.SoilLayersId); Assert.AreEqual(waternets.ElementAt(i).Id, stage.WaternetId); Assert.AreEqual(waternetCreatorSettings.ElementAt(i).Id, stage.WaternetCreatorSettingsId); + Assert.AreEqual(states.ElementAt(i).Id, stage.StateId); } }