Index: Ringtoets.sln =================================================================== diff -u -r7c3fd1ef091a5a8f0d5bc51f24a8a5bc07cab173 -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets.sln (.../Ringtoets.sln) (revision 7c3fd1ef091a5a8f0d5bc51f24a8a5bc07cab173) +++ Ringtoets.sln (.../Ringtoets.sln) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -1184,11 +1184,6 @@ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Integration.TestUtil", "Ringtoets\Piping\test\Ringtoets.Piping.Integration.TestUtil\Ringtoets.Piping.Integration.TestUtil.csproj", "{A4972765-DDBB-4A1E-B17C-7185577E5591}" - ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Revetment.Data.TestUtil", "Ringtoets\Revetment\test\Ringtoets.Revetment.Data.TestUtil\Ringtoets.Revetment.Data.TestUtil.csproj", "{3706200E-48C6-4B86-B48C-4E45C69ABE95}" ProjectSection(ProjectDependencies) = postProject {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} @@ -1395,11 +1390,6 @@ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Integration.TestUtil.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Integration.TestUtil.Test\Ringtoets.Piping.Integration.TestUtil.Test.csproj", "{070DC87D-520B-4A84-8965-ED5012875FCC}" - ProjectSection(ProjectDependencies) = postProject - {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.IO.TestUtil.Test", "Ringtoets\Piping\test\Ringtoets.Piping.IO.TestUtil.Test\Ringtoets.Piping.IO.TestUtil.Test.csproj", "{000F1F5A-B5BC-4169-8393-15AD87A9E0CE}" ProjectSection(ProjectDependencies) = postProject {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} @@ -3437,14 +3427,6 @@ {659D7F4A-18FD-4999-9886-C8BA5017955D}.Release|x86.Build.0 = Release|x86 {659D7F4A-18FD-4999-9886-C8BA5017955D}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {659D7F4A-18FD-4999-9886-C8BA5017955D}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {A4972765-DDBB-4A1E-B17C-7185577E5591}.CreateInstaller|x86.ActiveCfg = Release|x86 - {A4972765-DDBB-4A1E-B17C-7185577E5591}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 - {A4972765-DDBB-4A1E-B17C-7185577E5591}.Debug|x86.ActiveCfg = Debug|x86 - {A4972765-DDBB-4A1E-B17C-7185577E5591}.Debug|x86.Build.0 = Debug|x86 - {A4972765-DDBB-4A1E-B17C-7185577E5591}.Release|x86.ActiveCfg = Release|x86 - {A4972765-DDBB-4A1E-B17C-7185577E5591}.Release|x86.Build.0 = Release|x86 - {A4972765-DDBB-4A1E-B17C-7185577E5591}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {A4972765-DDBB-4A1E-B17C-7185577E5591}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {3706200E-48C6-4B86-B48C-4E45C69ABE95}.CreateInstaller|x86.ActiveCfg = Release|x86 {3706200E-48C6-4B86-B48C-4E45C69ABE95}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 {3706200E-48C6-4B86-B48C-4E45C69ABE95}.Debug|x86.ActiveCfg = Debug|x86 @@ -3753,14 +3735,6 @@ {EA3E979C-FB00-443B-B6A0-273254F24802}.Release|x86.Build.0 = Release|x86 {EA3E979C-FB00-443B-B6A0-273254F24802}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {EA3E979C-FB00-443B-B6A0-273254F24802}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {070DC87D-520B-4A84-8965-ED5012875FCC}.CreateInstaller|x86.ActiveCfg = Release|x86 - {070DC87D-520B-4A84-8965-ED5012875FCC}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 - {070DC87D-520B-4A84-8965-ED5012875FCC}.Debug|x86.ActiveCfg = Debug|x86 - {070DC87D-520B-4A84-8965-ED5012875FCC}.Debug|x86.Build.0 = Debug|x86 - {070DC87D-520B-4A84-8965-ED5012875FCC}.Release|x86.ActiveCfg = Release|x86 - {070DC87D-520B-4A84-8965-ED5012875FCC}.Release|x86.Build.0 = Release|x86 - {070DC87D-520B-4A84-8965-ED5012875FCC}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {070DC87D-520B-4A84-8965-ED5012875FCC}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {000F1F5A-B5BC-4169-8393-15AD87A9E0CE}.CreateInstaller|x86.ActiveCfg = Release|x86 {000F1F5A-B5BC-4169-8393-15AD87A9E0CE}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 {000F1F5A-B5BC-4169-8393-15AD87A9E0CE}.Debug|x86.ActiveCfg = Debug|x86 @@ -4485,7 +4459,6 @@ {174BA68D-6176-4AC5-8DFD-98CDD2C4D971} = {88E04195-C43E-40D3-B5F2-3A25E1E79E03} {D24FA2F7-28A7-413B-AFD3-EE10E985630B} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F} {659D7F4A-18FD-4999-9886-C8BA5017955D} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F} - {A4972765-DDBB-4A1E-B17C-7185577E5591} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {3706200E-48C6-4B86-B48C-4E45C69ABE95} = {E4FB8F4B-D49C-4858-A6C1-1D5EB7EF54D4} {B5EEC43B-85AE-4A3A-8FFA-90C1F5199D04} = {E4FB8F4B-D49C-4858-A6C1-1D5EB7EF54D4} {BF753DB5-973B-4ADF-B0F6-9437325C3466} = {1C1E8754-CF61-4858-9CEE-3E5DE344474F} @@ -4534,7 +4507,6 @@ {E111FC08-BE9A-493A-85D8-51CE6FBB13A3} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4} {4A675B7E-96AD-4911-B154-85385C9330C3} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {EA3E979C-FB00-443B-B6A0-273254F24802} = {88E04195-C43E-40D3-B5F2-3A25E1E79E03} - {070DC87D-520B-4A84-8965-ED5012875FCC} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {000F1F5A-B5BC-4169-8393-15AD87A9E0CE} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {F0FB401A-3494-4237-9E6D-02CDF77912A8} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4} {98FD0100-A601-450B-A2CD-718FAEB3A408} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4} Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj =================================================================== diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj (.../Ringtoets.Integration.TestUtils.Test.csproj) (revision 93036b575ee81b4517b29db51f1eadf81454fb93) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/Ringtoets.Integration.TestUtils.Test.csproj (.../Ringtoets.Integration.TestUtils.Test.csproj) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -108,9 +108,9 @@ {14C6F716-64E2-4BC4-A1EF-05865FCEFA4C} Ringtoets.Piping.Primitives - - {A4972765-DDBB-4A1E-B17C-7185577E5591} - Ringtoets.Piping.Integration.TestUtil + + {955E574D-67CE-4347-AA6B-7DF8A04ED754} + Ringtoets.Piping.Data.TestUtil {87c2c553-c0bc-40bf-b1ea-b83bff357f27} Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -34,7 +34,7 @@ using Ringtoets.HeightStructures.Data; using Ringtoets.Integration.Data; using Ringtoets.Piping.Data; -using Ringtoets.Piping.Integration.TestUtil; +using Ringtoets.Piping.Data.TestUtil; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj =================================================================== diff -u -r71d8173532c9c038e25caf03e296beb8e8f9cbe8 -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj (.../Ringtoets.Integration.TestUtils.csproj) (revision 71d8173532c9c038e25caf03e296beb8e8f9cbe8) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj (.../Ringtoets.Integration.TestUtils.csproj) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -155,9 +155,9 @@ {14c6f716-64e2-4bc4-a1ef-05865fcefa4c} Ringtoets.Piping.Primitives - - {a4972765-ddbb-4a1e-b17c-7185577e5591} - Ringtoets.Piping.Integration.TestUtil + + {955E574D-67CE-4347-AA6B-7DF8A04ED754} + Ringtoets.Piping.Data.TestUtil {87c2c553-c0bc-40bf-b1ea-b83bff357f27} Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs =================================================================== diff -u -r71d8173532c9c038e25caf03e296beb8e8f9cbe8 -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 71d8173532c9c038e25caf03e296beb8e8f9cbe8) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -37,7 +37,7 @@ using Ringtoets.HeightStructures.Data; using Ringtoets.Integration.Data; using Ringtoets.Integration.Service; -using Ringtoets.Piping.Integration.TestUtil; +using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Revetment.Data; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -0,0 +1,262 @@ +// Copyright (C) Stichting Deltares 2017. 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.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; + +namespace Ringtoets.Piping.Data.TestUtil.Test +{ + [TestFixture] + public class PipingTestDataGeneratorTest + { + [Test] + public void GetPipingFailureMechanismWithAllCalculationConfigurations_ReturnsFailureMechanismWithAllConfigurations() + { + // Call + PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetPipingFailureMechanismWithAllCalculationConfigurations(); + + // Assert + PipingTestDataGeneratorHelper.AssertHasStochasticSoilModels(failureMechanism); + PipingTestDataGeneratorHelper.AssertHasSurfaceLines(failureMechanism); + PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithOutputs(failureMechanism); + PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(failureMechanism); + } + + [Test] + public void ConfigureFailureMechanismWithAllCalculationConfigurations_ReturnsFailureMechanismWithAllConfigurations() + { + // Setup + var failureMechanism = new PipingFailureMechanism(); + HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated(); + + // Call + PipingTestDataGenerator.ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydraulicBoundaryLocation); + + // Assert + PipingTestDataGeneratorHelper.AssertHasStochasticSoilModels(failureMechanism); + PipingTestDataGeneratorHelper.AssertHasSurfaceLines(failureMechanism); + PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithOutputs(failureMechanism); + PipingTestDataGeneratorHelper.AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(failureMechanism); + + AssertCalculationsHasSameHydraulicBoundaryLocation(failureMechanism.CalculationsGroup, hydraulicBoundaryLocation); + + CalculationGroup nestedCalculationGroup = failureMechanism.CalculationsGroup.Children.OfType().First(); + AssertCalculationsHasSameHydraulicBoundaryLocation(nestedCalculationGroup, hydraulicBoundaryLocation); + } + + [Test] + public void GetPipingCalculationScenario_Always_ReturnCalculationWithDataSet() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetPipingCalculationScenario(); + + // Assert + AssertCalculationScenario(calculation); + } + + [Test] + public void GetPipingCalculationScenarioWithoutHydraulicLocationAndAssessmentLevel_Always_ReturnCalculationScenarioWithoutHydraulicLocationAndAssessmentLevel() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetPipingCalculationScenarioWithoutHydraulicLocationAndAssessmentLevel(); + + // Assert + AssertCalculationScenario(calculation, false); + } + + [Test] + public void GetPipingCalculationScenarioWithAssessmentLevel_Always_ReturnCalculationScenarioWithAssessmentLevel() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetPipingCalculationScenarioWithAssessmentLevel(); + + // Assert + AssertCalculationScenario(calculation, false, true); + } + + [Test] + public void GetPipingCalculationScenarioWithoutSurfaceLine_Always_ReturnCalculationScenarioWithoutSurfaceLine() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSurfaceLine(); + + // Assert + AssertCalculationScenario(calculation, true, false, false); + } + + [Test] + public void GetPipingCalculationScenarioWithoutSoilModel_Always_ReturnCalculationScenarioWithoutSoilModel() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilModel(); + + // Assert + AssertCalculationScenario(calculation, true, false, true, false); + } + + [Test] + public void GetPipingCalculationScenarioWithoutSoilProfile_Always_ReturnCalculationScenarioWithoutSoilProfile() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetPipingCalculationScenarioWithoutSoilProfile(); + + // Assert + AssertCalculationScenario(calculation, true, false, true, true, false); + } + + [Test] + public void GetIrrelevantPipingCalculationScenario_Always_ReturnCalculationScenario() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetIrrelevantPipingCalculationScenario(); + + // Assert + Assert.IsFalse(calculation.IsRelevant); + Assert.AreEqual(0.5, calculation.Contribution, calculation.Contribution.GetAccuracy()); + } + + [Test] + public void GetPipingCalculationScenarioWithNaNs_Always_ReturnCalculationScenarioWithNaNs() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetPipingCalculationScenarioWithNaNs(); + + // Assert + Assert.IsTrue(calculation.IsRelevant); + Assert.AreEqual(double.NaN, calculation.Contribution); + Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name); + Assert.AreEqual(double.NaN, calculation.InputParameters.AssessmentLevel.Value); + Assert.AreEqual("PK001_0001", calculation.InputParameters.SurfaceLine.Name); + Assert.AreEqual(double.NaN, calculation.InputParameters.EntryPointL.Value); + Assert.AreEqual(double.NaN, calculation.InputParameters.ExitPointL.Value); + Assert.AreEqual("PK001_0001_Piping", calculation.InputParameters.StochasticSoilModel.Name); + Assert.AreEqual("W1-6_0_1D1", calculation.InputParameters.StochasticSoilProfile.SoilProfile.Name); + Assert.AreEqual(double.NaN, calculation.InputParameters.PhreaticLevelExit.Mean.Value); + Assert.AreEqual(double.NaN, calculation.InputParameters.PhreaticLevelExit.StandardDeviation.Value); + Assert.AreEqual(double.NaN, calculation.InputParameters.DampingFactorExit.Mean.Value); + Assert.AreEqual(double.NaN, calculation.InputParameters.DampingFactorExit.StandardDeviation.Value); + } + + [Test] + public void GetPipingCalculationScenarioWithInfinities_Always_ReturnCalculationScenarioWithInfinities() + { + // Call + PipingCalculationScenario calculation = PipingTestDataGenerator.GetPipingCalculationScenarioWithInfinities(); + + // Assert + Assert.IsTrue(calculation.IsRelevant); + Assert.AreEqual(double.PositiveInfinity, calculation.Contribution); + Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name); + Assert.AreEqual(double.NegativeInfinity, calculation.InputParameters.AssessmentLevel.Value); + Assert.AreEqual("PK001_0001", calculation.InputParameters.SurfaceLine.Name); + Assert.AreEqual(double.NegativeInfinity, calculation.InputParameters.EntryPointL.Value); + Assert.AreEqual(double.PositiveInfinity, calculation.InputParameters.ExitPointL.Value); + Assert.AreEqual("PK001_0001_Piping", calculation.InputParameters.StochasticSoilModel.Name); + Assert.AreEqual("W1-6_0_1D1", calculation.InputParameters.StochasticSoilProfile.SoilProfile.Name); + Assert.AreEqual(double.NegativeInfinity, calculation.InputParameters.PhreaticLevelExit.Mean.Value); + Assert.AreEqual(double.PositiveInfinity, calculation.InputParameters.PhreaticLevelExit.StandardDeviation.Value); + Assert.AreEqual(double.PositiveInfinity, calculation.InputParameters.DampingFactorExit.Mean.Value); + Assert.AreEqual(double.PositiveInfinity, calculation.InputParameters.DampingFactorExit.StandardDeviation.Value); + } + + private static void AssertCalculationScenario(PipingCalculationScenario calculation, + bool hasHydraulicLocation = true, + bool hasAssessmentLevel = false, + bool hasSurfaceLine = true, + bool hasSoilModel = true, + bool hasSoilProfile = true) + { + Assert.IsTrue(calculation.IsRelevant); + Assert.AreEqual(1.0, calculation.Contribution, calculation.Contribution.GetAccuracy()); + Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name); + + if (hasHydraulicLocation) + { + Assert.AreEqual(1, calculation.InputParameters.HydraulicBoundaryLocation.Id); + Assert.AreEqual("PUNT_KAT_18", calculation.InputParameters.HydraulicBoundaryLocation.Name); + } + else + { + Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation); + } + + if (hasAssessmentLevel) + { + Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation); + Assert.IsTrue(calculation.InputParameters.UseAssessmentLevelManualInput); + Assert.AreEqual(3, calculation.InputParameters.AssessmentLevel.Value); + } + + if (hasSurfaceLine) + { + Assert.AreEqual("PK001_0001", calculation.InputParameters.SurfaceLine.Name); + } + else + { + Assert.IsNull(calculation.InputParameters.SurfaceLine); + } + + if (hasSoilModel) + { + Assert.AreEqual("PK001_0001_Piping", calculation.InputParameters.StochasticSoilModel.Name); + + if (hasSoilProfile) + { + Assert.IsNotNull(calculation.InputParameters.StochasticSoilProfile); + Assert.AreEqual("W1-6_0_1D1", calculation.InputParameters.StochasticSoilProfile.SoilProfile.Name); + Assert.AreEqual(1, calculation.InputParameters.StochasticSoilProfile.SoilProfile.Layers.Count()); + } + else + { + Assert.IsNull(calculation.InputParameters.StochasticSoilProfile); + } + } + else + { + Assert.IsNull(calculation.InputParameters.StochasticSoilModel); + Assert.IsNull(calculation.InputParameters.StochasticSoilProfile); + } + + Assert.AreEqual(0, calculation.InputParameters.PhreaticLevelExit.Mean.Value); + Assert.AreEqual(0.1, calculation.InputParameters.PhreaticLevelExit.StandardDeviation.Value); + Assert.AreEqual(0.7, calculation.InputParameters.DampingFactorExit.Mean.Value); + Assert.AreEqual(0.1, calculation.InputParameters.DampingFactorExit.StandardDeviation.Value); + } + + private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculationGroup, + HydraulicBoundaryLocation hydraulicBoundaryLocation) + { + IEnumerable calculationsWithHydraulicBoundaryLocation = + calculationGroup.Children + .OfType() + .Where(calc => calc.InputParameters.HydraulicBoundaryLocation != null); + + foreach (PipingCalculation calculation in calculationsWithHydraulicBoundaryLocation) + { + Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation); + } + } + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Ringtoets.Piping.Data.TestUtil.Test.csproj =================================================================== diff -u -r570695e818fcf887563710ad6d26df301be56227 -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Ringtoets.Piping.Data.TestUtil.Test.csproj (.../Ringtoets.Piping.Data.TestUtil.Test.csproj) (revision 570695e818fcf887563710ad6d26df301be56227) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Ringtoets.Piping.Data.TestUtil.Test.csproj (.../Ringtoets.Piping.Data.TestUtil.Test.csproj) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -51,6 +51,7 @@ + @@ -71,6 +72,10 @@ {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data + + {4843D6E5-066F-4795-94F5-1D53932DD03C} + Ringtoets.Common.Data.TestUtil + {ce994cc9-6f6a-48ac-b4be-02c30a21f4db} Ringtoets.Piping.Data Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -0,0 +1,413 @@ +// Copyright (C) Stichting Deltares 2017. 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 Core.Common.Base.Data; +using Core.Common.Base.Geometry; +using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.Piping.KernelWrapper.TestUtil; +using Ringtoets.Piping.Primitives; + +namespace Ringtoets.Piping.Data.TestUtil +{ + /// + /// Class responsible for generating test data configurations. + /// + public static class PipingTestDataGenerator + { + /// + /// Gets a fully configured with all + /// possible parent and nested calculation configurations. + /// + public static PipingFailureMechanism GetPipingFailureMechanismWithAllCalculationConfigurations() + { + var failureMechanism = new PipingFailureMechanism(); + var hydroLocation = new HydraulicBoundaryLocation(1, "", 0, 0); + ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydroLocation); + + return failureMechanism; + } + + /// + /// Gets a without hydraulic boundary location or design water level. + /// + /// A without hydraulic boundary location or design water level. + public static PipingCalculationScenario GetPipingCalculationScenarioWithoutHydraulicLocationAndAssessmentLevel() + { + PipingCalculationScenario calculation = GetPipingCalculationScenario(); + calculation.InputParameters.HydraulicBoundaryLocation = null; + + return calculation; + } + + /// + /// Gets a with manual design water level set. + /// + /// A with a manual design water level. + public static PipingCalculationScenario GetPipingCalculationScenarioWithAssessmentLevel() + { + PipingCalculationScenario calculation = GetPipingCalculationScenario(); + calculation.InputParameters.UseAssessmentLevelManualInput = true; + calculation.InputParameters.AssessmentLevel = (RoundedDouble) 3.0; + + return calculation; + } + + /// + /// Gets a without surface line. + /// + /// A without surface line. + public static PipingCalculationScenario GetPipingCalculationScenarioWithoutSurfaceLine() + { + PipingCalculationScenario calculation = GetPipingCalculationScenario(); + calculation.InputParameters.SurfaceLine = null; + + return calculation; + } + + /// + /// Gets a without soil model. + /// + /// A without soil model . + public static PipingCalculationScenario GetPipingCalculationScenarioWithoutSoilModel() + { + PipingCalculationScenario calculation = GetPipingCalculationScenario(); + calculation.InputParameters.StochasticSoilModel = null; + calculation.InputParameters.StochasticSoilProfile = null; + + return calculation; + } + + /// + /// Gets a without soil profile. + /// + /// A without soil profile. + public static PipingCalculationScenario GetPipingCalculationScenarioWithoutSoilProfile() + { + PipingCalculationScenario calculation = GetPipingCalculationScenario(); + calculation.InputParameters.StochasticSoilProfile = null; + + return calculation; + } + + /// + /// Gets a with relevance set to false. + /// + /// A with relevance set to false + /// . + public static PipingCalculationScenario GetIrrelevantPipingCalculationScenario() + { + PipingCalculationScenario calculation = GetPipingCalculationScenario(); + calculation.Contribution = (RoundedDouble) 0.5; + calculation.IsRelevant = false; + + return calculation; + } + + /// + /// Gets a . + /// + /// A . + public static PipingCalculationScenario GetPipingCalculationScenario() + { + var surfaceline = new RingtoetsPipingSurfaceLine + { + ReferenceLineIntersectionWorldPoint = new Point2D(0, 5), + Name = "PK001_0001" + }; + surfaceline.SetGeometry(new[] + { + new Point3D(0, 0, 0), + new Point3D(0, 10, 0) + }); + + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) + { + Name = "PK001_0001 W1-6_0_1D1", + InputParameters = + { + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_KAT_18", 0, 0), + SurfaceLine = surfaceline, + StochasticSoilModel = new StochasticSoilModel("PK001_0001_Piping"), + StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) + { + SoilProfile = new PipingSoilProfile("W1-6_0_1D1", 0, new[] + { + new PipingSoilLayer(0) + }, SoilProfileType.SoilProfile1D, 0) + }, + PhreaticLevelExit = + { + Mean = (RoundedDouble) 0, + StandardDeviation = (RoundedDouble) 0.1 + }, + DampingFactorExit = + { + Mean = (RoundedDouble) 0.7, + StandardDeviation = (RoundedDouble) 0.1 + } + } + }; + + return calculation; + } + + /// + /// Gets a with double.NaN values set. + /// + /// A with double.NaN values. + public static PipingCalculationScenario GetPipingCalculationScenarioWithNaNs() + { + PipingCalculationScenario calculation = GetPipingCalculationScenarioWithAssessmentLevel(); + calculation.Contribution = RoundedDouble.NaN; + calculation.InputParameters.AssessmentLevel = RoundedDouble.NaN; + calculation.InputParameters.EntryPointL = RoundedDouble.NaN; + calculation.InputParameters.ExitPointL = RoundedDouble.NaN; + calculation.InputParameters.PhreaticLevelExit = new NormalDistribution + { + Mean = RoundedDouble.NaN, + StandardDeviation = RoundedDouble.NaN + }; + calculation.InputParameters.DampingFactorExit = new LogNormalDistribution + { + Mean = RoundedDouble.NaN, + StandardDeviation = RoundedDouble.NaN + }; + + return calculation; + } + + /// + /// Gets a with double.NegativeInfinity + /// and double.PositiveInfinity values set. + /// + /// A with double.NegativeInfinity + /// and double.PositiveInfinity values. + public static PipingCalculationScenario GetPipingCalculationScenarioWithInfinities() + { + PipingCalculationScenario calculation = GetPipingCalculationScenarioWithAssessmentLevel(); + calculation.Contribution = (RoundedDouble) double.PositiveInfinity; + + calculation.InputParameters.SurfaceLine.SetGeometry(new[] + { + new Point3D(0, double.NegativeInfinity, 0), + new Point3D(0, double.PositiveInfinity, 0) + }); + + calculation.InputParameters.AssessmentLevel = (RoundedDouble) double.NegativeInfinity; + calculation.InputParameters.EntryPointL = (RoundedDouble) double.NegativeInfinity; + calculation.InputParameters.ExitPointL = (RoundedDouble) double.PositiveInfinity; + calculation.InputParameters.PhreaticLevelExit = new NormalDistribution + { + Mean = (RoundedDouble) double.NegativeInfinity, + StandardDeviation = (RoundedDouble) double.PositiveInfinity + }; + calculation.InputParameters.DampingFactorExit = new LogNormalDistribution + { + Mean = (RoundedDouble) double.PositiveInfinity, + StandardDeviation = (RoundedDouble) double.PositiveInfinity + }; + + return calculation; + } + + /// + /// Configures a to a fully configured failure + /// mechanism with all possible parent and nested calculation configurations. + /// + /// The failure mechanism to be updated. + /// The hydraulic boundary location used + /// by calculations. + /// This method assumes is a newly + /// created instance. + public static void ConfigureFailureMechanismWithAllCalculationConfigurations(PipingFailureMechanism failureMechanism, + HydraulicBoundaryLocation hydraulicBoundaryLocation) + { + var surfaceline1 = new RingtoetsPipingSurfaceLine + { + ReferenceLineIntersectionWorldPoint = new Point2D(0, 5), + Name = "Line A" + }; + surfaceline1.SetGeometry(new[] + { + new Point3D(0, 0, 0), + new Point3D(0, 10, 0) + }); + var surfaceline2 = new RingtoetsPipingSurfaceLine + { + ReferenceLineIntersectionWorldPoint = new Point2D(10, 5), + Name = "Line B" + }; + surfaceline2.SetGeometry(new[] + { + new Point3D(10, 0, 0), + new Point3D(10, 10, 0) + }); + + failureMechanism.SurfaceLines.AddRange(new[] + { + surfaceline1, + surfaceline2 + }, "some/path/to/surfacelines"); + var stochasticSoilModel1 = new StochasticSoilModel("A") + { + Geometry = + { + new Point2D(-5, 5), + new Point2D(5, 5) + }, + StochasticSoilProfiles = + { + new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) + } + }; + var stochasticSoilModel2 = new StochasticSoilModel("C") + { + Geometry = + { + new Point2D(5, 5), + new Point2D(15, 5) + }, + StochasticSoilProfiles = + { + new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile2D, 2) + } + }; + + failureMechanism.StochasticSoilModels.AddRange(new[] + { + stochasticSoilModel1, + stochasticSoilModel2 + }, "some/path/to/stochasticsoilmodels"); + + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationWithOutput = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation, + SurfaceLine = surfaceline1, + StochasticSoilModel = stochasticSoilModel1 + }, + Output = new TestPipingOutput(), + SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + }; + var calculationWithSurfaceLineAndSoilModel = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation, + SurfaceLine = surfaceline1, + StochasticSoilModel = stochasticSoilModel1, + StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles[0] + } + }; + var calculationWithOutputAndHydraulicBoundaryLocation = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation, + SurfaceLine = surfaceline2, + StochasticSoilModel = stochasticSoilModel2 + }, + Output = new TestPipingOutput(), + SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + }; + var calculationWithHydraulicBoundaryLocation = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation + } + }; + var calculationWithSurfaceLineAndStochasticSoilModel = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + SurfaceLine = surfaceline1, + StochasticSoilModel = stochasticSoilModel2, + StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0] + } + }; + + var subCalculation = new PipingCalculationScenario(new GeneralPipingInput()); + var subCalculationWithOutput = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation, + SurfaceLine = surfaceline2, + StochasticSoilModel = stochasticSoilModel2, + StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0] + }, + Output = new TestPipingOutput(), + SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + }; + var subCalculationWithOutputAndHydraulicBoundaryLocation = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation, + SurfaceLine = surfaceline1, + StochasticSoilModel = stochasticSoilModel1, + StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles[0] + }, + Output = new TestPipingOutput(), + SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + }; + var subCalculationWithHydraulicBoundaryLocation = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation + } + }; + var subCalculationWithSurfaceLineAndStochasticSoilModel = new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + SurfaceLine = surfaceline1, + StochasticSoilModel = stochasticSoilModel2, + StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles[0] + } + }; + + failureMechanism.CalculationsGroup.Children.Add(calculation); + failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput); + failureMechanism.CalculationsGroup.Children.Add(calculationWithSurfaceLineAndSoilModel); + failureMechanism.CalculationsGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation); + failureMechanism.CalculationsGroup.Children.Add(calculationWithSurfaceLineAndStochasticSoilModel); + failureMechanism.CalculationsGroup.Children.Add(calculationWithHydraulicBoundaryLocation); + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup + { + Children = + { + subCalculation, + subCalculationWithOutput, + subCalculationWithOutputAndHydraulicBoundaryLocation, + subCalculationWithHydraulicBoundaryLocation, + subCalculationWithSurfaceLineAndStochasticSoilModel + } + }); + } + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -0,0 +1,99 @@ +// Copyright (C) Stichting Deltares 2017. 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.Primitives; + +namespace Ringtoets.Piping.Data.TestUtil +{ + /// + /// Class to help asserting the . + /// + public static class PipingTestDataGeneratorHelper + { + /// + /// Asserts that the contains all possible calculation configurations + /// for the parent and nested calculations with output. + /// + /// The failure mechanism to assert. + public static void AssertHasAllPossibleCalculationConfigurationsWithOutputs(PipingFailureMechanism failureMechanism) + { + IEnumerable calculationRoot = failureMechanism.CalculationsGroup.Children; + AssertPipingCalculationGroupWithOutput(calculationRoot.OfType()); + + CalculationGroup nestedCalculations = calculationRoot.OfType().First(); + AssertPipingCalculationGroupWithOutput(nestedCalculations.Children.OfType()); + } + + /// + /// Asserts that the contains all possible calculation configurations + /// for the parent and nested calculations without output. + /// + /// The failure mechanism to assert. + public static void AssertHasAllPossibleCalculationConfigurationsWithoutOutputs(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 that 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.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj =================================================================== diff -u -r026cc14e6eb321e7e3e1c16d2e278cab74602339 -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj (.../Ringtoets.Piping.Data.TestUtil.csproj) (revision 026cc14e6eb321e7e3e1c16d2e278cab74602339) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj (.../Ringtoets.Piping.Data.TestUtil.csproj) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -39,6 +39,10 @@ MinimumRecommendedRules.ruleset + + ..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + True + @@ -48,6 +52,8 @@ + + @@ -85,6 +91,7 @@ Copying.licenseheader + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs =================================================================== diff -u -r9a84eac646ba120e685a58839a3d3ad71d077c2e -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 9a84eac646ba120e685a58839a3d3ad71d077c2e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -29,7 +29,6 @@ using Ringtoets.Common.IO.TestUtil; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; -using Ringtoets.Piping.Integration.TestUtil; using Ringtoets.Piping.IO.Configurations; using Ringtoets.Piping.Primitives; Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj =================================================================== diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj (.../Ringtoets.Piping.IO.Test.csproj) (revision 93036b575ee81b4517b29db51f1eadf81454fb93) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj (.../Ringtoets.Piping.IO.Test.csproj) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -142,10 +142,6 @@ {955E574D-67CE-4347-AA6B-7DF8A04ED754} Ringtoets.Piping.Data.TestUtil - - {A4972765-DDBB-4A1E-B17C-7185577E5591} - Ringtoets.Piping.Integration.TestUtil - {4A675B7E-96AD-4911-B154-85385C9330C3} Ringtoets.Piping.IO.TestUtil Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil.Test/PipingTestDataGeneratorTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil.Test/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil.Test/Ringtoets.Piping.Integration.TestUtil.Test.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil.Test/packages.config'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil/PipingTestDataGenerator.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil/PipingTestDataGeneratorHelper.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil/Ringtoets.Piping.Integration.TestUtil.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6456699cf3b6e52dad3a92aaa3c6714fad072a96 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Integration.TestUtil/packages.config'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs =================================================================== diff -u -r16df8541528639fd1e8d9f2584fae28808b63fad -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs (.../PipingDataSynchronizationServiceTest.cs) (revision 16df8541528639fd1e8d9f2584fae28808b63fad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs (.../PipingDataSynchronizationServiceTest.cs) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -28,7 +28,6 @@ using Ringtoets.Common.Service; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; -using Ringtoets.Piping.Integration.TestUtil; using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Primitives; Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj =================================================================== diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r6456699cf3b6e52dad3a92aaa3c6714fad072a96 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj (.../Ringtoets.Piping.Service.Test.csproj) (revision 93036b575ee81b4517b29db51f1eadf81454fb93) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj (.../Ringtoets.Piping.Service.Test.csproj) (revision 6456699cf3b6e52dad3a92aaa3c6714fad072a96) @@ -105,10 +105,6 @@ {CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB} Ringtoets.Piping.Data - - {a4972765-ddbb-4a1e-b17c-7185577e5591} - Ringtoets.Piping.Integration.TestUtil - {27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8} Ringtoets.Piping.KernelWrapper.TestUtil