Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs
===================================================================
diff -u -rc61152c80323d74e6f848f5617c33ddeacd5e089 -r2d9d5de4880ea9d1341b820174515aa07ad45752
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs (.../DesignWaterLevelCalculationsProperties.cs) (revision c61152c80323d74e6f848f5617c33ddeacd5e089)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs (.../DesignWaterLevelCalculationsProperties.cs) (revision 2d9d5de4880ea9d1341b820174515aa07ad45752)
@@ -33,13 +33,13 @@
/// ViewModel of a collection of with
/// a design water level calculation result for properties panel.
///
- public class DesignWaterLevelCalculationsProperties : HydraulicBoundaryLocationCalculationsProperties
+ public abstract class DesignWaterLevelCalculationsProperties : HydraulicBoundaryLocationCalculationsProperties
{
///
///
/// Creates a new instance of .
///
- public DesignWaterLevelCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations)
+ protected DesignWaterLevelCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations)
: base(hydraulicBoundaryLocationCalculations) {}
[TypeConverter(typeof(ExpandableArrayConverter))]
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs
===================================================================
diff -u -r628f2f0fb1146e8b4bce994f9d81971adf6791b7 -r2d9d5de4880ea9d1341b820174515aa07ad45752
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs (.../WaveHeightCalculationsProperties.cs) (revision 628f2f0fb1146e8b4bce994f9d81971adf6791b7)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationsProperties.cs (.../WaveHeightCalculationsProperties.cs) (revision 2d9d5de4880ea9d1341b820174515aa07ad45752)
@@ -33,13 +33,13 @@
/// ViewModel of a collection of with
/// a wave height calculation result for properties panel.
///
- public class WaveHeightCalculationsProperties : HydraulicBoundaryLocationCalculationsProperties
+ public abstract class WaveHeightCalculationsProperties : HydraulicBoundaryLocationCalculationsProperties
{
///
///
/// Creates a new instance of .
///
- public WaveHeightCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations)
+ protected WaveHeightCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations)
: base(hydraulicBoundaryLocationCalculations) {}
[TypeConverter(typeof(ExpandableArrayConverter))]
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs
===================================================================
diff -u -r1cbbb2310c2dd1270825700be09b51c5f321cfd2 -r2d9d5de4880ea9d1341b820174515aa07ad45752
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs (.../DesignWaterLevelCalculationsPropertiesTest.cs) (revision 1cbbb2310c2dd1270825700be09b51c5f321cfd2)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs (.../DesignWaterLevelCalculationsPropertiesTest.cs) (revision 2d9d5de4880ea9d1341b820174515aa07ad45752)
@@ -43,7 +43,7 @@
var hydraulicBoundaryLocationCalculations = new ObservableList();
// Call
- var properties = new DesignWaterLevelCalculationsProperties(hydraulicBoundaryLocationCalculations);
+ var properties = new TestDesignWaterLevelCalculationsProperties(hydraulicBoundaryLocationCalculations);
// Assert
Assert.IsInstanceOf(properties);
@@ -57,7 +57,7 @@
public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
{
// Call
- var properties = new DesignWaterLevelCalculationsProperties(new ObservableList());
+ var properties = new TestDesignWaterLevelCalculationsProperties(new ObservableList());
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -78,7 +78,7 @@
var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
// Call
- var properties = new DesignWaterLevelCalculationsProperties(new ObservableList
+ var properties = new TestDesignWaterLevelCalculationsProperties(new ObservableList
{
hydraulicBoundaryLocationCalculation
});
@@ -87,5 +87,11 @@
Assert.AreEqual(1, properties.Calculations.Length);
Assert.AreSame(hydraulicBoundaryLocationCalculation, properties.Calculations[0].Data);
}
+
+ private class TestDesignWaterLevelCalculationsProperties : DesignWaterLevelCalculationsProperties
+ {
+ public TestDesignWaterLevelCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations)
+ : base(hydraulicBoundaryLocationCalculations) {}
+ }
}
}
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs
===================================================================
diff -u -r1cbbb2310c2dd1270825700be09b51c5f321cfd2 -r2d9d5de4880ea9d1341b820174515aa07ad45752
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs (.../WaveHeightCalculationsPropertiesTest.cs) (revision 1cbbb2310c2dd1270825700be09b51c5f321cfd2)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs (.../WaveHeightCalculationsPropertiesTest.cs) (revision 2d9d5de4880ea9d1341b820174515aa07ad45752)
@@ -43,7 +43,7 @@
var hydraulicBoundaryLocationCalculations = new ObservableList();
// Call
- var properties = new WaveHeightCalculationsProperties(hydraulicBoundaryLocationCalculations);
+ var properties = new TestWaveHeightCalculationsProperties(hydraulicBoundaryLocationCalculations);
// Assert
Assert.IsInstanceOf(properties);
@@ -57,7 +57,7 @@
public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
{
// Call
- var properties = new WaveHeightCalculationsProperties(new ObservableList());
+ var properties = new TestWaveHeightCalculationsProperties(new ObservableList());
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -78,7 +78,7 @@
var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
// Call
- var properties = new WaveHeightCalculationsProperties(new ObservableList
+ var properties = new TestWaveHeightCalculationsProperties(new ObservableList
{
hydraulicBoundaryLocationCalculation
});
@@ -87,5 +87,11 @@
Assert.AreEqual(1, properties.Calculations.Length);
Assert.AreSame(hydraulicBoundaryLocationCalculation, properties.Calculations[0].Data);
}
+
+ private class TestWaveHeightCalculationsProperties : WaveHeightCalculationsProperties
+ {
+ public TestWaveHeightCalculationsProperties(IObservableEnumerable hydraulicBoundaryLocationCalculations)
+ : base(hydraulicBoundaryLocationCalculations) {}
+ }
}
}
\ No newline at end of file