Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionPropertiesTest.cs =================================================================== diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -rdbfba4c1829b1d42f4d99a88f7d8699bc3beeb2a --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionPropertiesTest.cs (.../VariationCoefficientLogNormalDistributionPropertiesTest.cs) (revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionPropertiesTest.cs (.../VariationCoefficientLogNormalDistributionPropertiesTest.cs) (revision dbfba4c1829b1d42f4d99a88f7d8699bc3beeb2a) @@ -56,7 +56,10 @@ var observerableMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var properties = new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock); + var properties = new VariationCoefficientLogNormalDistributionProperties( + VariationCoefficientDistributionPropertiesReadOnly.None, + observerableMock, + null); // Assert Assert.IsNull(properties.Data); @@ -71,7 +74,7 @@ public void Constructor_EditableFieldsAndWithoutObervable_ThrowArgumentException(VariationCoefficientDistributionPropertiesReadOnly flags) { // Call - TestDelegate call = () => new VariationCoefficientLogNormalDistributionProperties(flags, null); + TestDelegate call = () => new VariationCoefficientLogNormalDistributionProperties(flags, null, null); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "Observable must be specified unless no property can be set."); @@ -91,7 +94,7 @@ var observerableMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var properties = new VariationCoefficientLogNormalDistributionProperties(propertiesReadOnly, observerableMock); + var properties = new VariationCoefficientLogNormalDistributionProperties(propertiesReadOnly, observerableMock, null); var meanPropertyName = TypeUtils.GetMemberName(lndvp => lndvp.Mean); var variationCoefficientPropertyName = TypeUtils.GetMemberName(lndvp => lndvp.CoefficientOfVariation); @@ -116,7 +119,7 @@ var observerableMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var properties = new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock); + var properties = new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock, null); var distribution = new VariationCoefficientLogNormalDistribution(2); // Call @@ -134,14 +137,18 @@ [Test] [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All)] [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean)] - public void SetProperties_ReadOnlyMeanWithObserverable_ThrowsArgumentException(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly) + public void Mean_ReadOnlyWithObserverable_ThrowsArgumentException(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly) { // Setup var mockRepository = new MockRepository(); + IPropertyChangeHandler handler = mockRepository.StrictMock(); var observerableMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var properties = new VariationCoefficientLogNormalDistributionProperties(propertiesReadOnly, observerableMock) + var properties = new VariationCoefficientLogNormalDistributionProperties( + propertiesReadOnly, + observerableMock, + handler) { Data = new VariationCoefficientLogNormalDistribution(2) }; @@ -156,15 +163,20 @@ } [Test] - public void SetProperties_MeanWithObserverable_ValueSetNotifyObservers() + public void Mean_WithObserverable_ValueSetNotifyObservers() { // Setup var mockRepository = new MockRepository(); + IPropertyChangeHandler handler = mockRepository.StrictMock(); + handler.Expect(o => o.PropertyChanged()); var observerableMock = mockRepository.StrictMock(); observerableMock.Expect(o => o.NotifyObservers()); mockRepository.ReplayAll(); - var properties = new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock) + var properties = new VariationCoefficientLogNormalDistributionProperties( + VariationCoefficientDistributionPropertiesReadOnly.None, + observerableMock, + handler) { Data = new VariationCoefficientLogNormalDistribution(2) }; @@ -181,14 +193,15 @@ [Test] [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All)] [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation)] - public void SetProperties_ReadOnlyVariationCoefficientWithoutObserverable_ThrowsArgumentException(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly) + public void CoefficientOfVariation_ReadOnlyWithoutObserverable_ThrowsArgumentException(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly) { // Setup - var mocks = new MockRepository(); - var observable = mocks.Stub(); - mocks.ReplayAll(); + var mockRepository = new MockRepository(); + IPropertyChangeHandler handler = mockRepository.StrictMock(); + var observable = mockRepository.Stub(); + mockRepository.ReplayAll(); - var properties = new VariationCoefficientLogNormalDistributionProperties(propertiesReadOnly, observable) + var properties = new VariationCoefficientLogNormalDistributionProperties(propertiesReadOnly, observable, handler) { Data = new VariationCoefficientLogNormalDistribution(2) }; @@ -199,19 +212,24 @@ // Assert string message = Assert.Throws(test).Message; Assert.AreEqual("CoefficientOfVariation is set to be read-only.", message); - mocks.VerifyAll(); + mockRepository.VerifyAll(); } [Test] - public void SetProperties_VariationCoefficientWithObserverable_ValueSetNotifyObservers() + public void CoefficientOfVariation_WithObserverable_ValueSetNotifyObservers() { // Setup var mockRepository = new MockRepository(); + IPropertyChangeHandler handler = mockRepository.StrictMock(); + handler.Expect(o => o.PropertyChanged()); var observerableMock = mockRepository.StrictMock(); observerableMock.Expect(o => o.NotifyObservers()).Repeat.Once(); mockRepository.ReplayAll(); - var properties = new VariationCoefficientLogNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock) + var properties = new VariationCoefficientLogNormalDistributionProperties( + VariationCoefficientDistributionPropertiesReadOnly.None, + observerableMock, + handler) { Data = new VariationCoefficientLogNormalDistribution(2) }; @@ -238,7 +256,7 @@ mockRepository.ReplayAll(); // Call - var properties = new VariationCoefficientLogNormalDistributionProperties(propertiesReadOnly, observerableMock) + var properties = new VariationCoefficientLogNormalDistributionProperties(propertiesReadOnly, observerableMock, null) { Data = new VariationCoefficientLogNormalDistribution(2) };