Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -69,7 +69,7 @@ { Id = section.Id.DeepClone(), Name = section.Name.DeepClone(), - Composition = (short) section.Composition, + Composition = (byte) section.Composition, Comments = section.Comments.Body.DeepClone(), Norm = section.FailureMechanismContribution.Norm, Order = order Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs =================================================================== diff -u -r064557819261426179042d10f40a25b3fc23aeec -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision 064557819261426179042d10f40a25b3fc23aeec) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -83,7 +83,7 @@ } entity.BreakWaterHeight = input.BreakWater.Height.Value.ToNaNAsNull(); - entity.BreakWaterType = Convert.ToInt16(input.BreakWater.Type); + entity.BreakWaterType = Convert.ToByte(input.BreakWater.Type); entity.UseBreakWater = Convert.ToByte(input.UseBreakWater); entity.CriticalFlowRateMean = input.CriticalFlowRate.Mean.Value.ToNaNAsNull(); entity.CriticalFlowRateStandardDeviation = input.CriticalFlowRate.StandardDeviation.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs (.../RingtoetsPipingSurfaceLineCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs (.../RingtoetsPipingSurfaceLineCreateExtensions.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -92,7 +92,7 @@ { var entity = new CharacteristicPointEntity { - Type = (short) type, + Type = (byte) type, X = point.X.ToNaNAsNull(), Y = point.Y.ToNaNAsNull(), Z = point.Z.ToNaNAsNull() Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs =================================================================== diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -65,7 +65,7 @@ entityToUpdate.UseForeshore = Convert.ToByte(input.UseForeshore); entityToUpdate.UseBreakWater = Convert.ToByte(input.UseBreakWater); - entityToUpdate.BreakWaterType = Convert.ToInt16(input.BreakWater.Type); + entityToUpdate.BreakWaterType = Convert.ToByte(input.BreakWater.Type); entityToUpdate.BreakWaterHeight = input.BreakWater.Height.Value.ToNaNAsNull(); entityToUpdate.AllowedLevelIncreaseStorageMean = input.AllowedLevelIncreaseStorage.Mean.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -50,7 +50,7 @@ public double Norm { get; set; } public string HydraulicDatabaseVersion { get; set; } public string HydraulicDatabaseLocation { get; set; } - public short Composition { get; set; } + public byte Composition { get; set; } public string ReferenceLinePointXml { get; set; } public int Order { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs (.../CharacteristicPointEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs (.../CharacteristicPointEntity.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -37,7 +37,7 @@ { public long CharacteristicPointEntityId { get; set; } public long SurfaceLineEntityId { get; set; } - public short Type { get; set; } + public byte Type { get; set; } public Nullable X { get; set; } public Nullable Y { get; set; } public Nullable Z { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -51,7 +51,7 @@ public string Name { get; set; } public string Comments { get; set; } public byte UseBreakWater { get; set; } - public short BreakWaterType { get; set; } + public byte BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } public byte UseForeshore { get; set; } public Nullable Orientation { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -56,7 +56,7 @@ public byte DikeHeightCalculationType { get; set; } public Nullable DikeHeight { get; set; } public byte UseBreakWater { get; set; } - public short BreakWaterType { get; set; } + public byte BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -69,7 +69,7 @@ public Nullable DeviationWaveDirection { get; set; } public byte UseBreakWater { get; set; } public byte UseForeshore { get; set; } - public short BreakWaterType { get; set; } + public byte BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs =================================================================== diff -u -r46b7b8c7ae08c83f5a21504d5e1f2f47b33b5e40 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs (.../IStructuresCalculationEntity.cs) (revision 46b7b8c7ae08c83f5a21504d5e1f2f47b33b5e40) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresCalculationEntity.cs (.../IStructuresCalculationEntity.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -42,7 +42,7 @@ double? StormDurationMean { get; set; } byte UseBreakWater { get; set; } byte UseForeshore { get; set; } - short BreakWaterType { get; set; } + byte BreakWaterType { get; set; } double? BreakWaterHeight { get; set; } HydraulicLocationEntity HydraulicLocationEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r18259e66145f5da6ade4866bee22627fc92b3d71 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 18259e66145f5da6ade4866bee22627fc92b3d71) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2016. All rights reserved. -// -// This file is part of Ringtoets. -// -// Ringtoets is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -// T4 code generation is enabled for model 'D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\repos\WettelijkToetsInstrumentarium\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -17,7 +17,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -734,7 +734,7 @@ - + @@ -2856,7 +2856,7 @@ - + @@ -2889,7 +2889,7 @@ - + @@ -2955,7 +2955,7 @@ - + @@ -3151,7 +3151,7 @@ - + @@ -3387,7 +3387,7 @@ - + @@ -3712,7 +3712,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -7,67 +7,67 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -51,7 +51,7 @@ public string Name { get; set; } public string Comments { get; set; } public byte UseBreakWater { get; set; } - public short BreakWaterType { get; set; } + public byte BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } public byte UseForeshore { get; set; } public Nullable StructureNormalOrientation { get; set; } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensionsTest.cs =================================================================== diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensionsTest.cs (.../RingtoetsPipingSurfaceLineCreateExtensionsTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensionsTest.cs (.../RingtoetsPipingSurfaceLineCreateExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -185,32 +185,32 @@ { switch (characteristicPointEntity.Type) { - case (short) CharacteristicPointType.BottomDitchDikeSide: + case (byte) CharacteristicPointType.BottomDitchDikeSide: Assert.AreEqual(geometry[bottomDitchDikeIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[bottomDitchDikeIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[bottomDitchDikeIndex].Z, characteristicPointEntity.Z); break; - case (short) CharacteristicPointType.BottomDitchPolderSide: + case (byte) CharacteristicPointType.BottomDitchPolderSide: Assert.AreEqual(geometry[bottomDitchPolderIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[bottomDitchPolderIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[bottomDitchPolderIndex].Z, characteristicPointEntity.Z); break; - case (short) CharacteristicPointType.DikeToeAtPolder: + case (byte)CharacteristicPointType.DikeToeAtPolder: Assert.AreEqual(geometry[toePolderIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[toePolderIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[toePolderIndex].Z, characteristicPointEntity.Z); break; - case (short) CharacteristicPointType.DikeToeAtRiver: + case (byte)CharacteristicPointType.DikeToeAtRiver: Assert.AreEqual(geometry[toeDikeIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[toeDikeIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[toeDikeIndex].Z, characteristicPointEntity.Z); break; - case (short) CharacteristicPointType.DitchDikeSide: + case (byte)CharacteristicPointType.DitchDikeSide: Assert.AreEqual(geometry[ditchDikeIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[ditchDikeIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[ditchDikeIndex].Z, characteristicPointEntity.Z); break; - case (short) CharacteristicPointType.DitchPolderSide: + case (byte)CharacteristicPointType.DitchPolderSide: Assert.AreEqual(geometry[ditchPolderIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[ditchPolderIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[ditchPolderIndex].Z, characteristicPointEntity.Z); @@ -260,15 +260,15 @@ Assert.AreEqual(expectedXml, entity.PointsXml); Assert.AreEqual(6, entity.CharacteristicPointEntities.Count); - short[] characteristicPointTypeValues = entity.CharacteristicPointEntities + byte[] characteristicPointTypeValues = entity.CharacteristicPointEntities .Select(cpe => cpe.Type) .ToArray(); - CollectionAssert.Contains(characteristicPointTypeValues, (short) CharacteristicPointType.DikeToeAtRiver); - CollectionAssert.Contains(characteristicPointTypeValues, (short) CharacteristicPointType.DikeToeAtPolder); - CollectionAssert.Contains(characteristicPointTypeValues, (short) CharacteristicPointType.DitchDikeSide); - CollectionAssert.Contains(characteristicPointTypeValues, (short) CharacteristicPointType.BottomDitchDikeSide); - CollectionAssert.Contains(characteristicPointTypeValues, (short) CharacteristicPointType.BottomDitchPolderSide); - CollectionAssert.Contains(characteristicPointTypeValues, (short) CharacteristicPointType.DitchPolderSide); + CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.DikeToeAtRiver); + CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.DikeToeAtPolder); + CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.DitchDikeSide); + CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.BottomDitchDikeSide); + CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.BottomDitchPolderSide); + CollectionAssert.Contains(characteristicPointTypeValues, (byte) CharacteristicPointType.DitchPolderSide); Assert.AreEqual(0, entity.SurfaceLineEntityId); Assert.AreEqual(0, entity.FailureMechanismEntityId); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rba5cba6640241fd1fc40cb471ebfbd737681f5aa -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -67,7 +67,7 @@ { Id = testId, Name = testName, - Composition = (short) assessmentSectionComposition, + Composition = (byte) assessmentSectionComposition, Comments = comments, Norm = norm }; @@ -1017,7 +1017,7 @@ return new AssessmentSectionEntity { Norm = 1.0/30000, - Composition = Convert.ToInt16(AssessmentSectionComposition.Dike) + Composition = Convert.ToByte(AssessmentSectionComposition.Dike) }; } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs (.../ClosingStructuresCalculationEntityReadExtensionsTest.cs) (revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs (.../ClosingStructuresCalculationEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -92,7 +92,7 @@ WidthFlowAperturesCoefficientOfVariation = 13.13, StormDurationMean = 14.14, UseBreakWater = Convert.ToByte(true), - BreakWaterType = Convert.ToInt16(BreakWaterType.Wall), + BreakWaterType = Convert.ToByte(BreakWaterType.Wall), BreakWaterHeight = 15.15, UseForeshore = Convert.ToByte(true), InflowModelType = Convert.ToByte(ClosingStructureInflowModelType.LowSill), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r61ab88e24142156c8918da824b7dcd976ec4ebd7 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision 61ab88e24142156c8918da824b7dcd976ec4ebd7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -71,7 +71,7 @@ UseForeshore = Convert.ToByte(flagValue), DikeHeight = 2.3, UseBreakWater = Convert.ToByte(flagValue), - BreakWaterType = Convert.ToInt16(breakWaterType), + BreakWaterType = Convert.ToByte(breakWaterType), BreakWaterHeight = 5.7, DikeHeightCalculationType = Convert.ToByte(dikeHeightCalculationType) }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs (.../HeightStructuresCalculationEntityReadExtensionsTest.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs (.../HeightStructuresCalculationEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -163,7 +163,7 @@ UseForeshore = Convert.ToByte(flagUsage), UseBreakWater = Convert.ToByte(!flagUsage), ForeshoreProfileEntity = foreshoreEntity, - BreakWaterType = Convert.ToInt16(type), + BreakWaterType = Convert.ToByte(type), BreakWaterHeight = breakWaterHeight }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs =================================================================== diff -u -re440a0fe415d87b898ae1b6ad2e4ba98d0f104cf -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs (.../SurfaceLineEntityReadExtensionsTest.cs) (revision e440a0fe415d87b898ae1b6ad2e4ba98d0f104cf) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs (.../SurfaceLineEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -248,27 +248,27 @@ { new CharacteristicPointEntity { - X = x, Y = y, Z = z, Type = (short) CharacteristicPointType.BottomDitchDikeSide + X = x, Y = y, Z = z, Type = (byte) CharacteristicPointType.BottomDitchDikeSide }, new CharacteristicPointEntity { - X = x, Y = y, Z = z, Type = (short) CharacteristicPointType.BottomDitchPolderSide + X = x, Y = y, Z = z, Type = (byte) CharacteristicPointType.BottomDitchPolderSide }, new CharacteristicPointEntity { - X = x, Y = y, Z = z, Type = (short) CharacteristicPointType.DikeToeAtPolder + X = x, Y = y, Z = z, Type = (byte) CharacteristicPointType.DikeToeAtPolder }, new CharacteristicPointEntity { - X = x, Y = y, Z = z, Type = (short) CharacteristicPointType.DikeToeAtRiver + X = x, Y = y, Z = z, Type = (byte) CharacteristicPointType.DikeToeAtRiver }, new CharacteristicPointEntity { - X = x, Y = y, Z = z, Type = (short) CharacteristicPointType.DitchDikeSide + X = x, Y = y, Z = z, Type = (byte) CharacteristicPointType.DitchDikeSide }, new CharacteristicPointEntity { - X = x, Y = y, Z = z, Type = (short) CharacteristicPointType.DitchPolderSide + X = x, Y = y, Z = z, Type = (byte) CharacteristicPointType.DitchPolderSide } } }; @@ -316,7 +316,7 @@ { return new CharacteristicPointEntity { - Type = (short) type, + Type = (byte)type, X = point.X, Y = point.Y, Z = point.Z }; } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs =================================================================== diff -u -rba5cba6640241fd1fc40cb471ebfbd737681f5aa -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision ba5cba6640241fd1fc40cb471ebfbd737681f5aa) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -78,14 +78,14 @@ Norm = norm, Name = "A", Order = 56, - Composition = Convert.ToInt16(AssessmentSectionComposition.Dike) + Composition = Convert.ToByte(AssessmentSectionComposition.Dike) }, new AssessmentSectionEntity { Norm = norm, Name = "B", Order = 0, - Composition = Convert.ToInt16(AssessmentSectionComposition.Dike) + Composition = Convert.ToByte(AssessmentSectionComposition.Dike) } } }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs (.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs (.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) @@ -92,7 +92,7 @@ WidthFlowAperturesCoefficientOfVariation = 13.13, StormDurationMean = 14.14, UseBreakWater = Convert.ToByte(true), - BreakWaterType = Convert.ToInt16(BreakWaterType.Wall), + BreakWaterType = Convert.ToByte(BreakWaterType.Wall), BreakWaterHeight = 15.15, UseForeshore = Convert.ToByte(true), InsideWaterLevelMean = 16.16,