Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs =================================================================== diff -u -r6436 -r6787 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 6787) @@ -103,7 +103,7 @@ string projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\StabilityOutside1DProfileTest\Actualisatie.damx"); List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 59); - Assert.That(allCalculationResults, Has.Count.EqualTo(36)); + Assert.That(allCalculationResults, Has.Count.EqualTo(100); Assert.Multiple(() => { Assert.That(allCalculationResults[1].LocationName, Is.EqualTo("RK210-560")); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ImportTests.cs =================================================================== diff -u -r6779 -r6787 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ImportTests.cs (.../ImportTests.cs) (revision 6779) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ImportTests.cs (.../ImportTests.cs) (revision 6787) @@ -37,7 +37,7 @@ public class ImportTests { [Test] - public void GivenConfigurationFileWhenCreatingNewProjectThenCorrectDataIsImported() + public void GivenConfigurationFileIncludingShapeFilesWhenCreatingNewProjectThenCorrectDataIsImported() { const string damDataSourceFileName = @"TestData\StabilityOutside1DProfileTest\Actualisatie.defx"; const string damProjectFileName = @"TestData\StabilityOutside1DProfileTest\ActualisatieImported.damx"; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs =================================================================== diff -u -r6436 -r6787 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 6787) @@ -69,15 +69,19 @@ damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside; } - damProjectData.LocationJobs[0].Run = true; + foreach (var locationJob in damProjectData.LocationJobs) + { + locationJob.Run = true; + } DamProjectCalculationSpecification.SelectedAnalysisType = AnalysisType.NoAdaption; Input input = FillXmlInputFromDamUi.CreateInput(damProjectData); string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); - // Enable next line for debugging - // DamXmlSerialization.SaveInputAsXmlFile("InputForDebugging.xml", input); - +#if DEBUG + // Next line for debugging + DamXmlSerialization.SaveInputAsXmlFile("InputForDebugging.xml", input); +#endif var damEngineInterface = new EngineInterface(inputXml); string validationMessages = damEngineInterface.Validate(); @@ -86,8 +90,10 @@ // only if validation is ok, then string outputXml = damEngineInterface.Run(); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputXml); - // Enable next line for debugging - // DamXmlSerialization.SaveOutputAsXmlFile("OutputForDebugging.xml", output); +#if DEBUG + // Next line for debugging + DamXmlSerialization.SaveOutputAsXmlFile("OutputForDebugging.xml", output); +#endif FillDamUiFromXmlOutput.AddOutputToDamProjectData(damProjectData, output); }