Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs =================================================================== diff -u -r1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f -r89da36d08725d00bf84c448d980f624f7d14356f --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs (.../DesignWaterLevelLocationPropertiesTest.cs) (revision 1e20f7e689e1e04d3e228e0aa8f71e6bd397dd2f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs (.../DesignWaterLevelLocationPropertiesTest.cs) (revision 89da36d08725d00bf84c448d980f624f7d14356f) @@ -55,7 +55,7 @@ public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new DesignWaterLevelLocationProperties(new TestHydraulicBoundaryLocation(), null); + TestDelegate test = () => new DesignWaterLevelLocationProperties(null); // Assert string paramName = Assert.Throws(test).ParamName; @@ -66,15 +66,14 @@ public void Constructor_ExpectedValues() { // Setup - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); // Call - var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation); + var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation); // Assert Assert.IsInstanceOf(properties); - Assert.AreSame(hydraulicBoundaryLocation, properties.Data); + Assert.AreSame(hydraulicBoundaryLocationCalculation, properties.Data); } [Test] @@ -85,7 +84,7 @@ var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); // Call - var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation); + var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation); // Assert Assert.AreEqual(hydraulicBoundaryLocation.Id, properties.Id); @@ -160,7 +159,7 @@ }; // Call - var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation); + var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation); // Assert Assert.AreEqual(id, properties.Id); @@ -191,11 +190,10 @@ public void Constructor_Always_PropertiesHaveExpectedAttributesValues() { // Setup - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); // Call - var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation); + var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation); // Assert TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true); @@ -297,7 +295,7 @@ hydraulicBoundaryLocation.Attach(observer); - var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation); + var properties = new DesignWaterLevelLocationProperties(hydraulicBoundaryLocationCalculation); // Call properties.ShouldIllustrationPointsBeCalculated = true;