Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs =================================================================== diff -u -r2651fdf110e56d0f48e416fcffc1b4922cff00a5 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs (.../HydraulicBoundaryLocationCreateExtensions.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs (.../HydraulicBoundaryLocationCreateExtensions.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -92,10 +92,10 @@ Name = location.Name.DeepClone(), LocationX = location.Location.X.ToNaNAsNull(), LocationY = location.Location.Y.ToNaNAsNull(), - DesignWaterLevel = double.IsNaN(location.DesignWaterLevel) ? (double?)null : location.DesignWaterLevel, - WaveHeight = double.IsNaN(location.WaveHeight) ? (double?)null : location.WaveHeight, - DesignWaterLevelCalculationConvergence = (byte)location.DesignWaterLevelCalculationConvergence, - WaveHeightCalculationConvergence = (byte)location.WaveHeightCalculationConvergence, + DesignWaterLevel = double.IsNaN(location.DesignWaterLevel) ? (double?) null : location.DesignWaterLevel, + WaveHeight = double.IsNaN(location.WaveHeight) ? (double?) null : location.WaveHeight, + DesignWaterLevelCalculationConvergence = (byte) location.DesignWaterLevelCalculationConvergence, + WaveHeightCalculationConvergence = (byte) location.WaveHeightCalculationConvergence, Order = order }; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs =================================================================== diff -u -r2651fdf110e56d0f48e416fcffc1b4922cff00a5 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -53,6 +53,23 @@ private readonly Dictionary hydraulicLocations = CreateDictionary(); /// + /// Obtains the which was registered for the + /// given . + /// + /// The for which a + /// read/update operation has been registered. + /// The constructed . + /// Thrown when is null. + /// Thrown when no create/update operation + /// has been registered for . + /// Use to find out + /// whether a create/update operation has been registered for . + public ForeshoreProfileEntity Get(ForeshoreProfile model) + { + return Get(foreshoreProfiles, model); + } + + /// /// Registers a create or update operation for and the /// that was constructed with the information. /// @@ -406,7 +423,7 @@ { return Get(hydraulicLocations, model) as T; } - + /// /// Obtains the which was registered for the /// given . @@ -442,23 +459,6 @@ } /// - /// Obtains the which was registered for the - /// given . - /// - /// The for which a - /// read/update operation has been registered. - /// The constructed . - /// Thrown when is null. - /// Thrown when no create/update operation - /// has been registered for . - /// Use to find out - /// whether a create/update operation has been registered for . - public ForeshoreProfileEntity Get(ForeshoreProfile model) - { - return Get(foreshoreProfiles, model); - } - - /// /// Obtains the which was /// registered for the given . /// Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -r61da629193cfe328c6220fbbb711f7f3bbbe27aa -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs) (revision 61da629193cfe328c6220fbbb711f7f3bbbe27aa) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -21,8 +21,8 @@ using System; using Application.Ringtoets.Storage.DbContext; -using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.HydraRing.Data; +using Ringtoets.WaveImpactAsphaltCover.Data; namespace Application.Ringtoets.Storage.Create.WaveImpactAsphaltCover { @@ -41,8 +41,8 @@ /// The index at which resides within its parent. /// A new . /// Thrown when is null. - internal static WaveImpactAsphaltCoverWaveConditionsCalculationEntity Create(this WaveImpactAsphaltCoverWaveConditionsCalculation calculation, - PersistenceRegistry registry, int order) + internal static WaveImpactAsphaltCoverWaveConditionsCalculationEntity Create(this WaveImpactAsphaltCoverWaveConditionsCalculation calculation, + PersistenceRegistry registry, int order) { if (registry == null) { @@ -56,7 +56,7 @@ Comments = calculation.Comments.DeepClone(), Orientation = calculation.InputParameters.Orientation, UseBreakWater = Convert.ToByte(calculation.InputParameters.UseBreakWater), - BreakWaterType = (byte)calculation.InputParameters.BreakWater.Type, + BreakWaterType = (byte) calculation.InputParameters.BreakWater.Type, BreakWaterHeight = calculation.InputParameters.BreakWater.Height, UseForeshore = Convert.ToByte(calculation.InputParameters.UseForeshore), UpperBoundaryRevetment = calculation.InputParameters.UpperBoundaryRevetment, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs =================================================================== diff -u -r377971ba79970be3f1ad8afa1264a1724af94627 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs) (revision 377971ba79970be3f1ad8afa1264a1724af94627) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -60,11 +60,10 @@ DesignWaterLevelCalculationConvergence = (CalculationConvergence) entity.DesignWaterLevelCalculationConvergence, WaveHeightCalculationConvergence = (CalculationConvergence) entity.WaveHeightCalculationConvergence }; - + collector.Read(entity, hydraulicBoundaryLocation); return hydraulicBoundaryLocation; } - } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -r61da629193cfe328c6220fbbb711f7f3bbbe27aa -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision 61da629193cfe328c6220fbbb711f7f3bbbe27aa) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -25,9 +25,9 @@ using Application.Ringtoets.Storage.DbContext; using Core.Common.Base.Data; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; +using Ringtoets.WaveImpactAsphaltCover.Data; namespace Application.Ringtoets.Storage.Read.WaveImpactAsphaltCover { @@ -80,7 +80,7 @@ return calculation; } - + private static ForeshoreProfile GetDikeProfileValue(ForeshoreProfileEntity foreshoreProfileEntity, ReadConversionCollector collector) { if (foreshoreProfileEntity != null) @@ -100,13 +100,14 @@ } return null; } + private static WaveImpactAsphaltCoverWaveConditionsOutput ReadCalculationOutputs(ICollection waveImpactAsphaltCoverWaveConditionsOutputEntities) { if (waveImpactAsphaltCoverWaveConditionsOutputEntities.Any()) { return new WaveImpactAsphaltCoverWaveConditionsOutput(waveImpactAsphaltCoverWaveConditionsOutputEntities - .OrderBy(oe => oe.Order) - .Select(oe => oe.Read())); + .OrderBy(oe => oe.Order) + .Select(oe => oe.Read())); } return null; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs =================================================================== diff -u -r553f0128e1d2b027e25e00909fd2f3d0b13404b2 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs) (revision 553f0128e1d2b027e25e00909fd2f3d0b13404b2) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -44,6 +44,6 @@ entity.WaveHeight.ToNullAsNaN(), entity.WavePeakPeriod.ToNullAsNaN(), entity.WaveAngle.ToNullAsNaN()); - } + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ForeshoreProfileCreateExtensionsTest.cs =================================================================== diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ForeshoreProfileCreateExtensionsTest.cs (.../ForeshoreProfileCreateExtensionsTest.cs) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ForeshoreProfileCreateExtensionsTest.cs (.../ForeshoreProfileCreateExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -85,14 +85,14 @@ { // Setup var foreshoreProfile = new ForeshoreProfile( - new Point2D(0, 0), + new Point2D(0, 0), Enumerable.Empty(), new BreakWater(BreakWaterType.Caisson, double.NaN), new ForeshoreProfile.ConstructionProperties - { - Orientation = double.NaN, - X0 = double.NaN - }); + { + Orientation = double.NaN, + X0 = double.NaN + }); var registry = new PersistenceRegistry(); // Call @@ -144,7 +144,7 @@ // Assert Assert.IsNotNull(entity); - Assert.AreEqual((int)breakWaterType, entity.BreakWaterType); + Assert.AreEqual((int) breakWaterType, entity.BreakWaterType); Assert.AreEqual(height, entity.BreakWaterHeight, foreshoreProfile.BreakWater.Height.GetAccuracy()); } @@ -153,7 +153,7 @@ { // Setup string testName = "original name"; - var foreshoreProfile = new ForeshoreProfile(new Point2D(0,0), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties + var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties { Name = testName }); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r056c24804fa3267952bebae1f58705bf45338b07 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 056c24804fa3267952bebae1f58705bf45338b07) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -151,7 +151,7 @@ public void Create_WithUpdatedN_FailureMechanismMetaUpdated() { // Setup - var n = new Random(21).Next(1,20); + var n = new Random(21).Next(1, 20); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.GeneralInput.N = n; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs =================================================================== diff -u -r056c24804fa3267952bebae1f58705bf45338b07 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCreateExtensionsTest.cs) (revision 056c24804fa3267952bebae1f58705bf45338b07) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCreateExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -185,7 +185,7 @@ var registry = new PersistenceRegistry(); // Call - GrassCoverErosionOutwardsHydraulicLocationEntity entity = + GrassCoverErosionOutwardsHydraulicLocationEntity entity = hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 0); // Assert @@ -212,7 +212,7 @@ var registry = new PersistenceRegistry(); // Call - GrassCoverErosionOutwardsHydraulicLocationEntity entity = + GrassCoverErosionOutwardsHydraulicLocationEntity entity = hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 0); // Assert @@ -232,7 +232,7 @@ var registry = new PersistenceRegistry(); // Call - GrassCoverErosionOutwardsHydraulicLocationEntity entity1 = + GrassCoverErosionOutwardsHydraulicLocationEntity entity1 = hydraulicBoundaryLocations.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 0); GrassCoverErosionOutwardsHydraulicLocationEntity entity2 = hydraulicBoundaryLocations.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 1); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs =================================================================== diff -u -r2651fdf110e56d0f48e416fcffc1b4922cff00a5 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -460,7 +460,7 @@ var registry = new PersistenceRegistry(); // Call - TestDelegate call = () => registry.Contains((ForeshoreProfile)null); + TestDelegate call = () => registry.Contains((ForeshoreProfile) null); // Assert string paramName = Assert.Throws(call).ParamName; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -r897606646e4335ec83cefe0a1456a24b5645aefb -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision 897606646e4335ec83cefe0a1456a24b5645aefb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -225,7 +225,11 @@ // Assert Assert.AreEqual(2, entity.StabilityStoneCoverWaveConditionsOutputEntities.Count); - Assert.AreEqual(new[] { 0, 1 }, entity.StabilityStoneCoverWaveConditionsOutputEntities.Select(oe => oe.Order)); + Assert.AreEqual(new[] + { + 0, + 1 + }, entity.StabilityStoneCoverWaveConditionsOutputEntities.Select(oe => oe.Order)); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r5cc8a49cc445a67f425ced8216c772b9170ea517 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision 5cc8a49cc445a67f425ced8216c772b9170ea517) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -118,6 +118,7 @@ Assert.AreEqual(1, entity.FailureMechanismSectionEntities.Count); Assert.AreEqual(1, entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaveImpactAsphaltCoverSectionResultEntities).Count()); } + [Test] public void Create_WithoutForeshoreProfiles_EmptyForeshoreProfilesEntities() { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -r897606646e4335ec83cefe0a1456a24b5645aefb -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision 897606646e4335ec83cefe0a1456a24b5645aefb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -30,9 +30,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; +using Ringtoets.WaveImpactAsphaltCover.Data; namespace Application.Ringtoets.Storage.Test.Create.WaveImpactAsphaltCover { @@ -222,7 +222,11 @@ // Assert Assert.AreEqual(2, entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Count); - Assert.AreEqual(new [] {0,1}, entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Select(oe => oe.Order)); + Assert.AreEqual(new[] + { + 0, + 1 + }, entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Select(oe => oe.Order)); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs =================================================================== diff -u -r897606646e4335ec83cefe0a1456a24b5645aefb -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs) (revision 897606646e4335ec83cefe0a1456a24b5645aefb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -85,6 +85,6 @@ Assert.IsNull(entity.WaveAngle); Assert.IsNull(entity.WaveImpactAsphaltCoverWaveConditionsCalculationEntity); - } + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r52207b1b9ba8ad1c1743bbf31d58de7bb46192b8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 52207b1b9ba8ad1c1743bbf31d58de7bb46192b8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -340,7 +340,7 @@ var entity = CreateAssessmentSectionEntity(); const string comments = "Some text"; - var n = new Random(21).Next(1,20); + var n = new Random(21).Next(1, 20); var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismType = (int) FailureMechanismType.GrassRevetmentTopErosionAndInwards, @@ -376,7 +376,7 @@ var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.GrassRevetmentTopErosionAndInwards, + FailureMechanismType = (int) FailureMechanismType.GrassRevetmentTopErosionAndInwards, GrassCoverErosionInwardsFailureMechanismMetaEntities = { new GrassCoverErosionInwardsFailureMechanismMetaEntity @@ -420,7 +420,7 @@ var rootGroupEntity = new CalculationGroupEntity(); var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.GrassRevetmentTopErosionAndInwards, + FailureMechanismType = (int) FailureMechanismType.GrassRevetmentTopErosionAndInwards, FailureMechanismSectionEntities = CreateFailureMechanismSectionEntities(), GrassCoverErosionInwardsFailureMechanismMetaEntities = { @@ -487,7 +487,7 @@ var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.GrassRevetmentErosionOutwards, + FailureMechanismType = (int) FailureMechanismType.GrassRevetmentErosionOutwards, GrassCoverErosionOutwardsFailureMechanismMetaEntities = { new GrassCoverErosionOutwardsFailureMechanismMetaEntity @@ -532,7 +532,7 @@ var profileBName = "profileB"; var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.GrassRevetmentErosionOutwards, + FailureMechanismType = (int) FailureMechanismType.GrassRevetmentErosionOutwards, GrassCoverErosionOutwardsFailureMechanismMetaEntities = { new GrassCoverErosionOutwardsFailureMechanismMetaEntity @@ -566,7 +566,11 @@ // Assert ObservableList foreshoreProfiles = section.GrassCoverErosionOutwards.ForeshoreProfiles; - CollectionAssert.AreEqual(new[] { profileBName, profileAName }, foreshoreProfiles.Select(fp => fp.Name)); + CollectionAssert.AreEqual(new[] + { + profileBName, + profileAName + }, foreshoreProfiles.Select(fp => fp.Name)); } [Test] @@ -580,7 +584,7 @@ var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.StabilityStoneRevetment, + FailureMechanismType = (int) FailureMechanismType.StabilityStoneRevetment, CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), Comments = comments @@ -673,7 +677,11 @@ // Assert ObservableList foreshoreProfiles = section.StabilityStoneCover.ForeshoreProfiles; - CollectionAssert.AreEqual(new [] {profileBName, profileAName}, foreshoreProfiles.Select(fp => fp.Name)); + CollectionAssert.AreEqual(new[] + { + profileBName, + profileAName + }, foreshoreProfiles.Select(fp => fp.Name)); } [Test] @@ -687,7 +695,7 @@ var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.WaveImpactOnAsphaltRevetment, + FailureMechanismType = (int) FailureMechanismType.WaveImpactOnAsphaltRevetment, CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), Comments = comments @@ -714,7 +722,7 @@ var profileBName = "profileB"; var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.WaveImpactOnAsphaltRevetment, + FailureMechanismType = (int) FailureMechanismType.WaveImpactOnAsphaltRevetment, CalculationGroupEntity = new CalculationGroupEntity(), ForeshoreProfileEntities = { @@ -741,7 +749,11 @@ // Assert ObservableList foreshoreProfiles = section.WaveImpactAsphaltCover.ForeshoreProfiles; - CollectionAssert.AreEqual(new[] { profileBName, profileAName }, foreshoreProfiles.Select(fp => fp.Name)); + CollectionAssert.AreEqual(new[] + { + profileBName, + profileAName + }, foreshoreProfiles.Select(fp => fp.Name)); } [Test] @@ -752,7 +764,7 @@ var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismType = (int)FailureMechanismType.WaveImpactOnAsphaltRevetment, + FailureMechanismType = (int) FailureMechanismType.WaveImpactOnAsphaltRevetment, CalculationGroupEntity = new CalculationGroupEntity { CalculationGroupEntity1 = Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs =================================================================== diff -u -r5cc8a49cc445a67f425ced8216c772b9170ea517 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 5cc8a49cc445a67f425ced8216c772b9170ea517) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -995,7 +995,7 @@ var rootGroupEntity = new CalculationGroupEntity { Name = "A", - WaveImpactAsphaltCoverWaveConditionsCalculationEntities = + WaveImpactAsphaltCoverWaveConditionsCalculationEntities = { new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { @@ -1019,10 +1019,10 @@ ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); Assert.AreEqual(2, rootChildren.Length); - var rootChildCalculation1 = (WaveImpactAsphaltCoverWaveConditionsCalculation)rootChildren[0]; + var rootChildCalculation1 = (WaveImpactAsphaltCoverWaveConditionsCalculation) rootChildren[0]; Assert.AreEqual("1", rootChildCalculation1.Name); - var rootChildCalculation2 = (WaveImpactAsphaltCoverWaveConditionsCalculation)rootChildren[1]; + var rootChildCalculation2 = (WaveImpactAsphaltCoverWaveConditionsCalculation) rootChildren[1]; Assert.AreEqual("2", rootChildCalculation2.Name); } @@ -1070,16 +1070,16 @@ ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); Assert.AreEqual(4, rootChildren.Length); - var rootChildCalculation1 = (WaveImpactAsphaltCoverWaveConditionsCalculation)rootChildren[0]; + var rootChildCalculation1 = (WaveImpactAsphaltCoverWaveConditionsCalculation) rootChildren[0]; Assert.AreEqual("calculation1", rootChildCalculation1.Name); - var rootChildGroup1 = (CalculationGroup)rootChildren[1]; + var rootChildGroup1 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("group1", rootChildGroup1.Name); - var rootChildCalculation2 = (WaveImpactAsphaltCoverWaveConditionsCalculation)rootChildren[2]; + var rootChildCalculation2 = (WaveImpactAsphaltCoverWaveConditionsCalculation) 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/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r056c24804fa3267952bebae1f58705bf45338b07 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 056c24804fa3267952bebae1f58705bf45338b07) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,15 +24,13 @@ using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Read; using Application.Ringtoets.Storage.Serializers; -using Core.Common.Base; using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionOutwards.Data; -using Ringtoets.HydraRing.Data; using Ringtoets.Piping.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ForeshoreProfileReadExtensionsTest.cs =================================================================== diff -u -r3b68b0758709ec06ecc7581f4f852f3cea864c5d -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ForeshoreProfileReadExtensionsTest.cs (.../ForeshoreProfileReadExtensionsTest.cs) (revision 3b68b0758709ec06ecc7581f4f852f3cea864c5d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ForeshoreProfileReadExtensionsTest.cs (.../ForeshoreProfileReadExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -89,7 +89,7 @@ Assert.IsNull(foreshoreProfile.BreakWater); Assert.IsFalse(foreshoreProfile.HasBreakWater); Assert.IsEmpty(foreshoreProfile.Geometry); - } + } [Test] public void Read_WithGeometryAndBreakWaterTypeAndValues_CompleteForeshoreProfile() @@ -114,7 +114,7 @@ Name = name, Orientation = orientation, X0 = x0, - BreakWaterType = (byte)breakWaterType, + BreakWaterType = (byte) breakWaterType, BreakWaterHeight = height, GeometryXml = pointXml }; @@ -134,6 +134,6 @@ Assert.AreEqual(breakWaterType, foreshoreProfile.BreakWater.Type); Assert.IsTrue(foreshoreProfile.HasBreakWater); CollectionAssert.AreEqual(points, foreshoreProfile.Geometry); - } + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs =================================================================== diff -u -r3b68b0758709ec06ecc7581f4f852f3cea864c5d -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs (.../DikeProfileEntityReadExtensionsTest.cs) (revision 3b68b0758709ec06ecc7581f4f852f3cea864c5d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs (.../DikeProfileEntityReadExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -35,9 +35,9 @@ public class DikeProfileEntityReadExtensionsTest { private const string validRoughnessPointXml = "" + - ""; + "xmlns=\"http://schemas.datacontract.org/2004/07/Application.Ringtoets.Storage.Serializers\" " + + "xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">" + + ""; [Test] public void Read_ReadConversionCollectorNull_ThrowArgumentNullException() Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -336,7 +336,7 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - PipingSemiProbabilisticOutputEntities = + PipingSemiProbabilisticOutputEntities = { new PipingSemiProbabilisticOutputEntity() { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -r97018b4e8e9cd81438e8fd0d111d889e20946617 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs (.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs (.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Read.Piping; using NUnit.Framework; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs =================================================================== diff -u -r377971ba79970be3f1ad8afa1264a1724af94627 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 377971ba79970be3f1ad8afa1264a1724af94627) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -1257,7 +1257,7 @@ var collector = new ReadConversionCollector(); // Call - TestDelegate test = () => collector.Contains((GrassCoverErosionOutwardsHydraulicLocationEntity)null); + TestDelegate test = () => collector.Contains((GrassCoverErosionOutwardsHydraulicLocationEntity) null); // Assert var paramName = Assert.Throws(test).ParamName; @@ -1315,7 +1315,7 @@ var collector = new ReadConversionCollector(); // Call - TestDelegate test = () => collector.Get((GrassCoverErosionOutwardsHydraulicLocationEntity)null); + TestDelegate test = () => collector.Get((GrassCoverErosionOutwardsHydraulicLocationEntity) null); // Assert var paramName = Assert.Throws(test).ParamName; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r897606646e4335ec83cefe0a1456a24b5645aefb -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 897606646e4335ec83cefe0a1456a24b5645aefb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -32,9 +32,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; +using Ringtoets.WaveImpactAsphaltCover.Data; namespace Application.Ringtoets.Storage.Test.Read.WaveImpactAsphaltCover { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -r897606646e4335ec83cefe0a1456a24b5645aefb -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 897606646e4335ec83cefe0a1456a24b5645aefb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -126,26 +126,26 @@ Assert.NotNull(pipingFailureMechanism.CalculationsGroup); Assert.AreEqual(3, pipingFailureMechanism.CalculationsGroup.Children.Count); - Assert.AreEqual(1, ((CalculationGroup)pipingFailureMechanism.CalculationsGroup.Children[0]).Children.Count); - Assert.IsInstanceOf(((CalculationGroup)pipingFailureMechanism.CalculationsGroup.Children[0]).Children[0]); - Assert.AreEqual(0, ((CalculationGroup)pipingFailureMechanism.CalculationsGroup.Children[1]).Children.Count); + Assert.AreEqual(1, ((CalculationGroup) pipingFailureMechanism.CalculationsGroup.Children[0]).Children.Count); + Assert.IsInstanceOf(((CalculationGroup) pipingFailureMechanism.CalculationsGroup.Children[0]).Children[0]); + Assert.AreEqual(0, ((CalculationGroup) pipingFailureMechanism.CalculationsGroup.Children[1]).Children.Count); Assert.IsInstanceOf(pipingFailureMechanism.CalculationsGroup.Children[2]); GrassCoverErosionInwardsFailureMechanism grassCoverErosionInwardsFailureMechanism = assessmentSection.GrassCoverErosionInwards; Assert.NotNull(grassCoverErosionInwardsFailureMechanism.CalculationsGroup); Assert.AreEqual(3, grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children.Count); - Assert.AreEqual(1, ((CalculationGroup)grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children[0]).Children.Count); - Assert.IsInstanceOf(((CalculationGroup)grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children[0]).Children[0]); - Assert.AreEqual(0, ((CalculationGroup)grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children[1]).Children.Count); + Assert.AreEqual(1, ((CalculationGroup) grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children[0]).Children.Count); + Assert.IsInstanceOf(((CalculationGroup) grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children[0]).Children[0]); + Assert.AreEqual(0, ((CalculationGroup) grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children[1]).Children.Count); Assert.IsInstanceOf(grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children[2]); GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; Assert.AreEqual(2, grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations.Count); Assert.AreEqual(2, grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles.Count); Assert.IsInstanceOf( - ((CalculationGroup)grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children[0]).Children[0]); - Assert.AreEqual(0, ((CalculationGroup)grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children[1]).Children.Count); + ((CalculationGroup) grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children[0]).Children[0]); + Assert.AreEqual(0, ((CalculationGroup) grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children[1]).Children.Count); Assert.IsInstanceOf( grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children[2]); @@ -154,19 +154,19 @@ Assert.NotNull(stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup); Assert.AreEqual(3, stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children.Count); - Assert.AreEqual(1, ((CalculationGroup)stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]).Children.Count); + Assert.AreEqual(1, ((CalculationGroup) stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]).Children.Count); Assert.IsInstanceOf( - ((CalculationGroup)stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]).Children[0]); + ((CalculationGroup) stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]).Children[0]); - var stabilityStoneCoverCalculationWithoutOutput = ((CalculationGroup)stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]) - .Children[0] as StabilityStoneCoverWaveConditionsCalculation; + var stabilityStoneCoverCalculationWithoutOutput = ((CalculationGroup) stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]) + .Children[0] as StabilityStoneCoverWaveConditionsCalculation; Assert.NotNull(stabilityStoneCoverCalculationWithoutOutput); Assert.IsFalse(stabilityStoneCoverCalculationWithoutOutput.HasOutput); - Assert.AreEqual(0, ((CalculationGroup)stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[1]).Children.Count); + Assert.AreEqual(0, ((CalculationGroup) stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[1]).Children.Count); var stabilityStoneCoverCalculationWithOutput = stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children[2] - as StabilityStoneCoverWaveConditionsCalculation; + as StabilityStoneCoverWaveConditionsCalculation; Assert.NotNull(stabilityStoneCoverCalculationWithOutput); Assert.IsTrue(stabilityStoneCoverCalculationWithOutput.HasOutput); Assert.AreEqual(2, stabilityStoneCoverCalculationWithOutput.Output.BlocksOutput.Count()); @@ -177,17 +177,17 @@ Assert.NotNull(waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup); Assert.AreEqual(3, waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children.Count); - Assert.AreEqual(1, ((CalculationGroup)waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]).Children.Count); + Assert.AreEqual(1, ((CalculationGroup) waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]).Children.Count); - var waveImpactAsphaltCoverCalculationWithoutOutput = ((CalculationGroup)waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]) - .Children[0] as WaveImpactAsphaltCoverWaveConditionsCalculation; + var waveImpactAsphaltCoverCalculationWithoutOutput = ((CalculationGroup) waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children[0]) + .Children[0] as WaveImpactAsphaltCoverWaveConditionsCalculation; Assert.NotNull(waveImpactAsphaltCoverCalculationWithoutOutput); Assert.IsFalse(waveImpactAsphaltCoverCalculationWithoutOutput.HasOutput); - Assert.AreEqual(0, ((CalculationGroup)waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children[1]).Children.Count); + Assert.AreEqual(0, ((CalculationGroup) waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children[1]).Children.Count); - var waveImpactAsphaltCoverCalculationWithOutput = waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children[2] - as WaveImpactAsphaltCoverWaveConditionsCalculation; + var waveImpactAsphaltCoverCalculationWithOutput = waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children[2] + as WaveImpactAsphaltCoverWaveConditionsCalculation; Assert.NotNull(waveImpactAsphaltCoverCalculationWithOutput); Assert.IsTrue(waveImpactAsphaltCoverCalculationWithOutput.HasOutput); Assert.AreEqual(2, waveImpactAsphaltCoverCalculationWithOutput.Output.Items.Count()); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/TestForeshoreProfileTest.cs =================================================================== diff -u -r8aaa7b9a8a2826cf8da31d0fd136f2d559933afe -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/TestForeshoreProfileTest.cs (.../TestForeshoreProfileTest.cs) (revision 8aaa7b9a8a2826cf8da31d0fd136f2d559933afe) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/TestForeshoreProfileTest.cs (.../TestForeshoreProfileTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -39,7 +39,7 @@ Assert.IsFalse(profile.HasBreakWater); Assert.AreEqual(0.0, profile.X0); Assert.AreEqual(0.0, profile.Orientation.Value); - Assert.AreEqual(new Point2D(0,0), profile.WorldReferencePoint); - } + Assert.AreEqual(new Point2D(0, 0), profile.WorldReferencePoint); + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestForeshoreProfile.cs =================================================================== diff -u -r8aaa7b9a8a2826cf8da31d0fd136f2d559933afe -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision 8aaa7b9a8a2826cf8da31d0fd136f2d559933afe) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,11 +28,11 @@ /// /// Simple foreshore profile that can be used for testing. /// - public class TestForeshoreProfile : ForeshoreProfile { - + public class TestForeshoreProfile : ForeshoreProfile + { /// /// Creates a new instance of . /// - public TestForeshoreProfile() : base(new Point2D(0,0), Enumerable.Empty(), null, new ConstructionProperties()) {} + public TestForeshoreProfile() : base(new Point2D(0, 0), Enumerable.Empty(), null, new ConstructionProperties()) {} } } \ No newline at end of file Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs =================================================================== diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6) +++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using System.Linq; + namespace Core.Common.Base.IO { /// Index: Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs =================================================================== diff -u -r1dddcf22e6d496a00dcfe85cf8d1302a8df121cd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision 1dddcf22e6d496a00dcfe85cf8d1302a8df121cd) +++ Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -30,7 +30,6 @@ [TestFixture] public class FileImporterBaseTest { - [Test] public void Constructor_FilePathNull_ThrowArgumentNullException() { @@ -44,6 +43,7 @@ string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("filePath", paramName); } + [Test] public void Constructor_ImportTargetNull_ThrowArgumentNullException() { @@ -182,9 +182,9 @@ private class SimpleFileImporter : FileImporterBase { - public SimpleFileImporter(T importTarget) : base("", importTarget) { } + public SimpleFileImporter(T importTarget) : base("", importTarget) {} - public SimpleFileImporter(string filePath, T importTarget) : base(filePath, importTarget) { } + public SimpleFileImporter(string filePath, T importTarget) : base(filePath, importTarget) {} public IObservable[] AffectedNonTargetObservableInstancesOverride { private get; set; } Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs =================================================================== diff -u -r4cd987d7abd8340848d2159381f1d8ed4dfb7d96 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs (.../DataGridViewComboBoxItemWrapperTest.cs) (revision 4cd987d7abd8340848d2159381f1d8ed4dfb7d96) +++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs (.../DataGridViewComboBoxItemWrapperTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Controls.DataGrid; -using Core.Common.Controls.Properties; using NUnit.Framework; namespace Core.Common.Controls.Test.DataGrid Index: Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs =================================================================== diff -u -r516f5c56f48bee70f78ca969a5658d89b9dd8dce -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs (.../SelectItemDialogTest.cs) (revision 516f5c56f48bee70f78ca969a5658d89b9dd8dce) +++ Core/Common/test/Core.Common.Gui.Test/Forms/SelectItemDialogTest.cs (.../SelectItemDialogTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -150,7 +150,7 @@ { var tag = new object(); dialog.AddItemType("aName", "aCategory", Resources.abacus, tag); - var listView = (ListView)new ControlTester("listViewItemTypes", dialog).TheObject; + var listView = (ListView) new ControlTester("listViewItemTypes", dialog).TheObject; dialog.Show(); // Call Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs =================================================================== diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327) +++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -89,10 +89,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestView; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -174,10 +171,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestView; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -230,10 +224,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestViewDerivative; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -268,10 +259,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestView; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -305,10 +293,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestViewDerivative; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -385,10 +370,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestView; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -430,10 +412,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestView; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -482,10 +461,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestView; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -534,10 +510,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - view = invocation.Arguments[0] as TestViewDerivative; - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -606,10 +579,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(viewList); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => - { - viewList.Add(invocation.Arguments[0] as TestView); - }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { viewList.Add(invocation.Arguments[0] as TestView); }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); viewHost.Expect(vh => vh.SetFocusToView(Arg.Matches(c => c == viewList.First()))); Index: Core/Common/test/Core.Common.Gui.TestUtil.Test/PluginTestHelperTest.cs =================================================================== diff -u -rbe9ffe357aaf542c7bcec7f32929028081223566 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Common/test/Core.Common.Gui.TestUtil.Test/PluginTestHelperTest.cs (.../PluginTestHelperTest.cs) (revision be9ffe357aaf542c7bcec7f32929028081223566) +++ Core/Common/test/Core.Common.Gui.TestUtil.Test/PluginTestHelperTest.cs (.../PluginTestHelperTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -34,7 +34,7 @@ { // Call TestDelegate test = () => PluginTestHelper.AssertPropertyInfoDefined(null, typeof(object), typeof(object)); - + // Assert Assert.Throws(test); } @@ -55,7 +55,7 @@ // Call TestDelegate test = () => PluginTestHelper.AssertPropertyInfoDefined(new PropertyInfo[] { - new PropertyInfo() + new PropertyInfo() }, typeof(object), typeof(object)); // Assert @@ -66,11 +66,11 @@ public void AssertPropertyInfoDefined_MultipleInfosSingleMatching_ReturnsMatchingInfoFromList() { // Call - var foundInfo = PluginTestHelper.AssertPropertyInfoDefined(new [] - { - new PropertyInfo(), - new PropertyInfo() - }, typeof(int), typeof(IObjectProperties)); + var foundInfo = PluginTestHelper.AssertPropertyInfoDefined(new[] + { + new PropertyInfo(), + new PropertyInfo() + }, typeof(int), typeof(IObjectProperties)); // Assert Assert.AreEqual(typeof(int), foundInfo.DataType); @@ -103,7 +103,7 @@ // Call TestDelegate test = () => PluginTestHelper.AssertViewInfoDefined(new ViewInfo[] { - new ViewInfo() + new ViewInfo() }, typeof(object), typeof(object)); // Assert @@ -115,10 +115,10 @@ { // Call var foundInfo = PluginTestHelper.AssertViewInfoDefined(new[] - { - new ViewInfo(), - new ViewInfo() - }, typeof(int), typeof(IView)); + { + new ViewInfo(), + new ViewInfo() + }, typeof(int), typeof(IView)); // Assert Assert.AreEqual(typeof(int), foundInfo.DataType); @@ -151,7 +151,7 @@ // Call TestDelegate test = () => PluginTestHelper.AssertViewInfoDefined(new ViewInfo[] { - new ViewInfo() + new ViewInfo() }, typeof(object), typeof(object), typeof(object)); // Assert @@ -177,10 +177,10 @@ { // Call var foundInfo = PluginTestHelper.AssertViewInfoDefined(new[] - { - new ViewInfo(), - new ViewInfo() - }, typeof(int), typeof(string), typeof(IView)); + { + new ViewInfo(), + new ViewInfo() + }, typeof(int), typeof(string), typeof(IView)); // Assert Assert.AreEqual(typeof(int), foundInfo.DataType); Index: Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs =================================================================== diff -u -rbe9ffe357aaf542c7bcec7f32929028081223566 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs (.../PluginTestHelper.cs) (revision be9ffe357aaf542c7bcec7f32929028081223566) +++ Core/Common/test/Core.Common.Gui.TestUtil/PluginTestHelper.cs (.../PluginTestHelper.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -47,8 +47,8 @@ { Assert.NotNull(propertyInfos); var propertyInfo = propertyInfos.FirstOrDefault( - tni => - tni.DataType == dataObjectType && + tni => + tni.DataType == dataObjectType && tni.PropertyObjectType == propertyObjectType); Assert.NotNull(propertyInfo); return propertyInfo; Index: Core/Common/test/Core.Common.TestUtil/TestDataPath.cs =================================================================== diff -u -r2d65ef2d76be3732554f992581e092755dd5195b -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Common/test/Core.Common.TestUtil/TestDataPath.cs (.../TestDataPath.cs) (revision 2d65ef2d76be3732554f992581e092755dd5195b) +++ Core/Common/test/Core.Common.TestUtil/TestDataPath.cs (.../TestDataPath.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -98,14 +98,14 @@ public static readonly TestDataPath Plugin = System.IO.Path.Combine("Ringtoets", "Piping", "test", "Ringtoets.Piping.Plugin.Test"); } - public static class StabilityStoneCover + public static class Revetment { - public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "StabilityStoneCover", "test", "Ringtoets.StabilityStoneCover.IO.Test"); + public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "Revetment", "test", "Ringtoets.Revetment.IO.Test"); } - public static class Revetment + public static class StabilityStoneCover { - public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "Revetment", "test", "Ringtoets.Revetment.IO.Test"); + public static readonly TestDataPath IO = System.IO.Path.Combine("Ringtoets", "StabilityStoneCover", "test", "Ringtoets.StabilityStoneCover.IO.Test"); } public static class WaveImpactAsphaltCover Index: Core/Components/test/Core.Components.Gis.IO.Test/Readers/PointShapeFileReaderTest.cs =================================================================== diff -u -r53e2b72ae05642a466890760547a683b52c48abc -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Core/Components/test/Core.Components.Gis.IO.Test/Readers/PointShapeFileReaderTest.cs (.../PointShapeFileReaderTest.cs) (revision 53e2b72ae05642a466890760547a683b52c48abc) +++ Core/Components/test/Core.Components.Gis.IO.Test/Readers/PointShapeFileReaderTest.cs (.../PointShapeFileReaderTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -112,7 +112,7 @@ { // Setup string corruptPointShapeFile = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, - "CorruptFile.shp"); + "CorruptFile.shp"); // Call TestDelegate call = () => new PointShapeFileReader(corruptPointShapeFile); Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r8a90c409545ce1b48e018d3b5d6b5982dbef926f -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 8a90c409545ce1b48e018d3b5d6b5982dbef926f) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -34,7 +34,6 @@ using Ringtoets.Common.IO; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionOutwards.Data; -using Ringtoets.GrassCoverErosionOutwards.Plugin; using Ringtoets.HeightStructures.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; Index: Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/DikeProfile.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/DikeProfile.cs (.../DikeProfile.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/DikeProfile.cs (.../DikeProfile.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -54,7 +54,7 @@ throw new ArgumentNullException("properties"); } - ForeshoreProfile = new ForeshoreProfile(worldCoordinate, foreshoreGeometry, breakWater, + ForeshoreProfile = new ForeshoreProfile(worldCoordinate, foreshoreGeometry, breakWater, new ForeshoreProfile.ConstructionProperties { Name = properties.Name, @@ -74,7 +74,8 @@ /// /// Gets the name of the dike profile. /// - public string Name { + public string Name + { get { return ForeshoreProfile.Name; Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision ce190360da30edf73fb464cc0fea1d9a795aa5d4) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -57,10 +57,10 @@ this.viewParent = viewParent; } - public bool CalculateDesignWaterLevels(string hydraulicBoundaryDatabasePath, - IEnumerable locations, - string ringId, double norm, - ICalculationMessageProvider messageProvider) + public bool CalculateDesignWaterLevels(string hydraulicBoundaryDatabasePath, + IEnumerable locations, + string ringId, double norm, + ICalculationMessageProvider messageProvider) { if (messageProvider == null) { @@ -72,16 +72,16 @@ throw new ArgumentNullException("locations"); } var activities = locations.Select(location => new DesignWaterLevelCalculationActivity(location, - hydraulicBoundaryDatabasePath, - ringId, - norm, messageProvider)).ToArray(); + hydraulicBoundaryDatabasePath, + ringId, + norm, messageProvider)).ToArray(); return RunActivities(hydraulicBoundaryDatabasePath, activities); } - public bool CalculateWaveHeights(string hydraulicBoundaryDatabasePath, - IEnumerable locations, - string ringId, double norm, - ICalculationMessageProvider messageProvider) + public bool CalculateWaveHeights(string hydraulicBoundaryDatabasePath, + IEnumerable locations, + string ringId, double norm, + ICalculationMessageProvider messageProvider) { if (messageProvider == null) { @@ -93,9 +93,9 @@ throw new ArgumentNullException("locations"); } var activities = locations.Select(location => new WaveHeightCalculationActivity(location, - hydraulicBoundaryDatabasePath, - ringId, - norm, messageProvider)).ToArray(); + hydraulicBoundaryDatabasePath, + ringId, + norm, messageProvider)).ToArray(); return RunActivities(hydraulicBoundaryDatabasePath, activities); } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/SelectionDialogBase.cs =================================================================== diff -u -r1e5ad56c5709dbdc59254e6f723d01e0bce55454 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Forms/SelectionDialogBase.cs (.../SelectionDialogBase.cs) (revision 1e5ad56c5709dbdc59254e6f723d01e0bce55454) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/SelectionDialogBase.cs (.../SelectionDialogBase.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -52,14 +52,6 @@ SelectedItems = new List(); } - private void Localize() - { - SelectAllButton.Text = Resources.SelectionDialogBase_SelectionDialogBase_Select_all; - DeselectAllButton.Text = Resources.SelectionDialogBase_SelectionDialogBase_Deselect_all; - DoForSelectedButton.Text = Resources.SelectionDialogBase_SelectionDialogBase_Generate; - CustomCancelButton.Text = Resources.SelectionDialogBase_SelectionDialogBase_Cancel; - } - /// /// Gets a collection of selected if they were selected /// in the dialog and a confirmation was given. If no confirmation was given or no @@ -74,7 +66,7 @@ { DataGridViewControl.SetDataSource(data); } - + protected override void Dispose(bool disposing) { if (disposing && (components != null)) @@ -89,6 +81,26 @@ return CustomCancelButton; } + /// + /// Initializes the . + /// Display name of the column header for . + /// + protected void InitializeDataGridView(string nameColumnHeader) + { + DataGridViewControl.AddCheckBoxColumn(TypeUtils.GetMemberName>(row => row.Selected), + Resources.SelectionDialogBase_ColumnSelect_DisplayName); + DataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName>(row => row.Name), + nameColumnHeader, true, DataGridViewAutoSizeColumnMode.Fill); + } + + private void Localize() + { + SelectAllButton.Text = Resources.SelectionDialogBase_SelectionDialogBase_Select_all; + DeselectAllButton.Text = Resources.SelectionDialogBase_SelectionDialogBase_Deselect_all; + DoForSelectedButton.Text = Resources.SelectionDialogBase_SelectionDialogBase_Generate; + CustomCancelButton.Text = Resources.SelectionDialogBase_SelectionDialogBase_Cancel; + } + private void SetSelectedItems() { SelectedItems = GetSelectedItems(); @@ -104,19 +116,6 @@ return GetSelectableRows().Where(row => row.Selected).Select(row => row.Item).ToArray(); } - /// - /// Initializes the . - /// Display name of the column header for . - /// - protected void InitializeDataGridView(string nameColumnHeader) - { - DataGridViewControl.AddCheckBoxColumn(TypeUtils.GetMemberName>(row => row.Selected), - Resources.SelectionDialogBase_ColumnSelect_DisplayName); - DataGridViewControl.AddTextBoxColumn(TypeUtils.GetMemberName>(row => row.Name), - nameColumnHeader, true, DataGridViewAutoSizeColumnMode.Fill); - - } - #region Event handling private void SelectAllButton_Click(object sender, EventArgs e) Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/DesignWaterLevelLocationRow.cs =================================================================== diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/DesignWaterLevelLocationRow.cs (.../DesignWaterLevelLocationRow.cs) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/DesignWaterLevelLocationRow.cs (.../DesignWaterLevelLocationRow.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -38,7 +38,7 @@ /// /// The for this row. /// Thrown when is null. - public DesignWaterLevelLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation) : base(hydraulicBoundaryLocation) { } + public DesignWaterLevelLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation) : base(hydraulicBoundaryLocation) {} /// /// Gets the . Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs =================================================================== diff -u -r515b6e8f36c1d08a017e240a29f0b41134902073 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs (.../HydraulicBoundaryLocationsView.cs) (revision 515b6e8f36c1d08a017e240a29f0b41134902073) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs (.../HydraulicBoundaryLocationsView.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -54,14 +54,6 @@ InitializeEventHandlers(); } - private void LocalizeControls() - { - CalculateForSelectedButton.Text = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsView_CalculateForSelectedButton_Text; - DeselectAllButton.Text = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsView_DeselectAllButton_Text; - SelectAllButton.Text = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsView_SelectAllButton_Text; - ButtonGroupBox.Text = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsView_ButtonGroupBox_Text; - } - /// /// Gets or sets the . /// @@ -160,6 +152,14 @@ /// The enumeration of to use in the calculation. protected abstract void HandleCalculateSelectedLocations(IEnumerable locations); + private void LocalizeControls() + { + CalculateForSelectedButton.Text = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsView_CalculateForSelectedButton_Text; + DeselectAllButton.Text = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsView_DeselectAllButton_Text; + SelectAllButton.Text = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsView_SelectAllButton_Text; + ButtonGroupBox.Text = RingtoetsCommonFormsResources.HydraulicBoundaryLocationsView_ButtonGroupBox_Text; + } + private IEnumerable GetHydraulicBoundaryLocationContextRows() { return dataGridViewControl.Rows.Cast().Select(row => (T) row.DataBoundItem); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs =================================================================== diff -u -r515b6e8f36c1d08a017e240a29f0b41134902073 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs (.../WaveHeightLocationRow.cs) (revision 515b6e8f36c1d08a017e240a29f0b41134902073) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs (.../WaveHeightLocationRow.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -38,7 +38,7 @@ /// /// The for this row. /// Thrown when is null. - public WaveHeightLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation) : base(hydraulicBoundaryLocation) { } + public WaveHeightLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation) : base(hydraulicBoundaryLocation) {} /// /// Gets the . Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using log4net; using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; using Ringtoets.HydraRing.Data; Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryLocationCalculationService.cs =================================================================== diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryLocationCalculationService.cs (.../HydraulicBoundaryLocationCalculationService.cs) (revision ce190360da30edf73fb464cc0fea1d9a795aa5d4) +++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraulicBoundaryLocationCalculationService.cs (.../HydraulicBoundaryLocationCalculationService.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -37,7 +37,7 @@ /// Abstract service that provides methods for performing Hydra-Ring calculations for hydraulic boundary locations. /// /// The input type of the calculation. - public abstract class HydraulicBoundaryLocationCalculationService : IHydraulicBoundaryLocationCalculationService + public abstract class HydraulicBoundaryLocationCalculationService : IHydraulicBoundaryLocationCalculationService where T : HydraRingCalculationInput { private static readonly ILog log = LogManager.GetLogger(typeof(HydraulicBoundaryLocationCalculationService)); @@ -87,20 +87,20 @@ return reliabilityIndexCalculationParser.Output; } - private static void VerifyOutput(ReliabilityIndexCalculationOutput output, ICalculationMessageProvider messageProvider, string locationName) - { - if (output == null) - { - log.Error(messageProvider.GetCalculationFailedMessage(locationName)); - } - } - /// /// Creates the input for the calculation. /// /// The hydraulic boundary location to create the input for. /// The norm which is needed in the input. /// The created Input. protected abstract T CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double norm); + + private static void VerifyOutput(ReliabilityIndexCalculationOutput output, ICalculationMessageProvider messageProvider, string locationName) + { + if (output == null) + { + log.Error(messageProvider.GetCalculationFailedMessage(locationName)); + } + } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs =================================================================== diff -u -rf95a4ded6035d61601445fa79685b9bb66a59cca -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs (.../RingtoetsCommonDataCalculationService.cs) (revision f95a4ded6035d61601445fa79685b9bb66a59cca) +++ Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs (.../RingtoetsCommonDataCalculationService.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -49,4 +49,4 @@ return Math.Abs(output.CalculatedReliabilityIndex - StatisticsConverter.NormToBeta(norm)) <= 1.0e-3; } } -} +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/ForeshoreProfileTest.cs =================================================================== diff -u -r9b0f19dce46cb8c54cd27dadb2d79888035a1aff -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/ForeshoreProfileTest.cs (.../ForeshoreProfileTest.cs) (revision 9b0f19dce46cb8c54cd27dadb2d79888035a1aff) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/ForeshoreProfileTest.cs (.../ForeshoreProfileTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -101,7 +101,7 @@ new Point2D[] { null - }, + }, null, new ForeshoreProfile.ConstructionProperties()); // Assert Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision ce190360da30edf73fb464cc0fea1d9a795aa5d4) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -238,7 +238,7 @@ // Call Action call = () => guiService.CalculateDesignWaterLevels(validDatabasePath, - new List() + new List() { new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3) }, Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs =================================================================== diff -u -r3e5a3e2990566fe86caaaa87136d0f57543a9666 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs (.../BreakWaterPropertiesTest.cs) (revision 3e5a3e2990566fe86caaaa87136d0f57543a9666) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs (.../BreakWaterPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -48,8 +48,8 @@ { // Setup var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], - new BreakWater(BreakWaterType.Wall, 10.0), - new ForeshoreProfile.ConstructionProperties()); + new BreakWater(BreakWaterType.Wall, 10.0), + new ForeshoreProfile.ConstructionProperties()); var properties = new BreakWaterProperties(); @@ -67,7 +67,7 @@ { // Setup var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], - null, new ForeshoreProfile.ConstructionProperties()); + null, new ForeshoreProfile.ConstructionProperties()); var properties = new BreakWaterProperties(); @@ -83,8 +83,8 @@ { // Setup var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], - new BreakWater(BreakWaterType.Caisson, 10.0), - new ForeshoreProfile.ConstructionProperties()); + new BreakWater(BreakWaterType.Caisson, 10.0), + new ForeshoreProfile.ConstructionProperties()); // Call var properties = new BreakWaterProperties @@ -123,7 +123,7 @@ { // Setup var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], - null, new ForeshoreProfile.ConstructionProperties()); + null, new ForeshoreProfile.ConstructionProperties()); // Call var properties = new BreakWaterProperties Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ForeshoreGeometryPropertiesTest.cs =================================================================== diff -u -r3e5a3e2990566fe86caaaa87136d0f57543a9666 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ForeshoreGeometryPropertiesTest.cs (.../ForeshoreGeometryPropertiesTest.cs) (revision 3e5a3e2990566fe86caaaa87136d0f57543a9666) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ForeshoreGeometryPropertiesTest.cs (.../ForeshoreGeometryPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -50,7 +50,7 @@ var properties = new ForeshoreGeometryProperties(); // Call - properties.Data = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], null, + properties.Data = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()); // Assert @@ -62,11 +62,11 @@ { // Setup var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), - new[] - { - new Point2D(0, 0), - new Point2D(1, 1) - }, null, new ForeshoreProfile.ConstructionProperties()); + new[] + { + new Point2D(0, 0), + new Point2D(1, 1) + }, null, new ForeshoreProfile.ConstructionProperties()); var properties = new ForeshoreGeometryProperties(); @@ -86,8 +86,8 @@ public void PropertyAttributes_ReturnExpectedValues() { // 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()); // Call var properties = new ForeshoreGeometryProperties Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/SelectionDialogBaseTest.cs =================================================================== diff -u -r76511556cd5348a48bb0401dae48e6ed2215fa61 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/SelectionDialogBaseTest.cs (.../SelectionDialogBaseTest.cs) (revision 76511556cd5348a48bb0401dae48e6ed2215fa61) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/SelectionDialogBaseTest.cs (.../SelectionDialogBaseTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -83,24 +83,24 @@ // Assert Assert.IsEmpty(dialog.SelectedItems); - var dataGridViewControl = (DataGridViewControl)new ControlTester("DataGridViewControl", dialog).TheObject; + var dataGridViewControl = (DataGridViewControl) new ControlTester("DataGridViewControl", dialog).TheObject; var dataGridView = dataGridViewControl.Controls.OfType().First(); Assert.AreEqual(2, dataGridView.ColumnCount); - var locationCalculateColumn = (DataGridViewCheckBoxColumn)dataGridView.Columns[selectItemColumnIndex]; + var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[selectItemColumnIndex]; const string expectedLocationCalculateHeaderText = "Gebruik"; Assert.AreEqual(expectedLocationCalculateHeaderText, locationCalculateColumn.HeaderText); Assert.AreEqual("Selected", locationCalculateColumn.DataPropertyName); Assert.IsFalse(locationCalculateColumn.ReadOnly); - var nameColumn = (DataGridViewTextBoxColumn)dataGridView.Columns[nameColumnIndex]; + var nameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[nameColumnIndex]; Assert.AreEqual(string.Empty, nameColumn.HeaderText); Assert.AreEqual("Name", nameColumn.DataPropertyName); Assert.AreEqual(DataGridViewAutoSizeColumnMode.Fill, nameColumn.AutoSizeMode); Assert.IsTrue(nameColumn.ReadOnly); var buttonTester = new ButtonTester("DoForSelectedButton", dialog); - var button = (Button)buttonTester.TheObject; + var button = (Button) buttonTester.TheObject; Assert.IsFalse(button.Enabled); } } @@ -132,7 +132,7 @@ using (var dialog = new TestFullyConfiguredSelectionDialogBase(testForm)) { - var selectionView = (DataGridViewControl)new ControlTester("DataGridViewControl", dialog).TheObject; + var selectionView = (DataGridViewControl) new ControlTester("DataGridViewControl", dialog).TheObject; dialog.SetDataSource(items); dialog.Show(); @@ -159,7 +159,7 @@ using (var dialog = new TestFullyConfiguredSelectionDialogBase(testForm)) { - var selectionView = (DataGridViewControl)new ControlTester("DataGridViewControl", dialog).TheObject; + var selectionView = (DataGridViewControl) new ControlTester("DataGridViewControl", dialog).TheObject; dialog.SetDataSource(items); dialog.Show(); @@ -187,7 +187,7 @@ using (var dialog = new TestFullyConfiguredSelectionDialogBase(testForm)) { - var selectionView = (DataGridViewControl)new ControlTester("DataGridViewControl", dialog).TheObject; + var selectionView = (DataGridViewControl) new ControlTester("DataGridViewControl", dialog).TheObject; dialog.SetDataSource(items); dialog.Show(); @@ -222,20 +222,20 @@ dialog.SetDataSource(items); dialog.Show(); - var dataGridView = (DataGridViewControl)new ControlTester("DataGridViewControl", dialog).TheObject; + var dataGridView = (DataGridViewControl) new ControlTester("DataGridViewControl", dialog).TheObject; var rows = dataGridView.Rows; var button = new ButtonTester("SelectAllButton", dialog); // Precondition - Assert.IsFalse((bool)rows[0].Cells[selectItemColumnIndex].Value); - Assert.IsFalse((bool)rows[1].Cells[selectItemColumnIndex].Value); + Assert.IsFalse((bool) rows[0].Cells[selectItemColumnIndex].Value); + Assert.IsFalse((bool) rows[1].Cells[selectItemColumnIndex].Value); // Call button.Click(); // Assert - Assert.IsTrue((bool)rows[0].Cells[selectItemColumnIndex].Value); - Assert.IsTrue((bool)rows[1].Cells[selectItemColumnIndex].Value); + Assert.IsTrue((bool) rows[0].Cells[selectItemColumnIndex].Value); + Assert.IsTrue((bool) rows[1].Cells[selectItemColumnIndex].Value); } } @@ -254,7 +254,7 @@ dialog.SetDataSource(items); dialog.Show(); - var dataGridView = (DataGridViewControl)new ControlTester("DataGridViewControl", dialog).TheObject; + var dataGridView = (DataGridViewControl) new ControlTester("DataGridViewControl", dialog).TheObject; var rows = dataGridView.Rows; var button = new ButtonTester("DeselectAllButton", dialog); @@ -264,15 +264,15 @@ } // Precondition - Assert.IsTrue((bool)rows[0].Cells[selectItemColumnIndex].Value); - Assert.IsTrue((bool)rows[1].Cells[selectItemColumnIndex].Value); + Assert.IsTrue((bool) rows[0].Cells[selectItemColumnIndex].Value); + Assert.IsTrue((bool) rows[1].Cells[selectItemColumnIndex].Value); // Call button.Click(); // Assert - Assert.IsFalse((bool)rows[0].Cells[selectItemColumnIndex].Value); - Assert.IsFalse((bool)rows[1].Cells[selectItemColumnIndex].Value); + Assert.IsFalse((bool) rows[0].Cells[selectItemColumnIndex].Value); + Assert.IsFalse((bool) rows[1].Cells[selectItemColumnIndex].Value); } } @@ -293,14 +293,14 @@ var buttonTester = new ButtonTester("DoForSelectedButton", dialog); // Call - var button = (Button)buttonTester.TheObject; + var button = (Button) buttonTester.TheObject; // Assert Assert.IsFalse(button.Enabled); Assert.IsEmpty(dialog.SelectedItems); } } - + private class TestSelectionDialogBase : SelectionDialogBase { public TestSelectionDialogBase(IWin32Window dialogParent) : base(dialogParent) {} Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs =================================================================== diff -u -ra50b5199ff7097db5e96948c4e192b5fef0e9f92 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision a50b5199ff7097db5e96948c4e192b5fef0e9f92) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -437,8 +437,9 @@ LocationsToCalculate = new List(); } - public IEnumerable LocationsToCalculate { get; private set; } public override IAssessmentSection AssessmentSection { get; set; } + + public IEnumerable LocationsToCalculate { get; private set; } public object CreateForSelection { get; set; } protected override TestHydraulicBoundaryLocationRow CreateNewRow(HydraulicBoundaryLocation location) Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs (.../RingtoetsMapDataFactoryTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs (.../RingtoetsMapDataFactoryTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,7 +24,6 @@ using Core.Components.Gis.Data; using Core.Components.Gis.Style; using NUnit.Framework; -using Ringtoets.Common.Data.Properties; using Ringtoets.Common.Forms.Views; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; @@ -42,7 +41,7 @@ // Assert Assert.IsEmpty(data.Features); - Assert.AreEqual(Resources.ReferenceLine_DisplayName, data.Name); + Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, data.Name); AssertEqualStyle(data.Style, Color.Red, 3, DashStyle.Solid); } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/ProfileLocationReaderTest.cs =================================================================== diff -u -rc287a312566b944a0b43783344709001a2486f91 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/ProfileLocationReaderTest.cs (.../ProfileLocationReaderTest.cs) (revision c287a312566b944a0b43783344709001a2486f91) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/ProfileLocationReaderTest.cs (.../ProfileLocationReaderTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -173,7 +173,7 @@ // Assert var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Het bestand kon niet worden geopend. Mogelijk is het bestand corrupt of in gebruik door een andere applicatie.", - validFilePath); + validFilePath); var exception = Assert.Throws(call); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FailureMechanismSectionReaderTest.cs =================================================================== diff -u -rcff3301f201c4e1d4691334cd3af48698f1b0d41 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FailureMechanismSectionReaderTest.cs (.../FailureMechanismSectionReaderTest.cs) (revision cff3301f201c4e1d4691334cd3af48698f1b0d41) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FailureMechanismSectionReaderTest.cs (.../FailureMechanismSectionReaderTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -311,7 +311,7 @@ [Test] public void ReadFailureMechanismSection_FileInUse_ThrowCriticalFileReadException() { - // Setup + // Setup string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("FailureMechanismSections", "traject_227_vakken.shp")); @@ -322,7 +322,7 @@ // Assert var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Het bestand kon niet worden geopend. Mogelijk is het bestand corrupt of in gebruik door een andere applicatie.", - validFilePath); + validFilePath); var exception = Assert.Throws(call); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraulicBoundaryLocationsExporterTest.cs =================================================================== diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraulicBoundaryLocationsExporterTest.cs (.../HydraulicBoundaryLocationsExporterTest.cs) (revision ce190360da30edf73fb464cc0fea1d9a795aa5d4) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraulicBoundaryLocationsExporterTest.cs (.../HydraulicBoundaryLocationsExporterTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -110,8 +110,8 @@ // Setup var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(123, "aName", 1.1, 2.2) { - DesignWaterLevel = (RoundedDouble)111.111, - WaveHeight = (RoundedDouble)222.222 + DesignWaterLevel = (RoundedDouble) 111.111, + WaveHeight = (RoundedDouble) 222.222 }; string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO, "test.shp"); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLineReaderTest.cs =================================================================== diff -u -rcff3301f201c4e1d4691334cd3af48698f1b0d41 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLineReaderTest.cs (.../ReferenceLineReaderTest.cs) (revision cff3301f201c4e1d4691334cd3af48698f1b0d41) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLineReaderTest.cs (.../ReferenceLineReaderTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -208,7 +208,7 @@ // Assert var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': Het bestand kon niet worden geopend. Mogelijk is het bestand corrupt of in gebruik door een andere applicatie.", - validReferenceLineShapeFile); + validReferenceLineShapeFile); var exception = Assert.Throws(call); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs (.../RingtoetsCommonDataCalculationServiceTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs (.../RingtoetsCommonDataCalculationServiceTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -69,4 +69,4 @@ Assert.IsFalse(calculationConverged); } } -} +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -52,7 +52,7 @@ // Setup const string locationName = "locationName"; const string activityName = "GetActivityName"; - + var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return(activityName); mockRepository.ReplayAll(); @@ -326,7 +326,7 @@ const int norm = 300; var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, + string.Empty, norm, calculationMessageProviderMock); using (new WaveHeightCalculationServiceConfig()) Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs =================================================================== diff -u -rfae43a9590e1fd964bd37cdcdf62b4d7f8a00b15 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs (.../WaveHeightCalculationServiceConfigTest.cs) (revision fae43a9590e1fd964bd37cdcdf62b4d7f8a00b15) +++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs (.../WaveHeightCalculationServiceConfigTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -56,7 +56,7 @@ var expectedService = WaveHeightCalculationService.Instance; // Call - using (new WaveHeightCalculationServiceConfig()) { } + using (new WaveHeightCalculationServiceConfig()) {} // Assert Assert.AreSame(expectedService, WaveHeightCalculationService.Instance); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs (.../GrassCoverErosionInwardsScenariosView.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs (.../GrassCoverErosionInwardsScenariosView.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -30,6 +30,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.Helpers; using Ringtoets.GrassCoverErosionInwards.Data; +using Ringtoets.GrassCoverErosionInwards.Forms.Properties; using Ringtoets.GrassCoverErosionInwards.Utils; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -128,7 +129,7 @@ dataGridViewControl.AddComboBoxColumn>( TypeUtils.GetMemberName(sr => sr.Calculation), - Properties.Resources.GrassCoverErosionInwardsScenariosView_AddDataGridColumns_Calculation, + Resources.GrassCoverErosionInwardsScenariosView_AddDataGridColumns_Calculation, null, TypeUtils.GetMemberName>(wrapper => wrapper.WrappedObject), TypeUtils.GetMemberName>(wrapper => wrapper.DisplayName)); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -161,12 +161,12 @@ // Assert Assert.AreEqual(group.Children.Count, children.Length); - var calculationGroupContext = (GrassCoverErosionInwardsCalculationGroupContext)children[0]; + var calculationGroupContext = (GrassCoverErosionInwardsCalculationGroupContext) children[0]; Assert.AreSame(childGroup, calculationGroupContext.WrappedData); Assert.AreSame(failureMechanism, calculationGroupContext.FailureMechanism); Assert.AreSame(assessmentSectionMock, calculationGroupContext.AssessmentSection); Assert.AreSame(calculationItemMock, children[1]); - var calculationContext = (GrassCoverErosionInwardsCalculationContext)children[2]; + var calculationContext = (GrassCoverErosionInwardsCalculationContext) children[2]; Assert.AreSame(childCalculation, calculationContext.WrappedData); Assert.AreSame(assessmentSectionMock, calculationContext.AssessmentSection); } @@ -994,8 +994,8 @@ DialogBoxHandler = (name, wnd) => { - var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog)new FormTester(name).TheObject; - var grid = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog) new FormTester(name).TheObject; + var grid = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; grid.Rows[0].Cells[0].Value = true; @@ -1051,8 +1051,8 @@ DialogBoxHandler = (name, wnd) => { - var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog)new FormTester(name).TheObject; - var grid = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog) new FormTester(name).TheObject; + var grid = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; grid.Rows[0].Cells[0].Value = true; @@ -1116,8 +1116,8 @@ DialogBoxHandler = (name, wnd) => { - var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog)new FormTester(name).TheObject; - var grid = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog) new FormTester(name).TheObject; + var grid = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; grid.Rows[0].Cells[0].Value = true; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs =================================================================== diff -u -r79079e310d68c1bd9a3980d693684641fdfbcfc7 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision 79079e310d68c1bd9a3980d693684641fdfbcfc7) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -225,12 +225,12 @@ DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(3, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); - Assert.AreEqual("profiel63p1IDCalculation", ((DataGridViewComboBoxCell)dataGridViewCell).Items[1].ToString()); - Assert.AreEqual("profiel63p2IDCalculation", ((DataGridViewComboBoxCell)dataGridViewCell).Items[2].ToString()); + Assert.AreEqual("profiel63p1IDCalculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); + Assert.AreEqual("profiel63p2IDCalculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[2].ToString()); DataGridViewCell dataGridViewCellWithRemovedCalculation = dataGridView.Rows[56].Cells[1]; - Assert.AreEqual(1, ((DataGridViewComboBoxCell)dataGridViewCellWithRemovedCalculation).Items.Count); - Assert.AreEqual("", ((DataGridViewComboBoxCell)dataGridViewCellWithRemovedCalculation).Items[0].ToString()); + Assert.AreEqual(1, ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items.Count); + Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items[0].ToString()); } } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs =================================================================== diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs (.../GrassCoverErosionInwardsPluginTest.cs) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs (.../GrassCoverErosionInwardsPluginTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -61,32 +61,32 @@ Assert.AreEqual(4, propertyInfos.Length); PropertyInfo failureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(GrassCoverErosionInwardsFailureMechanismContext), + propertyInfos, + typeof(GrassCoverErosionInwardsFailureMechanismContext), typeof(GrassCoverErosionInwardsFailureMechanismContextProperties)); Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck); Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData); Assert.IsNull(failureMechanismContextProperties.AfterCreate); PropertyInfo dikeProfileProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(DikeProfile), + typeof(DikeProfile), typeof(DikeProfileProperties)); Assert.IsNull(dikeProfileProperties.AdditionalDataCheck); Assert.IsNull(dikeProfileProperties.GetObjectPropertiesData); Assert.IsNull(dikeProfileProperties.AfterCreate); PropertyInfo inputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(GrassCoverErosionInwardsInputContext), typeof(GrassCoverErosionInwardsInputContextProperties)); Assert.IsNull(inputContextProperties.AdditionalDataCheck); Assert.IsNull(inputContextProperties.GetObjectPropertiesData); Assert.IsNull(inputContextProperties.AfterCreate); PropertyInfo outputProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(GrassCoverErosionInwardsOutput), + propertyInfos, + typeof(GrassCoverErosionInwardsOutput), typeof(GrassCoverErosionInwardsOutputProperties)); Assert.IsNull(outputProperties.AdditionalDataCheck); Assert.IsNull(outputProperties.GetObjectPropertiesData); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs =================================================================== diff -u -r2876f9193f8ea4f2bf130601553d4f8eace0580c -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs (.../GrassCoverErosionOutwardsWaveConditionsOutput.cs) (revision 2876f9193f8ea4f2bf130601553d4f8eace0580c) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs (.../GrassCoverErosionOutwardsWaveConditionsOutput.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -30,7 +30,7 @@ /// /// Container for the results of a grass cover erosion outwards wave conditions calculation. /// - public class GrassCoverErosionOutwardsWaveConditionsOutput: Observable, ICalculationOutput + public class GrassCoverErosionOutwardsWaveConditionsOutput : Observable, ICalculationOutput { /// /// Creates a new instance of . Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs =================================================================== diff -u -r8db89aecb3565f4784cedd541e7407e8360b6a6f -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs) (revision 8db89aecb3565f4784cedd541e7407e8360b6a6f) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationContext.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -40,7 +40,7 @@ /// which the belongs to. /// Thrown when any input parameter is null. public GrassCoverErosionOutwardsDesignWaterLevelLocationContext(ObservableList wrappedList, - HydraulicBoundaryLocation hydraulicBoundaryLocation) + HydraulicBoundaryLocation hydraulicBoundaryLocation) : base(wrappedList, hydraulicBoundaryLocation) {} } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationsContext.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationsContext.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContext.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsDesignWaterLevelLocationsContext.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContext.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -44,8 +44,8 @@ /// the . /// Thrown when any input parameter is null. public GrassCoverErosionOutwardsDesignWaterLevelLocationsContext( - ObservableList hydraulicBoundaryLocations, - IAssessmentSection assessmentSection, + ObservableList hydraulicBoundaryLocations, + IAssessmentSection assessmentSection, GrassCoverErosionOutwardsFailureMechanism failureMechanism) : base(hydraulicBoundaryLocations) { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs =================================================================== diff -u -rf4590e94b14a89d075cdf5e1746823dd9eeaa847 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs (.../GrassCoverErosionOutwardsFailureMechanismProperties.cs) (revision f4590e94b14a89d075cdf5e1746823dd9eeaa847) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs (.../GrassCoverErosionOutwardsFailureMechanismProperties.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -40,6 +40,28 @@ { private static readonly ILog log = LogManager.GetLogger(typeof(GrassCoverErosionOutwardsFailureMechanismProperties)); + #region Length effect parameters + + [PropertyOrder(3)] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_LengthEffect")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "FailureMechanism_N_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "FailureMechanism_N_Description")] + public int LengthEffect + { + get + { + return data.GeneralInput.N; + } + set + { + data.GeneralInput.N = value; + ClearHydraulicBoundaryLocationOutput(); + data.NotifyObservers(); + } + } + + #endregion + private void ClearHydraulicBoundaryLocationOutput() { GrassCoverErosionOutwardsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(data.HydraulicBoundaryLocations); @@ -75,28 +97,6 @@ #endregion - #region Length effect parameters - - [PropertyOrder(3)] - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_LengthEffect")] - [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "FailureMechanism_N_DisplayName")] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "FailureMechanism_N_Description")] - public int LengthEffect - { - get - { - return data.GeneralInput.N; - } - set - { - data.GeneralInput.N = value; - ClearHydraulicBoundaryLocationOutput(); - data.NotifyObservers(); - } - } - - #endregion - #region Model settings [PropertyOrder(4)] Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs =================================================================== diff -u -r5144a0cdb812048a94e9d812b30018415eebb07d -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs) (revision 5144a0cdb812048a94e9d812b30018415eebb07d) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputProperties.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -25,8 +25,8 @@ using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; using Ringtoets.GrassCoverErosionOutwards.Data; -using Ringtoets.Revetment.Forms.PropertyClasses; using Ringtoets.GrassCoverErosionOutwards.Forms.Properties; +using Ringtoets.Revetment.Forms.PropertyClasses; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs =================================================================== diff -u -rc882c4baa2b5279b3b4dce4f1b461bcf13e91d5f -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision c882c4baa2b5279b3b4dce4f1b461bcf13e91d5f) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -58,18 +58,18 @@ } } - protected override DesignWaterLevelLocationRow CreateNewRow(HydraulicBoundaryLocation location) - { - return new DesignWaterLevelLocationRow(location); - } + public override IAssessmentSection AssessmentSection { get; set; } /// /// Gets or sets the for which the /// hydraulic boundary locations are shown. /// public GrassCoverErosionOutwardsFailureMechanism FailureMechanism { get; set; } - public override IAssessmentSection AssessmentSection { get; set; } + protected override DesignWaterLevelLocationRow CreateNewRow(HydraulicBoundaryLocation location) + { + return new DesignWaterLevelLocationRow(location); + } protected override void InitializeDataGridView() { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -64,14 +64,14 @@ } } + public override IAssessmentSection AssessmentSection { get; set; } + /// /// Gets or sets the for which the /// hydraulic boundary locations are shown. /// public GrassCoverErosionOutwardsFailureMechanism FailureMechanism { get; set; } - public override IAssessmentSection AssessmentSection { get; set; } - protected override WaveHeightLocationRow CreateNewRow(HydraulicBoundaryLocation location) { return new WaveHeightLocationRow(location); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -111,7 +111,7 @@ yield return new ViewInfo< GrassCoverErosionOutwardsDesignWaterLevelLocationsContext, - IEnumerable, + IEnumerable, GrassCoverErosionOutwardsDesignWaterLevelLocationsView> { GetViewName = (v, o) => RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwardsWaterLevelLocations_DisplayName, @@ -331,7 +331,7 @@ private static bool CloseDesignWaterLevelLocationsViewForData(GrassCoverErosionOutwardsDesignWaterLevelLocationsView view, object dataToCloseFor) { - return CloseHydraulicBoundaryLocationsViewForData(view.AssessmentSection, dataToCloseFor); + return CloseHydraulicBoundaryLocationsViewForData(view.AssessmentSection, dataToCloseFor); } #endregion @@ -348,16 +348,15 @@ var failureMechanismContext = dataToCloseFor as GrassCoverErosionOutwardsFailureMechanismContext; var assessmentSection = dataToCloseFor as IAssessmentSection; var failureMechanism = dataToCloseFor as GrassCoverErosionOutwardsFailureMechanism; - + if (assessmentSection != null) { - failureMechanism = ((IAssessmentSection)dataToCloseFor).GetFailureMechanisms().OfType().Single(); + failureMechanism = ((IAssessmentSection) dataToCloseFor).GetFailureMechanisms().OfType().Single(); } if (failureMechanismContext != null) { failureMechanism = failureMechanismContext.Parent.GetFailureMechanisms().OfType().Single(); - } return failureMechanism != null && ReferenceEquals(failureMechanism, viewFailureMechanism); } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/MessageProviders/GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider.cs =================================================================== diff -u -r06b2840a2bb64c0960c8ac29322b5a0971c73c77 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/MessageProviders/GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider.cs) (revision 06b2840a2bb64c0960c8ac29322b5a0971c73c77) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/MessageProviders/GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -20,8 +20,8 @@ // All rights reserved. using Ringtoets.Common.Service.MessageProviders; -using Ringtoets.GrassCoverErosionOutwards.Service.Properties; using Ringtoets.GrassCoverErosionOutwards.Data; +using Ringtoets.GrassCoverErosionOutwards.Service.Properties; namespace Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -20,13 +20,11 @@ // All rights reserved. using System; -using System.Linq; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Contribution; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.HydraRing.Data; namespace Ringtoets.GrassCoverErosionOutwards.Data.Test @@ -43,7 +41,10 @@ failureMechanism.HydraulicBoundaryLocations.Add(hydraulicBoundaryLocation); // Precondition - CollectionAssert.AreEqual(new[] { hydraulicBoundaryLocation }, failureMechanism.HydraulicBoundaryLocations); + CollectionAssert.AreEqual(new[] + { + hydraulicBoundaryLocation + }, failureMechanism.HydraulicBoundaryLocations); // Call failureMechanism.SetGrassCoverErosionOutwardsHydraulicBoundaryLocations(null); @@ -114,7 +115,10 @@ { failureMechanism }); - assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new [] { failureMechanism }, 1, 300)); + assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new[] + { + failureMechanism + }, 1, 300)); mocks.ReplayAll(); // Call @@ -139,7 +143,10 @@ { failureMechanism }); - assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new[] { failureMechanism }, 1, 300)); + assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new[] + { + failureMechanism + }, 1, 300)); mocks.ReplayAll(); // Call Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -rc0c23a5508146aad6005fc0eb3b78bab7a63dc63 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs) (revision c0c23a5508146aad6005fc0eb3b78bab7a63dc63) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -47,7 +47,7 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(new GrassCoverErosionOutwardsWaveConditionsCalculation(), - failureMechanism, assessmentSection); + failureMechanism, assessmentSection); using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -88,7 +88,7 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(new GrassCoverErosionOutwardsWaveConditionsCalculation(), - failureMechanism, assessmentSection); + failureMechanism, assessmentSection); using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs =================================================================== diff -u -ree395d64328db8f999b871e80491399a0a65e844 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs) (revision ee395d64328db8f999b871e80491399a0a65e844) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -20,11 +20,9 @@ // All rights reserved. using System; -using Core.Common.Controls.PresentationObjects; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -58,8 +58,14 @@ // Assert Assert.IsInstanceOf>(context); Assert.AreSame(input, context.WrappedData); - CollectionAssert.AreEqual(new[] { foreshoreProfile }, context.ForeshoreProfiles); - CollectionAssert.AreEqual(new[] { hydraulicBoundaryLocation }, context.HydraulicBoundaryLocations); + CollectionAssert.AreEqual(new[] + { + foreshoreProfile + }, context.ForeshoreProfiles); + CollectionAssert.AreEqual(new[] + { + hydraulicBoundaryLocation + }, context.HydraulicBoundaryLocations); } [Test] Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs =================================================================== diff -u -r8a90c409545ce1b48e018d3b5d6b5982dbef926f -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs) (revision 8a90c409545ce1b48e018d3b5d6b5982dbef926f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -26,7 +26,6 @@ using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses; using Ringtoets.HydraRing.Data; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs =================================================================== diff -u -rf4590e94b14a89d075cdf5e1746823dd9eeaa847 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision f4590e94b14a89d075cdf5e1746823dd9eeaa847) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -37,6 +37,13 @@ [TestFixture] public class GrassCoverErosionOutwardsFailureMechanismPropertiesTest { + private const int namePropertyIndex = 0; + private const int codePropertyIndex = 1; + private const int lengthEffectPropertyIndex = 2; + private const int aPropertyIndex = 3; + private const int bPropertyIndex = 4; + private const int cPropertyIndex = 5; + [Test] public void Constructor_ExpectedValues() { @@ -148,7 +155,7 @@ Assert.AreEqual("c", cProperty.DisplayName); Assert.AreEqual("De waarde van de parameter 'c' in de berekening voor golf condities.", cProperty.Description); } - + [Test] [TestCase(1)] [TestCase(10)] @@ -161,10 +168,10 @@ observerMock.Expect(o => o.UpdateObserver()); mockRepository.ReplayAll(); - var hydraulicLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) + var hydraulicLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevel = (RoundedDouble)3.8, - WaveHeight = (RoundedDouble)5.2 + DesignWaterLevel = (RoundedDouble) 3.8, + WaveHeight = (RoundedDouble) 5.2 }; var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism @@ -196,12 +203,5 @@ Assert.AreEqual(CalculationConvergence.NotCalculated, hydraulicLocation.WaveHeightCalculationConvergence); mockRepository.VerifyAll(); } - - private const int namePropertyIndex = 0; - private const int codePropertyIndex = 1; - private const int lengthEffectPropertyIndex = 2; - private const int aPropertyIndex = 3; - private const int bPropertyIndex = 4; - private const int cPropertyIndex = 5; } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -115,17 +115,17 @@ { // Setup var random = new Random(21); - var assessmentLevel = (RoundedDouble)random.NextDouble(); - var lowerBoundaryRevetment = (RoundedDouble)random.NextDouble(); - var lowerBoundaryWaterLevels = (RoundedDouble)random.NextDouble(); - var upperBoundaryRevetment = lowerBoundaryRevetment + (RoundedDouble)random.NextDouble(); - var upperBoundaryWaterLevels = lowerBoundaryWaterLevels + (RoundedDouble)random.NextDouble(); + var assessmentLevel = (RoundedDouble) random.NextDouble(); + var lowerBoundaryRevetment = (RoundedDouble) random.NextDouble(); + var lowerBoundaryWaterLevels = (RoundedDouble) random.NextDouble(); + var upperBoundaryRevetment = lowerBoundaryRevetment + (RoundedDouble) random.NextDouble(); + var upperBoundaryWaterLevels = lowerBoundaryWaterLevels + (RoundedDouble) random.NextDouble(); var stepSize = WaveConditionsInputStepSize.Half; - var worldX = (RoundedDouble)random.NextDouble(); - var worldY = (RoundedDouble)random.NextDouble(); - var damHeight = (RoundedDouble)random.NextDouble(); - var foreshoreProfileOrientation = (RoundedDouble)random.NextDouble(); + var worldX = (RoundedDouble) random.NextDouble(); + var worldY = (RoundedDouble) random.NextDouble(); + var damHeight = (RoundedDouble) random.NextDouble(); + var foreshoreProfileOrientation = (RoundedDouble) random.NextDouble(); var foreshoreProfile = new ForeshoreProfile( new Point2D(worldX, worldY), @@ -188,12 +188,12 @@ mockRepository.ReplayAll(); var random = new Random(21); - var orientation = (RoundedDouble)random.NextDouble(); - var assessmentLevel = (RoundedDouble)random.NextDouble(); - var newLowerBoundaryRevetment = (RoundedDouble)random.NextDouble(); - var newLowerBoundaryWaterLevels = (RoundedDouble)random.NextDouble(); - var newUpperBoundaryRevetment = newLowerBoundaryRevetment + (RoundedDouble)random.NextDouble(); - var newUpperBoundaryWaterLevels = newLowerBoundaryWaterLevels + (RoundedDouble)random.NextDouble(); + var orientation = (RoundedDouble) random.NextDouble(); + var assessmentLevel = (RoundedDouble) random.NextDouble(); + var newLowerBoundaryRevetment = (RoundedDouble) random.NextDouble(); + var newLowerBoundaryWaterLevels = (RoundedDouble) random.NextDouble(); + var newUpperBoundaryRevetment = newLowerBoundaryRevetment + (RoundedDouble) random.NextDouble(); + var newUpperBoundaryWaterLevels = newLowerBoundaryWaterLevels + (RoundedDouble) random.NextDouble(); var newStepSize = WaveConditionsInputStepSize.Half; var newHydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "name", 0.0, 1.1) @@ -210,10 +210,10 @@ var newForeshoreProfile = new ForeshoreProfile( new Point2D( - (RoundedDouble)random.NextDouble(), - (RoundedDouble)random.NextDouble()), + (RoundedDouble) random.NextDouble(), + (RoundedDouble) random.NextDouble()), Enumerable.Empty(), - new BreakWater(BreakWaterType.Dam, (RoundedDouble)random.NextDouble()), + new BreakWater(BreakWaterType.Dam, (RoundedDouble) random.NextDouble()), new ForeshoreProfile.ConstructionProperties()); var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -433,7 +433,7 @@ grassCoverErosionOutwardsHydraulicBoundaryLocation2 }; var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext( - grassCoverErosionOutwardsHydraulicBoundaryLocations, + grassCoverErosionOutwardsHydraulicBoundaryLocations, assessmentSectionMock, failureMechanism); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb96f2e7a668c663c44150fcc3045edebb3ad56e9 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision b96f2e7a668c663c44150fcc3045edebb3ad56e9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -44,6 +44,8 @@ [TestFixture] public class GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest { + private const int contextMenuRelevancyIndexWhenRelevant = 0; + private const int contextMenuRelevancyIndexWhenNotRelevant = 0; private MockRepository mocks; private GrassCoverErosionOutwardsPlugin plugin; private TreeNodeInfo info; @@ -192,7 +194,7 @@ Assert.AreSame(failureMechanism, failureMechanismSectionsContext.WrappedData); Assert.AreSame(assessmentSection, failureMechanismSectionsContext.ParentAssessmentSection); - var foreshoreProfilesContext = (ForeshoreProfilesContext)inputsFolder.Contents[1]; + var foreshoreProfilesContext = (ForeshoreProfilesContext) inputsFolder.Contents[1]; Assert.AreSame(failureMechanism.ForeshoreProfiles, foreshoreProfilesContext.WrappedData); Assert.AreSame(assessmentSection, foreshoreProfilesContext.ParentAssessmentSection); @@ -392,8 +394,5 @@ } } } - - private const int contextMenuRelevancyIndexWhenRelevant = 0; - private const int contextMenuRelevancyIndexWhenNotRelevant = 0; } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -48,7 +48,6 @@ using Ringtoets.HydraRing.Calculation.TestUtil; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; -using Ringtoets.Revetment.Forms.PresentationObjects; using Ringtoets.Revetment.Service.TestUtil; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -345,7 +344,7 @@ var commentsContext = (CommentContext) children[0]; Assert.AreSame(calculation, commentsContext.WrappedData); - var inputContext = (GrassCoverErosionOutwardsWaveConditionsInputContext)children[1]; + var inputContext = (GrassCoverErosionOutwardsWaveConditionsInputContext) children[1]; Assert.AreSame(calculation.InputParameters, inputContext.WrappedData); CollectionAssert.AreEqual(new[] { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -46,7 +46,6 @@ using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Plugin; -using Ringtoets.HydraRing.Calculation.TestUtil; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Service.TestUtil; @@ -687,17 +686,16 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 1, 1) { - DesignWaterLevel = (RoundedDouble)12.0 + DesignWaterLevel = (RoundedDouble) 12.0 }, - LowerBoundaryRevetment = (RoundedDouble)1.0, - UpperBoundaryRevetment = (RoundedDouble)10.0, + LowerBoundaryRevetment = (RoundedDouble) 1.0, + UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, - LowerBoundaryWaterLevels = (RoundedDouble)1.0, - UpperBoundaryWaterLevels = (RoundedDouble)10.0 + LowerBoundaryWaterLevels = (RoundedDouble) 1.0, + UpperBoundaryWaterLevels = (RoundedDouble) 10.0 } }; - var group = new CalculationGroup(); group.Children.Add(calculationA); group.Children.Add(calculationB); @@ -712,7 +710,7 @@ assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - + using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -740,7 +738,7 @@ } } } - + [Test] public void ContextMenuStrip_TwoCalculationsClickOnCalculateAllInGroup_MessagesLogged() { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -147,4 +147,4 @@ return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsInputContext)); } } -} +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rb96f2e7a668c663c44150fcc3045edebb3ad56e9 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs (.../HydraulicBoundariesGroupContextTreeNodeInfoTest.cs) (revision b96f2e7a668c663c44150fcc3045edebb3ad56e9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/HydraulicBoundariesGroupContextTreeNodeInfoTest.cs (.../HydraulicBoundariesGroupContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -180,7 +180,7 @@ Assert.AreSame(failureMechanism.HydraulicBoundaryLocations, waterLevelHydraulicBoundaryLocationsContext.WrappedData); Assert.AreSame(assessmentSectionMock, waterLevelHydraulicBoundaryLocationsContext.AssessmentSection); - var waveHeightHydraulicBoundaryLocationsContext = (GrassCoverErosionOutwardsWaveHeightLocationsContext)children[1]; + var waveHeightHydraulicBoundaryLocationsContext = (GrassCoverErosionOutwardsWaveHeightLocationsContext) children[1]; Assert.AreSame(failureMechanism.HydraulicBoundaryLocations, waveHeightHydraulicBoundaryLocationsContext.WrappedData); Assert.AreSame(assessmentSectionMock, waveHeightHydraulicBoundaryLocationsContext.AssessmentSection); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -328,7 +328,7 @@ HydraulicBoundaryLocation expectedLocation = locations.First(); Assert.AreEqual(expectedLocation, calculatedLocations.First()); Assert.AreSame(dataGridViewSource, dataGridView.DataSource); - Assert.IsTrue((bool)rows[0].Cells[locationCalculateColumnIndex].Value); + Assert.IsTrue((bool) rows[0].Cells[locationCalculateColumnIndex].Value); Assert.IsFalse((bool) rows[1].Cells[locationCalculateColumnIndex].Value); Assert.IsFalse((bool) rows[2].Cells[locationCalculateColumnIndex].Value); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -37,6 +37,11 @@ [TestFixture] public class GrassCoverErosionOutwardsFailureMechanismResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithGrassCoverErosionOutwardsFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -220,11 +225,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private static void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -323,7 +323,7 @@ HydraulicBoundaryLocation expectedLocation = locations.First(); Assert.AreEqual(expectedLocation, calculatedLocations.First()); Assert.AreSame(dataGridViewSource, dataGridView.DataSource); - Assert.IsTrue((bool)rows[0].Cells[locationCalculateColumnIndex].Value); + Assert.IsTrue((bool) rows[0].Cells[locationCalculateColumnIndex].Value); Assert.IsFalse((bool) rows[1].Cells[locationCalculateColumnIndex].Value); Assert.IsFalse((bool) rows[2].Cells[locationCalculateColumnIndex].Value); mockRepository.VerifyAll(); @@ -334,8 +334,8 @@ { // Setup GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(); - ObservableList locations = (ObservableList)view.Data; - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + ObservableList locations = (ObservableList) view.Data; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; var dataGridViewSource = dataGridView.DataSource; var rows = dataGridView.Rows; rows[0].Cells[locationCalculateColumnIndex].Value = true; @@ -364,9 +364,9 @@ // Assert TestHelper.AssertLogMessageIsGenerated(action, "De bijdrage van dit toetsspoor is nul. Daardoor is de doorsnede-eis onbepaald en kunnen de berekeningen niet worden uitgevoerd.", 1); Assert.AreSame(dataGridViewSource, dataGridView.DataSource); - Assert.IsTrue((bool)rows[0].Cells[locationCalculateColumnIndex].Value); - Assert.IsFalse((bool)rows[1].Cells[locationCalculateColumnIndex].Value); - Assert.IsFalse((bool)rows[2].Cells[locationCalculateColumnIndex].Value); + Assert.IsTrue((bool) rows[0].Cells[locationCalculateColumnIndex].Value); + Assert.IsFalse((bool) rows[1].Cells[locationCalculateColumnIndex].Value); + Assert.IsFalse((bool) rows[2].Cells[locationCalculateColumnIndex].Value); mockRepository.VerifyAll(); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -rb740d9c15d6f93006d47867269b9f57c5fcaaf57 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision b740d9c15d6f93006d47867269b9f57c5fcaaf57) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.GrassCoverErosionOutwards.Integration.Test")] [assembly: AssemblyProduct("Ringtoets.GrassCoverErosionOutwards.Integration.Test")] -[assembly: Guid("c7ba9280-0ada-4be4-a02e-779cf35251df")] +[assembly: Guid("c7ba9280-0ada-4be4-a02e-779cf35251df")] \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs =================================================================== diff -u -re76f825d46c84e4de20cb664d0e3bfbf9646ae56 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision e76f825d46c84e4de20cb664d0e3bfbf9646ae56) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -119,35 +119,35 @@ Assert.AreEqual(7, propertyInfos.Length); PropertyInfo grassCoverErosionOutwardsFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(GrassCoverErosionOutwardsFailureMechanismContext), + propertyInfos, + typeof(GrassCoverErosionOutwardsFailureMechanismContext), typeof(GrassCoverErosionOutwardsFailureMechanismProperties)); Assert.IsNull(grassCoverErosionOutwardsFailureMechanismProperties.AdditionalDataCheck); Assert.IsNull(grassCoverErosionOutwardsFailureMechanismProperties.AfterCreate); var waterLevelHydraulicBoundaryLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContext), + propertyInfos, + typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContext), typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContextProperties)); Assert.IsNull(waterLevelHydraulicBoundaryLocationsContextProperties.AdditionalDataCheck); Assert.IsNull(waterLevelHydraulicBoundaryLocationsContextProperties.AfterCreate); var waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(GrassCoverErosionOutwardsWaveHeightLocationsContext), typeof(GrassCoverErosionOutwardsWaveHeightLocationsContextProperties)); Assert.IsNull(waveHeightLocationContextProperties.AdditionalDataCheck); Assert.IsNull(waveHeightLocationContextProperties.AfterCreate); var grassCoverErosionWaveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(GrassCoverErosionOutwardsWaveConditionsOutput), typeof(GrassCoverErosionOutwardsWaveConditionsOutputProperties)); Assert.IsNull(grassCoverErosionWaveConditionsOutputProperties.AdditionalDataCheck); Assert.IsNull(grassCoverErosionWaveConditionsOutputProperties.AfterCreate); var grassCoverErosionWaveConditionsInputContextroperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(GrassCoverErosionOutwardsWaveConditionsInputContext), typeof(GrassCoverErosionOutwardsWaveConditionsInputContextProperties)); Assert.IsNull(grassCoverErosionWaveConditionsInputContextroperties.AdditionalDataCheck); @@ -161,7 +161,7 @@ Assert.IsNull(grassCoverErosionDesignWaterLevelLocationContextProperties.AfterCreate); var grasCoverErosionWaveHeightWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(GrassCoverErosionOutwardsWaveHeightLocationContext), typeof(GrassCoverErosionOutwardsWaveHeightLocationContextProperties)); Assert.IsNull(grasCoverErosionWaveHeightWaterLevelLocationContextProperties.AdditionalDataCheck); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs =================================================================== diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs) (revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -45,8 +45,8 @@ // Assert Assert.IsNull(info.AdditionalDataCheck); Assert.IsNull(info.AfterCreate); - Assert.AreEqual(typeof(GrassCoverErosionOutwardsFailureMechanismContext),info.DataType); - Assert.AreEqual(typeof(GrassCoverErosionOutwardsFailureMechanismProperties),info.PropertyObjectType); + Assert.AreEqual(typeof(GrassCoverErosionOutwardsFailureMechanismContext), info.DataType); + Assert.AreEqual(typeof(GrassCoverErosionOutwardsFailureMechanismProperties), info.PropertyObjectType); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -77,9 +77,9 @@ // Call var locations = info.GetViewData(new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext( - expectedLocations, - assessmentSectionStub, - new GrassCoverErosionOutwardsFailureMechanism())); + expectedLocations, + assessmentSectionStub, + new GrassCoverErosionOutwardsFailureMechanism())); // Assert Assert.AreSame(locations, expectedLocations); @@ -105,7 +105,7 @@ var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var data = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext( - new ObservableList(), + new ObservableList(), assessmentSectionStub, grassCoverErosionOutwardsFailureMechanism); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs =================================================================== diff -u -r232167b1fa0b3e017074e366ef8f835bbd76d773 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs) (revision 232167b1fa0b3e017074e366ef8f835bbd76d773) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -77,9 +77,9 @@ // Call var locations = info.GetViewData(new GrassCoverErosionOutwardsWaveHeightLocationsContext( - expectedLocations, - assessmentSectionStub, - new GrassCoverErosionOutwardsFailureMechanism())); + expectedLocations, + assessmentSectionStub, + new GrassCoverErosionOutwardsFailureMechanism())); // Assert Assert.AreSame(locations, expectedLocations); @@ -103,7 +103,7 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var data = new GrassCoverErosionOutwardsWaveHeightLocationsContext( - new ObservableList(), + new ObservableList(), assessmentSectionStub, failureMechanism); plugin.Gui = guiStub; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r2a48ccf3a43d03b13a90b073a05afa4e2dd80436 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 2a48ccf3a43d03b13a90b073a05afa4e2dd80436) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -252,33 +252,33 @@ // Call using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView)) { - // Assert - Assert.AreEqual(7, menu.Items.Count); + // Assert + Assert.AreEqual(7, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, - RingtoetsCommonFormsResources.Checkbox_ticked); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, + RingtoetsCommonFormsResources.Checkbox_ticked); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate, - RingtoetsCommonFormsResources.ValidateAllIcon, - false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, - RingtoetsCommonFormsResources.CalculateAllIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.ValidateAll_No_calculations_to_validate, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndex, - RingtoetsCommonFormsResources.Clear_all_output, - RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, - RingtoetsCommonFormsResources.ClearIcon, - false); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndex, + RingtoetsCommonFormsResources.Clear_all_output, + RingtoetsCommonFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear, + RingtoetsCommonFormsResources.ClearIcon, + false); + } } } - } [Test] public void ContextMenuStrip_FailureMechanismIsNotRelevant_AddCustomItems() @@ -306,16 +306,16 @@ // Call using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView)) { - // Assert - Assert.AreEqual(2, menu.Items.Count); + // Assert + Assert.AreEqual(2, menu.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, - RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, - RingtoetsCommonFormsResources.Checkbox_empty); + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, + RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, + RingtoetsCommonFormsResources.Checkbox_empty); + } } } - } [Test] public void ContextMenuStrip_FailureMechanismIsRelevantAndClickOnIsRelevantItem_OnChangeActionRemovesAllViewsForItem() @@ -341,10 +341,10 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenRelevant].PerformClick(); + } } - } // Assert // Assert expectancies are called in TearDown() } @@ -372,10 +372,10 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { - // Call - contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); + // Call + contextMenu.Items[contextMenuRelevancyIndexWhenNotRelevant].PerformClick(); + } } - } // Assert // Assert expectancies are called in TearDown() } @@ -404,15 +404,15 @@ // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.CalculateAllIcon, - false); + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + } } } - } [Test] public void ContextMenuStrip_FailureMechanismSectionsSetNoHydraulicBoundaryDatabase_ContextMenuItemCalculateAllDisabledAndTooltipSet() @@ -442,15 +442,15 @@ // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndex, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsCommonFormsResources.CalculateAllIcon, - false); + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndex, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.CalculateAllIcon, + false); + } } } - } [Test] public void ContextMenuStrip_FailureMechanismSectionsSetHydraulicBoundaryDatabaseNotValid_ContextMenuItemCalculateAllDisabledAndTooltipSet() @@ -481,16 +481,16 @@ // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex]; + // Assert + ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex]; - Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Calculate_all, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } } } - } [Test] public void ContextMenuStrip_FailureMechanismSectionsAndHydraulicDatabaseSet_ContextMenuItemCalculateAllEnabled() @@ -529,14 +529,14 @@ // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.Calculate_all_ToolTip, - RingtoetsCommonFormsResources.CalculateAllIcon); + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex, + RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Calculate_all_ToolTip, + RingtoetsCommonFormsResources.CalculateAllIcon); + } } } - } [Test] public void ContextMenuStrip_NoFailureMechanismSections_ContextMenuItemValidateAllDisabledAndTooltipSet() @@ -562,15 +562,15 @@ // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, - RingtoetsCommonFormsResources.ValidateAllIcon, - false); + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_failure_mechanism_sections_imported, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + } } } - } [Test] public void ContextMenuStrip_FailureMechanismSectionsSetNoHydraulicBoundaryDatabase_ContextMenuItemValidateAllDisabledAndTooltipSet() @@ -600,15 +600,15 @@ // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - // Assert - TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, - RingtoetsCommonFormsResources.ValidateAllIcon, - false); + // Assert + TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuValidateAllIndex, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.Plugin_AllDataAvailable_No_hydraulic_boundary_database_imported, + RingtoetsCommonFormsResources.ValidateAllIcon, + false); + } } } - } [Test] public void ContextMenuStrip_FailureMechanismSectionsSetHydraulicBoundaryDatabaseNotValid_ContextMenuItemValidateAllDisabledAndTooltipSet() @@ -639,16 +639,16 @@ // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - // Assert - ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex]; + // Assert + ToolStripItem contextMenuItem = contextMenu.Items[contextMenuValidateAllIndex]; - Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text); - StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image); - Assert.IsFalse(contextMenuItem.Enabled); + Assert.AreEqual(RingtoetsCommonFormsResources.Validate_all, contextMenuItem.Text); + StringAssert.Contains(string.Format(RingtoetsCommonServicesResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, contextMenuItem.Image); + Assert.IsFalse(contextMenuItem.Enabled); + } } } - } [Test] public void ContextMenuStrip_FailureMechanismSectionsAndHydraulicDatabaseSet_ContextMenuItemValidateAllEnabled() @@ -687,14 +687,14 @@ // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) { - // Assert - TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, - RingtoetsCommonFormsResources.Validate_all, - RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip, - RingtoetsCommonFormsResources.ValidateAllIcon); + // Assert + TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex, + RingtoetsCommonFormsResources.Validate_all, + RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip, + RingtoetsCommonFormsResources.ValidateAllIcon); + } } } - } [Test] public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations() @@ -755,31 +755,31 @@ using (var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { - // Call - TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(), messages => - { - var messageList = messages.ToList(); + // Call + TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(), messages => + { + var messageList = messages.ToList(); - // Assert - Assert.AreEqual(14, messageList.Count); - StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]); - StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]); - StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]); - StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[3]); - Assert.AreEqual("De berekening voor hoogte kunstwerk 'A' is niet gelukt.", messageList[4]); - StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[5]); - StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[6]); - StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[7]); - StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[8]); - StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[9]); - Assert.AreEqual("De berekening voor hoogte kunstwerk 'B' is niet gelukt.", messageList[10]); - StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[11]); - Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[12]); - Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[13]); - }); + // Assert + Assert.AreEqual(14, messageList.Count); + StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]); + StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]); + StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]); + StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[3]); + Assert.AreEqual("De berekening voor hoogte kunstwerk 'A' is niet gelukt.", messageList[4]); + StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[5]); + StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[6]); + StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[7]); + StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[8]); + StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", messageList[9]); + Assert.AreEqual("De berekening voor hoogte kunstwerk 'B' is niet gelukt.", messageList[10]); + StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[11]); + Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[12]); + Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[13]); + }); + } } } - } [Test] public void ContextMenuStrip_ClickOnValidateAllItem_ValidateAllChildCalculations() @@ -833,21 +833,21 @@ using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { - // Call - TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(), messages => - { - var messageList = messages.ToList(); + // Call + TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(), messages => + { + var messageList = messages.ToList(); - // Assert - Assert.AreEqual(4, messageList.Count); - StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]); - StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]); - StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[2]); - StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[3]); - }); + // Assert + Assert.AreEqual(4, messageList.Count); + StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]); + StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]); + StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[2]); + StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[3]); + }); + } } } - } public override void TearDown() { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs =================================================================== diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -62,15 +62,15 @@ // assert Assert.AreEqual(2, propertyInfos.Length); PropertyInfo failureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(HeightStructuresFailureMechanismContext), + propertyInfos, + typeof(HeightStructuresFailureMechanismContext), typeof(HeightStructuresFailureMechanismContextProperties)); Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck); Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData); Assert.IsNull(failureMechanismContextProperties.AfterCreate); PropertyInfo heightStructuresInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(HeightStructuresInputContext), typeof(HeightStructuresInputContextProperties)); Assert.IsNull(heightStructuresInputContextProperties.AdditionalDataCheck); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/WaveConditionsCalculationOutput.cs =================================================================== diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/WaveConditionsCalculationOutput.cs (.../WaveConditionsCalculationOutput.cs) (revision fb6c8cb473282ccd9b920afddb33a2284c7274cd) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/WaveConditionsCalculationOutput.cs (.../WaveConditionsCalculationOutput.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -54,4 +54,4 @@ /// public double WaveAngle { get; private set; } } -} +} \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs =================================================================== diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs (.../WaveConditionsCalculationParser.cs) (revision fb6c8cb473282ccd9b920afddb33a2284c7274cd) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs (.../WaveConditionsCalculationParser.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -35,7 +35,7 @@ private const string waveHeightText = "Wave height"; private const string wavePeakPeriodText = "Wave period"; private const string reductionFactorText = "reduction factor"; - + private const char equalsCharacter = '='; private double? waveAngle; Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingCalculationServiceConfigTest.cs =================================================================== diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingCalculationServiceConfigTest.cs (.../HydraRingCalculationServiceConfigTest.cs) (revision fb6c8cb473282ccd9b920afddb33a2284c7274cd) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingCalculationServiceConfigTest.cs (.../HydraRingCalculationServiceConfigTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -57,7 +57,7 @@ var expectedService = HydraRingCalculationService.Instance; // Call - using (new HydraRingCalculationServiceConfig()) { } + using (new HydraRingCalculationServiceConfig()) {} // Assert Assert.AreSame(expectedService, HydraRingCalculationService.Instance); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingVariableAssertTest.cs =================================================================== diff -u -rb01947f044cd7492d3161afd47c76ba7e7d1e5db -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingVariableAssertTest.cs (.../HydraRingVariableAssertTest.cs) (revision b01947f044cd7492d3161afd47c76ba7e7d1e5db) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingVariableAssertTest.cs (.../HydraRingVariableAssertTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -188,4 +188,4 @@ Assert.Throws(() => HydraRingVariableAssert.AreEqual(expected, actual)); } } -} +} \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/TestHydraRingCalculationServiceTest.cs =================================================================== diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/TestHydraRingCalculationServiceTest.cs (.../TestHydraRingCalculationServiceTest.cs) (revision fb6c8cb473282ccd9b920afddb33a2284c7274cd) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/TestHydraRingCalculationServiceTest.cs (.../TestHydraRingCalculationServiceTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input; @@ -79,31 +80,31 @@ { get { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } } public override int CalculationTypeId { get { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } } public override int VariableId { get { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } } public override HydraRingSection Section { get { - throw new System.NotImplementedException(); + throw new NotImplementedException(); } } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs =================================================================== diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs (.../HydraulicBoundaryDatabaseProperties.cs) (revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs (.../HydraulicBoundaryDatabaseProperties.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -23,6 +23,7 @@ using Core.Common.Utils.Attributes; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Forms.PresentationObjects; +using Ringtoets.Integration.Forms.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.PropertyClasses @@ -33,8 +34,8 @@ public class HydraulicBoundaryDatabaseProperties : ObjectProperties { [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")] - [ResourcesDisplayName(typeof(Properties.Resources), "HydraulicBoundaryDatabase_FilePath_DisplayName")] - [ResourcesDescription(typeof(Properties.Resources), "HydraulicBoundaryDatabase_FilePath_Description")] + [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_FilePath_DisplayName")] + [ResourcesDescription(typeof(Resources), "HydraulicBoundaryDatabase_FilePath_Description")] public string FilePath { get Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rd696a981f204db5592dc3304d9ad8f4f7ef94128 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision d696a981f204db5592dc3304d9ad8f4f7ef94128) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -65,7 +65,6 @@ using Ringtoets.Integration.Forms.Views; using Ringtoets.Integration.Forms.Views.SectionResultViews; using Ringtoets.Integration.Plugin.FileImporters; -using Ringtoets.Integration.Plugin.Properties; using Ringtoets.Integration.Service; using Ringtoets.Integration.Service.MessageProviders; using Ringtoets.Piping.Data; @@ -385,7 +384,7 @@ yield return new ViewInfo, ICommentable, CommentView> { - GetViewName = (v, o) => Resources.Comment_DisplayName, + GetViewName = (v, o) => RingtoetsIntegrationPluginResources.Comment_DisplayName, GetViewData = context => context.WrappedData, Image = RingtoetsCommonFormsResources.EditDocumentIcon, CloseForData = CloseCommentViewForData @@ -417,8 +416,8 @@ yield return new ImportInfo { CreateFileImporter = (context, filePath) => new ForeshoreProfilesImporter(context.WrappedData, - context.ParentAssessmentSection.ReferenceLine, - filePath), + context.ParentAssessmentSection.ReferenceLine, + filePath), Name = RingtoetsIntegrationPluginResources.ForeshoreProfilesImporter_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsIntegrationPluginResources.Foreshore, @@ -451,8 +450,8 @@ yield return new ExportInfo { CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationsExporter( - context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath, - Resources.DesignWaterLevel_Description, Resources.WaveHeight_Description), + context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath, + RingtoetsIntegrationPluginResources.DesignWaterLevel_Description, RingtoetsIntegrationPluginResources.WaveHeight_Description), IsEnabled = context => context.WrappedData.HydraulicBoundaryDatabase != null, FileFilter = RingtoetsCommonIoResources.DataTypeDisplayName_shape_file_filter }; @@ -607,7 +606,7 @@ yield return new TreeNodeInfo { Text = foreshoreProfile => foreshoreProfile.Name, - Image = context => Resources.Foreshore, + Image = context => RingtoetsIntegrationPluginResources.Foreshore, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddPropertiesItem() .Build() @@ -628,7 +627,7 @@ yield return new TreeNodeInfo> { - Text = comment => Resources.Comment_DisplayName, + Text = comment => RingtoetsIntegrationPluginResources.Comment_DisplayName, Image = context => RingtoetsCommonFormsResources.EditDocumentIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddOpenItem() @@ -1171,7 +1170,7 @@ bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, + assessmentSection.FailureMechanismContribution.Norm, new DesignWaterLevelCalculationMessageProvider()); if (successfulCalculation) { @@ -1208,10 +1207,10 @@ } IAssessmentSection assessmentSection = nodeData.WrappedData; bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(assessmentSection.HydraulicBoundaryDatabase.FilePath, - assessmentSection.HydraulicBoundaryDatabase.Locations, - assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, - new WaveHeightCalculationMessageProvider()); + assessmentSection.HydraulicBoundaryDatabase.Locations, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + new WaveHeightCalculationMessageProvider()); if (successfulCalculation) { nodeData.NotifyObservers(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs =================================================================== diff -u -r1e9a35d13ae40069200f8b1e6c1aa91bb54ce086 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs (.../DesignWaterLevelLocationContextTest.cs) (revision 1e9a35d13ae40069200f8b1e6c1aa91bb54ce086) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs (.../DesignWaterLevelLocationContextTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -21,7 +21,6 @@ using System; using NUnit.Framework; -using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Forms.PresentationObjects; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs =================================================================== diff -u -r1e9a35d13ae40069200f8b1e6c1aa91bb54ce086 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs (.../WaveHeightLocationContextTest.cs) (revision 1e9a35d13ae40069200f8b1e6c1aa91bb54ce086) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs (.../WaveHeightLocationContextTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -21,7 +21,6 @@ using System; using NUnit.Framework; -using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Forms.PresentationObjects; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs =================================================================== diff -u -r1e9a35d13ae40069200f8b1e6c1aa91bb54ce086 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision 1e9a35d13ae40069200f8b1e6c1aa91bb54ce086) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -23,7 +23,6 @@ using Core.Common.Base.Geometry; using Core.Common.Gui.PropertyBag; using NUnit.Framework; -using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Forms.PresentationObjects; using Ringtoets.Integration.Forms.PropertyClasses; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -172,53 +172,53 @@ Assert.AreSame(assessmentSection.GrassCoverErosionInwards, grassCoverErosionInwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, grassCoverErosionInwardsFailureMechanismContext.Parent); - var macrostabilityInwardsFailureMechanismContext = (FailureMechanismContext)objects[6]; + var macrostabilityInwardsFailureMechanismContext = (FailureMechanismContext) objects[6]; Assert.AreSame(assessmentSection.MacrostabilityInwards, macrostabilityInwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, macrostabilityInwardsFailureMechanismContext.Parent); - var macrostabilityOutwardsFailureMechanismContext = (FailureMechanismContext)objects[7]; + var macrostabilityOutwardsFailureMechanismContext = (FailureMechanismContext) objects[7]; Assert.AreSame(assessmentSection.MacrostabilityOutwards, macrostabilityOutwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, macrostabilityOutwardsFailureMechanismContext.Parent); - var microstabilityFailureMechanismContext = (FailureMechanismContext)objects[8]; + var microstabilityFailureMechanismContext = (FailureMechanismContext) objects[8]; Assert.AreSame(assessmentSection.Microstability, microstabilityFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, microstabilityFailureMechanismContext.Parent); - var stabilityStoneCoverFailureMechanismContext = (StabilityStoneCoverFailureMechanismContext)objects[9]; + var stabilityStoneCoverFailureMechanismContext = (StabilityStoneCoverFailureMechanismContext) objects[9]; Assert.AreSame(assessmentSection.StabilityStoneCover, stabilityStoneCoverFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, stabilityStoneCoverFailureMechanismContext.Parent); - var waveImpactAsphaltCoverFailureMechanismContext = (WaveImpactAsphaltCoverFailureMechanismContext)objects[10]; + var waveImpactAsphaltCoverFailureMechanismContext = (WaveImpactAsphaltCoverFailureMechanismContext) objects[10]; Assert.AreSame(assessmentSection.WaveImpactAsphaltCover, waveImpactAsphaltCoverFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, waveImpactAsphaltCoverFailureMechanismContext.Parent); - var waterPressureAsphaltCoverFailureMechanismContext = (FailureMechanismContext)objects[11]; + var waterPressureAsphaltCoverFailureMechanismContext = (FailureMechanismContext) objects[11]; Assert.AreSame(assessmentSection.WaterPressureAsphaltCover, waterPressureAsphaltCoverFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, waterPressureAsphaltCoverFailureMechanismContext.Parent); - var grassCoverErosionOutwardsFailureMechanismContext = (GrassCoverErosionOutwardsFailureMechanismContext)objects[12]; + var grassCoverErosionOutwardsFailureMechanismContext = (GrassCoverErosionOutwardsFailureMechanismContext) objects[12]; Assert.AreSame(assessmentSection.GrassCoverErosionOutwards, grassCoverErosionOutwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, grassCoverErosionOutwardsFailureMechanismContext.Parent); - var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext)objects[13]; + var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext) objects[13]; Assert.AreSame(assessmentSection.GrassCoverSlipOffOutwards, grassCoverSlipOffOutwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, grassCoverSlipOffOutwardsFailureMechanismContext.Parent); - var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext)objects[14]; + var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext) objects[14]; Assert.AreSame(assessmentSection.GrassCoverSlipOffInwards, grassCoverSlipOffInwardsFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, grassCoverSlipOffInwardsFailureMechanismContext.Parent); var heightStructuresFailureMechanismContext = (HeightStructuresFailureMechanismContext) objects[15]; Assert.AreSame(assessmentSection.HeightStructures, heightStructuresFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, heightStructuresFailureMechanismContext.Parent); - var closingStructureFailureMechnaismContext = (FailureMechanismContext)objects[16]; + var closingStructureFailureMechnaismContext = (FailureMechanismContext) objects[16]; Assert.AreSame(assessmentSection.ClosingStructure, closingStructureFailureMechnaismContext.WrappedData); Assert.AreSame(assessmentSection, closingStructureFailureMechnaismContext.Parent); - var pipingStructureFailureMechanismContext = (FailureMechanismContext)objects[17]; + var pipingStructureFailureMechanismContext = (FailureMechanismContext) objects[17]; Assert.AreSame(assessmentSection.PipingStructure, pipingStructureFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, pipingStructureFailureMechanismContext.Parent); - var strengthStabilityPointConstructionFailureMechanismContext = (FailureMechanismContext)objects[18]; + var strengthStabilityPointConstructionFailureMechanismContext = (FailureMechanismContext) objects[18]; Assert.AreSame(assessmentSection.StrengthStabilityPointConstruction, strengthStabilityPointConstructionFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, strengthStabilityPointConstructionFailureMechanismContext.Parent); - var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext)objects[19]; + var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext) objects[19]; Assert.AreSame(assessmentSection.StrengthStabilityLengthwiseConstruction, strengthStabilityLengthwiseConstructionFailureMechanismContext.WrappedData); Assert.AreSame(assessmentSection, strengthStabilityLengthwiseConstructionFailureMechanismContext.Parent); var duneErosionFailureMechanismContext = (FailureMechanismContext) objects[20]; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreTreeNodeInfoTest.cs =================================================================== diff -u -r8d97f1f5da3f6e6954160d0e0076ce04349ed738 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreTreeNodeInfoTest.cs (.../ForeshoreTreeNodeInfoTest.cs) (revision 8d97f1f5da3f6e6954160d0e0076ce04349ed738) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreTreeNodeInfoTest.cs (.../ForeshoreTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -91,7 +91,7 @@ var nonDefaultBreakWaterType = BreakWaterType.Wall; var nonDefaultBreakWaterHeight = 5.5; - var breakWater = new BreakWater(nonDefaultBreakWaterType, nonDefaultBreakWaterHeight); + var breakWater = new BreakWater(nonDefaultBreakWaterType, nonDefaultBreakWaterHeight); double orientation = 96; var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), @@ -153,4 +153,4 @@ mocks.VerifyAll(); } } -} +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs (.../ClosingStructureResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs (.../ClosingStructureResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -29,9 +29,9 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs (.../DuneErosionResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs (.../DuneErosionResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -27,9 +27,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,9 +28,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,9 +28,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs (.../MacrostabilityInwardsResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs (.../MacrostabilityInwardsResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -29,9 +29,9 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -29,9 +29,9 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,9 +28,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,9 +28,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,9 +28,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs (.../StrengthStabilityPointConstructionResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs (.../StrengthStabilityPointConstructionResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,9 +28,9 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,9 +28,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs =================================================================== diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,9 +28,9 @@ using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/DikeProfilesImporterTest.cs =================================================================== diff -u -r59c2ee32cb47c49461cf11d5aea1d78f3c230127 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision 59c2ee32cb47c49461cf11d5aea1d78f3c230127) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -116,7 +116,7 @@ { // Setup string fileDirectory = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Plugin, - Path.Combine("DikeProfiles", "NoDikeProfileGeometries")); + Path.Combine("DikeProfiles", "NoDikeProfileGeometries")); string filePath = Path.Combine(fileDirectory, "Voorlanden 12-2.shp"); ReferenceLine referenceLine = CreateMatchingReferenceLine(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfilesImporterTest.cs =================================================================== diff -u -r59c2ee32cb47c49461cf11d5aea1d78f3c230127 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfilesImporterTest.cs (.../ForeshoreProfilesImporterTest.cs) (revision 59c2ee32cb47c49461cf11d5aea1d78f3c230127) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfilesImporterTest.cs (.../ForeshoreProfilesImporterTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -131,7 +131,7 @@ { // Setup string fileDirectory = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Plugin, - Path.Combine("DikeProfiles", "NoDamsAndNoForeshoreGeometries")); + Path.Combine("DikeProfiles", "NoDamsAndNoForeshoreGeometries")); string filePath = Path.Combine(fileDirectory, "Voorlanden 12-2.shp"); ReferenceLine referenceLine = CreateMatchingReferenceLine(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r90de5f60de0a152b946e686873ffb15cae3a7038 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 90de5f60de0a152b946e686873ffb15cae3a7038) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -221,9 +221,8 @@ string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Plugin, "completeWithLocationsToBeFilteredOut.sqlite"); string copyValidFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Plugin, - "copyOfCompleteWithLocationsToBeFilteredOut.sqlite"); + "copyOfCompleteWithLocationsToBeFilteredOut.sqlite"); - // Precondition Assert.IsTrue(File.Exists(validFilePath), string.Format("Precodition failed. File does not exist: {0}", validFilePath)); @@ -254,7 +253,6 @@ string validFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Plugin, "completeWithLocationsToBeFilteredOut.sqlite"); - // Precondition Assert.IsTrue(File.Exists(validFilePath), string.Format("Precodition failed. File does not exist: {0}", validFilePath)); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ProfilesImporterTest.cs =================================================================== diff -u -rc287a312566b944a0b43783344709001a2486f91 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ProfilesImporterTest.cs (.../ProfilesImporterTest.cs) (revision c287a312566b944a0b43783344709001a2486f91) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ProfilesImporterTest.cs (.../ProfilesImporterTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -377,7 +377,7 @@ // Assert Action> asserts = messages => - { + { var start = "Meerdere definities gevonden voor profiel 'profiel001'. Bestand '"; var end = "' wordt overgeslagen."; bool found = messages.Any(m => m.StartsWith(start) && m.EndsWith(end)); @@ -539,7 +539,7 @@ : base(referenceLine, filePath, importTarget) {} protected override void CreateProfiles(ReadResult importProfileLocationResult, ReadResult importDikeProfileDataResult) {} - + protected override bool DikeProfileDataIsValid(DikeProfileData data, string prflFilePath) { return true; Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -rd696a981f204db5592dc3304d9ad8f4f7ef94128 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision d696a981f204db5592dc3304d9ad8f4f7ef94128) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -202,40 +202,40 @@ Assert.AreEqual(12, propertyInfos.Length); PropertyInfo ringtoetsProjectProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(IProject), + propertyInfos, + typeof(IProject), typeof(RingtoetsProjectProperties)); Assert.IsNull(ringtoetsProjectProperties.AdditionalDataCheck); Assert.IsNull(ringtoetsProjectProperties.GetObjectPropertiesData); Assert.IsNull(ringtoetsProjectProperties.AfterCreate); PropertyInfo assessmentSectionProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(IAssessmentSection), + propertyInfos, + typeof(IAssessmentSection), typeof(AssessmentSectionProperties)); Assert.IsNull(assessmentSectionProperties.AdditionalDataCheck); Assert.IsNull(assessmentSectionProperties.GetObjectPropertiesData); Assert.IsNull(assessmentSectionProperties.AfterCreate); PropertyInfo hydraulicBoundaryDatabaseProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(HydraulicBoundaryDatabaseContext), + typeof(HydraulicBoundaryDatabaseContext), typeof(HydraulicBoundaryDatabaseProperties)); Assert.IsNull(hydraulicBoundaryDatabaseProperties.AdditionalDataCheck); Assert.IsNull(hydraulicBoundaryDatabaseProperties.GetObjectPropertiesData); Assert.IsNull(hydraulicBoundaryDatabaseProperties.AfterCreate); PropertyInfo standAloneFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(FailureMechanismContext), + typeof(FailureMechanismContext), typeof(StandAloneFailureMechanismContextProperties)); Assert.IsNull(standAloneFailureMechanismProperties.AdditionalDataCheck); Assert.IsNull(standAloneFailureMechanismProperties.GetObjectPropertiesData); Assert.IsNull(standAloneFailureMechanismProperties.AfterCreate); PropertyInfo calculationGroupProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(ICalculationContext), + typeof(ICalculationContext), typeof(CalculationGroupContextProperties)); Assert.IsNull(calculationGroupProperties.AdditionalDataCheck); Assert.IsNull(calculationGroupProperties.GetObjectPropertiesData); @@ -251,38 +251,38 @@ PropertyInfo outputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(ProbabilityAssessmentOutput), + typeof(ProbabilityAssessmentOutput), typeof(ProbabilityAssessmentOutputProperties)); Assert.IsNull(outputContextProperties.AdditionalDataCheck); Assert.IsNull(outputContextProperties.GetObjectPropertiesData); Assert.IsNull(outputContextProperties.AfterCreate); PropertyInfo designWaterLevelLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(DesignWaterLevelLocationsContext), + typeof(DesignWaterLevelLocationsContext), typeof(DesignWaterLevelLocationsContextProperties)); Assert.IsNull(designWaterLevelLocationsContextProperties.AdditionalDataCheck); Assert.IsNotNull(designWaterLevelLocationsContextProperties.GetObjectPropertiesData); Assert.IsNull(designWaterLevelLocationsContextProperties.AfterCreate); PropertyInfo designWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(DesignWaterLevelLocationContext), + typeof(DesignWaterLevelLocationContext), typeof(DesignWaterLevelLocationContextProperties)); Assert.IsNull(designWaterLevelLocationContextProperties.AdditionalDataCheck); Assert.IsNull(designWaterLevelLocationContextProperties.GetObjectPropertiesData); Assert.IsNull(designWaterLevelLocationContextProperties.AfterCreate); PropertyInfo waveHeightLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(WaveHeightLocationsContext), typeof(WaveHeightLocationsContextProperties)); Assert.IsNull(waveHeightLocationsContextProperties.AdditionalDataCheck); Assert.IsNotNull(waveHeightLocationsContextProperties.GetObjectPropertiesData); Assert.IsNull(waveHeightLocationsContextProperties.AfterCreate); PropertyInfo waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(WaveHeightLocationContext), typeof(WaveHeightLocationContextProperties)); Assert.IsNull(waveHeightLocationContextProperties.AdditionalDataCheck); Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -rc96cfd7d2d167db3b0775f7d76f320c5e582ae27 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision c96cfd7d2d167db3b0775f7d76f320c5e582ae27) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -313,7 +313,7 @@ assessmentSection.WaveImpactAsphaltCover.WaveConditionsCalculationGroup.Children.Add(waveImpactAshpaltCoverWaveConditionsCalculation); // Call - + IEnumerable affectedItems = RingtoetsDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(assessmentSection); // Assert @@ -430,7 +430,7 @@ grassCoverErosionInwardsCalculation, stabilityStoneCoverWaveConditionsCalculation, waveImpactAshpaltCoverWaveConditionsCalculation, - grassCoverErosionOutwardsWaveConditionsCalculation, + grassCoverErosionOutwardsWaveConditionsCalculation, heightStructuresCalculation }, affectedItems); } @@ -506,7 +506,7 @@ grassCoverErosionInwardsCalculation, stabilityStoneCoverWaveConditionsCalculation, waveImpactAshpaltCoverWaveConditionsCalculation, - grassCoverErosionOutwardsWaveConditionsCalculation, + grassCoverErosionOutwardsWaveConditionsCalculation, heightStructuresCalculation }, affectedItems); } @@ -703,8 +703,8 @@ // Setup var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 0, 0) { - DesignWaterLevel = (RoundedDouble)designWaterLevel, - WaveHeight = (RoundedDouble)waveHeight + DesignWaterLevel = (RoundedDouble) designWaterLevel, + WaveHeight = (RoundedDouble) waveHeight }; var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { @@ -732,12 +732,12 @@ Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight); Assert.AreEqual(CalculationConvergence.NotCalculated, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); Assert.AreEqual(CalculationConvergence.NotCalculated, hydraulicBoundaryLocation.WaveHeightCalculationConvergence); - + Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevel); Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeight); Assert.AreEqual(CalculationConvergence.NotCalculated, grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); Assert.AreEqual(CalculationConvergence.NotCalculated, grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeightCalculationConvergence); - + Assert.IsTrue(affected); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelsContext.cs =================================================================== diff -u -rf05844909ef96f5e6ea721563a33d32e042ef5ce -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelsContext.cs (.../StochasticSoilModelsContext.cs) (revision f05844909ef96f5e6ea721563a33d32e042ef5ce) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/StochasticSoilModelsContext.cs (.../StochasticSoilModelsContext.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -40,8 +40,8 @@ /// The assessment section. /// When any input argument is null. public StochasticSoilModelsContext(ObservableList wrappedStochasticSoilModels, - PipingFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + PipingFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) : base(wrappedStochasticSoilModels) { if (failureMechanism == null) Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision d689ea05c1014eb4d51b927e11eb6c48255f0a47) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -293,7 +293,7 @@ var assessmentSection = o as IAssessmentSection; var pipingFailureMechanism = o as PipingFailureMechanism; - var viewPipingFailureMechanismContext = (PipingFailureMechanismContext)view.Data; + var viewPipingFailureMechanismContext = (PipingFailureMechanismContext) view.Data; var viewPipingFailureMechanism = viewPipingFailureMechanismContext.WrappedData; return assessmentSection != null @@ -746,7 +746,7 @@ private void PipingCalculationGroupContextOnNodeRemoved(PipingCalculationGroupContext nodeData, object parentNodeData) { - var parentGroupContext = (PipingCalculationGroupContext)parentNodeData; + var parentGroupContext = (PipingCalculationGroupContext) parentNodeData; parentGroupContext.WrappedData.Children.Remove(nodeData.WrappedData); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs =================================================================== diff -u -r1dc89167ccdfcc4069e7bceb1db90dba570daba9 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs (.../PipingSurfaceLineSelectionDialogTest.cs) (revision 1dc89167ccdfcc4069e7bceb1db90dba570daba9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs (.../PipingSurfaceLineSelectionDialogTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -91,17 +91,17 @@ // Assert Assert.IsEmpty(dialog.SelectedItems); - var dataGridViewControl = (DataGridViewControl)new ControlTester("DataGridViewControl", dialog).TheObject; + var dataGridViewControl = (DataGridViewControl) new ControlTester("DataGridViewControl", dialog).TheObject; var dataGridView = dataGridViewControl.Controls.OfType().First(); Assert.AreEqual(2, dataGridView.ColumnCount); - var locationCalculateColumn = (DataGridViewCheckBoxColumn)dataGridView.Columns[selectItemColumnIndex]; + var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[selectItemColumnIndex]; const string expectedLocationCalculateHeaderText = "Gebruik"; Assert.AreEqual(expectedLocationCalculateHeaderText, locationCalculateColumn.HeaderText); Assert.AreEqual("Selected", locationCalculateColumn.DataPropertyName); Assert.IsFalse(locationCalculateColumn.ReadOnly); - var nameColumn = (DataGridViewTextBoxColumn)dataGridView.Columns[nameColumnIndex]; + var nameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[nameColumnIndex]; const string expectedNameHeaderText = "Profielschematisatie"; Assert.AreEqual(expectedNameHeaderText, nameColumn.HeaderText); Assert.AreEqual("Name", nameColumn.DataPropertyName); @@ -128,10 +128,10 @@ // Assert dialog.Show(); - var dataGridViewControl = (DataGridViewControl)new ControlTester("DataGridViewControl").TheObject; + var dataGridViewControl = (DataGridViewControl) new ControlTester("DataGridViewControl").TheObject; Assert.AreEqual(1, dataGridViewControl.Rows.Count); - Assert.IsFalse((bool)dataGridViewControl.Rows[0].Cells[selectItemColumnIndex].Value); - Assert.AreEqual(testname, (string)dataGridViewControl.Rows[0].Cells[nameColumnIndex].Value); + Assert.IsFalse((bool) dataGridViewControl.Rows[0].Cells[selectItemColumnIndex].Value); + Assert.AreEqual(testname, (string) dataGridViewControl.Rows[0].Cells[nameColumnIndex].Value); } } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision d689ea05c1014eb4d51b927e11eb6c48255f0a47) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -153,10 +153,10 @@ // Assert Assert.AreEqual(group.Children.Count, children.Length); Assert.AreSame(calculationItem, children[0]); - var returnedCalculationContext = (PipingCalculationScenarioContext)children[1]; + var returnedCalculationContext = (PipingCalculationScenarioContext) children[1]; Assert.AreSame(childCalculation, returnedCalculationContext.WrappedData); Assert.AreSame(pipingFailureMechanism, returnedCalculationContext.FailureMechanism); - var returnedCalculationGroupContext = (PipingCalculationGroupContext)children[2]; + var returnedCalculationGroupContext = (PipingCalculationGroupContext) children[2]; Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData); Assert.AreSame(pipingFailureMechanism, returnedCalculationGroupContext.FailureMechanism); Assert.AreSame(assessmentSectionMock, returnedCalculationGroupContext.AssessmentSection); @@ -1031,8 +1031,8 @@ int rowCount = 0; DialogBoxHandler = (name, wnd) => { - selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject; - grid = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject; + grid = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; rowCount = grid.Rows.Count; new ButtonTester("CustomCancelButton", selectionDialog).Click(); }; @@ -1183,8 +1183,8 @@ DialogBoxHandler = (name, wnd) => { - var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject; - var grid = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject; + var grid = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; grid.Rows[0].Cells[0].Value = true; @@ -1302,8 +1302,8 @@ DialogBoxHandler = (name, wnd) => { - var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject; - var grid = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject; + var grid = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; grid.Rows[0].Cells[0].Value = true; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r1dc89167ccdfcc4069e7bceb1db90dba570daba9 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 1dc89167ccdfcc4069e7bceb1db90dba570daba9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -97,7 +97,7 @@ // Setup & Call ShowPipingCalculationsView(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Assert Assert.IsFalse(dataGridView.AutoGenerateColumns); @@ -109,11 +109,11 @@ Assert.AreEqual("DisplayName", column.DisplayMember); } - var soilProfilesCombobox = (DataGridViewComboBoxColumn)dataGridView.Columns[stochasticSoilProfilesColumnIndex]; + var soilProfilesCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[stochasticSoilProfilesColumnIndex]; var soilProfilesComboboxItems = soilProfilesCombobox.Items; Assert.AreEqual(0, soilProfilesComboboxItems.Count); // Row dependend - var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn)dataGridView.Columns[hydraulicBoundaryLocationsColumnIndex]; + var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[hydraulicBoundaryLocationsColumnIndex]; var hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(1, hydraulicBoundaryLocationComboboxItems.Count); Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); @@ -125,7 +125,7 @@ // Setup & Call ShowPipingCalculationsView(); - var listBox = (ListBox)new ControlTester("listBox").TheObject; + var listBox = (ListBox) new ControlTester("listBox").TheObject; // Assert Assert.AreEqual(0, listBox.Items.Count); @@ -158,8 +158,8 @@ pipingCalculationsView.AssessmentSection = assessmentSection; // Assert - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn)dataGridView.Columns[hydraulicBoundaryLocationsColumnIndex]; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[hydraulicBoundaryLocationsColumnIndex]; var hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(1, hydraulicBoundaryLocationComboboxItems.Count); Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); @@ -186,8 +186,8 @@ pipingCalculationsView.AssessmentSection = assessmentSection; // Assert - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn)dataGridView.Columns[hydraulicBoundaryLocationsColumnIndex]; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[hydraulicBoundaryLocationsColumnIndex]; var hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(3, hydraulicBoundaryLocationComboboxItems.Count); Assert.AreEqual("", hydraulicBoundaryLocationComboboxItems[0].ToString()); @@ -227,7 +227,7 @@ pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; // Assert - var listBox = (ListBox)new ControlTester("listBox").TheObject; + var listBox = (ListBox) new ControlTester("listBox").TheObject; Assert.AreEqual(3, listBox.Items.Count); Assert.AreSame(failureMechanismSection1, listBox.Items[0]); Assert.AreSame(failureMechanismSection2, listBox.Items[1]); @@ -245,14 +245,14 @@ mocks.ReplayAll(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Assert - var stochasticSoilModelsComboboxItems = ((DataGridViewComboBoxCell)dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex]).Items; + var stochasticSoilModelsComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilModelsColumnIndex]).Items; Assert.AreEqual(1, stochasticSoilModelsComboboxItems.Count); Assert.AreEqual("Model A", stochasticSoilModelsComboboxItems[0].ToString()); - stochasticSoilModelsComboboxItems = ((DataGridViewComboBoxCell)dataGridView.Rows[1].Cells[stochasticSoilModelsColumnIndex]).Items; + stochasticSoilModelsComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[1].Cells[stochasticSoilModelsColumnIndex]).Items; Assert.AreEqual(3, stochasticSoilModelsComboboxItems.Count); Assert.AreEqual("", stochasticSoilModelsComboboxItems[0].ToString()); Assert.AreEqual("Model A", stochasticSoilModelsComboboxItems[1].ToString()); @@ -272,16 +272,16 @@ mocks.ReplayAll(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Assert - var soilProfilesComboboxItems = ((DataGridViewComboBoxCell)dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex]).Items; + var soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex]).Items; Assert.AreEqual(3, soilProfilesComboboxItems.Count); Assert.AreEqual("", soilProfilesComboboxItems[0].ToString()); Assert.AreEqual("Profile 1", soilProfilesComboboxItems[1].ToString()); Assert.AreEqual("Profile 2", soilProfilesComboboxItems[2].ToString()); - soilProfilesComboboxItems = ((DataGridViewComboBoxCell)dataGridView.Rows[1].Cells[stochasticSoilProfilesColumnIndex]).Items; + soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[1].Cells[stochasticSoilProfilesColumnIndex]).Items; Assert.AreEqual(1, soilProfilesComboboxItems.Count); Assert.AreEqual("Profile 5", soilProfilesComboboxItems[0].ToString()); @@ -299,7 +299,7 @@ mocks.ReplayAll(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Assert var rows = dataGridView.Rows; @@ -341,7 +341,7 @@ var hydraulicBoundaryDatabase = mocks.StrictMock(); var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase); - var secondPipingCalculationItem = ((PipingCalculationScenario)((CalculationGroup)pipingCalculationsView.Data).Children[1]); + var secondPipingCalculationItem = ((PipingCalculationScenario) ((CalculationGroup) pipingCalculationsView.Data).Children[1]); var secondPipingInputItem = secondPipingCalculationItem.InputParameters; var applicationSelectionMock = mocks.StrictMock(); @@ -356,7 +356,7 @@ pipingCalculationsView.ApplicationSelection = applicationSelectionMock; - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call dataGridView.CurrentCell = dataGridView.Rows[1].Cells[0]; @@ -376,7 +376,7 @@ var hydraulicBoundaryDatabase = mocks.StrictMock(); var pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase); - var secondPipingCalculationItem = ((PipingCalculationScenario)((CalculationGroup)pipingCalculationsView.Data).Children[1]); + var secondPipingCalculationItem = ((PipingCalculationScenario) ((CalculationGroup) pipingCalculationsView.Data).Children[1]); var secondPipingInputItem = secondPipingCalculationItem.InputParameters; applicationSelectionMock.Stub(asm => asm.Selection) @@ -391,7 +391,7 @@ pipingCalculationsView.ApplicationSelection = applicationSelectionMock; - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call dataGridView.CurrentCell = dataGridView.Rows[1].Cells[0]; @@ -417,8 +417,8 @@ pipingCalculationsView.ApplicationSelection = applicationSelectionMock; - var listBox = (ListBox)new ControlTester("listBox").TheObject; - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var listBox = (ListBox) new ControlTester("listBox").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Precondition Assert.AreEqual(2, dataGridView.Rows.Count); @@ -454,7 +454,7 @@ mocks.ReplayAll(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call dataGridView.Rows[0].Cells[cellIndex].Value = newValue; @@ -489,10 +489,10 @@ mocks.ReplayAll(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call - dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble)newValue; + dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble) newValue; // Assert Assert.IsEmpty(dataGridView.Rows[0].ErrorText); @@ -511,7 +511,7 @@ new TestStochasticSoilModel() } }; - var button = (Button)new ButtonTester("buttonGenerateScenarios", testForm).TheObject; + var button = (Button) new ButtonTester("buttonGenerateScenarios", testForm).TheObject; // Call var state = button.Enabled; @@ -532,7 +532,7 @@ new RingtoetsPipingSurfaceLine() }, }; - var button = (Button)new ButtonTester("buttonGenerateScenarios", testForm).TheObject; + var button = (Button) new ButtonTester("buttonGenerateScenarios", testForm).TheObject; // Call var state = button.Enabled; @@ -557,7 +557,7 @@ new TestStochasticSoilModel() } }; - var button = (Button)new ButtonTester("buttonGenerateScenarios", testForm).TheObject; + var button = (Button) new ButtonTester("buttonGenerateScenarios", testForm).TheObject; // Call var state = button.Enabled; @@ -590,7 +590,7 @@ var pipingScenarioView = ShowPipingCalculationsView(); pipingScenarioView.PipingFailureMechanism = pipingFailureMechanismWithSections; - var listBox = (ListBox)new ControlTester("listBox").TheObject; + var listBox = (ListBox) new ControlTester("listBox").TheObject; // Precondition Assert.AreEqual(0, listBox.Items.Count); @@ -634,8 +634,8 @@ DataGridViewControl grid = null; DialogBoxHandler = (name, wnd) => { - selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject; - grid = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject; + grid = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; new ButtonTester("CustomCancelButton", selectionDialog).Click(); }; @@ -712,8 +712,8 @@ DialogBoxHandler = (name, wnd) => { - var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject; - var selectionView = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject; + var selectionView = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; selectionView.Rows[0].Cells[0].Value = true; // When @@ -741,8 +741,8 @@ DialogBoxHandler = (name, wnd) => { - var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject; - var selectionView = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject; + var selectionView = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; selectionView.Rows[0].Cells[0].Value = true; // When @@ -780,8 +780,8 @@ DialogBoxHandler = (name, wnd) => { - var selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject; - var selectionView = (DataGridViewControl)new ControlTester("DataGridViewControl", selectionDialog).TheObject; + var selectionDialog = (PipingSurfaceLineSelectionDialog) new FormTester(name).TheObject; + var selectionView = (DataGridViewControl) new ControlTester("DataGridViewControl", selectionDialog).TheObject; selectionView.Rows[0].Cells[0].Value = true; // When @@ -807,7 +807,7 @@ pipingFailureMechanism.NotifyObservers(); // Then - var button = (Button)new ButtonTester("buttonGenerateScenarios", testForm).TheObject; + var button = (Button) new ButtonTester("buttonGenerateScenarios", testForm).TheObject; Assert.IsFalse(button.Enabled); } @@ -824,7 +824,7 @@ pipingFailureMechanism.NotifyObservers(); // Then - var button = (Button)new ButtonTester("buttonGenerateScenarios", testForm).TheObject; + var button = (Button) new ButtonTester("buttonGenerateScenarios", testForm).TheObject; Assert.IsFalse(button.Enabled); } @@ -841,7 +841,7 @@ pipingFailureMechanism.StochasticSoilModels.Add(new TestStochasticSoilModel()); // Then - var button = (Button)new ButtonTester("buttonGenerateScenarios", testForm).TheObject; + var button = (Button) new ButtonTester("buttonGenerateScenarios", testForm).TheObject; Assert.IsFalse(button.Enabled); } @@ -859,7 +859,7 @@ pipingCalculationsView.PipingFailureMechanism.NotifyObservers(); // Then - var button = (Button)new ButtonTester("buttonGenerateScenarios", testForm).TheObject; + var button = (Button) new ButtonTester("buttonGenerateScenarios", testForm).TheObject; Assert.IsTrue(button.Enabled); } @@ -887,7 +887,7 @@ pipingCalculationsView.PipingFailureMechanism.NotifyObservers(); // Then - var button = (Button)new ButtonTester("buttonGenerateScenarios", testForm).TheObject; + var button = (Button) new ButtonTester("buttonGenerateScenarios", testForm).TheObject; Assert.IsFalse(button.Enabled); } @@ -908,16 +908,16 @@ mocks.ReplayAll(); - var data = (CalculationGroup)pipingCalculationView.Data; - var pipingCalculation = (PipingCalculationScenario)data.Children.First(); + var data = (CalculationGroup) pipingCalculationView.Data; + var pipingCalculation = (PipingCalculationScenario) data.Children.First(); pipingCalculation.Attach(pipingCalculationObserver); pipingCalculation.InputParameters.Attach(pipingCalculationInputObserver); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call - dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble)newValue; + dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble) newValue; // Assert Assert.AreEqual(RingtoetsPipingDataResources.PipingInput_EntryPointL_greater_or_equal_to_ExitPointL, dataGridView.Rows[0].ErrorText); @@ -941,16 +941,16 @@ mocks.ReplayAll(); - var data = (CalculationGroup)pipingCalculationView.Data; - var pipingCalculation = (PipingCalculationScenario)data.Children.First(); + var data = (CalculationGroup) pipingCalculationView.Data; + var pipingCalculation = (PipingCalculationScenario) data.Children.First(); pipingCalculation.Attach(pipingCalculationObserver); pipingCalculation.InputParameters.Attach(pipingCalculationInputObserver); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call - dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble)newValue; + dataGridView.Rows[0].Cells[cellIndex].Value = (RoundedDouble) newValue; // Assert var expectedMessage = "Het gespecificeerde punt moet op het profiel liggen (bereik [0, 10])."; @@ -971,7 +971,7 @@ mocks.ReplayAll(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; dataGridView.CurrentCell = dataGridView.Rows[selectedRow].Cells[0]; @@ -980,8 +980,8 @@ // Assert Assert.IsInstanceOf(selection); - var dataRow = (PipingCalculationRow)dataGridView.Rows[selectedRow].DataBoundItem; - Assert.AreSame(dataRow.PipingCalculation, ((PipingInputContext)selection).PipingCalculation); + var dataRow = (PipingCalculationRow) dataGridView.Rows[selectedRow].DataBoundItem; + Assert.AreSame(dataRow.PipingCalculation, ((PipingInputContext) selection).PipingCalculation); mocks.VerifyAll(); } @@ -1015,16 +1015,16 @@ mocks.ReplayAll(); - var data = (CalculationGroup)pipingCalculationView.Data; - var pipingCalculation = (PipingCalculationScenario)data.Children.First(); + var data = (CalculationGroup) pipingCalculationView.Data; + var pipingCalculation = (PipingCalculationScenario) data.Children.First(); pipingCalculation.Attach(pipingCalculationObserver); pipingCalculation.InputParameters.Attach(pipingCalculationInputObserver); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Call - dataGridView.Rows[0].Cells[cellIndex].Value = newValue is double ? (RoundedDouble)(double)newValue : newValue; + dataGridView.Rows[0].Cells[cellIndex].Value = newValue is double ? (RoundedDouble) (double) newValue : newValue; // Assert mocks.VerifyAll(); @@ -1181,14 +1181,14 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation1, DampingFactorExit = { - Mean = (RoundedDouble)1.1111 + Mean = (RoundedDouble) 1.1111 }, PhreaticLevelExit = { - Mean = (RoundedDouble)2.2222 + Mean = (RoundedDouble) 2.2222 }, - EntryPointL = (RoundedDouble)3.3333, - ExitPointL = (RoundedDouble)4.4444 + EntryPointL = (RoundedDouble) 3.3333, + ExitPointL = (RoundedDouble) 4.4444 } }, new PipingCalculationScenario(new GeneralPipingInput()) @@ -1202,14 +1202,14 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation2, DampingFactorExit = { - Mean = (RoundedDouble)5.5555 + Mean = (RoundedDouble) 5.5555 }, PhreaticLevelExit = { - Mean = (RoundedDouble)6.6666 + Mean = (RoundedDouble) 6.6666 }, - EntryPointL = (RoundedDouble)7.7777, - ExitPointL = (RoundedDouble)8.8888 + EntryPointL = (RoundedDouble) 7.7777, + ExitPointL = (RoundedDouble) 8.8888 } } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs =================================================================== diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -71,7 +71,7 @@ Assert.AreEqual(6, propertyInfos.Length); PropertyInfo pipingFailureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(PipingFailureMechanismContext), typeof(PipingFailureMechanismContextProperties)); Assert.IsNull(pipingFailureMechanismContextProperties.AdditionalDataCheck); @@ -80,14 +80,14 @@ PropertyInfo pipingInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(PipingInputContext), + typeof(PipingInputContext), typeof(PipingInputContextProperties)); Assert.IsNull(pipingInputContextProperties.AdditionalDataCheck); Assert.IsNull(pipingInputContextProperties.GetObjectPropertiesData); Assert.IsNull(pipingInputContextProperties.AfterCreate); PropertyInfo pipingOutputProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(PipingSemiProbabilisticOutput), typeof(PipingSemiProbabilisticOutputProperties)); Assert.IsNull(pipingOutputProperties.AdditionalDataCheck); @@ -111,7 +111,7 @@ Assert.IsNull(stochasticSoilModelProperties.AfterCreate); PropertyInfo stochasticSoilProfileProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(StochasticSoilProfile), typeof(StochasticSoilProfileProperties)); Assert.IsNull(stochasticSoilProfileProperties.AdditionalDataCheck); Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInputStepSizeExtensions.cs =================================================================== diff -u -rae93bd6b8ccbffa91f7c5c10e898736b5919b73d -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInputStepSizeExtensions.cs (.../WaveConditionsInputStepSizeExtensions.cs) (revision ae93bd6b8ccbffa91f7c5c10e898736b5919b73d) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInputStepSizeExtensions.cs (.../WaveConditionsInputStepSizeExtensions.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -45,7 +45,7 @@ case WaveConditionsInputStepSize.Two: return 2.0; default: - throw new InvalidEnumArgumentException("stepSize", (int)stepSize, typeof(WaveConditionsInputStepSize)); + throw new InvalidEnumArgumentException("stepSize", (int) stepSize, typeof(WaveConditionsInputStepSize)); } } } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/AssemblyInfo.cs =================================================================== diff -u -rbcea123bdb3c5dc3649b066f675e3e5cc1a8bc89 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision bcea123bdb3c5dc3649b066f675e3e5cc1a8bc89) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.Revetment.Forms")] [assembly: AssemblyProduct("Ringtoets.Revetment.Forms")] -[assembly: Guid("1b78f06b-abb3-4a0a-8f1f-d2bf06694278")] +[assembly: Guid("1b78f06b-abb3-4a0a-8f1f-d2bf06694278")] \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/IWaveConditionsInputContextProperties.cs =================================================================== diff -u -rdc8fd6351d4fb3b111eaeda4a108ebb27dc844c5 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/IWaveConditionsInputContextProperties.cs (.../IWaveConditionsInputContextProperties.cs) (revision dc8fd6351d4fb3b111eaeda4a108ebb27dc844c5) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/IWaveConditionsInputContextProperties.cs (.../IWaveConditionsInputContextProperties.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -34,25 +34,25 @@ public interface IWaveConditionsInputContextProperties : IObjectProperties where T : WaveConditionsInputContext { /// - /// Gets the available . + /// Gets and sets the selected . /// - /// An of available . - IEnumerable GetAvailableHydraulicBoundaryLocations(); + HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; } /// - /// Gets the available . + /// Gets and sets the selected . /// - /// An of available . - IEnumerable GetAvailableForeshoreProfiles(); + ForeshoreProfile ForeshoreProfile { get; set; } /// - /// Gets and sets the selected . + /// Gets the available . /// - HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; } + /// An of available . + IEnumerable GetAvailableHydraulicBoundaryLocations(); /// - /// Gets and sets the selected . + /// Gets the available . /// - ForeshoreProfile ForeshoreProfile { get; set; } + /// An of available . + IEnumerable GetAvailableForeshoreProfiles(); } } \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs =================================================================== diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -43,7 +43,7 @@ /// /// ViewModel of for properties panel. /// - public abstract class WaveConditionsInputContextProperties : ObjectProperties, IWaveConditionsInputContextProperties + public abstract class WaveConditionsInputContextProperties : ObjectProperties, IWaveConditionsInputContextProperties where T : WaveConditionsInputContext { private const int hydraulicBoundaryLocationPropertyIndex = 0; Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditor.cs =================================================================== diff -u -rdc8fd6351d4fb3b111eaeda4a108ebb27dc844c5 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditor.cs (.../WaveConditionsInputContextForeshoreProfileEditor.cs) (revision dc8fd6351d4fb3b111eaeda4a108ebb27dc844c5) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditor.cs (.../WaveConditionsInputContextForeshoreProfileEditor.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -45,7 +45,7 @@ public WaveConditionsInputContextForeshoreProfileEditor() { DisplayMember = TypeUtils.GetMemberName(dp => dp.Name); - NullItem = new ForeshoreProfile(new Point2D(0,0), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties + NullItem = new ForeshoreProfile(new Point2D(0, 0), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties { Name = CoreCommonControlsResources.DisplayName_None }); Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/AssemblyInfo.cs =================================================================== diff -u -rae04c23f970bb96e54adbfb8c2fe1aaf95d13326 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision ae04c23f970bb96e54adbfb8c2fe1aaf95d13326) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.Revetment.IO")] [assembly: AssemblyProduct("Ringtoets.Revetment.IO")] -[assembly: Guid("c344f779-1341-47eb-acf6-e87560c57132")] +[assembly: Guid("c344f779-1341-47eb-acf6-e87560c57132")] \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeExtensionsTest.cs =================================================================== diff -u -rae93bd6b8ccbffa91f7c5c10e898736b5919b73d -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeExtensionsTest.cs (.../WaveConditionsInputStepSizeExtensionsTest.cs) (revision ae93bd6b8ccbffa91f7c5c10e898736b5919b73d) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeExtensionsTest.cs (.../WaveConditionsInputStepSizeExtensionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -44,7 +44,7 @@ public void AsValue_InvalidValue_ThrowsInvalidEnumArgumentException() { // Call - TestDelegate test = () => ((WaveConditionsInputStepSize)4).AsValue(); + TestDelegate test = () => ((WaveConditionsInputStepSize) 4).AsValue(); // Assert var parameter = Assert.Throws(test).ParamName; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs (.../WaveConditionsInputStepSizeTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs (.../WaveConditionsInputStepSizeTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -41,7 +41,7 @@ var type = typeof(WaveConditionsInputStepSize); var memInfo = type.GetMember(value.ToString()); var attributes = memInfo[0].GetCustomAttributes(typeof(ResourcesDisplayNameAttribute), false); - return ((ResourcesDisplayNameAttribute)attributes[0]).DisplayName; + return ((ResourcesDisplayNameAttribute) attributes[0]).DisplayName; } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs =================================================================== diff -u -r09da07d5b79a478769d509c2c0a2cbbc53c1a982 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision 09da07d5b79a478769d509c2c0a2cbbc53c1a982) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -142,7 +142,7 @@ // Call input.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0) { - DesignWaterLevel = (RoundedDouble)assessmentLevel + DesignWaterLevel = (RoundedDouble) assessmentLevel }; // Assert @@ -158,7 +158,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0) { - DesignWaterLevel = (RoundedDouble)3.2 + DesignWaterLevel = (RoundedDouble) 3.2 } }; @@ -286,7 +286,7 @@ var input = new WaveConditionsInput(); // Call - input.Orientation = (RoundedDouble)orientation; + input.Orientation = (RoundedDouble) orientation; // Assert Assert.AreEqual(orientation, input.Orientation, input.Orientation.GetAccuracy()); @@ -339,7 +339,7 @@ public void UpperBoundaryDesignWaterLevel_DesignWaterLevelSet_ReturnValueJustBelowDesignWaterLevel() { // Setup - var designWaterLevel = (RoundedDouble)1.0; + var designWaterLevel = (RoundedDouble) 1.0; var waveConditionsInput = new WaveConditionsInput(); // Call @@ -379,11 +379,11 @@ // Setup var input = new WaveConditionsInput() { - UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment + UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment }; // Call - input.LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment; + input.LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment; // Assert Assert.AreEqual(lowerBoundaryRevetment, input.LowerBoundaryRevetment, input.LowerBoundaryRevetment.GetAccuracy()); @@ -398,11 +398,11 @@ // Setup var input = new WaveConditionsInput() { - UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment + UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment }; // Call - TestDelegate test = () => input.LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment; + TestDelegate test = () => input.LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment; // Assert string expectedMessage = Resources.WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_above_lower_boundary_revetment; @@ -451,11 +451,11 @@ // Setup var input = new WaveConditionsInput() { - LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment + LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment }; // Call - input.UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment; + input.UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment; // Assert Assert.AreEqual(upperBoundaryRevetment, input.UpperBoundaryRevetment, input.UpperBoundaryRevetment.GetAccuracy()); @@ -470,11 +470,11 @@ // Setup var input = new WaveConditionsInput() { - LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment + LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment }; // Call - TestDelegate test = () => input.UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment; + TestDelegate test = () => input.UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment; // Assert string expectedMessage = Resources.WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_above_lower_boundary_revetment; @@ -490,7 +490,7 @@ var input = new WaveConditionsInput(); // Call - input.UpperBoundaryRevetment = (RoundedDouble)newValue; + input.UpperBoundaryRevetment = (RoundedDouble) newValue; // Assert Assert.AreEqual(1000, input.UpperBoundaryRevetment, input.UpperBoundaryRevetment.GetAccuracy()); @@ -523,11 +523,11 @@ // Setup var input = new WaveConditionsInput() { - UpperBoundaryWaterLevels = (RoundedDouble)upperBoundaryWaterLevels + UpperBoundaryWaterLevels = (RoundedDouble) upperBoundaryWaterLevels }; // Call - input.LowerBoundaryWaterLevels = (RoundedDouble)lowerBoundaryWaterLevels; + input.LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryWaterLevels; // Assert Assert.AreEqual(lowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy()); @@ -542,11 +542,11 @@ // Setup var input = new WaveConditionsInput() { - UpperBoundaryWaterLevels = (RoundedDouble)upperBoundaryWaterLevels + UpperBoundaryWaterLevels = (RoundedDouble) upperBoundaryWaterLevels }; // Call - TestDelegate test = () => input.LowerBoundaryWaterLevels = (RoundedDouble)lowerBoundaryWaterLevels; + TestDelegate test = () => input.LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryWaterLevels; // Assert string expectedMessage = Resources.WaveConditionsInput_ValidateWaterLevelBoundaries_Upper_boundary_water_levels_must_be_above_lower_boundary_water_levels; @@ -562,7 +562,7 @@ var input = new WaveConditionsInput(); // Call - input.LowerBoundaryWaterLevels = (RoundedDouble)newValue; + input.LowerBoundaryWaterLevels = (RoundedDouble) newValue; // Assert Assert.AreEqual(-50, input.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy()); @@ -595,11 +595,11 @@ // Setup var input = new WaveConditionsInput() { - LowerBoundaryWaterLevels = (RoundedDouble)lowerBoundaryWaterLevels + LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryWaterLevels }; // Call - input.UpperBoundaryWaterLevels = (RoundedDouble)upperBoundaryWaterLevels; + input.UpperBoundaryWaterLevels = (RoundedDouble) upperBoundaryWaterLevels; // Assert Assert.AreEqual(upperBoundaryWaterLevels, input.UpperBoundaryWaterLevels, input.UpperBoundaryWaterLevels.GetAccuracy()); @@ -614,11 +614,11 @@ // Setup var input = new WaveConditionsInput() { - LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryWaterLevels + LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryWaterLevels }; // Call - TestDelegate test = () => input.UpperBoundaryRevetment = (RoundedDouble)upperBoundaryWaterLevels; + TestDelegate test = () => input.UpperBoundaryRevetment = (RoundedDouble) upperBoundaryWaterLevels; // Assert string expectedMessage = Resources.WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_above_lower_boundary_revetment; @@ -634,7 +634,7 @@ var input = new WaveConditionsInput(); // Call - input.UpperBoundaryWaterLevels = (RoundedDouble)newValue; + input.UpperBoundaryWaterLevels = (RoundedDouble) newValue; // Assert Assert.AreEqual(1000, input.UpperBoundaryWaterLevels, input.UpperBoundaryWaterLevels.GetAccuracy()); @@ -651,13 +651,13 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevel = (RoundedDouble)designWaterLevel + DesignWaterLevel = (RoundedDouble) designWaterLevel }, - LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetments, - UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetments, + LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetments, + UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetments, StepSize = WaveConditionsInputStepSize.One, - LowerBoundaryWaterLevels = (RoundedDouble)1.0, - UpperBoundaryWaterLevels = (RoundedDouble)10.0 + LowerBoundaryWaterLevels = (RoundedDouble) 1.0, + UpperBoundaryWaterLevels = (RoundedDouble) 10.0 }; // Call @@ -697,11 +697,11 @@ // Setup var input = new WaveConditionsInput() { - LowerBoundaryRevetment = (RoundedDouble)1.0, - UpperBoundaryRevetment = (RoundedDouble)10.0, + LowerBoundaryRevetment = (RoundedDouble) 1.0, + UpperBoundaryRevetment = (RoundedDouble) 10.0, StepSize = WaveConditionsInputStepSize.One, - LowerBoundaryWaterLevels = (RoundedDouble)1.0, - UpperBoundaryWaterLevels = (RoundedDouble)10.0 + LowerBoundaryWaterLevels = (RoundedDouble) 1.0, + UpperBoundaryWaterLevels = (RoundedDouble) 10.0 }; // Call @@ -722,13 +722,13 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevel = (RoundedDouble)designWaterLevel + DesignWaterLevel = (RoundedDouble) designWaterLevel }, - LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment, - UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment, + LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, + UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment, StepSize = stepSize, - LowerBoundaryWaterLevels = (RoundedDouble)lowerBoundaryWaterLevels, - UpperBoundaryWaterLevels = (RoundedDouble)upperBoundaryWaterLevels + LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryWaterLevels, + UpperBoundaryWaterLevels = (RoundedDouble) upperBoundaryWaterLevels }; // Call Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs (.../WaveConditionsInputContextTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs (.../WaveConditionsInputContextTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -58,7 +58,7 @@ Assert.IsInstanceOf(context); Assert.AreSame(input, context.WrappedData); } - + private class TestWaveConditionsInputContext : WaveConditionsInputContext { public TestWaveConditionsInputContext(WaveConditionsInput wrappedData) : base(wrappedData) {} Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -rbcea123bdb3c5dc3649b066f675e3e5cc1a8bc89 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision bcea123bdb3c5dc3649b066f675e3e5cc1a8bc89) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.Revetment.Forms.Test")] [assembly: AssemblyProduct("Ringtoets.Revetment.Forms.Test")] -[assembly: Guid("ff5e2f3b-2eab-4ab5-95e7-28abe833c641")] +[assembly: Guid("ff5e2f3b-2eab-4ab5-95e7-28abe833c641")] \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -37,6 +37,7 @@ ForeshoreProfile = new ForeshoreProfile(new Point2D(8.7, 7.8), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()), UseForeshore = true }; + private readonly WaveConditionsOutput waveConditionsOutput = new WaveConditionsOutput(0.0, 1.1, 2.2, 3.3); [Test] Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -rae04c23f970bb96e54adbfb8c2fe1aaf95d13326 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision ae04c23f970bb96e54adbfb8c2fe1aaf95d13326) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.Revetment.IO.Test")] [assembly: AssemblyProduct("Ringtoets.Revetment.IO.Test")] -[assembly: Guid("b58beeba-17a4-47b6-a131-a3f53b1c717d")] +[assembly: Guid("b58beeba-17a4-47b6-a131-a3f53b1c717d")] \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -159,7 +159,7 @@ string fileContent = File.ReadAllText(filePath); Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam aanwezig, Voorlandgeometrie aanwezig, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting [°]\r\n" + "blocksName, , 0.000, 0.000, , nee, nee, Steen (blokken), 1.11, 2.22, 3.33, 4.44\r\n" + - "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.22\r\n", + "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.22\r\n", fileContent); } finally Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs =================================================================== diff -u -ra83a90f5076b11fccbc6fae259f5ef59cc776a92 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision a83a90f5076b11fccbc6fae259f5ef59cc776a92) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -162,7 +162,7 @@ string fileContent = File.ReadAllText(filePath); Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam aanwezig, Voorlandgeometrie aanwezig, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting [°]\r\n" + "blocksName, , 0.000, 0.000, , nee, nee, Steen (blokken), 1.11, 2.22, 3.33, 4.44\r\n" + - "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.22\r\n", + "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.22\r\n", fileContent); } finally Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r1d0754dba6c2a05f96d4ea937cc0d6de62644755 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs (.../TestWaveConditionsCalculationServiceTest.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs (.../TestWaveConditionsCalculationServiceTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -82,7 +82,7 @@ public void Inputs_Always_ReturnsInputsOfCalculateMethod() { // Setup - RoundedDouble waterLevel = (RoundedDouble)23.5; + RoundedDouble waterLevel = (RoundedDouble) 23.5; const double a = 1.0; const double b = 0.3; const double c = 0.8; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/WaveConditionsCalculationServiceConfigTest.cs =================================================================== diff -u -rc6176d50a690c3ff5ee1c4b2902dcabc2e270201 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/WaveConditionsCalculationServiceConfigTest.cs (.../WaveConditionsCalculationServiceConfigTest.cs) (revision c6176d50a690c3ff5ee1c4b2902dcabc2e270201) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/WaveConditionsCalculationServiceConfigTest.cs (.../WaveConditionsCalculationServiceConfigTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -56,7 +56,7 @@ var expectedService = WaveConditionsCalculationService.Instance; // Call - using (new WaveConditionsCalculationServiceConfig()) { } + using (new WaveConditionsCalculationServiceConfig()) {} // Assert Assert.AreSame(expectedService, WaveConditionsCalculationService.Instance); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationServiceInput.cs =================================================================== diff -u -r9f5fa34afb489eb0d46dab724e9d8121a31a04bb -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationServiceInput.cs (.../TestWaveConditionsCalculationServiceInput.cs) (revision 9f5fa34afb489eb0d46dab724e9d8121a31a04bb) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationServiceInput.cs (.../TestWaveConditionsCalculationServiceInput.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -42,14 +42,14 @@ /// The specified ring id. /// The specified name. public TestWaveConditionsCalculationServiceInput(RoundedDouble waterLevel, - double a, - double b, - double c, - double norm, - WaveConditionsInput input, - string hlcdDirectory, - string ringId, - string name) + double a, + double b, + double c, + double norm, + WaveConditionsInput input, + string hlcdDirectory, + string ringId, + string name) { WaterLevel = waterLevel; A = a; @@ -66,7 +66,7 @@ /// Gets the specified water level. /// public RoundedDouble WaterLevel { get; private set; } - + /// /// Gets the specified 'a' parameter. /// Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs (.../StabilityStoneCoverWaveConditionsInputContext.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs (.../StabilityStoneCoverWaveConditionsInputContext.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -66,9 +66,9 @@ { get { - return assessmentSection.HydraulicBoundaryDatabase != null - ? assessmentSection.HydraulicBoundaryDatabase.Locations - : Enumerable.Empty(); + return assessmentSection.HydraulicBoundaryDatabase != null + ? assessmentSection.HydraulicBoundaryDatabase.Locations + : Enumerable.Empty(); } } Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs =================================================================== diff -u -rf6585ba2acee5d6479f5387f40b24c796e92921b -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs (.../StabilityStoneCoverCalculationConfigurationHelper.cs) (revision f6585ba2acee5d6479f5387f40b24c796e92921b) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs (.../StabilityStoneCoverCalculationConfigurationHelper.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -75,6 +75,6 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation } }; - } + } } } \ No newline at end of file Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs =================================================================== diff -u -rfbdcde760eb5401367c8b922504819cd263d58a2 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs (.../StabilityStoneCoverDataSynchronizationService.cs) (revision fbdcde760eb5401367c8b922504819cd263d58a2) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverDataSynchronizationService.cs (.../StabilityStoneCoverDataSynchronizationService.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -91,7 +91,7 @@ affectedItems.Add(calculation); } } - + return affectedItems; } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs =================================================================== diff -u -r65cec137f19d9ded25248ba376b2ea8d43c18c2c -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 65cec137f19d9ded25248ba376b2ea8d43c18c2c) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -28,7 +28,6 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Revetment.Data; namespace Ringtoets.StabilityStoneCover.Data.Test { Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs =================================================================== diff -u -rf135e2b0ee4b6ff6eb52d57083243d48ba47cad7 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs (.../StabilityStoneCoverWaveConditionsOutputTest.cs) (revision f135e2b0ee4b6ff6eb52d57083243d48ba47cad7) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs (.../StabilityStoneCoverWaveConditionsOutputTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -60,7 +60,7 @@ new WaveConditionsOutput(1, 0, 3, 5), new WaveConditionsOutput(8, 2, 6, 1) }; - + var blocksOutput = new[] { new WaveConditionsOutput(6, 2, 9, 4), Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismPropertiesTest.cs =================================================================== diff -u -r6da94dc5f56cf8edbf991440dd97f5b28856e658 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismPropertiesTest.cs (.../StabilityStoneCoverFailureMechanismPropertiesTest.cs) (revision 6da94dc5f56cf8edbf991440dd97f5b28856e658) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverFailureMechanismPropertiesTest.cs (.../StabilityStoneCoverFailureMechanismPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -23,10 +23,7 @@ using System.ComponentModel; using Core.Common.Gui.PropertyBag; using NUnit.Framework; -using Rhino.Mocks; -using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.StabilityStoneCover.Data; -using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; using Ringtoets.StabilityStoneCover.Forms.PropertyClasses; namespace Ringtoets.StabilityStoneCover.Forms.Test.PropertyClasses Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -80,12 +80,12 @@ var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var input = new WaveConditionsInput(); var failureMechanism = new StabilityStoneCoverFailureMechanism(); var inputContext = new StabilityStoneCoverWaveConditionsInputContext(input, - failureMechanism.ForeshoreProfiles, - assessmentSection); + failureMechanism.ForeshoreProfiles, + assessmentSection); // Call var properties = new StabilityStoneCoverWaveConditionsInputContextProperties @@ -127,17 +127,17 @@ mocks.ReplayAll(); var random = new Random(21); - var assessmentLevel = (RoundedDouble)random.NextDouble(); - var lowerBoundaryRevetment = (RoundedDouble)random.NextDouble(); - var lowerBoundaryWaterLevels = (RoundedDouble)random.NextDouble(); - var upperBoundaryRevetment = lowerBoundaryRevetment + (RoundedDouble)random.NextDouble(); - var upperBoundaryWaterLevels = lowerBoundaryWaterLevels + (RoundedDouble)random.NextDouble(); + var assessmentLevel = (RoundedDouble) random.NextDouble(); + var lowerBoundaryRevetment = (RoundedDouble) random.NextDouble(); + var lowerBoundaryWaterLevels = (RoundedDouble) random.NextDouble(); + var upperBoundaryRevetment = lowerBoundaryRevetment + (RoundedDouble) random.NextDouble(); + var upperBoundaryWaterLevels = lowerBoundaryWaterLevels + (RoundedDouble) random.NextDouble(); var stepSize = WaveConditionsInputStepSize.Half; - var worldX = (RoundedDouble)random.NextDouble(); - var worldY = (RoundedDouble)random.NextDouble(); - var damHeight = (RoundedDouble)random.NextDouble(); - var foreshoreProfileOrientation = (RoundedDouble)random.NextDouble(); + var worldX = (RoundedDouble) random.NextDouble(); + var worldY = (RoundedDouble) random.NextDouble(); + var damHeight = (RoundedDouble) random.NextDouble(); + var foreshoreProfileOrientation = (RoundedDouble) random.NextDouble(); var foreshoreProfile = new ForeshoreProfile( new Point2D(worldX, worldY), @@ -211,12 +211,12 @@ mocks.ReplayAll(); var random = new Random(21); - var orientation = (RoundedDouble)random.NextDouble(); - var assessmentLevel = (RoundedDouble)random.NextDouble(); - var newLowerBoundaryRevetment = (RoundedDouble)random.NextDouble(); - var newLowerBoundaryWaterLevels = (RoundedDouble)random.NextDouble(); - var newUpperBoundaryRevetment = newLowerBoundaryRevetment + (RoundedDouble)random.NextDouble(); - var newUpperBoundaryWaterLevels = newLowerBoundaryWaterLevels + (RoundedDouble)random.NextDouble(); + var orientation = (RoundedDouble) random.NextDouble(); + var assessmentLevel = (RoundedDouble) random.NextDouble(); + var newLowerBoundaryRevetment = (RoundedDouble) random.NextDouble(); + var newLowerBoundaryWaterLevels = (RoundedDouble) random.NextDouble(); + var newUpperBoundaryRevetment = newLowerBoundaryRevetment + (RoundedDouble) random.NextDouble(); + var newUpperBoundaryWaterLevels = newLowerBoundaryWaterLevels + (RoundedDouble) random.NextDouble(); var newStepSize = WaveConditionsInputStepSize.Half; var newHydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "name", 0.0, 1.1) @@ -243,10 +243,10 @@ var newForeshoreProfile = new ForeshoreProfile( new Point2D( - (RoundedDouble)random.NextDouble(), - (RoundedDouble)random.NextDouble()), + (RoundedDouble) random.NextDouble(), + (RoundedDouble) random.NextDouble()), Enumerable.Empty(), - new BreakWater(BreakWaterType.Dam, (RoundedDouble)random.NextDouble()), + new BreakWater(BreakWaterType.Dam, (RoundedDouble) random.NextDouble()), new ForeshoreProfile.ConstructionProperties()); var properties = new StabilityStoneCoverWaveConditionsInputContextProperties @@ -304,7 +304,6 @@ input.ForeshoreProfile = foreshoreProfile; } - var failureMechanism = new StabilityStoneCoverFailureMechanism(); var inputContext = new StabilityStoneCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs =================================================================== diff -u -r76511556cd5348a48bb0401dae48e6ed2215fa61 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs (.../StabilityStoneCoverCalculationConfigurationHelperTest.cs) (revision 76511556cd5348a48bb0401dae48e6ed2215fa61) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs (.../StabilityStoneCoverCalculationConfigurationHelperTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -127,7 +127,7 @@ Assert.AreEqual(string.Format("{0} (1)", name), firstCalculation.Name); Assert.AreEqual(locations[0], firstCalculation.InputParameters.HydraulicBoundaryLocation); - var secondCalculation = (StabilityStoneCoverWaveConditionsCalculation)calculationBases.ElementAt(2); + var secondCalculation = (StabilityStoneCoverWaveConditionsCalculation) calculationBases.ElementAt(2); Assert.AreEqual(string.Format("{0} (2)", name), secondCalculation.Name); Assert.AreSame(locations[1], secondCalculation.InputParameters.HydraulicBoundaryLocation); } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -45,7 +45,6 @@ using Ringtoets.HydraRing.Calculation.TestUtil; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; -using Ringtoets.Revetment.Forms.PresentationObjects; using Ringtoets.Revetment.Service.TestUtil; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; @@ -196,7 +195,7 @@ var commentsContext = (CommentContext) children[0]; Assert.AreSame(calculation, commentsContext.WrappedData); - var inputContext = (StabilityStoneCoverWaveConditionsInputContext)children[1]; + var inputContext = (StabilityStoneCoverWaveConditionsInputContext) children[1]; Assert.AreSame(calculation.InputParameters, inputContext.WrappedData); CollectionAssert.AreEqual(new[] { @@ -257,7 +256,7 @@ var commentsContext = (CommentContext) children[0]; Assert.AreSame(calculation, commentsContext.WrappedData); - var inputContext = (StabilityStoneCoverWaveConditionsInputContext)children[1]; + var inputContext = (StabilityStoneCoverWaveConditionsInputContext) children[1]; Assert.AreSame(calculation.InputParameters, inputContext.WrappedData); CollectionAssert.AreEqual(new[] { Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r86401a913aaf544979e4062d00acfe1fb24e1e4f -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 86401a913aaf544979e4062d00acfe1fb24e1e4f) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -44,7 +44,6 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms; -using Ringtoets.HydraRing.Calculation.TestUtil; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Service.TestUtil; Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -85,7 +85,7 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new StabilityStoneCoverFailureMechanism(); var input = new WaveConditionsInput(); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs =================================================================== diff -u -r1ff2f27e84cbd5da25a9da66d478467a773cb573 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision 1ff2f27e84cbd5da25a9da66d478467a773cb573) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -36,6 +36,10 @@ [TestFixture] public class StabilityStoneCoverResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerTwoAIndex = 1; + private const int assessmentLayerThreeIndex = 2; + [Test] public void GivenFormWithStabilityStoneCoverFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -157,9 +161,5 @@ Assert.AreEqual(0, rows.Count); } } - - private const int nameColumnIndex = 0; - private const int assessmentLayerTwoAIndex = 1; - private const int assessmentLayerThreeIndex = 2; } } \ No newline at end of file Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/StabilityStoneCoverWaveConditionsExporterTest.cs =================================================================== diff -u -r1d5ceacfda0640fe7527659cc57605d7f6fead0f -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision 1d5ceacfda0640fe7527659cc57605d7f6fead0f) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -176,7 +176,7 @@ string fileContent = File.ReadAllText(filePath); Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam aanwezig, Voorlandgeometrie aanwezig, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting [°]\r\n" + "aCalculation, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 1.11, 2.22, 3.33, 4.44\r\n" + - "aCalculation, aLocation, 44.000, 123.456, , nee, nee, Steen (blokken), 3.33, 1.11, 4.44, 2.22\r\n", + "aCalculation, aLocation, 44.000, 123.456, , nee, nee, Steen (blokken), 3.33, 1.11, 4.44, 2.22\r\n", fileContent); } finally Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs =================================================================== diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -52,19 +52,19 @@ PropertyInfo failureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, - typeof(StabilityStoneCoverFailureMechanismContext), + typeof(StabilityStoneCoverFailureMechanismContext), typeof(StabilityStoneCoverFailureMechanismProperties)); Assert.IsNull(failureMechanismProperties.AdditionalDataCheck); Assert.IsNull(failureMechanismProperties.AfterCreate); PropertyInfo waveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, + propertyInfos, typeof(StabilityStoneCoverWaveConditionsOutput), typeof(StabilityStoneCoverWaveConditionsOutputProperties)); Assert.IsNull(waveConditionsOutputProperties.AdditionalDataCheck); Assert.IsNull(waveConditionsOutputProperties.AfterCreate); PropertyInfo waveConditionsInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(StabilityStoneCoverWaveConditionsInputContext), + propertyInfos, + typeof(StabilityStoneCoverWaveConditionsInputContext), typeof(StabilityStoneCoverWaveConditionsInputContextProperties)); Assert.IsNull(waveConditionsInputContextProperties.AdditionalDataCheck); Assert.IsNull(waveConditionsInputContextProperties.AfterCreate); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityOutputTest.cs =================================================================== diff -u -r4d8254c6735e3fc7323678002af10739280eda52 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityOutputTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityOutputTest.cs) (revision 4d8254c6735e3fc7323678002af10739280eda52) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityOutputTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityOutputTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -33,7 +33,7 @@ { // Call var output = new StabilityStoneCoverWaveConditionsCalculationActivityOutput(); - + // Assert CollectionAssert.IsEmpty(output.BlocksOutput); CollectionAssert.IsEmpty(output.ColumnsOutput); @@ -67,7 +67,10 @@ output.AddBlocksOutput(element); // Assert - CollectionAssert.AreEqual(new[] { element }, output.BlocksOutput); + CollectionAssert.AreEqual(new[] + { + element + }, output.BlocksOutput); } [Test] @@ -98,7 +101,10 @@ output.AddColumnsOutput(element); // Assert - CollectionAssert.AreEqual(new[] { element }, output.ColumnsOutput); + CollectionAssert.AreEqual(new[] + { + element + }, output.ColumnsOutput); } } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/AssemblyInfo.cs =================================================================== diff -u -ra481b019d025f649cd52d4714aebcf7d323d0ecb -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a481b019d025f649cd52d4714aebcf7d323d0ecb) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -26,4 +26,4 @@ [assembly: AssemblyTitle("Ringtoets.WaveImpactAsphaltCover.Data")] [assembly: AssemblyProduct("Ringtoets.WaveImpactAsphaltCover.Data")] [assembly: InternalsVisibleTo("Ringtoets.WaveImpactAsphaltCover.Data.Test")] -[assembly: Guid("d2c6aee0-7d8c-4641-9a78-7ccd1fcb34b8")] +[assembly: Guid("d2c6aee0-7d8c-4641-9a78-7ccd1fcb34b8")] \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -29,7 +29,7 @@ /// /// Class holding information about a wave conditions calculation for the . /// - public class WaveImpactAsphaltCoverWaveConditionsCalculation: Observable, ICalculation + public class WaveImpactAsphaltCoverWaveConditionsCalculation : Observable, ICalculation { /// /// Creates a new instance of . Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationContext.cs =================================================================== diff -u -r047a56dd0274ea50de6f06ebad47fbe75ba86ba5 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationContext.cs (.../WaveImpactAsphaltCoverCalculationContext.cs) (revision 047a56dd0274ea50de6f06ebad47fbe75ba86ba5) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationContext.cs (.../WaveImpactAsphaltCoverCalculationContext.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -31,7 +31,7 @@ /// in order to prepare it for performing a calculation. /// public class WaveImpactAsphaltCoverWaveConditionsCalculationContext : WaveImpactAsphaltCoverContext, - ICalculationContext + ICalculationContext { /// /// Creates a new instance of . @@ -41,8 +41,8 @@ /// The assessment section which the calculation belongs to. /// When any input argument is null. public WaveImpactAsphaltCoverWaveConditionsCalculationContext(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, - WaveImpactAsphaltCoverFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + WaveImpactAsphaltCoverFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) : base(calculation, failureMechanism, assessmentSection) {} } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContext.cs =================================================================== diff -u -r047a56dd0274ea50de6f06ebad47fbe75ba86ba5 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContext.cs (.../WaveImpactAsphaltCoverCalculationGroupContext.cs) (revision 047a56dd0274ea50de6f06ebad47fbe75ba86ba5) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContext.cs (.../WaveImpactAsphaltCoverCalculationGroupContext.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -31,7 +31,7 @@ /// Presentation object for all data required to configure an instance of /// in order be able to create configurable wave impact asphalt calculations. /// - public class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext + public class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext : WaveImpactAsphaltCoverContext, ICalculationContext { /// @@ -41,9 +41,9 @@ /// The failure mechanism which the context belongs to. /// The assessment section which the context belongs to. /// When any input argument is null. - public WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(CalculationGroup calculationsGroup, - WaveImpactAsphaltCoverFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + public WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(CalculationGroup calculationsGroup, + WaveImpactAsphaltCoverFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) : base(calculationsGroup, failureMechanism, assessmentSection) {} } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismContext.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismContext.cs (.../WaveImpactAsphaltCoverFailureMechanismContext.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismContext.cs (.../WaveImpactAsphaltCoverFailureMechanismContext.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -38,6 +38,6 @@ /// The parent of . /// When any input argument is null. public WaveImpactAsphaltCoverFailureMechanismContext(WaveImpactAsphaltCoverFailureMechanism wrappedFailureMechanism, IAssessmentSection parent) : - base(wrappedFailureMechanism, parent) {} + base(wrappedFailureMechanism, parent) {} } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs =================================================================== diff -u -r1d8a218ddfc990be2d637dfdafd9e6969ff9ae7e -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs) (revision 1d8a218ddfc990be2d637dfdafd9e6969ff9ae7e) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputProperties.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -29,7 +29,6 @@ using Ringtoets.WaveImpactAsphaltCover.Forms.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; - namespace Ringtoets.WaveImpactAsphaltCover.Forms.PropertyClasses { /// @@ -52,4 +51,4 @@ } } } -} +} \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/Properties/AssemblyInfo.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.WaveImpactAsphaltCover.Plugin")] [assembly: AssemblyProduct("Ringtoets.WaveImpactAsphaltCover.Plugin")] -[assembly: Guid("926e634f-c8b7-4a8b-9c54-9032b6a3bf98")] +[assembly: Guid("926e634f-c8b7-4a8b-9c54-9032b6a3bf98")] \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r1d0754dba6c2a05f96d4ea937cc0d6de62644755 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 1d0754dba6c2a05f96d4ea937cc0d6de62644755) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -51,7 +51,6 @@ using RingtoetsRevetmentServiceResources = Ringtoets.Revetment.Service.Properties.Resources; using WaveImpactAsphaltCoverDataResources = Ringtoets.WaveImpactAsphaltCover.Data.Properties.Resources; - namespace Ringtoets.WaveImpactAsphaltCover.Plugin { /// Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.WaveImpactAsphaltCover.Data.Test")] [assembly: AssemblyProduct("Ringtoets.WaveImpactAsphaltCover.Data.Test")] -[assembly: Guid("7f9d52c1-a7b8-4944-b2c1-5b32eac7347a")] +[assembly: Guid("7f9d52c1-a7b8-4944-b2c1-5b32eac7347a")] \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.WaveImpactAsphaltCover.Forms.Test")] [assembly: AssemblyProduct("Ringtoets.WaveImpactAsphaltCover.Forms.Test")] -[assembly: Guid("edf6412b-efd6-4aa0-b169-2b2e12ab8bd4")] +[assembly: Guid("edf6412b-efd6-4aa0-b169-2b2e12ab8bd4")] \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -84,8 +84,8 @@ var input = new WaveConditionsInput(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var inputContext = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, - failureMechanism.ForeshoreProfiles, - assessmentSection); + failureMechanism.ForeshoreProfiles, + assessmentSection); // Call var properties = new WaveImpactAsphaltCoverWaveConditionsInputContextProperties @@ -127,17 +127,17 @@ mocks.ReplayAll(); var random = new Random(21); - var assessmentLevel = (RoundedDouble)random.NextDouble(); - var lowerBoundaryRevetment = (RoundedDouble)random.NextDouble(); - var lowerBoundaryWaterLevels = (RoundedDouble)random.NextDouble(); - var upperBoundaryRevetment = lowerBoundaryRevetment + (RoundedDouble)random.NextDouble(); - var upperBoundaryWaterLevels = lowerBoundaryWaterLevels + (RoundedDouble)random.NextDouble(); + var assessmentLevel = (RoundedDouble) random.NextDouble(); + var lowerBoundaryRevetment = (RoundedDouble) random.NextDouble(); + var lowerBoundaryWaterLevels = (RoundedDouble) random.NextDouble(); + var upperBoundaryRevetment = lowerBoundaryRevetment + (RoundedDouble) random.NextDouble(); + var upperBoundaryWaterLevels = lowerBoundaryWaterLevels + (RoundedDouble) random.NextDouble(); var stepSize = WaveConditionsInputStepSize.Half; - var worldX = (RoundedDouble)random.NextDouble(); - var worldY = (RoundedDouble)random.NextDouble(); - var damHeight = (RoundedDouble)random.NextDouble(); - var foreshoreProfileOrientation = (RoundedDouble)random.NextDouble(); + var worldX = (RoundedDouble) random.NextDouble(); + var worldY = (RoundedDouble) random.NextDouble(); + var damHeight = (RoundedDouble) random.NextDouble(); + var foreshoreProfileOrientation = (RoundedDouble) random.NextDouble(); var foreshoreProfile = new ForeshoreProfile( new Point2D(worldX, worldY), @@ -176,8 +176,8 @@ failureMechanism.ForeshoreProfiles.Add(foreshoreProfile); var inputContext = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, - failureMechanism.ForeshoreProfiles, - assessmentSection); + failureMechanism.ForeshoreProfiles, + assessmentSection); // Call var properties = new WaveImpactAsphaltCoverWaveConditionsInputContextProperties @@ -211,12 +211,12 @@ mocks.ReplayAll(); var random = new Random(21); - var orientation = (RoundedDouble)random.NextDouble(); - var assessmentLevel = (RoundedDouble)random.NextDouble(); - var newLowerBoundaryRevetment = (RoundedDouble)random.NextDouble(); - var newLowerBoundaryWaterLevels = (RoundedDouble)random.NextDouble(); - var newUpperBoundaryRevetment = newLowerBoundaryRevetment + (RoundedDouble)random.NextDouble(); - var newUpperBoundaryWaterLevels = newLowerBoundaryWaterLevels + (RoundedDouble)random.NextDouble(); + var orientation = (RoundedDouble) random.NextDouble(); + var assessmentLevel = (RoundedDouble) random.NextDouble(); + var newLowerBoundaryRevetment = (RoundedDouble) random.NextDouble(); + var newLowerBoundaryWaterLevels = (RoundedDouble) random.NextDouble(); + var newUpperBoundaryRevetment = newLowerBoundaryRevetment + (RoundedDouble) random.NextDouble(); + var newUpperBoundaryWaterLevels = newLowerBoundaryWaterLevels + (RoundedDouble) random.NextDouble(); var newStepSize = WaveConditionsInputStepSize.Half; var newHydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "name", 0.0, 1.1) @@ -238,15 +238,15 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var inputContext = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, - failureMechanism.ForeshoreProfiles, - assessmentSection); + failureMechanism.ForeshoreProfiles, + assessmentSection); var newForeshoreProfile = new ForeshoreProfile( new Point2D( - (RoundedDouble)random.NextDouble(), - (RoundedDouble)random.NextDouble()), + (RoundedDouble) random.NextDouble(), + (RoundedDouble) random.NextDouble()), Enumerable.Empty(), - new BreakWater(BreakWaterType.Dam, (RoundedDouble)random.NextDouble()), + new BreakWater(BreakWaterType.Dam, (RoundedDouble) random.NextDouble()), new ForeshoreProfile.ConstructionProperties()); var properties = new WaveImpactAsphaltCoverWaveConditionsInputContextProperties @@ -304,7 +304,6 @@ input.ForeshoreProfile = foreshoreProfile; } - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var inputContext = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -45,7 +45,6 @@ using Ringtoets.HydraRing.Calculation.TestUtil; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; -using Ringtoets.Revetment.Forms.PresentationObjects; using Ringtoets.Revetment.Service.TestUtil; using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects; @@ -173,9 +172,9 @@ }; var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), - Enumerable.Empty(), - new BreakWater(BreakWaterType.Caisson, 1), - new ForeshoreProfile.ConstructionProperties()); + Enumerable.Empty(), + new BreakWater(BreakWaterType.Caisson, 1), + new ForeshoreProfile.ConstructionProperties()); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism { ForeshoreProfiles = @@ -196,7 +195,7 @@ var commentsContext = (CommentContext) children[0]; Assert.AreSame(calculation, commentsContext.WrappedData); - var inputContext = (WaveImpactAsphaltCoverWaveConditionsInputContext)children[1]; + var inputContext = (WaveImpactAsphaltCoverWaveConditionsInputContext) children[1]; Assert.AreSame(calculation.InputParameters, inputContext.WrappedData); CollectionAssert.AreEqual(new[] { @@ -232,9 +231,9 @@ Output = new WaveImpactAsphaltCoverWaveConditionsOutput(Enumerable.Empty()) }; var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), - Enumerable.Empty(), - new BreakWater(BreakWaterType.Caisson, 1), - new ForeshoreProfile.ConstructionProperties()); + Enumerable.Empty(), + new BreakWater(BreakWaterType.Caisson, 1), + new ForeshoreProfile.ConstructionProperties()); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism { ForeshoreProfiles = @@ -255,7 +254,7 @@ var commentsContext = (CommentContext) children[0]; Assert.AreSame(calculation, commentsContext.WrappedData); - var inputContext = (WaveImpactAsphaltCoverWaveConditionsInputContext)children[1]; + var inputContext = (WaveImpactAsphaltCoverWaveConditionsInputContext) children[1]; Assert.AreSame(calculation.InputParameters, inputContext.WrappedData); CollectionAssert.AreEqual(new[] { Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r86401a913aaf544979e4062d00acfe1fb24e1e4f -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 86401a913aaf544979e4062d00acfe1fb24e1e4f) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -44,7 +44,6 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms; -using Ringtoets.HydraRing.Calculation.TestUtil; using Ringtoets.HydraRing.Data; using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Service.TestUtil; Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -85,7 +85,7 @@ // Setup var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var input = new WaveConditionsInput(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -37,6 +37,11 @@ [TestFixture] public class WaveImpactAsphaltCoverFailureMechanismResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithWaveImpactAsphaltCoverFailureMechanismResultView_ThenExpectedColumnsAreVisible() { @@ -217,11 +222,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs =================================================================== diff -u -r8e0924d08a2377125c21114d088b6091bf1eb5fc -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs) (revision 8e0924d08a2377125c21114d088b6091bf1eb5fc) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -91,11 +91,11 @@ // Assert Assert.AreEqual(2, calculationBases.Count); - var firstCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation)calculationBases.First(); + var firstCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation) calculationBases.First(); Assert.AreEqual(name, firstCalculation.Name); Assert.AreEqual(locations[0], firstCalculation.InputParameters.HydraulicBoundaryLocation); - var secondCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation)calculationBases.ElementAt(1); + var secondCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation) calculationBases.ElementAt(1); Assert.AreEqual(string.Format("{0} (1)", name), secondCalculation.Name); Assert.AreSame(locations[1], secondCalculation.InputParameters.HydraulicBoundaryLocation); } @@ -123,11 +123,11 @@ // Assert Assert.AreEqual(3, calculationBases.Count); - var firstCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation)calculationBases.ElementAt(1); + var firstCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation) calculationBases.ElementAt(1); Assert.AreEqual(string.Format("{0} (1)", name), firstCalculation.Name); Assert.AreEqual(locations[0], firstCalculation.InputParameters.HydraulicBoundaryLocation); - var secondCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation)calculationBases.ElementAt(2); + var secondCalculation = (WaveImpactAsphaltCoverWaveConditionsCalculation) calculationBases.ElementAt(2); Assert.AreEqual(string.Format("{0} (2)", name), secondCalculation.Name); Assert.AreSame(locations[1], secondCalculation.InputParameters.HydraulicBoundaryLocation); } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -rd42451749e8feec1c96555eb81b1cd7d67e30146 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision d42451749e8feec1c96555eb81b1cd7d67e30146) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.WaveImpactAsphaltCover.IO.Test")] [assembly: AssemblyProduct("Ringtoets.WaveImpactAsphaltCover.IO.Test")] -[assembly: Guid("0d3fd1b3-8118-416f-89ae-1966738e73a5")] +[assembly: Guid("0d3fd1b3-8118-416f-89ae-1966738e73a5")] \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.WaveImpactAsphaltCover.Plugin.Test")] [assembly: AssemblyProduct("Ringtoets.WaveImpactAsphaltCover.Plugin.Test")] -[assembly: Guid("9a3bd409-de8f-4778-8d36-5ee5e6ad349c")] +[assembly: Guid("9a3bd409-de8f-4778-8d36-5ee5e6ad349c")] \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r8e97f37e10d4445dfa2aeda2d321f347b5a59921 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 8e97f37e10d4445dfa2aeda2d321f347b5a59921) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -215,7 +215,7 @@ var commentContext = (CommentContext) inputsFolder.Contents[2]; Assert.AreSame(failureMechanism, commentContext.WrappedData); - var hydraulicBoundariesCalculationGroup = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext)children[1]; + var hydraulicBoundariesCalculationGroup = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) children[1]; Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, hydraulicBoundariesCalculationGroup.WrappedData); Assert.AreSame(failureMechanism, hydraulicBoundariesCalculationGroup.FailureMechanism); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs (.../WaveImpactAsphaltCoverResultViewInfoTest.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs (.../WaveImpactAsphaltCoverResultViewInfoTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -255,7 +255,7 @@ var assessmentSection = mocks.Stub(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, - assessmentSection); + assessmentSection); mocks.ReplayAll(); @@ -278,7 +278,7 @@ // Setup var assessmentSection = mocks.Stub(); var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(new WaveImpactAsphaltCoverFailureMechanism(), - assessmentSection); + assessmentSection); mocks.ReplayAll(); using (var view = new WaveImpactAsphaltCoverFailureMechanismResultView()) Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs =================================================================== diff -u -r51d8e744ffb2168ca56ca4b6260ad9c2590c0170 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 51d8e744ffb2168ca56ca4b6260ad9c2590c0170) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -62,15 +62,15 @@ Assert.AreEqual(3, propertyInfos.Length); PropertyInfo failureMechanismContextProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(WaveImpactAsphaltCoverFailureMechanismContext), + propertyInfos, + typeof(WaveImpactAsphaltCoverFailureMechanismContext), typeof(WaveImpactAsphaltCoverFailureMechanismProperties)); Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck); Assert.IsNull(failureMechanismContextProperties.AfterCreate); PropertyInfo waveImpactAsphaltCoverWaveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined( - propertyInfos, - typeof(WaveImpactAsphaltCoverWaveConditionsOutput), + propertyInfos, + typeof(WaveImpactAsphaltCoverWaveConditionsOutput), typeof(WaveImpactAsphaltCoverWaveConditionsOutputProperties)); Assert.IsNull(waveImpactAsphaltCoverWaveConditionsOutputProperties.AdditionalDataCheck); Assert.IsNull(waveImpactAsphaltCoverWaveConditionsOutputProperties.GetObjectPropertiesData); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs =================================================================== diff -u -r69e974d251e2810972a296b67ce349ac66b4f014 -r1d119f8fbafa52dc700bc684375f3f0130a523fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs (.../WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs) (revision 69e974d251e2810972a296b67ce349ac66b4f014) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs (.../WaveImpactAsphaltCoverDataSynchronizationServiceTest.cs) (revision 1d119f8fbafa52dc700bc684375f3f0130a523fd) @@ -66,8 +66,8 @@ public void ClearAllCalculationOutputAndHydraulicBoundaryLocations_WithoutFailureMechanism_ThrowsArgumentNullException() { // Call - TestDelegate call = () => - WaveImpactAsphaltCoverDataSynchronizationService.ClearAllWaveConditionsCalculationOutputAndHydraulicBoundaryLocations(null); + TestDelegate call = () => + WaveImpactAsphaltCoverDataSynchronizationService.ClearAllWaveConditionsCalculationOutputAndHydraulicBoundaryLocations(null); // Assert var exception = Assert.Throws(call);