Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -r4a204921c07e423981a5c4c0e51202a9859abe25 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 4a204921c07e423981a5c4c0e51202a9859abe25) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -271,7 +271,7 @@ private static void ReadStabilityPointStructuresFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var stabilityPointStructuresFailureMechanismEntity = entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (int)FailureMechanismType.StabilityPointStructures); + var stabilityPointStructuresFailureMechanismEntity = entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (int) FailureMechanismType.StabilityPointStructures); if (stabilityPointStructuresFailureMechanismEntity != null) { stabilityPointStructuresFailureMechanismEntity.ReadAsStabilityPointStructuresFailureMechanism(assessmentSection.StabilityPointStructures, collector); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs =================================================================== diff -u -r3e7db9d95e07d438ec99f8488ec184848655b98c -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs (.../CalculationGroupEntityReadExtentions.cs) (revision 3e7db9d95e07d438ec99f8488ec184848655b98c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs (.../CalculationGroupEntityReadExtentions.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -27,8 +27,8 @@ using Application.Ringtoets.Storage.Read.GrassCoverErosionOutwards; using Application.Ringtoets.Storage.Read.HeightStructures; using Application.Ringtoets.Storage.Read.Piping; -using Application.Ringtoets.Storage.Read.StabilityStoneCover; using Application.Ringtoets.Storage.Read.StabilityPointStructures; +using Application.Ringtoets.Storage.Read.StabilityStoneCover; using Application.Ringtoets.Storage.Read.WaveImpactAsphaltCover; using Ringtoets.Common.Data.Calculation; using Ringtoets.Piping.Data; @@ -201,7 +201,7 @@ /// A new . /// Thrown when is null. internal static CalculationGroup ReadAsClosingStructuresCalculationGroup(this CalculationGroupEntity entity, - ReadConversionCollector collector) + ReadConversionCollector collector) { if (collector == null) { @@ -237,7 +237,7 @@ /// A new . /// Thrown when is null. internal static CalculationGroup ReadAsStabilityPointStructuresCalculationGroup(this CalculationGroupEntity entity, - ReadConversionCollector collector) + ReadConversionCollector collector) { if (collector == null) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensions.cs =================================================================== diff -u -r6e33ada58f1a53a5a732c3b4e46583ad846a2983 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensions.cs (.../ClosingStructuresSectionResultEntityReadExtensions.cs) (revision 6e33ada58f1a53a5a732c3b4e46583ad846a2983) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensions.cs (.../ClosingStructuresSectionResultEntityReadExtensions.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -42,7 +42,7 @@ /// A new . /// Thrown when any input parameter is null. internal static void Read(this ClosingStructuresSectionResultEntity entity, ClosingStructuresFailureMechanismSectionResult sectionResult, - ReadConversionCollector collector) + ReadConversionCollector collector) { if (sectionResult == null) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensions.cs =================================================================== diff -u -rfd75ff7d1794c6a64fd3ce1aa1f159effba2e102 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensions.cs (.../DuneErosionSectionResultEntityReadExtensions.cs) (revision fd75ff7d1794c6a64fd3ce1aa1f159effba2e102) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneErosionSectionResultEntityReadExtensions.cs (.../DuneErosionSectionResultEntityReadExtensions.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -49,7 +49,7 @@ } sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne); - sectionResult.AssessmentLayerTwoA = (AssessmentLayerTwoAResult)entity.LayerTwoA; + sectionResult.AssessmentLayerTwoA = (AssessmentLayerTwoAResult) entity.LayerTwoA; sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNullAsNaN(); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs =================================================================== diff -u -r9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs (.../StabilityPointStructureEntityReadExtensions.cs) (revision 9d44bbbae4b9c8fd9c6087fb36e7cd701b5297ac) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs (.../StabilityPointStructureEntityReadExtensions.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -58,107 +58,107 @@ Id = entity.Id, Location = new Point2D(entity.X.ToNullAsNaN(), entity.Y.ToNullAsNaN()), StructureNormalOrientation = entity.StructureNormalOrientation.ToNullAsNaN(), - StorageStructureArea = + StorageStructureArea = { - Mean = (RoundedDouble)entity.StorageStructureAreaMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.StorageStructureAreaCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.StorageStructureAreaMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.StorageStructureAreaCoefficientOfVariation.ToNullAsNaN() }, AllowedLevelIncreaseStorage = { - Mean = (RoundedDouble)entity.AllowedLevelIncreaseStorageMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.AllowedLevelIncreaseStorageStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.AllowedLevelIncreaseStorageMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.AllowedLevelIncreaseStorageStandardDeviation.ToNullAsNaN() }, FlowWidthAtBottomProtection = { - Mean = (RoundedDouble)entity.FlowWidthAtBottomProtectionMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.FlowWidthAtBottomProtectionStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.FlowWidthAtBottomProtectionMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.FlowWidthAtBottomProtectionStandardDeviation.ToNullAsNaN() }, InsideWaterLevel = { - Mean = (RoundedDouble)entity.InsideWaterLevelMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.InsideWaterLevelStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.InsideWaterLevelMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.InsideWaterLevelStandardDeviation.ToNullAsNaN() }, ThresholdHeightOpenWeir = { - Mean = (RoundedDouble)entity.ThresholdHeightOpenWeirMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.ThresholdHeightOpenWeirStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.ThresholdHeightOpenWeirMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.ThresholdHeightOpenWeirStandardDeviation.ToNullAsNaN() }, CriticalOvertoppingDischarge = { - Mean = (RoundedDouble)entity.CriticalOvertoppingDischargeMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.CriticalOvertoppingDischargeCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.CriticalOvertoppingDischargeMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.CriticalOvertoppingDischargeCoefficientOfVariation.ToNullAsNaN() }, WidthFlowApertures = { - Mean = (RoundedDouble)entity.WidthFlowAperturesMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.WidthFlowAperturesCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.WidthFlowAperturesMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.WidthFlowAperturesCoefficientOfVariation.ToNullAsNaN() }, ConstructiveStrengthLinearLoadModel = { - Mean = (RoundedDouble)entity.ConstructiveStrengthLinearLoadModelMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.ConstructiveStrengthLinearLoadModelCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.ConstructiveStrengthLinearLoadModelMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.ConstructiveStrengthLinearLoadModelCoefficientOfVariation.ToNullAsNaN() }, ConstructiveStrengthQuadraticLoadModel = { - Mean = (RoundedDouble)entity.ConstructiveStrengthQuadraticLoadModelMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.ConstructiveStrengthQuadraticLoadModelCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.ConstructiveStrengthQuadraticLoadModelMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.ConstructiveStrengthQuadraticLoadModelCoefficientOfVariation.ToNullAsNaN() }, BankWidth = { - Mean = (RoundedDouble)entity.BankWidthMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.BankWidthStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.BankWidthMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.BankWidthStandardDeviation.ToNullAsNaN() }, InsideWaterLevelFailureConstruction = { - Mean = (RoundedDouble)entity.InsideWaterLevelFailureConstructionMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.InsideWaterLevelFailureConstructionStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.InsideWaterLevelFailureConstructionMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.InsideWaterLevelFailureConstructionStandardDeviation.ToNullAsNaN() }, - EvaluationLevel = (RoundedDouble)entity.EvaluationLevel.ToNullAsNaN(), + EvaluationLevel = (RoundedDouble) entity.EvaluationLevel.ToNullAsNaN(), LevelCrestStructure = { - Mean = (RoundedDouble)entity.LevelCrestStructureMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.LevelCrestStructureStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.LevelCrestStructureMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.LevelCrestStructureStandardDeviation.ToNullAsNaN() }, - VerticalDistance = (RoundedDouble)entity.VerticalDistance.ToNullAsNaN(), + VerticalDistance = (RoundedDouble) entity.VerticalDistance.ToNullAsNaN(), FailureProbabilityRepairClosure = entity.FailureProbabilityRepairClosure.ToNullAsNaN(), FailureCollisionEnergy = { - Mean = (RoundedDouble)entity.FailureCollisionEnergyMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.FailureCollisionEnergyCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.FailureCollisionEnergyMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.FailureCollisionEnergyCoefficientOfVariation.ToNullAsNaN() }, ShipMass = { - Mean = (RoundedDouble)entity.ShipMassMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.ShipMassCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.ShipMassMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.ShipMassCoefficientOfVariation.ToNullAsNaN() }, ShipVelocity = { - Mean = (RoundedDouble)entity.ShipVelocityMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.ShipVelocityCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.ShipVelocityMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.ShipVelocityCoefficientOfVariation.ToNullAsNaN() }, LevellingCount = entity.LevellingCount, ProbabilityCollisionSecondaryStructure = entity.ProbabilityCollisionSecondaryStructure.ToNullAsNaN(), FlowVelocityStructureClosable = { - Mean = (RoundedDouble)entity.FlowVelocityStructureClosableMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.FlowVelocityStructureClosableStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.FlowVelocityStructureClosableMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.FlowVelocityStructureClosableStandardDeviation.ToNullAsNaN() }, StabilityLinearLoadModel = { - Mean = (RoundedDouble)entity.StabilityLinearLoadModelMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.StabilityLinearLoadModelCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.StabilityLinearLoadModelMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.StabilityLinearLoadModelCoefficientOfVariation.ToNullAsNaN() }, StabilityQuadraticLoadModel = { - Mean = (RoundedDouble)entity.StabilityQuadraticLoadModelMean.ToNullAsNaN(), - CoefficientOfVariation = (RoundedDouble)entity.StabilityQuadraticLoadModelCoefficientOfVariation.ToNullAsNaN() + Mean = (RoundedDouble) entity.StabilityQuadraticLoadModelMean.ToNullAsNaN(), + CoefficientOfVariation = (RoundedDouble) entity.StabilityQuadraticLoadModelCoefficientOfVariation.ToNullAsNaN() }, AreaFlowApertures = { - Mean = (RoundedDouble)entity.AreaFlowAperturesMean.ToNullAsNaN(), - StandardDeviation = (RoundedDouble)entity.AreaFlowAperturesStandardDeviation.ToNullAsNaN() + Mean = (RoundedDouble) entity.AreaFlowAperturesMean.ToNullAsNaN(), + StandardDeviation = (RoundedDouble) entity.AreaFlowAperturesStandardDeviation.ToNullAsNaN() }, - InflowModelType = (StabilityPointStructureInflowModelType)entity.InflowModelType + InflowModelType = (StabilityPointStructureInflowModelType) entity.InflowModelType }); collector.Read(entity, structure); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensions.cs =================================================================== diff -u -r6e33ada58f1a53a5a732c3b4e46583ad846a2983 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensions.cs (.../StabilityPointStructuresSectionResultEntityReadExtensions.cs) (revision 6e33ada58f1a53a5a732c3b4e46583ad846a2983) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensions.cs (.../StabilityPointStructuresSectionResultEntityReadExtensions.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -41,8 +41,8 @@ /// The object keeping track of read operations. /// A new . /// Thrown when any input parameter is null. - internal static void Read(this StabilityPointStructuresSectionResultEntity entity, StabilityPointStructuresFailureMechanismSectionResult sectionResult, - ReadConversionCollector collector) + internal static void Read(this StabilityPointStructuresSectionResultEntity entity, StabilityPointStructuresFailureMechanismSectionResult sectionResult, + ReadConversionCollector collector) { if (sectionResult == null) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs =================================================================== diff -u -rfd75ff7d1794c6a64fd3ce1aa1f159effba2e102 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs (.../StabilityStoneCoverSectionResultEntityReadExtensions.cs) (revision fd75ff7d1794c6a64fd3ce1aa1f159effba2e102) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverSectionResultEntityReadExtensions.cs (.../StabilityStoneCoverSectionResultEntityReadExtensions.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -49,7 +49,7 @@ } sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne); - sectionResult.AssessmentLayerTwoA = (AssessmentLayerTwoAResult)entity.LayerTwoA; + sectionResult.AssessmentLayerTwoA = (AssessmentLayerTwoAResult) entity.LayerTwoA; sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNullAsNaN(); } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs =================================================================== diff -u -r247c266ed24d7fb6cfc0e750e4802e3c26d28cdb -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs (.../StabilityPointStructureCreateExtensionsTest.cs) (revision 247c266ed24d7fb6cfc0e750e4802e3c26d28cdb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs (.../StabilityPointStructureCreateExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -138,7 +138,7 @@ Mean = RoundedDouble.NaN, StandardDeviation = RoundedDouble.NaN }, - WidthFlowApertures = + WidthFlowApertures = { Mean = RoundedDouble.NaN, CoefficientOfVariation = RoundedDouble.NaN Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r3e7db9d95e07d438ec99f8488ec184848655b98c -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 3e7db9d95e07d438ec99f8488ec184848655b98c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -197,8 +197,8 @@ Assert.AreEqual(0, childGroupEntity.Order); StabilityPointStructuresCalculationEntity[] calculationEntities = entity.CalculationGroupEntity.StabilityPointStructuresCalculationEntities - .OrderBy(ce => ce.Order) - .ToArray(); + .OrderBy(ce => ce.Order) + .ToArray(); StabilityPointStructuresCalculationEntity calculationEntity = calculationEntities[0]; Assert.AreEqual("Nieuwe berekening", calculationEntity.Name); Assert.AreEqual(1, calculationEntity.Order); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs =================================================================== diff -u -r31d2ac70c3ea6bb9f0461a296408af2a316ee5e0 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 31d2ac70c3ea6bb9f0461a296408af2a316ee5e0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -820,8 +820,8 @@ }, ConstructiveStrengthQuadraticLoadModel = { - Mean = (RoundedDouble)random.NextDouble(), - CoefficientOfVariation = (RoundedDouble)random.NextDouble() + Mean = (RoundedDouble) random.NextDouble(), + CoefficientOfVariation = (RoundedDouble) random.NextDouble() }, BankWidth = { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision b190a14336e0d8fe9aec34e81a68194081c76155) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -801,7 +801,7 @@ var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.StructureHeight, + FailureMechanismType = (int) FailureMechanismType.StructureHeight, CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), Comments = comments, @@ -836,11 +836,11 @@ var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.ReliabilityClosingOfStructure, + FailureMechanismType = (int) FailureMechanismType.ReliabilityClosingOfStructure, CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), Comments = comments, - ClosingStructureFailureMechanismMetaEntities = + ClosingStructureFailureMechanismMetaEntities = { new ClosingStructureFailureMechanismMetaEntity { @@ -871,11 +871,11 @@ var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.StabilityPointStructures, + FailureMechanismType = (int) FailureMechanismType.StabilityPointStructures, CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), Comments = comments, - StabilityPointStructuresFailureMechanismMetaEntities = + StabilityPointStructuresFailureMechanismMetaEntities = { new StabilityPointStructuresFailureMechanismMetaEntity { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs =================================================================== diff -u -r3e7db9d95e07d438ec99f8488ec184848655b98c -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 3e7db9d95e07d438ec99f8488ec184848655b98c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -774,10 +774,10 @@ ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); Assert.AreEqual(2, rootChildren.Length); - var rootChildCalculation1 = (StructuresCalculation)rootChildren[0]; + var rootChildCalculation1 = (StructuresCalculation) rootChildren[0]; Assert.AreEqual("1", rootChildCalculation1.Name); - var rootChildCalculation2 = (StructuresCalculation)rootChildren[1]; + var rootChildCalculation2 = (StructuresCalculation) rootChildren[1]; Assert.AreEqual("2", rootChildCalculation2.Name); } @@ -825,13 +825,13 @@ ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); Assert.AreEqual(4, rootChildren.Length); - var rootChildCalculation1 = (StructuresCalculation)rootChildren[0]; + var rootChildCalculation1 = (StructuresCalculation) rootChildren[0]; Assert.AreEqual("calculation1", rootChildCalculation1.Name); var rootChildGroup1 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("group1", rootChildGroup1.Name); - var rootChildCalculation2 = (StructuresCalculation)rootChildren[2]; + var rootChildCalculation2 = (StructuresCalculation) rootChildren[2]; Assert.AreEqual("calculation2", rootChildCalculation2.Name); var rootChildGroup2 = (CalculationGroup) rootChildren[3]; @@ -922,17 +922,17 @@ Assert.AreEqual("A", rootGroup.Name); ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); - var rootChildGroup1 = (CalculationGroup)rootChildren[0]; + var rootChildGroup1 = (CalculationGroup) rootChildren[0]; Assert.AreEqual("AA", rootChildGroup1.Name); CollectionAssert.IsEmpty(rootChildGroup1.Children); - var rootChildGroup2 = (CalculationGroup)rootChildren[1]; + var rootChildGroup2 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("AB", rootChildGroup2.Name); ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray(); - var rootChildGroup1Child1 = (CalculationGroup)rootChildGroup2Children[0]; + var rootChildGroup1Child1 = (CalculationGroup) rootChildGroup2Children[0]; Assert.AreEqual("ABA", rootChildGroup1Child1.Name); CollectionAssert.IsEmpty(rootChildGroup1Child1.Children); - var rootChildGroup1Child2 = (CalculationGroup)rootChildGroup2Children[1]; + var rootChildGroup1Child2 = (CalculationGroup) rootChildGroup2Children[1]; Assert.AreEqual("ABB", rootChildGroup1Child2.Name); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); } @@ -968,10 +968,10 @@ ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); Assert.AreEqual(2, rootChildren.Length); - var rootChildCalculation1 = (StructuresCalculation)rootChildren[0]; + var rootChildCalculation1 = (StructuresCalculation) rootChildren[0]; Assert.AreEqual("1", rootChildCalculation1.Name); - var rootChildCalculation2 = (StructuresCalculation)rootChildren[1]; + var rootChildCalculation2 = (StructuresCalculation) rootChildren[1]; Assert.AreEqual("2", rootChildCalculation2.Name); } @@ -1019,16 +1019,16 @@ ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); Assert.AreEqual(4, rootChildren.Length); - var rootChildCalculation1 = (StructuresCalculation)rootChildren[0]; + var rootChildCalculation1 = (StructuresCalculation) rootChildren[0]; Assert.AreEqual("calculation1", rootChildCalculation1.Name); - var rootChildGroup1 = (CalculationGroup)rootChildren[1]; + var rootChildGroup1 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("group1", rootChildGroup1.Name); - var rootChildCalculation2 = (StructuresCalculation)rootChildren[2]; + var rootChildCalculation2 = (StructuresCalculation) rootChildren[2]; Assert.AreEqual("calculation2", rootChildCalculation2.Name); - var rootChildGroup2 = (CalculationGroup)rootChildren[3]; + var rootChildGroup2 = (CalculationGroup) rootChildren[3]; Assert.AreEqual("group2", rootChildGroup2.Name); } @@ -1115,17 +1115,17 @@ Assert.AreEqual("A", rootGroup.Name); ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); - var rootChildGroup1 = (CalculationGroup)rootChildren[0]; + var rootChildGroup1 = (CalculationGroup) rootChildren[0]; Assert.AreEqual("AA", rootChildGroup1.Name); CollectionAssert.IsEmpty(rootChildGroup1.Children); - var rootChildGroup2 = (CalculationGroup)rootChildren[1]; + var rootChildGroup2 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("AB", rootChildGroup2.Name); ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray(); - var rootChildGroup1Child1 = (CalculationGroup)rootChildGroup2Children[0]; + var rootChildGroup1Child1 = (CalculationGroup) rootChildGroup2Children[0]; Assert.AreEqual("ABA", rootChildGroup1Child1.Name); CollectionAssert.IsEmpty(rootChildGroup1Child1.Children); - var rootChildGroup1Child2 = (CalculationGroup)rootChildGroup2Children[1]; + var rootChildGroup1Child2 = (CalculationGroup) rootChildGroup2Children[1]; Assert.AreEqual("ABB", rootChildGroup1Child2.Name); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); } @@ -1161,10 +1161,10 @@ ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); Assert.AreEqual(2, rootChildren.Length); - var rootChildCalculation1 = (StructuresCalculation)rootChildren[0]; + var rootChildCalculation1 = (StructuresCalculation) rootChildren[0]; Assert.AreEqual("1", rootChildCalculation1.Name); - var rootChildCalculation2 = (StructuresCalculation)rootChildren[1]; + var rootChildCalculation2 = (StructuresCalculation) rootChildren[1]; Assert.AreEqual("2", rootChildCalculation2.Name); } @@ -1212,16 +1212,16 @@ ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); Assert.AreEqual(4, rootChildren.Length); - var rootChildCalculation1 = (StructuresCalculation)rootChildren[0]; + var rootChildCalculation1 = (StructuresCalculation) rootChildren[0]; Assert.AreEqual("calculation1", rootChildCalculation1.Name); - var rootChildGroup1 = (CalculationGroup)rootChildren[1]; + var rootChildGroup1 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("group1", rootChildGroup1.Name); - var rootChildCalculation2 = (StructuresCalculation)rootChildren[2]; + var rootChildCalculation2 = (StructuresCalculation) rootChildren[2]; Assert.AreEqual("calculation2", rootChildCalculation2.Name); - var rootChildGroup2 = (CalculationGroup)rootChildren[3]; + var rootChildGroup2 = (CalculationGroup) rootChildren[3]; Assert.AreEqual("group2", rootChildGroup2.Name); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs =================================================================== diff -u -re440a0fe415d87b898ae1b6ad2e4ba98d0f104cf -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs (.../ClosingStructureEntityReadExtensionsTest.cs) (revision e440a0fe415d87b898ae1b6ad2e4ba98d0f104cf) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs (.../ClosingStructureEntityReadExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -138,8 +138,8 @@ Assert.AreEqual(entity.FailureProbabilityOpenStructure, structure.FailureProbabilityOpenStructure); Assert.AreEqual(entity.IdenticalApertures, structure.IdenticalApertures); Assert.AreEqual(entity.FailureProbabilityReparation, structure.FailureProbabilityReparation); - Assert.AreEqual((ClosingStructureInflowModelType)entity.InflowModelType, structure.InflowModelType); - + Assert.AreEqual((ClosingStructureInflowModelType) entity.InflowModelType, structure.InflowModelType); + Assert.IsTrue(collector.Contains(entity)); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IProbabilityAssessmentOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r9e54793f4e953bf1a1b9c9f9d731de4831dd9ff6 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IProbabilityAssessmentOutputEntityReadExtensionsTest.cs (.../IProbabilityAssessmentOutputEntityReadExtensionsTest.cs) (revision 9e54793f4e953bf1a1b9c9f9d731de4831dd9ff6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IProbabilityAssessmentOutputEntityReadExtensionsTest.cs (.../IProbabilityAssessmentOutputEntityReadExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -21,11 +21,11 @@ using System; using Application.Ringtoets.Storage.DbContext; +using Application.Ringtoets.Storage.Read; using Core.Common.Base.Data; using NUnit.Framework; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.TestUtil; -using Application.Ringtoets.Storage.Read; namespace Application.Ringtoets.Storage.Test.Read { @@ -55,8 +55,8 @@ Assert.AreEqual(entity.Probability, output.Probability); AssertRoundedDouble(entity.Reliability, output.Reliability); AssertRoundedDouble(entity.FactorOfSafety, output.FactorOfSafety); - } - + } + [Test] public void Read_ValidEntityWithNullValues_ReturnProbabilityAssessmentOutput() { @@ -92,7 +92,7 @@ private static void AssertRoundedDouble(double? expectedValue, RoundedDouble actualValue) { - Assert.AreEqual((RoundedDouble)expectedValue.ToNullAsNaN(), actualValue, actualValue.GetAccuracy()); + Assert.AreEqual((RoundedDouble) expectedValue.ToNullAsNaN(), actualValue, actualValue.GetAccuracy()); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IStructureCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rbce62ec6102f15b0dbb1328fd9d14063fd21c978 -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IStructureCalculationEntityReadExtensionsTest.cs (.../IStructureCalculationEntityReadExtensionsTest.cs) (revision bce62ec6102f15b0dbb1328fd9d14063fd21c978) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IStructureCalculationEntityReadExtensionsTest.cs (.../IStructureCalculationEntityReadExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -174,8 +174,8 @@ public void Read_EntityWithForeshoreProfileEntity_InputObjectUpdatedWithForeshoreProfile() { // Setup - var foreshoreProfile = new ForeshoreProfile(new Point2D(0,0), new Point2D[0], - null, new ForeshoreProfile.ConstructionProperties()); + var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], + null, new ForeshoreProfile.ConstructionProperties()); var foreshoreEntity = new ForeshoreProfileEntity(); var mocks = new MockRepository(); @@ -199,7 +199,7 @@ public void Read_EntityWithHydraulicLocationEntity_InputObjectUpdatedWithHydraulicBoundaryLocation() { // Setup - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "A", 0,0); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "A", 0, 0); var hydraulicLocationEntity = new HydraulicLocationEntity(); var mocks = new MockRepository(); @@ -221,7 +221,7 @@ private static void AssertRoundedDouble(double? entityValue, RoundedDouble roundedDouble) { - Assert.AreEqual((RoundedDouble)entityValue.ToNullAsNaN(), roundedDouble, roundedDouble.GetAccuracy()); + Assert.AreEqual((RoundedDouble) entityValue.ToNullAsNaN(), roundedDouble, roundedDouble.GetAccuracy()); } private class SimpleStructure : StructureBase Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs =================================================================== diff -u -re440a0fe415d87b898ae1b6ad2e4ba98d0f104cf -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs (.../StabilityPointStructureEntityReadExtensionsTest.cs) (revision e440a0fe415d87b898ae1b6ad2e4ba98d0f104cf) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs (.../StabilityPointStructureEntityReadExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -181,7 +181,7 @@ Assert.AreEqual(entity.StabilityQuadraticLoadModelCoefficientOfVariation, structure.StabilityQuadraticLoadModel.CoefficientOfVariation.Value); Assert.AreEqual(entity.AreaFlowAperturesMean, structure.AreaFlowApertures.Mean.Value); Assert.AreEqual(entity.AreaFlowAperturesStandardDeviation, structure.AreaFlowApertures.StandardDeviation.Value); - Assert.AreEqual((StabilityPointStructureInflowModelType)entity.InflowModelType, structure.InflowModelType); + Assert.AreEqual((StabilityPointStructureInflowModelType) entity.InflowModelType, structure.InflowModelType); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestForeshoreProfile.cs =================================================================== diff -u -r64b9d05b572ff4878d9e74c6d1e4586e1b6d0a3d -r86ce17cdf5cf329f4d5bcd444320994fead52294 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision 64b9d05b572ff4878d9e74c6d1e4586e1b6d0a3d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) @@ -34,7 +34,7 @@ /// Creates a new instance of . /// /// If true, create the ForeshoreProfile with a default . - public TestForeshoreProfile(bool useBreakWater = false) : base(new Point2D(0, 0), Enumerable.Empty(), useBreakWater ? new BreakWater(BreakWaterType.Dam, 10) : null, new ConstructionProperties()) { } + public TestForeshoreProfile(bool useBreakWater = false) : base(new Point2D(0, 0), Enumerable.Empty(), useBreakWater ? new BreakWater(BreakWaterType.Dam, 10) : null, new ConstructionProperties()) {} /// /// Creates a new instance of with a specified.