Index: src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs
===================================================================
diff -u -r6 -r359
--- src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs (.../SosSoilLayer1DControl.cs) (revision 6)
+++ src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs (.../SosSoilLayer1DControl.cs) (revision 359)
@@ -2,7 +2,6 @@
using Deltares.DSoilModel.Data;
using Deltares.Geotechnics;
using Deltares.Geotechnics.Forms;
-using Deltares.Standard;
using Deltares.Standard.Forms;
using Deltares.Standard.Forms.DExpress;
Index: src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj
===================================================================
diff -u -r353 -r359
--- src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj (.../Deltares.DSoilModel.Forms.Tests.csproj) (revision 353)
+++ src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj (.../Deltares.DSoilModel.Forms.Tests.csproj) (revision 359)
@@ -109,6 +109,7 @@
+
Index: src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs
===================================================================
diff -u
--- src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs (revision 0)
+++ src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs (revision 359)
@@ -0,0 +1,87 @@
+using System.Drawing;
+using Deltares.DSoilModel.Data;
+using Deltares.Geotechnics;
+using Deltares.Standard.Forms;
+using NUnit.Framework;
+
+namespace Deltares.DSoilModel.Forms.Tests
+{
+ [TestFixture, RequiresSTA]
+ class SosSoilLayer1DControlTests : ControlTester
+ {
+ protected override IPropertyControl CreatePropertyControl()
+ {
+ return new SosSoilLayer1DControl();
+ }
+
+ [Test]
+ public void ControlBindingsTest()
+ {
+ var layer = new SosSoilLayer1D
+ {
+ TopLevel = 9.9,
+// BottomLevel = 1.1,
+ MaximumTopLevel = 9,
+ MinimumTopLevel = -1,
+ RemarkTopLevel = "remark testSos1",
+ IsAquifer = true,
+ Soil = new Soil("TestSoil1", Color.Beige)
+ };
+
+ SoilLayer.DomainProvider = new DSoilModelProject();
+
+ PropertyControl.SelectedObject = layer;
+
+ //BindSupport.BindTextAndValue(this, , , typeof(SosSoilLayer1D), "Soil");
+ TestLabelControlVisibleValue(PropertyControl, "SoilLabel", true, "Grondsoort");
+// TestTextEditVisibleEnabledValue(PropertyControl, "SoilEdit", true, true, layer, l => l.Soil, new Soil()); // TODO: combobox without signs of the soil data
+
+ TestLabelControlVisibleValue(PropertyControl, "TopLabel", true, "Bovenkant [m NAP]");
+ TestSpinEditVisibleEnabledValue(PropertyControl, "TopEdit", true, true, layer, l => l.TopLevel, 9.1);
+ TestLabelControlVisibleValue(PropertyControl, "BottomLabel", true, "Onderkant [m NAP]");
+// TestSpinEditVisibleEnabledValue(PropertyControl, "BottomEdit", true, true, layer, l => l.BottomLevel, 2.2); // TODO: crazy property
+ TestLabelControlVisibleValue(PropertyControl, "HeightLabel", true, "Hoogte [m]");
+ TestSpinEditVisibleEnabledValue(PropertyControl, "HeightEdit", true, false, layer, l => l.Height); // only getter
+ TestLabelControlVisibleValue(PropertyControl, "MaxDepthTopLevelLabel", true, "Maximale waarde bovenkant [m]");
+// TestSpinEditVisibleEnabledValue(PropertyControl, "MaxDepthTopLevelEdit", true, false, layer, l => l.MaximumTopLevel); // TODO: null-able property
+ TestLabelControlVisibleValue(PropertyControl, "MinDepthTopLevelLabel", true, "Minimale waarde bovenkant [m]");
+// TestSpinEditVisibleEnabledValue(PropertyControl, "MinDepthTopLevelEdit", true, false, layer, l => l.MinimumTopLevel); // TODO: null-able property
+ TestLabelControlVisibleValue(PropertyControl, "RemarkTopLevelLabel", true, "Opmerking");
+ TestTextEditVisibleEnabledValue(PropertyControl, "RemarkTopLevelEdit", true, false, layer, l => l.RemarkTopLevel, "Other remark");
+
+ TestCheckEditVisibleEnabledValue(PropertyControl, "AquiferCheckEdit", true, true, layer, l => l.IsAquifer, "Is aquifer", false);
+ }
+
+ [Test]
+ public void TestSelectedObject_SosSoilLayer1D()
+ {
+ var layer = new SosSoilLayer1D();
+ SoilLayer.DomainProvider = new DSoilModelProject();
+
+ Assert.AreNotSame(layer, PropertyControl.SelectedObject);
+
+ PropertyControl.SelectedObject = layer;
+ Assert.AreSame(layer, PropertyControl.SelectedObject);
+ }
+
+ [Test]
+ public void TestSelectedObject_SoilLayerSurface()
+ {
+ SoilLayer.DomainProvider = new DSoilModelProject();
+
+ var layerSurface = new SoilLayerSurface();
+ layerSurface.SoilLayer = new SosSoilLayer1D();
+
+ Assert.AreNotSame(layerSurface.SoilLayer, PropertyControl.SelectedObject);
+
+ PropertyControl.SelectedObject = layerSurface;
+ Assert.AreSame(layerSurface.SoilLayer, PropertyControl.SelectedObject);
+ }
+
+ [Test]
+ public void TestIsVisible_AlwaysTrue()
+ {
+ Assert.IsTrue(PropertyControl.IsVisible);
+ }
+ }
+}