Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj =================================================================== diff -u -r9388d77ee849b9474ade84716cdde573a89025e1 -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj (.../Ringtoets.Integration.TestUtils.Test.csproj) (revision 9388d77ee849b9474ade84716cdde573a89025e1) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj (.../Ringtoets.Integration.TestUtils.Test.csproj) (revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5) @@ -105,6 +105,10 @@ {14c6f716-64e2-4bc4-a1ef-05865fcefa4c} Ringtoets.Piping.Primitives + + {070DC87D-520B-4A84-8965-ED5012875FCC} + Ringtoets.Piping.Integration.TestUtils.Test + {87c2c553-c0bc-40bf-b1ea-b83bff357f27} Ringtoets.Revetment.Data Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs =================================================================== diff -u -r43435200452dd3b310c0c9d044d685209c685eb3 -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision 43435200452dd3b310c0c9d044d685209c685eb3) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5) @@ -34,6 +34,7 @@ using Ringtoets.HeightStructures.Data; using Ringtoets.Integration.Data; using Ringtoets.Piping.Data; +using Ringtoets.Piping.Integration.TestUtils.Test; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; @@ -219,10 +220,10 @@ if (pipingFailureMechanism != null) { - AssertHasStochasticSoilModels(pipingFailureMechanism); - AssertHasSurfaceLines(pipingFailureMechanism); - AssertPipingFailureMechanismCalculationConfigurationsWithOutputs(pipingFailureMechanism); - AssertPipingFailureMechanismCalculationConfigurationsWithoutOutputs(pipingFailureMechanism); + PipingTestDataGeneratorHelper.AssertHasStochasticSoilModels(pipingFailureMechanism); + PipingTestDataGeneratorHelper.AssertHasSurfaceLines(pipingFailureMechanism); + PipingTestDataGeneratorHelper.AssertPipingFailureMechanismCalculationConfigurationsWithOutputs(pipingFailureMechanism); + PipingTestDataGeneratorHelper.AssertPipingFailureMechanismCalculationConfigurationsWithoutOutputs(pipingFailureMechanism); containsPipingFailureMechanism = true; } @@ -321,9 +322,9 @@ if (pipingFailureMechanism != null) { - AssertHasStochasticSoilModels(pipingFailureMechanism); - AssertHasSurfaceLines(pipingFailureMechanism); - AssertPipingFailureMechanismCalculationConfigurationsWithoutOutputs(pipingFailureMechanism); + PipingTestDataGeneratorHelper.AssertHasStochasticSoilModels(pipingFailureMechanism); + PipingTestDataGeneratorHelper.AssertHasSurfaceLines(pipingFailureMechanism); + PipingTestDataGeneratorHelper.AssertPipingFailureMechanismCalculationConfigurationsWithoutOutputs(pipingFailureMechanism); containsPipingFailureMechanism = true; } @@ -365,56 +366,6 @@ Assert.IsTrue(containsGrassCoverErosionInwardsFailureMechanism); } - #region Piping - - private static void AssertPipingFailureMechanismCalculationConfigurationsWithOutputs(PipingFailureMechanism failureMechanism) - { - IEnumerable calculationRoot = failureMechanism.CalculationsGroup.Children; - AssertPipingCalculationGroupWithOutput(calculationRoot.OfType()); - - CalculationGroup nestedCalculations = calculationRoot.OfType().First(); - AssertPipingCalculationGroupWithOutput(nestedCalculations.Children.OfType()); - } - - private static void AssertPipingFailureMechanismCalculationConfigurationsWithoutOutputs(PipingFailureMechanism failureMechanism) - { - IEnumerable calculationRoot = failureMechanism.CalculationsGroup.Children; - AssertPipingCalculationGroupWithoutOutput(calculationRoot.OfType()); - - CalculationGroup nestedCalculations = calculationRoot.OfType().First(); - AssertPipingCalculationGroupWithoutOutput(nestedCalculations.Children.OfType()); - } - - private static void AssertPipingCalculationGroupWithOutput(IEnumerable children) - { - AssertCalculationConfig(children, true, true); - } - - private static void AssertPipingCalculationGroupWithoutOutput(IEnumerable children) - { - AssertCalculationConfig(children, false, false); - AssertCalculationConfig(children, true, false); - } - - private static void AssertCalculationConfig( - IEnumerable children, bool hasHydraulicBoundaryLocation, bool hasOutput) - { - Assert.NotNull(children.FirstOrDefault(calc => (calc.InputParameters.HydraulicBoundaryLocation != null) == hasHydraulicBoundaryLocation - && calc.HasOutput == hasOutput)); - } - - private static void AssertHasStochasticSoilModels(PipingFailureMechanism failureMechanism) - { - CollectionAssert.IsNotEmpty(failureMechanism.StochasticSoilModels); - } - - private static void AssertHasSurfaceLines(PipingFailureMechanism failureMechanism) - { - CollectionAssert.IsNotEmpty(failureMechanism.SurfaceLines); - } - - #endregion - #region Grass Cover Erosion Inwards [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorHelper.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorHelper.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorHelper.cs (revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5) @@ -0,0 +1,98 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; +using System.Linq; +using NUnit.Framework; +using Ringtoets.Common.Data.Calculation; +using Ringtoets.Piping.Data; +using Ringtoets.Piping.Primitives; + +namespace Ringtoets.Piping.Integration.TestUtils.Test +{ + /// + /// Class to help asserting the . + /// + public static class PipingTestDataGeneratorHelper + { + /// + /// Asserts that the contains calculations with output. + /// + /// The failure mechanism to assert. + public static void AssertPipingFailureMechanismCalculationConfigurationsWithOutputs(PipingFailureMechanism failureMechanism) + { + IEnumerable calculationRoot = failureMechanism.CalculationsGroup.Children; + AssertPipingCalculationGroupWithOutput(calculationRoot.OfType()); + + CalculationGroup nestedCalculations = calculationRoot.OfType().First(); + AssertPipingCalculationGroupWithOutput(nestedCalculations.Children.OfType()); + } + + /// + /// Asserts that the contains calculations without output. + /// + /// The failure mechanism to assert. + public static void AssertPipingFailureMechanismCalculationConfigurationsWithoutOutputs(PipingFailureMechanism failureMechanism) + { + IEnumerable calculationRoot = failureMechanism.CalculationsGroup.Children; + AssertPipingCalculationGroupWithoutOutput(calculationRoot.OfType()); + + CalculationGroup nestedCalculations = calculationRoot.OfType().First(); + AssertPipingCalculationGroupWithoutOutput(nestedCalculations.Children.OfType()); + } + + /// + /// Asserts that the contains . + /// + /// The failure mechanism to assert. + public static void AssertHasStochasticSoilModels(PipingFailureMechanism failureMechanism) + { + CollectionAssert.IsNotEmpty(failureMechanism.StochasticSoilModels); + } + + /// + /// Asserts sthat the contains . + /// + /// The failure mechanism to assert. + public static void AssertHasSurfaceLines(PipingFailureMechanism failureMechanism) + { + CollectionAssert.IsNotEmpty(failureMechanism.SurfaceLines); + } + + private static void AssertPipingCalculationGroupWithOutput(IEnumerable children) + { + AssertCalculationConfig(children, true, true); + } + + private static void AssertPipingCalculationGroupWithoutOutput(IEnumerable children) + { + AssertCalculationConfig(children, false, false); + AssertCalculationConfig(children, true, false); + } + + private static void AssertCalculationConfig( + IEnumerable children, bool hasHydraulicBoundaryLocation, bool hasOutput) + { + Assert.NotNull(children.FirstOrDefault(calc => (calc.InputParameters.HydraulicBoundaryLocation != null) == hasHydraulicBoundaryLocation + && calc.HasOutput == hasOutput)); + } + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/PipingTestDataGeneratorTest.cs (revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5) @@ -0,0 +1,31 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using NUnit.Framework; + +namespace Ringtoets.Piping.Integration.TestUtils.Test +{ + [TestFixture] + public class PipingTestDataGeneratorTest + { + + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/Ringtoets.Piping.Integration.TestUtils.Test.csproj =================================================================== diff -u -r9388d77ee849b9474ade84716cdde573a89025e1 -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/Ringtoets.Piping.Integration.TestUtils.Test.csproj (.../Ringtoets.Piping.Integration.TestUtils.Test.csproj) (revision 9388d77ee849b9474ade84716cdde573a89025e1) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils.Test/Ringtoets.Piping.Integration.TestUtils.Test.csproj (.../Ringtoets.Piping.Integration.TestUtils.Test.csproj) (revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5) @@ -39,20 +39,49 @@ MinimumRecommendedRules.ruleset + + ..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True + Properties\GlobalAssembly.cs + + Copying.licenseheader + + + + {3bbfd65b-b277-4e50-ae6d-bd24c3434609} + Core.Common.Base + + + {D4200F43-3F72-4F42-AF0A-8CED416A38EC} + Ringtoets.Common.Data + + + {CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB} + Ringtoets.Piping.Data + + + {14c6f716-64e2-4bc4-a1ef-05865fcefa4c} + Ringtoets.Piping.Primitives + + + {A4972765-DDBB-4A1E-B17C-7185577E5591} + Ringtoets.Piping.Integration.TestUtils + + + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs =================================================================== diff -u -r182439744861ddb032d90ace9041f96d8ec5fe28 -r0a11587eb780952a8ba1e1ad5d724ba164a6a9d5 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs (.../PipingTestDataGenerator.cs) (revision 182439744861ddb032d90ace9041f96d8ec5fe28) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtils/PipingTestDataGenerator.cs (.../PipingTestDataGenerator.cs) (revision 0a11587eb780952a8ba1e1ad5d724ba164a6a9d5) @@ -50,7 +50,7 @@ /// /// Gets a without hydraulic boundary location or design water level. /// - /// A without hydraulic boundary location or design water level + /// A without hydraulic boundary location or design water level. public static PipingCalculation GetPipingCalculationWithoutHydraulicLocationAndAssessmentLevel() { PipingCalculation calculation = GetPipingCalculation(); @@ -59,6 +59,10 @@ return calculation; } + /// + /// Gets a with manual design water level set. + /// + /// A with a manual design water level. public static PipingCalculation GetPipingCalculationWithAssessmentLevel() { PipingCalculation calculation = GetPipingCalculation(); @@ -68,6 +72,10 @@ return calculation; } + /// + /// Gets a without surface line. + /// + /// A without surface line. public static PipingCalculation GetPipingCalculationWithoutSurfaceLine() { PipingCalculation calculation = GetPipingCalculation(); @@ -76,6 +84,10 @@ return calculation; } + /// + /// Gets a without soil model. + /// + /// A without soil model . public static PipingCalculation GetPipingCalculationWithoutSoilModel() { PipingCalculation calculation = GetPipingCalculation(); @@ -84,6 +96,10 @@ return calculation; } + /// + /// Gets a without soil profile. + /// + /// A without soil profile. public static PipingCalculation GetPipingCalculationWithoutSoilProfile() { PipingCalculation calculation = GetPipingCalculation(); @@ -92,6 +108,10 @@ return calculation; } + /// + /// Gets a . + /// + /// A . public static PipingCalculation GetPipingCalculation() { var surfaceline = new RingtoetsPipingSurfaceLine