Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs =================================================================== diff -u -r2529 -r2597 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2529) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2597) @@ -78,6 +78,7 @@ AttributeName = "DIKERINGID", DataSource = "Locationv2.shp" }, + // Head Pl2 will be put in location, Head Pl3 will be put in scenario if not already imported from scenarios.csv new DataAttribute { AttributeId = LocationShapeFileAttributeMap.HeadPl3AttributeId, @@ -87,8 +88,8 @@ new DataAttribute { AttributeId = LocationShapeFileAttributeMap.HeadPl2AttributeId, - AttributeName = "stijgh_m", - DataSource = "winterstijg_zonderDSM.shp" + AttributeName = "PLHIGH", + DataSource = "Polderpeilen.shp" }, } }; @@ -170,9 +171,9 @@ // 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 headpl2 in the import files are: - // In shapefiles: -3.651 for location 1, -3.632 for location 2 + // In shapefiles: -5.37 for both locations // In locations.csv: -99 for both locations - // Expected value in location will be -3.651 for location 1, -3.632 for location 2 + // Expected value in location will be -5.37 for both locations public void ValuesFromShapeFileOverwriteValuesFromLocationsCsv() { SetupInvoer1WithShapeFiles(); @@ -182,10 +183,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("HeadPL2")).ParameterValue); + Assert.AreEqual("-5.37", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL2")).ParameterValue); locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location2Id); - Assert.AreEqual("-3.632", locationDetails.First(x => x.ParameterName.Equals("HeadPL2")).ParameterValue); + Assert.AreEqual("-5.37", locationDetails.First(x => x.ParameterName.Equals("HeadPL2")).ParameterValue); } [Test]