Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/MacroStabilityInwardsExportRegistry.cs =================================================================== diff -u -r4ae2d687516989c13cee4f685adc637d126208fd -raa141f5355c7631aef79085d3bbea2d0bb4e9fa4 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/MacroStabilityInwardsExportRegistry.cs (.../MacroStabilityInwardsExportRegistry.cs) (revision 4ae2d687516989c13cee4f685adc637d126208fd) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/MacroStabilityInwardsExportRegistry.cs (.../MacroStabilityInwardsExportRegistry.cs) (revision aa141f5355c7631aef79085d3bbea2d0bb4e9fa4) @@ -84,12 +84,12 @@ /// Gets the waternets and their unique identifiers. /// public IReadOnlyDictionary Waternets => waternets; - + /// /// Gets the waternet creator settings and their unique identifiers. /// public IReadOnlyDictionary WaternetCreatorSettings => waternetCreatorSettings; - + /// /// Gets the states and their unique identifiers. /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableCalculationSettingsFactory.cs =================================================================== diff -u -r0a705d53bb78780c46906b841cbfe938dabc09af -raa141f5355c7631aef79085d3bbea2d0bb4e9fa4 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableCalculationSettingsFactory.cs (.../PersistableCalculationSettingsFactory.cs) (revision 0a705d53bb78780c46906b841cbfe938dabc09af) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableCalculationSettingsFactory.cs (.../PersistableCalculationSettingsFactory.cs) (revision aa141f5355c7631aef79085d3bbea2d0bb4e9fa4) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using System.Reflection; using Components.Persistence.Stability.Data; using Riskeer.MacroStabilityInwards.Data; Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetCreatorSettingsFactory.cs =================================================================== diff -u -rfe85aebfcb9ee3c8a6d57c5b66d095591d36a177 -raa141f5355c7631aef79085d3bbea2d0bb4e9fa4 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetCreatorSettingsFactory.cs (.../PersistableWaternetCreatorSettingsFactory.cs) (revision fe85aebfcb9ee3c8a6d57c5b66d095591d36a177) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableWaternetCreatorSettingsFactory.cs (.../PersistableWaternetCreatorSettingsFactory.cs) (revision aa141f5355c7631aef79085d3bbea2d0bb4e9fa4) @@ -151,7 +151,7 @@ AquitardHeadLandSide = input.PiezometricHeadPhreaticLine2Inwards, MeanWaterLevel = input.WaterLevelRiverAverage, IsDrainageConstructionPresent = input.DrainageConstructionPresent, - DrainageConstruction = new PersistablePoint(input.XCoordinateDrainageConstruction,input.ZCoordinateDrainageConstruction), + DrainageConstruction = new PersistablePoint(input.XCoordinateDrainageConstruction, input.ZCoordinateDrainageConstruction), IsDitchPresent = isDitchPresent, DitchCharacteristics = CreateDitchCharacteristics(input.SurfaceLine, isDitchPresent), EmbankmentCharacteristics = CreateEmbankmentCharacteristics(input.SurfaceLine), @@ -160,7 +160,7 @@ }; IEnumerable aquiferLayers = MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(input.SoilProfileUnderSurfaceLine.Layers) - .Where(l => l.Data.IsAquifer); + .Where(l => l.Data.IsAquifer); if (aquiferLayers.Count() == 1) { Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/IdFactoryTest.cs =================================================================== diff -u -r8baf1e4a72fd086748259c63e6f40f5d8de021e0 -raa141f5355c7631aef79085d3bbea2d0bb4e9fa4 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/IdFactoryTest.cs (.../IdFactoryTest.cs) (revision 8baf1e4a72fd086748259c63e6f40f5d8de021e0) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/IdFactoryTest.cs (.../IdFactoryTest.cs) (revision aa141f5355c7631aef79085d3bbea2d0bb4e9fa4) @@ -32,7 +32,7 @@ { // Setup var idFactory = new IdFactory(); - + // Call string firstId = idFactory.Create(); string secondId = idFactory.Create(); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/MacroStabilityInwardsExportRegistryTest.cs =================================================================== diff -u -r4ae2d687516989c13cee4f685adc637d126208fd -raa141f5355c7631aef79085d3bbea2d0bb4e9fa4 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/MacroStabilityInwardsExportRegistryTest.cs (.../MacroStabilityInwardsExportRegistryTest.cs) (revision 4ae2d687516989c13cee4f685adc637d126208fd) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/MacroStabilityInwardsExportRegistryTest.cs (.../MacroStabilityInwardsExportRegistryTest.cs) (revision aa141f5355c7631aef79085d3bbea2d0bb4e9fa4) @@ -103,7 +103,7 @@ { // Setup MacroStabilityInwardsSoilLayer2D soilLayer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D(); - + var registry = new MacroStabilityInwardsExportRegistry(); const string id = "1"; @@ -250,7 +250,7 @@ { // Setup var registry = new MacroStabilityInwardsExportRegistry(); - const MacroStabilityInwardsExportStageType stageType = (MacroStabilityInwardsExportStageType)99; + const MacroStabilityInwardsExportStageType stageType = (MacroStabilityInwardsExportStageType) 99; // Call void Call() => registry.AddSoilLayer(stageType, "1"); @@ -283,7 +283,7 @@ { // Setup var registry = new MacroStabilityInwardsExportRegistry(); - const MacroStabilityInwardsExportStageType stageType = (MacroStabilityInwardsExportStageType)99; + const MacroStabilityInwardsExportStageType stageType = (MacroStabilityInwardsExportStageType) 99; // Call void Call() => registry.AddWaternet(stageType, "1"); @@ -316,7 +316,7 @@ { // Setup var registry = new MacroStabilityInwardsExportRegistry(); - const MacroStabilityInwardsExportStageType stageType = (MacroStabilityInwardsExportStageType)99; + const MacroStabilityInwardsExportStageType stageType = (MacroStabilityInwardsExportStageType) 99; // Call void Call() => registry.AddWaternetCreatorSettings(stageType, "1"); @@ -349,7 +349,7 @@ { // Setup var registry = new MacroStabilityInwardsExportRegistry(); - const MacroStabilityInwardsExportStageType stageType = (MacroStabilityInwardsExportStageType)99; + const MacroStabilityInwardsExportStageType stageType = (MacroStabilityInwardsExportStageType) 99; // Call void Call() => registry.AddState(stageType, "1"); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableCalculationSettingsFactoryTest.cs =================================================================== diff -u -rbe3d9a45b29158909701853718aefbcb1d74497e -raa141f5355c7631aef79085d3bbea2d0bb4e9fa4 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableCalculationSettingsFactoryTest.cs (.../PersistableCalculationSettingsFactoryTest.cs) (revision be3d9a45b29158909701853718aefbcb1d74497e) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableCalculationSettingsFactoryTest.cs (.../PersistableCalculationSettingsFactoryTest.cs) (revision aa141f5355c7631aef79085d3bbea2d0bb4e9fa4) @@ -82,7 +82,7 @@ // Assert PersistableDataModelTestHelper.AssertCalculationSettings(slidingCurve, settingsCollection); - + var stages = new[] { MacroStabilityInwardsExportStageType.Daily, Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableSoilLayerCollectionFactoryTest.cs =================================================================== diff -u -rc9675e594248834c75fe0a05d3d993981b2b1148 -raa141f5355c7631aef79085d3bbea2d0bb4e9fa4 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableSoilLayerCollectionFactoryTest.cs (.../PersistableSoilLayerCollectionFactoryTest.cs) (revision c9675e594248834c75fe0a05d3d993981b2b1148) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableSoilLayerCollectionFactoryTest.cs (.../PersistableSoilLayerCollectionFactoryTest.cs) (revision aa141f5355c7631aef79085d3bbea2d0bb4e9fa4) @@ -46,6 +46,7 @@ var exception = Assert.Throws(Call); Assert.AreEqual("soilProfile", exception.ParamName); } + [Test] public void Create_IdFactoryNull_ThrowsArgumentNullException() { @@ -54,7 +55,6 @@ var soilProfile = mocks.Stub(); mocks.ReplayAll(); - // Call void Call() => PersistableSoilLayerCollectionFactory.Create(soilProfile, null, new MacroStabilityInwardsExportRegistry()); @@ -94,7 +94,7 @@ }) }, Enumerable.Empty()); - + var idFactory = new IdFactory(); var registry = new MacroStabilityInwardsExportRegistry(); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStateFactoryTest.cs =================================================================== diff -u -rdb6b3624eb33a8c762dec9f4565c18cd229fba5f -raa141f5355c7631aef79085d3bbea2d0bb4e9fa4 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStateFactoryTest.cs (.../PersistableStateFactoryTest.cs) (revision db6b3624eb33a8c762dec9f4565c18cd229fba5f) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.Test/Factories/PersistableStateFactoryTest.cs (.../PersistableStateFactoryTest.cs) (revision aa141f5355c7631aef79085d3bbea2d0bb4e9fa4) @@ -110,7 +110,7 @@ // Assert PersistableDataModelTestHelper.AssertStates(soilProfile, states); - AssertRegistry(registry, new [] + AssertRegistry(registry, new[] { MacroStabilityInwardsExportStageType.Daily, MacroStabilityInwardsExportStageType.Extreme