Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/GeneralClosingStructuresInputCreateExtensions.cs =================================================================== diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/GeneralClosingStructuresInputCreateExtensions.cs (.../GeneralClosingStructuresInputCreateExtensions.cs) (revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/GeneralClosingStructuresInputCreateExtensions.cs (.../GeneralClosingStructuresInputCreateExtensions.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -41,7 +41,6 @@ return new ClosingStructureFailureMechanismMetaEntity { N2A = input.N2A, - C = input.C.Value.ToNaNAsNull() }; } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs =================================================================== diff -u -radbfca968beb93b87561607f2b0fd9a23bdfc6bd -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs (.../ClosingStructureFailureMechanismMetaEntity.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs (.../ClosingStructureFailureMechanismMetaEntity.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -37,7 +37,6 @@ { public long ClosingStructureFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } - public Nullable C { get; set; } public int N2A { get; set; } public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r1ab694fe2d416435524ceca426d459caac4af304 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 1ab694fe2d416435524ceca426d459caac4af304) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 20-okt-2016 15:32:23 */ +/* Created On : 21-okt-2016 14:43:18 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -253,7 +253,6 @@ ( 'ClosingStructureFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, - 'C' REAL, 'N2A' INT (4) NOT NULL, CONSTRAINT 'FK_ClosingStructureFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r1ab694fe2d416435524ceca426d459caac4af304 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 1ab694fe2d416435524ceca426d459caac4af304) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -48,7 +48,6 @@ - @@ -2077,7 +2076,6 @@ - @@ -3599,7 +3597,6 @@ - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r1ab694fe2d416435524ceca426d459caac4af304 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 1ab694fe2d416435524ceca426d459caac4af304) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -5,58 +5,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs (.../ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs) (revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs (.../ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -20,7 +20,6 @@ // All rights reserved. using Application.Ringtoets.Storage.DbContext; -using Core.Common.Base.Data; using Ringtoets.ClosingStructures.Data; namespace Application.Ringtoets.Storage.Read.ClosingStructures @@ -42,8 +41,7 @@ { return new GeneralClosingStructuresInput { - N2A = entity.N2A, - C = (RoundedDouble) entity.C.ToNullAsNaN() + N2A = entity.N2A }; } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -rf25ee2320dd230d8d821689293c69de7c491b3b0 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision f25ee2320dd230d8d821689293c69de7c491b3b0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -361,7 +361,6 @@ private static void ReadGeneralInput(this FailureMechanismEntity entity, GeneralClosingStructuresInput generalInput) { GeneralClosingStructuresInput generalClosingStructuresInput = entity.ClosingStructureFailureMechanismMetaEntities.First().Read(); - generalInput.C = generalClosingStructuresInput.C; generalInput.N2A = generalClosingStructuresInput.N2A; } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r746effcbca139c44fe93d96707671311c685a2b9 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision 746effcbca139c44fe93d96707671311c685a2b9) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -25,7 +25,6 @@ using Application.Ringtoets.Storage.Create.ClosingStructures; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.TestUtil; -using Core.Common.Base.Data; using NUnit.Framework; using Ringtoets.ClosingStructures.Data; @@ -60,7 +59,6 @@ Comments = "Some text", GeneralInput = { - C = (RoundedDouble) 0.76, N2A = 5 } }; @@ -76,7 +74,6 @@ Assert.AreEqual(failureMechanism.Comments, entity.Comments); ClosingStructureFailureMechanismMetaEntity metaEntity = entity.ClosingStructureFailureMechanismMetaEntities.First(); - Assert.AreEqual(failureMechanism.GeneralInput.C.Value, metaEntity.C); Assert.AreEqual(failureMechanism.GeneralInput.N2A, metaEntity.N2A); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/GeneralClosingStructuresInputCreateExtensionsTest.cs =================================================================== diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/GeneralClosingStructuresInputCreateExtensionsTest.cs (.../GeneralClosingStructuresInputCreateExtensionsTest.cs) (revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/GeneralClosingStructuresInputCreateExtensionsTest.cs (.../GeneralClosingStructuresInputCreateExtensionsTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -22,7 +22,6 @@ using System; using Application.Ringtoets.Storage.Create.ClosingStructures; using Application.Ringtoets.Storage.DbContext; -using Core.Common.Base.Data; using NUnit.Framework; using Ringtoets.ClosingStructures.Data; @@ -39,42 +38,17 @@ var generalinput = new GeneralClosingStructuresInput { N2A = random.Next(1, 20), - C = (RoundedDouble) 1.23 }; // Call ClosingStructureFailureMechanismMetaEntity entity = generalinput.Create(); // Assert Assert.AreEqual(generalinput.N2A, entity.N2A); - Assert.AreEqual(generalinput.C.Value, entity.C); Assert.IsNull(entity.FailureMechanismEntity); Assert.AreEqual(0, entity.ClosingStructureFailureMechanismMetaEntityId); Assert.AreEqual(0, entity.FailureMechanismEntityId); } - - [Test] - public void Create_ValidInputWithNaN_ReturnMetaEntity() - { - // Setup - var random = new Random(45); - var generalinput = new GeneralClosingStructuresInput - { - N2A = random.Next(1, 20), - C = (RoundedDouble) double.NaN - }; - - // Call - ClosingStructureFailureMechanismMetaEntity entity = generalinput.Create(); - - // Assert - Assert.AreEqual(generalinput.N2A, entity.N2A); - Assert.IsNull(entity.C); - - Assert.IsNull(entity.FailureMechanismEntity); - Assert.AreEqual(0, entity.ClosingStructureFailureMechanismMetaEntityId); - Assert.AreEqual(0, entity.FailureMechanismEntityId); - } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rf25ee2320dd230d8d821689293c69de7c491b3b0 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision f25ee2320dd230d8d821689293c69de7c491b3b0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -889,7 +889,6 @@ ClosingStructuresFailureMechanism actualFailureMechanism) { Assert.AreEqual(expectedFailureMechanism.GeneralInput.N2A, actualFailureMechanism.GeneralInput.N2A); - Assert.AreEqual(expectedFailureMechanism.GeneralInput.C, actualFailureMechanism.GeneralInput.C); AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r228f2e1b1297e24c82c34e76eb5280ca245c8318 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 228f2e1b1297e24c82c34e76eb5280ca245c8318) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -846,7 +846,6 @@ { new ClosingStructureFailureMechanismMetaEntity { - C = 1.1, N2A = 3 } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs (.../ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs) (revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs (.../ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -36,15 +36,13 @@ var entity = new ClosingStructureFailureMechanismMetaEntity { N2A = 3, - C = 2.2 }; // Call GeneralClosingStructuresInput generalInput = entity.Read(); // Assert Assert.AreEqual(entity.N2A, generalInput.N2A); - Assert.AreEqual(entity.C, generalInput.C.Value); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -rf25ee2320dd230d8d821689293c69de7c491b3b0 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision f25ee2320dd230d8d821689293c69de7c491b3b0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -935,7 +935,6 @@ public void ReadAsClosingStructuresFailureMechanism_WithForshoreProfiles_ReturnFailureMechanismWithForeshoreProfilesSet() { // Setup - const double generalInputC = 1.1; const int generalInputN2A = 3; var entity = new FailureMechanismEntity @@ -960,7 +959,6 @@ { new ClosingStructureFailureMechanismMetaEntity { - C = generalInputC, N2A = generalInputN2A } } @@ -980,7 +978,6 @@ ForeshoreProfile child2 = failureMechanism.ForeshoreProfiles[1]; Assert.AreEqual("Child1", child2.Name); - Assert.AreEqual(generalInputC, failureMechanism.GeneralInput.C.Value); Assert.AreEqual(generalInputN2A, failureMechanism.GeneralInput.N2A); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -rf25ee2320dd230d8d821689293c69de7c491b3b0 -re570ba372fafe1802a4caae2ef9410b64457198b --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision f25ee2320dd230d8d821689293c69de7c491b3b0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -378,7 +378,6 @@ private static void ConfigureClosingStructuresFailureMechanism(ClosingStructuresFailureMechanism failureMechanism) { failureMechanism.GeneralInput.N2A = 6; - failureMechanism.GeneralInput.C = (RoundedDouble) 0.77; } #endregion Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs =================================================================== diff -u -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs (.../GeneralClosingStructuresInput.cs) (revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs (.../GeneralClosingStructuresInput.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -30,14 +30,12 @@ /// public class GeneralClosingStructuresInput { - private RoundedDouble c; - /// /// Initializes a new instance of the class. /// public GeneralClosingStructuresInput() { - c = new RoundedDouble(2, 0.5); + C = new RoundedDouble(2, 0.5); N2A = 1; GravitationalAcceleration = new RoundedDouble(2, 9.81); @@ -78,17 +76,7 @@ /// /// Gets or sets the 'C' parameter used to factor in the 'length effect'. /// - public RoundedDouble C - { - get - { - return c; - } - set - { - c = value.ToPrecision(c.NumberOfDecimalPlaces); - } - } + public RoundedDouble C { get; private set; } /// /// Gets or sets the 'N2A' parameter used to factor in the 'length effect'. @@ -102,7 +90,7 @@ { get { - return new RoundedDouble(2, Math.Max(1, c*N2A)); + return new RoundedDouble(2, Math.Max(1, C*N2A)); } } Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureFailureMechanismProperties.cs =================================================================== diff -u -rb73d9512e3a69a17d8be939d91cb655d20aa64f2 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureFailureMechanismProperties.cs (.../ClosingStructureFailureMechanismProperties.cs) (revision b73d9512e3a69a17d8be939d91cb655d20aa64f2) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureFailureMechanismProperties.cs (.../ClosingStructureFailureMechanismProperties.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -61,11 +61,6 @@ { return data.GeneralInput.C; } - set - { - data.GeneralInput.C = value; - data.NotifyObservers(); - } } [PropertyOrder(n2aPropertyIndex)] Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs =================================================================== diff -u -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -75,15 +75,14 @@ } [Test] - [TestCase(0, 0, 1)] - [TestCase(1, 1, 1)] - [TestCase(2, 2, 4)] - public void N_VariousValues_ReturnsExpectedValue(double c, int n2A, double expected) + [TestCase(0, 1)] + [TestCase(3, 1.5)] + [TestCase(6, 3)] + public void N_VariousValues_ReturnsExpectedValue(int n2A, double expected) { // Setup var inputParameters = new GeneralClosingStructuresInput { - C = (RoundedDouble) c, N2A = n2A }; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructureFailureMechanismPropertiesTest.cs =================================================================== diff -u -r0764f95727a4586e2b566d1e66c989a6327f3e2b -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructureFailureMechanismPropertiesTest.cs (.../ClosingStructureFailureMechanismPropertiesTest.cs) (revision 0764f95727a4586e2b566d1e66c989a6327f3e2b) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructureFailureMechanismPropertiesTest.cs (.../ClosingStructureFailureMechanismPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -21,14 +21,12 @@ using System.ComponentModel; using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.Gui.PropertyBag; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.ClosingStructures.Data; using Ringtoets.ClosingStructures.Forms.PropertyClasses; -using ClosingStructuresDataResources = Ringtoets.ClosingStructures.Data.Properties.Resources; namespace Ringtoets.ClosingStructures.Forms.Test.PropertyClasses { @@ -38,8 +36,6 @@ [Test] public void Constructor_ExpectedValues() { - // Setup - // Call var properties = new ClosingStructureFailureMechanismProperties(); @@ -60,9 +56,9 @@ properties.Data = failureMechanism; // Assert - Assert.AreEqual(ClosingStructuresDataResources.ClosingStructuresFailureMechanism_DisplayName, + Assert.AreEqual("Kunstwerken - Betrouwbaarheid sluiting kunstwerk", properties.Name); - Assert.AreEqual(ClosingStructuresDataResources.ClosingStructuresFailureMechanism_Code, + Assert.AreEqual("BSKW", properties.Code); GeneralClosingStructuresInput generalInput = failureMechanism.GeneralInput; @@ -86,10 +82,10 @@ public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers() { // Setup - const int numberProperties = 2; + const int numberOfChangedProperties = 1; var mockRepository = new MockRepository(); var observerMock = mockRepository.StrictMock(); - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mockRepository.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); @@ -99,15 +95,12 @@ Data = failureMechanism }; - RoundedDouble newC = (RoundedDouble) 2.1; const int newN2A = 10; // Call - properties.C = newC; properties.N2A = newN2A; // Assert - Assert.AreEqual(newC, failureMechanism.GeneralInput.C); Assert.AreEqual(newN2A, failureMechanism.GeneralInput.N2A); mockRepository.VerifyAll(); } @@ -157,7 +150,8 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(cProperty, lengthEffectCategory, "C [-]", - "De parameter 'C' die gebruikt wordt om het lengte-effect te berekenen."); + "De parameter 'C' die gebruikt wordt om het lengte-effect te berekenen.", + true); PropertyDescriptor n2aProperty = dynamicProperties[4]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(n2aProperty, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs =================================================================== diff -u -r0764f95727a4586e2b566d1e66c989a6327f3e2b -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs (.../ClosingStructuresPluginTest.cs) (revision 0764f95727a4586e2b566d1e66c989a6327f3e2b) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs (.../ClosingStructuresPluginTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -66,23 +66,23 @@ // assert Assert.AreEqual(2, propertyInfos.Length); - PropertyInfo closingStructureProperties = PluginTestHelper.AssertPropertyInfoDefined( + PropertyInfo closingStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(ClosingStructure), typeof(ClosingStructureProperties)); - Assert.IsNull(closingStructureProperties.AdditionalDataCheck); - Assert.IsNull(closingStructureProperties.GetObjectPropertiesData); - Assert.IsNull(closingStructureProperties.AfterCreate); + Assert.IsNull(closingStructurePropertyInfo.AdditionalDataCheck); + Assert.IsNull(closingStructurePropertyInfo.GetObjectPropertiesData); + Assert.IsNull(closingStructurePropertyInfo.AfterCreate); var failureMechanism = new ClosingStructuresFailureMechanism(); var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); - PropertyInfo closingStructureFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined( + PropertyInfo closingStructuresFailureMechanismContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(ClosingStructuresFailureMechanismContext), typeof(ClosingStructureFailureMechanismProperties)); - Assert.AreSame(failureMechanism, closingStructureFailureMechanismProperties.GetObjectPropertiesData(failureMechanismContext)); - Assert.IsNull(closingStructureFailureMechanismProperties.AdditionalDataCheck); - Assert.IsNull(closingStructureFailureMechanismProperties.AfterCreate); + Assert.AreSame(failureMechanism, closingStructuresFailureMechanismContextPropertyInfo.GetObjectPropertiesData(failureMechanismContext)); + Assert.IsNull(closingStructuresFailureMechanismContextPropertyInfo.AdditionalDataCheck); + Assert.IsNull(closingStructuresFailureMechanismContextPropertyInfo.AfterCreate); } mocks.VerifyAll(); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs) (revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -100,8 +100,8 @@ { // Setup var observerMock = mockRepository.StrictMock(); - int numberProperties = 1; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + int numberOfChangedProperties = 1; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); var assessmentSectionMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -152,8 +152,8 @@ { // Setup var observerMock = mockRepository.StrictMock(); - const int numberProperties = 5; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + const int numberOfChangedProperties = 5; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); var assessmentSectionMock = mockRepository.StrictMock(); var failureMechanismMock = mockRepository.StrictMock(); var calculationMock = mockRepository.StrictMock(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs =================================================================== diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -76,8 +76,8 @@ // Setup var mockRepository = new MockRepository(); var observerMock = mockRepository.StrictMock(); - int numberProperties = 1; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + int numberOfChangedProperties = 1; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r63b0f1800d86c219732bf730d0137e7711b00b47 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 63b0f1800d86c219732bf730d0137e7711b00b47) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -184,8 +184,8 @@ // Setup var mockRepository = new MockRepository(); var observerMock = mockRepository.StrictMock(); - const int numberProperties = 8; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + const int numberOfChangedProperties = 8; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mockRepository.ReplayAll(); var random = new Random(21); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs =================================================================== diff -u -r0764f95727a4586e2b566d1e66c989a6327f3e2b -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs (.../HeightStructuresFailureMechanismPropertiesTest.cs) (revision 0764f95727a4586e2b566d1e66c989a6327f3e2b) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismPropertiesTest.cs (.../HeightStructuresFailureMechanismPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -63,9 +63,9 @@ properties.Data = failureMechanism; // Assert - Assert.AreEqual(Resources.HeightStructuresFailureMechanism_DisplayName, properties.Name); - Assert.AreEqual(Resources.HeightStructuresFailureMechanism_Code, properties.Code); - Assert.AreEqual(2, properties.LengthEffect); + Assert.AreEqual("Kunstwerken - Hoogte kunstwerk", properties.Name); + Assert.AreEqual("HTKW", properties.Code); + Assert.AreEqual(failureMechanism.GeneralInput.N, properties.LengthEffect); GeneralHeightStructuresInput generalInput = failureMechanism.GeneralInput; Assert.AreEqual(generalInput.GravitationalAcceleration, properties.GravitationalAcceleration); @@ -80,10 +80,10 @@ public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers() { // Setup - const int numberProperties = 1; + const int numberOfChangedProperties = 1; var mockRepository = new MockRepository(); var observerMock = mockRepository.StrictMock(); - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mockRepository.ReplayAll(); var failureMechanism = new HeightStructuresFailureMechanism(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r6e68772763eff7e38ef3e2c4dcfcbc18aff21cd4 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 6e68772763eff7e38ef3e2c4dcfcbc18aff21cd4) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -208,8 +208,8 @@ { // Setup var observerMock = mockRepository.StrictMock(); - const int numberProperties = 6; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + const int numberOfChangedProperties = 6; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); var hydraulicBoundaryLocation = CreateValidHydraulicBoundaryLocation(); var assessmentSectionMock = mockRepository.Stub(); mockRepository.ReplayAll(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs =================================================================== diff -u -r0764f95727a4586e2b566d1e66c989a6327f3e2b -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision 0764f95727a4586e2b566d1e66c989a6327f3e2b) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -68,29 +68,29 @@ var failureMechanism = new HeightStructuresFailureMechanism(); var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); - PropertyInfo failureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined( + PropertyInfo heightStructuresFailureMechanismContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(HeightStructuresFailureMechanismContext), typeof(HeightStructuresFailureMechanismProperties)); - Assert.AreSame(failureMechanism, failureMechanismProperties.GetObjectPropertiesData(failureMechanismContext)); - Assert.IsNull(failureMechanismProperties.AdditionalDataCheck); - Assert.IsNull(failureMechanismProperties.AfterCreate); + Assert.AreSame(failureMechanism, heightStructuresFailureMechanismContextPropertyInfo.GetObjectPropertiesData(failureMechanismContext)); + Assert.IsNull(heightStructuresFailureMechanismContextPropertyInfo.AdditionalDataCheck); + Assert.IsNull(heightStructuresFailureMechanismContextPropertyInfo.AfterCreate); - PropertyInfo heightStructuresInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( + PropertyInfo heightStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(HeightStructuresInputContext), typeof(HeightStructuresInputContextProperties)); - Assert.IsNull(heightStructuresInputContextProperties.AdditionalDataCheck); - Assert.IsNull(heightStructuresInputContextProperties.GetObjectPropertiesData); - Assert.IsNull(heightStructuresInputContextProperties.AfterCreate); + Assert.IsNull(heightStructuresInputContextPropertyInfo.AdditionalDataCheck); + Assert.IsNull(heightStructuresInputContextPropertyInfo.GetObjectPropertiesData); + Assert.IsNull(heightStructuresInputContextPropertyInfo.AfterCreate); - PropertyInfo heightStructureProperties = PluginTestHelper.AssertPropertyInfoDefined( + PropertyInfo heightStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(HeightStructure), typeof(HeightStructureProperties)); - Assert.IsNull(heightStructureProperties.AdditionalDataCheck); - Assert.IsNull(heightStructureProperties.GetObjectPropertiesData); - Assert.IsNull(heightStructureProperties.AfterCreate); + Assert.IsNull(heightStructurePropertyInfo.AdditionalDataCheck); + Assert.IsNull(heightStructurePropertyInfo.GetObjectPropertiesData); + Assert.IsNull(heightStructurePropertyInfo.AfterCreate); } mocks.VerifyAll(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs =================================================================== diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs (.../CalculationContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationContextPropertiesTest.cs (.../CalculationContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -101,8 +101,8 @@ // Setup var mocks = new MockRepository(); var projectObserver = mocks.StrictMock(); - int numberProperties = 1; - projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + int numberOfChangedProperties = 1; + projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); var failureMechanismMock = mocks.StrictMock(); mocks.ReplayAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -341,8 +341,8 @@ var mocks = new MockRepository(); var assessmentSectionMock = mocks.StrictMock(); var projectObserver = mocks.StrictMock(); - int numberProperties = 6; - projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + int numberOfChangedProperties = 6; + projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mocks.ReplayAll(); PipingCalculationScenario calculationItem = new PipingCalculationScenario(new GeneralPipingInput()) @@ -424,8 +424,8 @@ var mocks = new MockRepository(); var assessmentSectionMock = mocks.StrictMock(); var inputObserver = mocks.StrictMock(); - int numberProperties = 2; - inputObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + int numberOfChangedProperties = 2; + inputObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mocks.ReplayAll(); RingtoetsPipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0); @@ -465,8 +465,8 @@ var mocks = new MockRepository(); var assessmentSectionMock = mocks.StrictMock(); var inputObserver = mocks.StrictMock(); - int numberProperties = 2; - inputObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + int numberOfChangedProperties = 2; + inputObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mocks.ReplayAll(); RingtoetsPipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r63b0f1800d86c219732bf730d0137e7711b00b47 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 63b0f1800d86c219732bf730d0137e7711b00b47) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -184,8 +184,8 @@ // Setup var mockRepository = new MockRepository(); var observerMock = mockRepository.StrictMock(); - const int numberProperties = 8; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + const int numberOfChangedProperties = 8; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mockRepository.ReplayAll(); var random = new Random(21); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs =================================================================== diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (.../WaveConditionsInputForeshoreProfilePropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (.../WaveConditionsInputForeshoreProfilePropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -100,8 +100,8 @@ // Setup var mockRepository = new MockRepository(); var observerMock = mockRepository.StrictMock(); - const int numberProperties = 1; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + const int numberOfChangedProperties = 1; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mockRepository.ReplayAll(); var input = new WaveConditionsInput(); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r63b0f1800d86c219732bf730d0137e7711b00b47 -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision 63b0f1800d86c219732bf730d0137e7711b00b47) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -206,8 +206,8 @@ // Setup var mocks = new MockRepository(); var observerMock = mocks.StrictMock(); - const int numberProperties = 8; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + const int numberOfChangedProperties = 8; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); var assessmentSection = mocks.Stub(); mocks.ReplayAll(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r21e5ca435e594d16a948ebdaa8a4c648082bb08e -re570ba372fafe1802a4caae2ef9410b64457198b --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs) (revision 21e5ca435e594d16a948ebdaa8a4c648082bb08e) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs) (revision e570ba372fafe1802a4caae2ef9410b64457198b) @@ -206,8 +206,8 @@ // Setup var mocks = new MockRepository(); var observerMock = mocks.StrictMock(); - const int numberProperties = 8; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); + const int numberOfChangedProperties = 8; + observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); var assessmentSection = mocks.Stub(); mocks.ReplayAll();