Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs =================================================================== diff -u -r5167 -r5168 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5167) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 5168) @@ -35,55 +35,59 @@ const double tolerance3Decimals = 0.00051; [Test] - [Category("Work_In_Progress")] public void TestStabilityOutsideWith2DstixFiles() { string projectFilename = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\StabilityOutside2DFromStixTest\BishopOutside.damx"); - List allCalculationresults = ComputeStabilityOutsideProject(projectFilename, 1); - Assert.That(allCalculationresults.Count, Is.EqualTo(1)); - Assert.That(allCalculationresults[0].LocationName, Is.EqualTo("DWP_1")); - Assert.That(allCalculationresults[0].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); - Assert.That(allCalculationresults[0].X, Is.EqualTo(99718.000)); - Assert.That(allCalculationresults[0].Y, Is.EqualTo(437106.000)); - Assert.That(allCalculationresults[0].AnalysisType, Is.EqualTo(AnalysisType.NoAdaption)); - Assert.That(allCalculationresults[0].IsUplift, Is.EqualTo(false)); -// Assert.That(allCalculationresults[0].ProfileName, Is.EqualTo("DWP_1.sti")); -// Assert.That(allCalculationresults[0].ProfileProbability, Is.EqualTo(100)); - Assert.That(allCalculationresults[0].StabilityModel, Is.EqualTo(MStabModelType.Bishop)); - Assert.That(allCalculationresults[0].SafetyFactor, Is.EqualTo(1.504).Within(tolerance3Decimals)); - Assert.That(allCalculationresults[0].ShoulderHeight, Is.Null); - Assert.That(allCalculationresults[0].ToeAtPolderX, Is.Null); - Assert.That(allCalculationresults[0].ToeAtPolderZ, Is.Null); - Assert.That(allCalculationresults[0].RequiredSafetyFactor, Is.EqualTo(1.170)); - Assert.That(allCalculationresults[0].RiverLevel, Is.EqualTo(4.4)); - Assert.That(allCalculationresults[0].RiverLevelLow, Is.EqualTo(0.63)); - Assert.That(allCalculationresults[0].DikeTableHeight, Is.EqualTo(4.900)); - Assert.That(allCalculationresults[0].SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(0.000)); - Assert.That(allCalculationresults[0].DikeLength, Is.EqualTo(36.150)); -// Assert.That(allCalculationresults[0].Pl3MinUplift, Is.EqualTo(1.837).Within(tolerance3Decimals)); -// Assert.That(allCalculationresults[0].Pl3HeadAdjusted, Is.EqualTo(1.60)); -// Assert.That(allCalculationresults[0].Pl3LocalLocationXMinUplift, Is.EqualTo(106).Within(tolerance3Decimals)); -// Assert.That(allCalculationresults[0].Pl3LocationXMinUplift, Is.EqualTo(114.42).Within(tolerance3Decimals)); -// Assert.That(allCalculationresults[0].Pl3LocationYMinUplift, Is.EqualTo(0.000)); - // Assert.That(allCalculationresults[0].Pl4MinUplift, Is.EqualTo(0.000)); - // Assert.That(allCalculationresults[0].Pl4HeadAdjusted, Is.EqualTo(0.000)); - // Assert.That(allCalculationresults[0].Pl4LocalLocationXMinUplift, Is.EqualTo(0.000)); - // Assert.That(allCalculationresults[0].Pl4LocationXMinUplift, Is.EqualTo(8.420)); - // Assert.That(allCalculationresults[0].Pl4LocationYMinUplift, Is.EqualTo(0.000)); - Assert.That(allCalculationresults[0].LocalPipingEntryPointX, Is.EqualTo(16.190).Within(tolerance3Decimals)); - Assert.That(allCalculationresults[0].PipingEntryPointX, Is.EqualTo(24.610).Within(tolerance3Decimals)); - Assert.That(allCalculationresults[0].PipingEntryPointY, Is.EqualTo(0.000)); - Assert.That(allCalculationresults[0].LocalPipingExitPointX, Is.EqualTo(null)); - Assert.That(allCalculationresults[0].PipingExitPointX, Is.EqualTo(null)); - Assert.That(allCalculationresults[0].PipingExitPointY, Is.EqualTo(null)); - Assert.That(allCalculationresults[0].SeepageLength, Is.EqualTo(null)); - Assert.That(allCalculationresults[0].ResultMessage, Is.EqualTo("")); - Assert.That(allCalculationresults[0].HeaveFactor, Is.EqualTo(null)); - Assert.That(allCalculationresults[0].Notes, Is.EqualTo("")); - Assert.That(allCalculationresults[0].NumberOfIterations, Is.EqualTo(0)); - Assert.That(allCalculationresults[0].ResultEvaluation, Is.EqualTo(ResultEvaluation.NotEvaluated)); - Assert.That(allCalculationresults[0].UpliftFactor, Is.EqualTo(null)); + List allCalculationResults = ComputeStabilityOutsideProject(projectFilename, 1); + Assert.That(allCalculationResults.Count, Is.EqualTo(1)); + Assert.Multiple(() => + { + Assert.That(allCalculationResults[0].LocationName, Is.EqualTo("DWP_1")); + Assert.That(allCalculationResults[0].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(allCalculationResults[0].X, Is.EqualTo(99718.000)); + Assert.That(allCalculationResults[0].Y, Is.EqualTo(437106.000)); + Assert.That(allCalculationResults[0].AnalysisType, Is.EqualTo(AnalysisType.NoAdaption)); + Assert.That(allCalculationResults[0].IsUplift, Is.EqualTo(false)); + // Assert.That(allCalculationresults[0].ProfileName, Is.EqualTo("DWP_1.sti")); + // Assert.That(allCalculationresults[0].ProfileProbability, Is.EqualTo(100)); + Assert.That(allCalculationResults[0].StabilityModel, Is.EqualTo(MStabModelType.Bishop)); + Assert.That(allCalculationResults[0].SafetyFactor, Is.EqualTo(1.504).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].ShoulderHeight, Is.Null); + Assert.That(allCalculationResults[0].ToeAtPolderX, Is.Null); + Assert.That(allCalculationResults[0].ToeAtPolderZ, Is.Null); + Assert.That(allCalculationResults[0].RequiredSafetyFactor, Is.EqualTo(1.170)); + Assert.That(allCalculationResults[0].RiverLevel, Is.EqualTo(4.4)); + Assert.That(allCalculationResults[0].RiverLevelLow, Is.EqualTo(0.63)); + Assert.That(allCalculationResults[0].DikeTableHeight, Is.EqualTo(4.900)); + Assert.That(allCalculationResults[0].SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(0.000)); + Assert.That(allCalculationResults[0].DikeLength, Is.EqualTo(36.150)); + + Assert.That(allCalculationResults[0].Pl3MinUplift, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl3HeadAdjusted, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl3LocalLocationXMinUplift, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl3LocationXMinUplift, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl3LocationYMinUplift, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl4MinUplift, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl4HeadAdjusted, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl4LocalLocationXMinUplift, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl4LocationXMinUplift, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl4LocationYMinUplift, Is.EqualTo(null)); + + Assert.That(allCalculationResults[0].LocalPipingEntryPointX, Is.EqualTo(16.190).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].PipingEntryPointX, Is.EqualTo(24.610).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].PipingEntryPointY, Is.EqualTo(0.000)); + Assert.That(allCalculationResults[0].LocalPipingExitPointX, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].PipingExitPointX, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].PipingExitPointY, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].SeepageLength, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].ResultMessage, Is.EqualTo("")); + Assert.That(allCalculationResults[0].HeaveFactor, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Notes, Is.EqualTo("")); + Assert.That(allCalculationResults[0].NumberOfIterations, Is.EqualTo(0)); + Assert.That(allCalculationResults[0].ResultEvaluation, Is.EqualTo(ResultEvaluation.NotEvaluated)); + Assert.That(allCalculationResults[0].UpliftFactor, Is.EqualTo(null)); + }); } ///