Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r1609 -r1664 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 1609) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 1664) @@ -463,9 +463,9 @@ var repository = new SensorRepository(testLocation); repository.Add(new[] { sensor1, sensor2, sensor3 }); - testLocation.SensorData.SurfaceLine.EnsurePointOfType(0, 0, 0, CharacteristicPointType.SurfaceLevelOutside); + testLocation.SensorLocation.SurfaceLine.EnsurePointOfType(0, 0, 0, CharacteristicPointType.SurfaceLevelOutside); - var table = testLocation.SensorData.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).ToList(); + var table = testLocation.SensorLocation.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).ToList(); Assert.AreEqual(5, table.ElementAt(0).Key); Assert.AreEqual(10, table.ElementAt(1).Key); @@ -476,7 +476,7 @@ Assert.AreEqual(12, table[2].Key); var sortedSensors = - testLocation.SensorData.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).Select(s => s.Value).ToList(); + testLocation.SensorLocation.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).Select(s => s.Value).ToList(); Assert.AreEqual(5, sortedSensors[0].RelativeLocation); Assert.AreEqual(10, sortedSensors[1].RelativeLocation); Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs =================================================================== diff -u -r1609 -r1664 --- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 1609) +++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 1664) @@ -89,7 +89,7 @@ //damProject.SaveXMLProject(projectFilename, damProject); // Check data for the second location - var sensorData = dike.Locations[1].SensorData; + var sensorData = dike.Locations[1].SensorLocation; Assert.AreEqual(4, sensorData.SensorCount); var sensorIds = (new int[] { 0, 10, 11, 12 }).ToList(); foreach (var sensor in sensorData.Sensors)