Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs =================================================================== diff -u -r2491 -r2506 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2491) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2506) @@ -160,6 +160,12 @@ } [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 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 public void ValuesFromShapeFileOverwriteValuesFromLocationsCsv() { SetupInvoer1WithShapeFiles(); @@ -176,6 +182,13 @@ } [Test] + // Some parameters for scenario can be read from either locations.csv, shapefile or scenarios.csv + // The value from scenarios.csv overwrites the value from shapefile, which overwrites the value from locations.csv + // In this test the values for headpl3 in the import files are: + // In scenarios.csv: not defined + // In shapefiles: not defined + // In locations.csv: -99 for both locations + // Expected value in scenario will be -99 public void ValuesFromLocationsCsvAreCopiedToScenarioIfNotDefinedInScenariosCsvOrShapeFile() { SetupInvoer1WithoutShapeFiles(); @@ -193,6 +206,13 @@ } [Test] + // Some parameters for scenario can be read from either locations.csv, shapefile or scenarios.csv + // The value from scenarios.csv overwrites the value from shapefile, which overwrites the value from locations.csv + // In this test the values for headpl3 in the import files are: + // In scenarios.csv: not defined + // In shapefiles: -3.651 for location 1, -3.632 for location 2 + // In locations.csv: -99 for both locations + // Expected value in scenario will be -3.651 for location 1, -3.632 for location 2 public void ValuesFromShapeFileAreCopiedToScenarioIfNotDefinedInScenariosCsv() { SetupInvoer1WithShapeFiles();