Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/LogNormalDistributionVariationPropertiesTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r9050ad5f3a80e630b2fcc092942a40d6343286a0
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/LogNormalDistributionVariationPropertiesTest.cs	(.../LogNormalDistributionVariationPropertiesTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/LogNormalDistributionVariationPropertiesTest.cs	(.../LogNormalDistributionVariationPropertiesTest.cs)	(revision 9050ad5f3a80e630b2fcc092942a40d6343286a0)
@@ -40,59 +40,65 @@
     [TestFixture]
     public class LogNormalDistributionVariationPropertiesTest
     {
-        private MockRepository mockRepository;
-
-        [SetUp]
-        public void SetUp()
-        {
-            mockRepository = new MockRepository();
-        }
-
         [Test]
         public void Constructor_WithoutParameters_ExpectedValues()
         {
             // Call
             var properties = new LogNormalDistributionVariationProperties();
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<IDistribution>>(properties);
+            Assert.IsInstanceOf<VariationCoefficientDistributionPropertiesBase<VariationCoefficientLogNormalDistribution>>(properties);
             Assert.IsNull(properties.Data);
-            Assert.AreEqual("Variatiecoëfficiënt", properties.ToString());
             Assert.AreEqual("Lognormaal", properties.DistributionType);
         }
 
         [Test]
         public void Constructor_WithParameters_ExpectedValues()
         {
             // Call
+            var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
-            var properties = new LogNormalDistributionVariationProperties(observerableMock, DistributionPropertiesReadOnly.None);
 
+            var properties = new LogNormalDistributionVariationProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock);
+
             // Assert
             Assert.IsNull(properties.Data);
-            Assert.AreEqual("Variatiecoëfficiënt", properties.ToString());
             Assert.AreEqual("Lognormaal", properties.DistributionType);
             mockRepository.VerifyAll();
         }
 
         [Test]
-        [TestCase(DistributionPropertiesReadOnly.All, true, true)]
-        [TestCase(DistributionPropertiesReadOnly.Mean, true, false)]
-        [TestCase(DistributionPropertiesReadOnly.None, false, false)]
-        [TestCase(DistributionPropertiesReadOnly.StandardDeviation, false, false)]
-        [TestCase(DistributionPropertiesReadOnly.VariationCoefficient, false, true)]
-        public void DynamicReadOnlyValidationMethod_VariousReadOnlySet_ExpectedValues(DistributionPropertiesReadOnly propertiesReadOnly,
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None)]
+        public void Constructor_EditableFieldsAndWithoutObervable_ThrowArgumentException(VariationCoefficientDistributionPropertiesReadOnly flags)
+        {
+            // Call
+            TestDelegate call = () => new LogNormalDistributionVariationProperties(flags, null);
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "Observable must be specified unless no property can be set.");
+        }
+
+        [Test]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All, true, true)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean, true, false)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None, false, false)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, false, true)]
+        public void DynamicReadOnlyValidationMethod_VariousReadOnlySet_ExpectedValues(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly,
                                                                                       bool expectMeanReadOnly,
                                                                                       bool expectVariarionCoefficient)
         {
             // Setup
+            var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
-            var properties = new LogNormalDistributionVariationProperties(observerableMock, propertiesReadOnly);
 
+            var properties = new LogNormalDistributionVariationProperties(propertiesReadOnly, observerableMock);
+
             var meanPropertyName = TypeUtils.GetMemberName<LogNormalDistributionVariationProperties>(lndvp => lndvp.Mean);
-            var variationCoefficientPropertyName = TypeUtils.GetMemberName<LogNormalDistributionVariationProperties>(lndvp => lndvp.VariationCoefficient);
+            var variationCoefficientPropertyName = TypeUtils.GetMemberName<LogNormalDistributionVariationProperties>(lndvp => lndvp.CoefficientOfVariation);
 
             // Call
             var meanIsReadOnly = properties.DynamicReadOnlyValidationMethod(meanPropertyName);
@@ -110,78 +116,62 @@
         public void Data_SetNewDistributionContextInstance_ReturnCorrectPropertyValues()
         {
             // Setup
+            var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
 
-            var properties = new LogNormalDistributionVariationProperties(observerableMock, DistributionPropertiesReadOnly.None);
-            var distribution = new LogNormalDistribution(2);
+            var properties = new LogNormalDistributionVariationProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock);
+            var distribution = new VariationCoefficientLogNormalDistribution(2);
 
             // Call
             properties.Data = distribution;
 
             // Assert
             Assert.AreEqual(distribution.Mean, properties.Mean);
-            Assert.AreEqual(distribution.GetVariationCoefficient(), properties.VariationCoefficient);
+            Assert.AreEqual(distribution.CoefficientOfVariation, properties.CoefficientOfVariation);
             var expectedToString = string.Format("{0} ({1} = {2})", distribution.Mean, Resources.Distribution_VariationCoefficient_DisplayName,
-                                                 distribution.GetVariationCoefficient());
+                                                 distribution.CoefficientOfVariation);
             Assert.AreEqual(expectedToString, properties.ToString());
             mockRepository.VerifyAll();
         }
 
         [Test]
-        [TestCase(DistributionPropertiesReadOnly.None)]
-        [TestCase(DistributionPropertiesReadOnly.StandardDeviation)]
-        [TestCase(DistributionPropertiesReadOnly.VariationCoefficient)]
-        public void SetProperties_EditableMeanWithoutObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean)]
+        public void SetProperties_ReadOnlyMeanWithObserverable_ThrowsArgumentException(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly)
         {
             // Setup
-            var properties = new LogNormalDistributionVariationProperties(null, propertiesReadOnly)
-            {
-                Data = new LogNormalDistribution(2)
-            };
-
-            // Call
-            TestDelegate test = () => properties.Mean = new RoundedDouble(2, 20);
-
-            // Assert
-            const string expectedMessage = "No observerable object set.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
-        }
-
-        [Test]
-        [TestCase(DistributionPropertiesReadOnly.All)]
-        [TestCase(DistributionPropertiesReadOnly.Mean)]
-        public void SetProperties_ReadOnlyMeanWithObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
-        {
-            // Setup
+            var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
 
-            var properties = new LogNormalDistributionVariationProperties(observerableMock, propertiesReadOnly)
+            var properties = new LogNormalDistributionVariationProperties(propertiesReadOnly, observerableMock)
             {
-                Data = new LogNormalDistribution(2)
+                Data = new VariationCoefficientLogNormalDistribution(2)
             };
 
             // Call
             TestDelegate test = () => properties.Mean = new RoundedDouble(2, 20);
 
             // Assert
-            const string expectedMessage = "Mean is set to be read-only.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
+            string message = Assert.Throws<InvalidOperationException>(test).Message;
+            Assert.AreEqual("Mean is set to be read-only.", message);
             mockRepository.VerifyAll();
         }
 
         [Test]
         public void SetProperties_MeanWithObserverable_ValueSetNotifyObservers()
         {
             // Setup
+            var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
-            observerableMock.Expect(o => o.NotifyObservers()).Repeat.Once();
-            var properties = new LogNormalDistributionVariationProperties(observerableMock, DistributionPropertiesReadOnly.None)
+            observerableMock.Expect(o => o.NotifyObservers());
+            mockRepository.ReplayAll();
+
+            var properties = new LogNormalDistributionVariationProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock)
             {
-                Data = new LogNormalDistribution(2)
+                Data = new VariationCoefficientLogNormalDistribution(2)
             };
-            mockRepository.ReplayAll();
             RoundedDouble newMeanValue = new RoundedDouble(3, 20);
 
             // Call
@@ -193,79 +183,68 @@
         }
 
         [Test]
-        [TestCase(DistributionPropertiesReadOnly.None)]
-        [TestCase(DistributionPropertiesReadOnly.Mean)]
-        public void SetProperties_EditableVariationCoefficientWithoutObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation)]
+        public void SetProperties_ReadOnlyVariationCoefficientWithoutObserverable_ThrowsArgumentException(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly)
         {
             // Setup
-            var properties = new LogNormalDistributionVariationProperties(null, propertiesReadOnly)
-            {
-                Data = new LogNormalDistribution(2)
-            };
+            var mocks = new MockRepository();
+            var observable = mocks.Stub<IObservable>();
+            mocks.ReplayAll();
 
-            // Call
-            TestDelegate test = () => properties.VariationCoefficient = new RoundedDouble(2, 20);
-
-            // Assert
-            const string expectedMessage = "No observerable object set.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
-        }
-
-        [Test]
-        [TestCase(DistributionPropertiesReadOnly.All)]
-        [TestCase(DistributionPropertiesReadOnly.VariationCoefficient)]
-        public void SetProperties_ReadOnlyVariationCoefficientWithoutObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
-        {
-            // Setup
-            var properties = new LogNormalDistributionVariationProperties(null, propertiesReadOnly)
+            var properties = new LogNormalDistributionVariationProperties(propertiesReadOnly, observable)
             {
-                Data = new LogNormalDistribution(2)
+                Data = new VariationCoefficientLogNormalDistribution(2)
             };
 
             // Call
-            TestDelegate test = () => properties.VariationCoefficient = new RoundedDouble(2, 20);
+            TestDelegate test = () => properties.CoefficientOfVariation = new RoundedDouble(2, 20);
 
             // Assert
-            const string expectedMessage = "Variation coefficient is set to be read-only.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
+            string message = Assert.Throws<InvalidOperationException>(test).Message;
+            Assert.AreEqual("CoefficientOfVariation is set to be read-only.", message);
+            mocks.VerifyAll();
         }
 
         [Test]
         public void SetProperties_VariationCoefficientWithObserverable_ValueSetNotifyObservers()
         {
             // Setup
+            var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
             observerableMock.Expect(o => o.NotifyObservers()).Repeat.Once();
-            var properties = new LogNormalDistributionVariationProperties(observerableMock, DistributionPropertiesReadOnly.None)
+            mockRepository.ReplayAll();
+
+            var properties = new LogNormalDistributionVariationProperties(VariationCoefficientDistributionPropertiesReadOnly.None, observerableMock)
             {
-                Data = new LogNormalDistribution(2)
+                Data = new VariationCoefficientLogNormalDistribution(2)
             };
-            mockRepository.ReplayAll();
             RoundedDouble newVariationCoefficientValue = new RoundedDouble(2, 20);
 
             // Call
-            properties.VariationCoefficient = newVariationCoefficientValue;
+            properties.CoefficientOfVariation = newVariationCoefficientValue;
 
             // Assert
-            Assert.AreEqual(newVariationCoefficientValue, properties.VariationCoefficient);
+            Assert.AreEqual(newVariationCoefficientValue, properties.CoefficientOfVariation);
             mockRepository.VerifyAll();
         }
 
         [Test]
-        [TestCase(DistributionPropertiesReadOnly.All, true, true)]
-        [TestCase(DistributionPropertiesReadOnly.Mean, true, false)]
-        [TestCase(DistributionPropertiesReadOnly.None, false, false)]
-        [TestCase(DistributionPropertiesReadOnly.VariationCoefficient, false, true)]
-        public void PropertyAttributes_ReturnExpectedValues(DistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectVariationCoefficientReadOnly)
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All, true, true)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean, true, false)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None, false, false)]
+        [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, false, true)]
+        public void PropertyAttributes_ReturnExpectedValues(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectVariationCoefficientReadOnly)
         {
             // Setup
+            var mockRepository = new MockRepository();
             var observerableMock = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
 
             // Call
-            var properties = new LogNormalDistributionVariationProperties(observerableMock, propertiesReadOnly)
+            var properties = new LogNormalDistributionVariationProperties(propertiesReadOnly, observerableMock)
             {
-                Data = new LogNormalDistribution(2)
+                Data = new VariationCoefficientLogNormalDistribution(2)
             };
 
             // Assert
@@ -294,7 +273,7 @@
                                                                            "De gemiddelde waarde van de lognormale verdeling.",
                                                                            attribute => attribute.Description);
 
-            var variationCoefficientPropertyName = TypeUtils.GetMemberName<LogNormalDistributionVariationProperties>(ndp => ndp.VariationCoefficient);
+            var variationCoefficientPropertyName = TypeUtils.GetMemberName<LogNormalDistributionVariationProperties>(ndp => ndp.CoefficientOfVariation);
             PropertyDescriptor variationCoefficientProperty = dynamicProperties.Find(variationCoefficientPropertyName, false);
             Assert.AreEqual(expectVariationCoefficientReadOnly, variationCoefficientProperty.IsReadOnly);
             AssertAttributeProperty<ResourcesDisplayNameAttribute, string>(variationCoefficientProperty.Attributes, "Variatiecoëfficiënt",