Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs =================================================================== diff -u -r1974 -r2028 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs (.../PipingSellmeijerVnkTests.cs) (revision 1974) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs (.../PipingSellmeijerVnkTests.cs) (revision 2028) @@ -37,7 +37,8 @@ [Test] public void CanPerformSellmeijerVnkDesignPipingVoorbeeld1() { - // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingSellmeijerVNK.damx" + // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" + // Select Failure mechanism Piping and model Sellmeijer (VNK) // Set Analysis type to "No Adaption" const string fileName = @"TestFiles\PipingVoorbeeld1_SellmeijerVNKInputFile.xml"; string inputString = File.ReadAllText(fileName); @@ -82,7 +83,8 @@ [Test] public void CanPerformSellmeijerVnkDesignWithAdaptionPipingVoorbeeld1() { - // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingSellmeijerVNK.damx" + // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" + // Select Failure mechanism Piping and model Sellmeijer (VNK) // Set Analysis type to "Adapt geometry" // Change required safety factor piping to 1.01 const string fileName = @"TestFiles\PipingVoorbeeld1_SellmeijerVNKDesignInputFile.xml"; @@ -138,7 +140,8 @@ [Test] public void TestIfSellmeijerVnkCalculationResultIsSetToFailDueToShoulderShoulderLengthError() { - // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingSellmeijerVNK.damx" + // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" + // Select Failure mechanism Piping and model Sellmeijer (VNK) // Set Analysis type to "Adapt geometry" const string fileName = @"TestFiles\PipingVoorbeeld1_SellmeijerVNKDesignInputFileFail.xml"; string inputString = File.ReadAllText(fileName); @@ -164,6 +167,7 @@ public void TestIfSellmeijerVnkCalculationGeneratesNoErrorWhenNewShoulderLengthIsSmaller() { // Based on ".\data\DamEngineTestProjects\Invoer3\DeltaDijk\DeltaDijk normal.damx" + // Select Failure mechanism Piping and model Sellmeijer (VNK) // Set Analysis type to "Adapt geometry" const string fileName = @"TestFiles\DeltaDijkInvoer3VNKAdaptionShoulderLength.xml"; string inputString = File.ReadAllText(fileName); Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs =================================================================== diff -u -r2016 -r2028 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 2016) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 2028) @@ -38,6 +38,7 @@ public void CanPerformBlighDesignNoAdaptionPipingVoorbeeld1() { // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" + // Select Failure mechanism Piping and model Bligh // Set Analysis type to "No Adaption" const string fileName = @"TestFiles\PipingVoorbeeld1_BlighInputFile.xml"; string inputString = File.ReadAllText(fileName); @@ -89,7 +90,7 @@ public void CanPerformBlighDesignNoAdaptionRechterDiezedijk() { // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk.damx" - // Set model to Piping Bligh + // Select Failure mechanism Piping and model Bligh // Set Analysis type to "No Adaption" // Select all locations const string fileName = @"TestFiles\Rechter Diezedijk_BlighInputFile.xml"; @@ -108,6 +109,7 @@ public void CanPerformBlighDesignWithAdaptionPipingVoorbeeld1() { // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" + // Select Failure mechanism Piping and model Bligh // Set Analysis type to "Adapt geometry" const string fileName = @"TestFiles\PipingVoorbeeld1_BlighDesignInputFile.xml"; string inputString = File.ReadAllText(fileName); @@ -148,7 +150,8 @@ [Test] public void CanPerformBlighDesignWithAdaptionRechterDiezedijk1Location() { - // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk piping Bligh design.damx" + // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk.damx" + // Select Failure mechanism Piping and model Bligh // Set Analysis type to "Adapt Geometry" // Select second location (101) const string fileName = @"TestFiles\Rechter Diezedijk_BlighDesignInputFile_1Location.xml"; @@ -168,7 +171,8 @@ [SetUICulture("en-US")] public void CanPerformBlighFailingDesignWithAdaptionRechterDiezedijk1Location() { - // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk piping Bligh design.damx" + // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk.damx" + // Select Failure mechanism Piping and model Bligh // Set Analysis type to "Adapt Geometry" // Select second location (101) // Set for this location in location scenario Required safety factor for piping to 8.0 @@ -191,7 +195,8 @@ [Test] public void CanPerformBlighDesignWithAdaptionRechterDiezedijk() { - // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk piping Bligh design.damx" + // Based on ".\data\DamEngineTestProjects\Larenstein_AaenMaas\Rechter Diezedijk.damx" + // Select Failure mechanism Piping and model Bligh // Set Analysis type to "Adapt Geometry" // Select first 5 locations (100, 101, 102, 103 and 104) const string fileName = @"TestFiles\Rechter Diezedijk_BlighDesignInputFile.xml"; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs =================================================================== diff -u -r1974 -r2028 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs (.../PipingSellmeijer4ForcesTests.cs) (revision 1974) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijer4ForcesTests.cs (.../PipingSellmeijer4ForcesTests.cs) (revision 2028) @@ -36,7 +36,8 @@ [Test] public void CanPerformSellmeijer4ForcesDesignPipingVoorbeeld1() { - // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingSellmeijer4Forces.damx" + // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" + // Select Failure mechanism Piping and model Sellmeijer 4-forces // Set Analysis type to "No Adaption" const string fileName = @"TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesInputFile.xml"; string inputString = File.ReadAllText(fileName); @@ -81,7 +82,8 @@ [Test] public void CanPerformSellmeijer4ForcesDesignWithAdaptionPipingVoorbeeld1() { - // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingSellmeijer4Forces.damx" + // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" + // Select Failure mechanism Piping and model Sellmeijer 4-forces // Set Analysis type to "Adapt geometry" const string fileName = @"TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignInputFile.xml"; string inputString = File.ReadAllText(fileName); @@ -136,7 +138,8 @@ [Test] public void CanPerformSellmeijer4ForcesDesignWithAdaptionWithHeightPipingVoorbeeld1() { - // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingSellmeijer4Forces.damx" + // Based on ".\data\DamEngineTestProjects\PipingVoorbeeld1\PipingVoorbeeld1.damx" + // Select Failure mechanism Piping and model Sellmeijer 4-forces // Set Analysis type to "Adapt geometry" // Set DTH = 4.5 for location "profiel 1" const string fileName = @"TestFiles\PipingVoorbeeld1_Sellmeijer4ForcesDesignHeightInputFile.xml";