Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs =================================================================== diff -u -r2512 -r2529 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2512) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2529) @@ -84,12 +84,19 @@ AttributeName = "stijgh_m", DataSource = "winterstijg_zonderDSM.shp" }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.HeadPl2AttributeId, + AttributeName = "stijgh_m", + DataSource = "winterstijg_zonderDSM.shp" + }, } }; dataPluginImporter.SetDataSources("", srcDataSources); } + private void SetupInvoer1WithoutShapeFiles() { srcDataSources = new List @@ -162,7 +169,7 @@ [Test] // Some parameters for location can be read from either locations.csv or shapefile // The value from shapefile overwrites the value from locations.csv - // In this test the values for headpl3 in the import files are: + // In this test the values for headpl2 in the import files are: // In shapefiles: -3.651 for location 1, -3.632 for location 2 // In locations.csv: -99 for both locations // Expected value in location will be -3.651 for location 1, -3.632 for location 2 @@ -175,10 +182,10 @@ IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location1Id); var nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); Assert.IsTrue(nameValueParameters.Any()); - Assert.AreEqual("-3.651", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("-3.651", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL2")).ParameterValue); locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location2Id); - Assert.AreEqual("-3.632", locationDetails.First(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("-3.632", locationDetails.First(x => x.ParameterName.Equals("HeadPL2")).ParameterValue); } [Test]