Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r875 -r1604 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 1604) @@ -67,7 +67,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Ignore; // call var actual = sensorLocation.IsValid(); @@ -81,7 +81,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; // call var actual = sensorLocation.IsValid(); @@ -95,7 +95,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; // call var actual = sensorLocation.IsValid(); @@ -109,7 +109,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Ignore; // call var actual = sensorLocation.IsValid(); @@ -123,7 +123,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; // call var actual = sensorLocation.IsValid(); @@ -137,7 +137,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; // call var actual = sensorLocation.IsValid(); @@ -151,7 +151,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL3 = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Ignore; // call var actual = sensorLocation.IsValid(); @@ -165,7 +165,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL3 = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl3 = DataSourceTypeSensors.LocationData; // call var actual = sensorLocation.IsValid(); @@ -179,7 +179,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; // call var actual = sensorLocation.IsValid(); @@ -194,7 +194,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL4 = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Ignore; // call var actual = sensorLocation.IsValid(); @@ -208,7 +208,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL4 = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl4 = DataSourceTypeSensors.LocationData; // call var actual = sensorLocation.IsValid(); @@ -222,7 +222,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL4 = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor; // call var actual = sensorLocation.IsValid(); @@ -236,7 +236,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; // call var actual = sensorLocation.IsValid(); @@ -250,7 +250,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData; // call var actual = sensorLocation.IsValid(); @@ -264,7 +264,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor; // call var actual = sensorLocation.IsValid(); @@ -278,7 +278,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; // call var actual = sensorLocation.IsValid(); @@ -292,7 +292,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; // call var actual = sensorLocation.IsValid(); @@ -306,7 +306,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor; // call var actual = sensorLocation.IsValid(); @@ -320,7 +320,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; // call var actual = sensorLocation.IsValid(); @@ -334,7 +334,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; // call var actual = sensorLocation.IsValid(); @@ -348,7 +348,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor; // call var actual = sensorLocation.IsValid(); @@ -362,7 +362,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; // call var actual = sensorLocation.IsValid(); @@ -376,7 +376,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; // call var actual = sensorLocation.IsValid(); @@ -390,7 +390,7 @@ { // setup var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor; // call var actual = sensorLocation.IsValid(); @@ -409,14 +409,14 @@ { Group = null, Location = location1, - PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData, - PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData, - PL3 = DataSourceTypeSensors.LocationData, - PL4 = DataSourceTypeSensors.LocationData + SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData, + SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData, + SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData, + SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData, + SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData, + SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData, + SourceTypePl3 = DataSourceTypeSensors.LocationData, + SourceTypePl4 = DataSourceTypeSensors.LocationData }; // call @@ -493,10 +493,10 @@ var sensorValues = new Dictionary { {sensor, sensorValue}}; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -512,10 +512,10 @@ var sensorLocation = CreateValidSensorLocation(); location.PlLineOffsetBelowDikeToeAtPolder = testValue; - sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); // assert Assert.AreEqual(testValue, actualValue); @@ -530,10 +530,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -548,10 +548,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -567,10 +567,10 @@ var sensorLocation = CreateValidSensorLocation(); location.PlLineOffsetBelowDikeTopAtPolder = testValue; - sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); // assert Assert.AreEqual(testValue, actualValue); @@ -585,10 +585,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Sensor; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -603,10 +603,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -622,10 +622,10 @@ var sensorLocation = CreateValidSensorLocation(); location.PlLineOffsetBelowDikeTopAtRiver = testValue; - sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); // assert Assert.AreEqual(testValue, actualValue); @@ -640,10 +640,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Sensor; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -658,10 +658,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowShoulderBaseInside, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -677,10 +677,10 @@ var sensorLocation = CreateValidSensorLocation(); location.PlLineOffsetBelowShoulderBaseInside = testValue; - sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowShoulderBaseInside, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor); // assert Assert.AreEqual(testValue, actualValue); @@ -695,10 +695,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Sensor; // call - var actualValue = sensorLocation.GetValue(x => x.PL1PLLineOffsetBelowShoulderBaseInside, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -713,10 +713,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Ignore; // call - var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -732,10 +732,10 @@ var sensorLocation = CreateValidSensorLocation(); location.PolderLevel = testValue; - sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; // call - var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor); // assert Assert.AreEqual(testValue, actualValue); @@ -750,10 +750,10 @@ var sensorValues = new Dictionary { { sensor, expectedValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; // call - var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtPolder, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor); // assert Assert.AreEqual(expectedValue, actualValue); @@ -768,10 +768,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Ignore; // call - var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtRiver, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -789,10 +789,10 @@ location.RiverLevel = testValue; Assert.AreEqual(testValue, location.RiverLevel); - sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; // call - var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtRiver, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor); // assert Assert.AreEqual(testValue, actualValue); @@ -807,10 +807,10 @@ var sensorValues = new Dictionary { { sensor, expectedValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; // call - var actualValue = sensorLocation.GetValue(x => x.PL1WaterLevelAtRiver, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor); // assert Assert.AreEqual(expectedValue, actualValue); @@ -825,10 +825,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL3 = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Ignore; // call - var actualValue = sensorLocation.GetValue(x => x.PL3, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -844,10 +844,10 @@ var sensorLocation = CreateValidSensorLocation(); location.HeadPl3 = testValue; - sensorLocation.PL3 = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl3 = DataSourceTypeSensors.LocationData; // call - var actualValue = sensorLocation.GetValue(x => x.PL3, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor); // assert Assert.AreEqual(testValue, actualValue); @@ -862,10 +862,10 @@ var sensorValues = new Dictionary { { sensor, expectedValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL3 = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl3 = DataSourceTypeSensors.Sensor; // call - var actualValue = sensorLocation.GetValue(x => x.PL3, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor); // assert Assert.AreEqual(expectedValue, actualValue); @@ -880,10 +880,10 @@ var sensorValues = new Dictionary { { sensor, sensorValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL4 = DataSourceTypeSensors.Ignore; + sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Ignore; // call - var actualValue = sensorLocation.GetValue(x => x.PL4, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor); // assert Assert.IsNull(actualValue); @@ -899,10 +899,10 @@ var sensorLocation = CreateValidSensorLocation(); location.HeadPl4 = testValue; - sensorLocation.PL4 = DataSourceTypeSensors.LocationData; + sensorLocation.SourceTypePl4 = DataSourceTypeSensors.LocationData; // call - var actualValue = sensorLocation.GetValue(x => x.PL4, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor); // assert Assert.AreEqual(testValue, actualValue); @@ -917,10 +917,10 @@ var sensorValues = new Dictionary { { sensor, expectedValue } }; var sensorLocation = CreateValidSensorLocation(); - sensorLocation.PL4 = DataSourceTypeSensors.Sensor; + sensorLocation.SourceTypePl4 = DataSourceTypeSensors.Sensor; // call - var actualValue = sensorLocation.GetValue(x => x.PL4, sensorValues, sensor); + var actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor); // assert Assert.AreEqual(expectedValue, actualValue); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorFactory.cs =================================================================== diff -u -r1545 -r1604 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorFactory.cs (.../SensorFactory.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorFactory.cs (.../SensorFactory.cs) (revision 1604) @@ -69,14 +69,14 @@ { Group = group, Location = location, - PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData, - PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData, - PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData, - PL3 = DataSourceTypeSensors.LocationData, - PL4 = DataSourceTypeSensors.LocationData + SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData, + SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData, + SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData, + SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData, + SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData, + SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData, + SourceTypePl3 = DataSourceTypeSensors.LocationData, + SourceTypePl4 = DataSourceTypeSensors.LocationData }; } } Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs =================================================================== diff -u -r875 -r1604 --- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs (.../Program.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs (.../Program.cs) (revision 1604) @@ -488,14 +488,14 @@ var sensorData = location.SensorData; sensorData.Group.ID = record.GroupID; sensorData.Alias = record.Alias; - sensorData.PL1WaterLevelAtRiver = record.InputPL1OuterWaterLevel; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder; - sensorData.PL1WaterLevelAtPolder = record.InputPL1PolderLevel; - sensorData.PL3 = record.InputPL3; - sensorData.PL4 = record.InputPL4; + sensorData.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel; + sensorData.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver; + sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder; + sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside; + sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder; + sensorData.SourceTypePl1WaterLevelAtPolder = record.InputPL1PolderLevel; + sensorData.SourceTypePl3 = record.InputPL3; + sensorData.SourceTypePl4 = record.InputPL4; } catch (Exception e) { Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs =================================================================== diff -u -r875 -r1604 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../branches/CalcualtionIncluded/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs) (revision 1604) @@ -1,4 +1,25 @@ -using System; +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of the application DAM - UI. +// +// DAM - UI is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -75,13 +96,13 @@ { Assert.IsTrue(sensorIds.Contains(sensor.ID), String.Format("Sensor Id {0} not part of expected list", sensor.ID)); } - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.PL1PLLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.PL1PLLineOffsetBelowDikeTopAtRiver); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.PL1PLLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorData.PL1WaterLevelAtRiver); - Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.PL1WaterLevelAtPolder); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.PL3); - Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.PL4); + Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder); + Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver); + Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside); + Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorData.SourceTypePl1WaterLevelAtRiver); + Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.SourceTypePl1WaterLevelAtPolder); + Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl3); + Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.SourceTypePl4); Assert.AreEqual(-1.33, sensorData.PolderLevel, cTolerance); Assert.AreEqual(0.8, sensorData.HeadPl3, cTolerance); Assert.AreEqual(0.8, sensorData.HeadPl4, cTolerance); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs =================================================================== diff -u -r1545 -r1604 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs (.../SensorImportFromExcelSheet.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs (.../SensorImportFromExcelSheet.cs) (revision 1604) @@ -303,14 +303,14 @@ var sensorData = location.SensorData; sensorData.Group.ID = record.GroupID; sensorData.Alias = record.Alias; - sensorData.PL1WaterLevelAtRiver = record.InputPL1OuterWaterLevel; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder; - sensorData.PL1WaterLevelAtPolder = record.InputPL1PolderLevel; - sensorData.PL3 = record.InputPL3; - sensorData.PL4 = record.InputPL4; + sensorData.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel; + sensorData.SourceTypePl1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver; + sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder; + sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside; + sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder; + sensorData.SourceTypePl1WaterLevelAtPolder = record.InputPL1PolderLevel; + sensorData.SourceTypePl3 = record.InputPL3; + sensorData.SourceTypePl4 = record.InputPL4; } catch (Exception e) { Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs =================================================================== diff -u -r1545 -r1604 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 1545) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 1604) @@ -79,8 +79,8 @@ [Browsable(false)] public SensorLocation() { - PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; - PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; + SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; } private Group sensorGroup; @@ -212,7 +212,7 @@ /// [Specification(typeof(SensorOrLocationData))] [PropertyOrder(1, 12)] - public DataSourceTypeSensors PL3 { get; set; } + public DataSourceTypeSensors SourceTypePl3 { get; set; } /// /// Gets or sets the PL4 data source type. @@ -222,7 +222,7 @@ /// [Specification(typeof(SensorOrLocationData))] [PropertyOrder(1, 13)] - public DataSourceTypeSensors PL4 { get; set; } + public DataSourceTypeSensors SourceTypePl4 { get; set; } /// @@ -233,7 +233,7 @@ /// [Specification(typeof(SensorOrLocationData))] [PropertyOrder(1, 6)] - public DataSourceTypeSensors PL1WaterLevelAtRiver { get; set; } + public DataSourceTypeSensors SourceTypePl1WaterLevelAtRiver { get; set; } /// /// Gets or sets the PL1 PL line offset below dike top at river data source type. @@ -243,7 +243,7 @@ /// [Specification(typeof(IgnoreOrLocationData))] [PropertyOrder(1, 7)] - public DataSourceTypeSensors PL1PLLineOffsetBelowDikeTopAtRiver { get; set; } + public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtRiver { get; set; } /// /// Gets or sets the PL1 PL line offset below dike top at polder data source type @@ -253,7 +253,7 @@ /// [Specification(typeof(IgnoreOrLocationData))] [PropertyOrder(1, 8)] - public DataSourceTypeSensors PL1PLLineOffsetBelowDikeTopAtPolder { get; set; } + public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtPolder { get; set; } /// /// Gets or sets the PL1 PL line offset below shoulder base inside data source type @@ -263,7 +263,7 @@ /// [Specification(typeof(IgnoreOrLocationData))] [PropertyOrder(1, 9)] - public DataSourceTypeSensors PL1PLLineOffsetBelowShoulderBaseInside { get; set; } + public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowShoulderBaseInside { get; set; } /// /// Gets or sets the PL1 PL line offset below dike toe at polder data source type. @@ -273,7 +273,7 @@ /// [Specification(typeof(IgnoreOrLocationData))] [PropertyOrder(1, 10)] - public DataSourceTypeSensors PL1PLLineOffsetBelowDikeToeAtPolder { get; set; } + public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeToeAtPolder { get; set; } /// /// Gets or sets the PL1 polder level data source type. @@ -283,7 +283,7 @@ /// [Specification(typeof(SensorOrLocationData))] [PropertyOrder(1, 11)] - public DataSourceTypeSensors PL1WaterLevelAtPolder { get; set; } + public DataSourceTypeSensors SourceTypePl1WaterLevelAtPolder { get; set; } /// /// Gets the sensor count. @@ -401,14 +401,14 @@ internal static class MemberNames { - internal static readonly string OffsetBelowDikeToeAtPolder = StaticReflection.GetMemberName(x => x.PL1PLLineOffsetBelowDikeToeAtPolder); - internal static readonly string OffsetBelowDikeTopAtPolder = StaticReflection.GetMemberName(x => x.PL1PLLineOffsetBelowDikeTopAtPolder); - internal static readonly string OffsetBelowDikeTopAtRiver = StaticReflection.GetMemberName(x => x.PL1PLLineOffsetBelowDikeTopAtRiver); - internal static readonly string OffsetBelowShoulderBaseInside = StaticReflection.GetMemberName(x => x.PL1PLLineOffsetBelowShoulderBaseInside); - internal static readonly string WaterLevelAtRiver = StaticReflection.GetMemberName(x => x.PL1WaterLevelAtRiver); - internal static readonly string PolderLevel = StaticReflection.GetMemberName(x => x.PL1WaterLevelAtPolder); - internal static readonly string PL3 = StaticReflection.GetMemberName(x => x.PL3); - internal static readonly string PL4 = StaticReflection.GetMemberName(x => x.PL4); + internal static readonly string OffsetBelowDikeToeAtPolder = StaticReflection.GetMemberName(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder); + internal static readonly string OffsetBelowDikeTopAtPolder = StaticReflection.GetMemberName(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder); + internal static readonly string OffsetBelowDikeTopAtRiver = StaticReflection.GetMemberName(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver); + internal static readonly string OffsetBelowShoulderBaseInside = StaticReflection.GetMemberName(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside); + internal static readonly string WaterLevelAtRiver = StaticReflection.GetMemberName(x => x.SourceTypePl1WaterLevelAtRiver); + internal static readonly string PolderLevel = StaticReflection.GetMemberName(x => x.SourceTypePl1WaterLevelAtPolder); + internal static readonly string PL3 = StaticReflection.GetMemberName(x => x.SourceTypePl3); + internal static readonly string PL4 = StaticReflection.GetMemberName(x => x.SourceTypePl4); } public double? GetValue(Expression> expression, IDictionary sensorValues, Sensor sensor) @@ -423,61 +423,61 @@ if (memberName == MemberNames.OffsetBelowDikeToeAtPolder) { - if (PL1PLLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData) + if (SourceTypePl1PlLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData) return Location.PlLineOffsetBelowDikeToeAtPolder; } if (memberName == MemberNames.OffsetBelowDikeTopAtPolder) { - if (PL1PLLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData) + if (SourceTypePl1PlLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData) return Location.PlLineOffsetBelowDikeTopAtPolder; } if (memberName == MemberNames.OffsetBelowDikeTopAtRiver) { - if (PL1PLLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData) + if (SourceTypePl1PlLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData) return Location.PlLineOffsetBelowDikeTopAtRiver; } if (memberName == MemberNames.OffsetBelowShoulderBaseInside) { - if (PL1PLLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData) + if (SourceTypePl1PlLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData) return Location.PlLineOffsetBelowShoulderBaseInside; } if (memberName == MemberNames.WaterLevelAtRiver) { - if (PL1WaterLevelAtRiver == DataSourceTypeSensors.LocationData) + if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.LocationData) return Location.RiverLevel; - if (PL1WaterLevelAtRiver == DataSourceTypeSensors.Sensor) + if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; } if (memberName == MemberNames.PolderLevel) { - if (PL1WaterLevelAtPolder == DataSourceTypeSensors.LocationData) + if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData) return Location.PolderLevel; - if (PL1WaterLevelAtPolder == DataSourceTypeSensors.Sensor) + if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; } if (memberName == MemberNames.PL3) { - if (PL3 == DataSourceTypeSensors.LocationData) + if (SourceTypePl3 == DataSourceTypeSensors.LocationData) return Location.HeadPl3; - if (PL3 == DataSourceTypeSensors.Sensor) + if (SourceTypePl3 == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; } if (memberName == MemberNames.PL4) { - if (PL4 == DataSourceTypeSensors.LocationData) + if (SourceTypePl4 == DataSourceTypeSensors.LocationData) return Location.HeadPl4; - if (PL4 == DataSourceTypeSensors.Sensor) + if (SourceTypePl4 == DataSourceTypeSensors.Sensor) return sensorValues[sensor]; }