Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r811967790aed0c6617f36c2135016a5bc4aa8fcc -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision 811967790aed0c6617f36c2135016a5bc4aa8fcc) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -30,6 +30,7 @@ using Ringtoets.ClosingStructures.Data.TestUtil; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; namespace Application.Ringtoets.Storage.Test.Create.ClosingStructures { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -27,6 +27,7 @@ using Application.Ringtoets.Storage.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.HydraRing.Data; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rd3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismCreateExtensionsTest.cs) (revision d3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismCreateExtensionsTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -27,6 +27,7 @@ using Application.Ringtoets.Storage.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Data.TestUtil; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs =================================================================== diff -u -r25cb0404c9026690062e1a17b1ef5e9ecdb176f6 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 25cb0404c9026690062e1a17b1ef5e9ecdb176f6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -30,6 +30,7 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Data.TestUtil; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r86ce17cdf5cf329f4d5bcd444320994fead52294 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -28,6 +28,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Data.TestUtil; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rd3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs) (revision d3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -27,6 +27,7 @@ using Application.Ringtoets.Storage.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.StabilityStoneCover.Data; namespace Application.Ringtoets.Storage.Test.Create.StabilityStoneCover Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs =================================================================== diff -u -r86ce17cdf5cf329f4d5bcd444320994fead52294 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 86ce17cdf5cf329f4d5bcd444320994fead52294) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -22,7 +22,6 @@ using System; using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.DbContext; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; @@ -32,6 +31,7 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Data.TestUtil; using Ringtoets.HydraRing.Data; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rd3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision d3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -27,6 +27,7 @@ using Application.Ringtoets.Storage.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.WaveImpactAsphaltCover.Data; namespace Application.Ringtoets.Storage.Test.Create.WaveImpactAsphaltCover Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs =================================================================== diff -u -r6e33ada58f1a53a5a732c3b4e46583ad846a2983 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 6e33ada58f1a53a5a732c3b4e46583ad846a2983) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -29,6 +29,7 @@ using Ringtoets.ClosingStructures.Data.TestUtil; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Data.TestUtil; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj =================================================================== diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj (.../Application.Ringtoets.Storage.TestUtil.Test.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj (.../Application.Ringtoets.Storage.TestUtil.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -61,7 +61,6 @@ - Fisheye: Tag 98f01944e8ac182e2a1e9b1ed4deb48a07952529 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/TestForeshoreProfileTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj =================================================================== diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj (.../Application.Ringtoets.Storage.TestUtil.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj (.../Application.Ringtoets.Storage.TestUtil.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -58,7 +58,6 @@ - Fisheye: Tag 98f01944e8ac182e2a1e9b1ed4deb48a07952529 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestForeshoreProfile.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj =================================================================== diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -59,6 +59,7 @@ + Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -0,0 +1,101 @@ +// 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 Core.Common.Base.Geometry; +using NUnit.Framework; +using Ringtoets.Common.Data.DikeProfiles; + +namespace Ringtoets.Common.Data.TestUtil.Test +{ + [TestFixture] + public class TestForeshoreProfileTest + { + [Test] + public void Constructor_Always_ReturnsForeshoreProfileWithEmptyNameAndOnePointAtOrigin() + { + // Call + ForeshoreProfile profile = new TestForeshoreProfile(); + + // Assert + Assert.IsEmpty(profile.Geometry); + Assert.IsNull(profile.Name); + Assert.IsFalse(profile.HasBreakWater); + Assert.AreEqual(0.0, profile.X0); + Assert.AreEqual(0.0, profile.Orientation.Value); + Assert.AreEqual(new Point2D(0, 0), profile.WorldReferencePoint); + } + + [Test] + public void Constructor_UseBreakWater_ReturnsForeshoreProfileWithEmptyNameAndOnePointAtOriginAndDefaultBreakWater() + { + // Call + ForeshoreProfile profile = new TestForeshoreProfile(true); + + // Assert + Assert.IsEmpty(profile.Geometry); + Assert.IsNull(profile.Name); + Assert.IsTrue(profile.HasBreakWater); + Assert.IsNotNull(profile.BreakWater); + Assert.AreEqual(BreakWaterType.Dam, profile.BreakWater.Type); + Assert.AreEqual(10.0, profile.BreakWater.Height.Value); + Assert.AreEqual(0.0, profile.X0); + Assert.AreEqual(0.0, profile.Orientation.Value); + Assert.AreEqual(new Point2D(0, 0), profile.WorldReferencePoint); + } + + [Test] + public void Constructor_WithName_ReturnForeshoreProfileWithGivenNameAndNoBreakWater() + { + // Setup + const string name = "test"; + + // Call + ForeshoreProfile profile = new TestForeshoreProfile(name); + + // Assert + Assert.IsEmpty(profile.Geometry); + Assert.AreEqual(name, profile.Name); + Assert.IsFalse(profile.HasBreakWater); + Assert.AreEqual(0.0, profile.X0); + Assert.AreEqual(0.0, profile.Orientation.Value); + Assert.AreEqual(new Point2D(0, 0), profile.WorldReferencePoint); + } + + [Test] + public void ConstructorWithBreakWater_Always_ReturnsForeshoreProfileWithEmptyNameAndOnePointAtOriginAndBreakWater() + { + // Setup + var breakWater = new BreakWater(BreakWaterType.Dam, 50.0); + + // Call + ForeshoreProfile profile = new TestForeshoreProfile(breakWater); + + // Assert + Assert.IsEmpty(profile.Geometry); + Assert.IsNull(profile.Name); + Assert.AreSame(breakWater, profile.BreakWater); + Assert.IsTrue(profile.HasBreakWater); + Assert.AreEqual(0.0, profile.X0); + Assert.AreEqual(0.0, profile.Orientation.Value); + Assert.AreEqual(new Point2D(0, 0), profile.WorldReferencePoint); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj =================================================================== diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -60,6 +60,7 @@ + Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -0,0 +1,61 @@ +// 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.Linq; +using Core.Common.Base.Geometry; +using Ringtoets.Common.Data.DikeProfiles; + +namespace Ringtoets.Common.Data.TestUtil +{ + /// + /// Simple foreshore profile that can be used for testing. + /// + public class TestForeshoreProfile : ForeshoreProfile + { + /// + /// Creates a new instance of . + /// + /// If true, create the ForeshoreProfile with a default . + public TestForeshoreProfile(bool useBreakWater = false) : this(null, + useBreakWater ? new BreakWater(BreakWaterType.Dam, 10) : null) {} + + /// + /// Creates a new instance of the with a given + /// name and no . + /// + /// Name of the profile. + public TestForeshoreProfile(string profileName) : this(profileName, null) {} + + /// + /// Creates a new instance of with a specified . + /// + /// The which needs to be set on the . + public TestForeshoreProfile(BreakWater breakWater) : this(null, breakWater) {} + + private TestForeshoreProfile(string profileName, BreakWater breakWater) : base(new Point2D(0, 0), + Enumerable.Empty(), + breakWater, + new ConstructionProperties + { + Name = profileName + }) {} + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs =================================================================== diff -u -rb5accd775c390fa85f815ef13c3c3e54a6d10ada -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs (.../ForeshoreProfilesContextTest.cs) (revision b5accd775c390fa85f815ef13c3c3e54a6d10ada) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/ForeshoreProfilesContextTest.cs (.../ForeshoreProfilesContextTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -79,15 +79,15 @@ { // Setup var mocks = new MockRepository(); - var failureMechanism = mocks.Stub(); + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); // Call - TestDelegate call = () => new ForeshoreProfilesContext(new ObservableList(), failureMechanism, null); + TestDelegate call = () => new ForeshoreProfilesContext(new ObservableList(), null, assessmentSection); // Assert string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("parentAssessmentSection", paramName); + Assert.AreEqual("parentFailureMechanism", paramName); mocks.VerifyAll(); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs =================================================================== diff -u -raf8c074a1078f8d4937039c70dc4f9725bc4fefc -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs (.../StructuresInputBasePropertiesTest.cs) (revision af8c074a1078f8d4937039c70dc4f9725bc4fefc) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs (.../StructuresInputBasePropertiesTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -24,7 +24,6 @@ using System.ComponentModel; using System.Globalization; using System.Linq; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -r4041baf0e78465709f1b12ef94f9ac613a569380 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 4041baf0e78465709f1b12ef94f9ac613a569380) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -117,10 +117,6 @@ - - {03dbe353-99f7-47d6-b826-60d694ffb9ac} - Application.Ringtoets.Storage.TestUtil - {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs =================================================================== diff -u -re9bf2aa18d42b83477c0fdf0021943e778c79bb1 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs (.../ForeshoreProfileEditorTest.cs) (revision e9bf2aa18d42b83477c0fdf0021943e778c79bb1) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs (.../ForeshoreProfileEditorTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -23,11 +23,11 @@ using System.Collections.Generic; using System.ComponentModel; using System.Windows.Forms.Design; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.DikeProfiles; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.UITypeEditors; namespace Ringtoets.Common.Forms.Test.UITypeEditors Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj =================================================================== diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -111,10 +111,6 @@ - - {03DBE353-99F7-47D6-B826-60D694FFB9AC} - Application.Ringtoets.Storage.TestUtil - {3BBFD65B-B277-4E50-AE6D-BD24C3434609} Core.Common.Base Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r64eede81657b51fb755944fd3939ceefb839e591 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 64eede81657b51fb755944fd3939ceefb839e591) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -24,7 +24,6 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; @@ -42,6 +41,7 @@ using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -reb66bc91750d4082efd2d01c0fc9e68da96ff62b -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision eb66bc91750d4082efd2d01c0fc9e68da96ff62b) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -24,7 +24,6 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Controls.TreeView; @@ -41,6 +40,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Plugin; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -racca39f8e27f0fc74521a290ae5404227e3e646e -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision acca39f8e27f0fc74521a290ae5404227e3e646e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -23,12 +23,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; using Core.Common.Base.Service; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.IO.FileImporters; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Service; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj =================================================================== diff -u -rbc4c4000ca4a850b49a88156ca2b919ea690494b -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj) (revision bc4c4000ca4a850b49a88156ca2b919ea690494b) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -59,10 +59,6 @@ - - {03DBE353-99F7-47D6-B826-60D694FFB9AC} - Application.Ringtoets.Storage.TestUtil - {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base @@ -99,18 +95,10 @@ {11F1F874-45AF-43E4-8AE5-15A5C9593E28} Ringtoets.Integration.Data - - {C8383B76-B3F1-4E6E-B56C-527B469FA20A} - Ringtoets.Integration.Plugin - {87c2c553-c0bc-40bf-b1ea-b83bff357f27} Ringtoets.Revetment.Data - - {2331235F-1E56-4344-ACC2-191C22A39594} - Ringtoets.Revetment.Service - {E7225477-577F-4A17-B7EC-6721158E1543} Ringtoets.GrassCoverErosionOutwards.Data Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r57a8a7c5fb3b437a1ed450361e91bc79d0ee5d76 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 57a8a7c5fb3b437a1ed450361e91bc79d0ee5d76) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -23,14 +23,14 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Geometry; using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Data.TestUtil; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj =================================================================== diff -u -r01c86929c554e5092193f6c7e0c673f58b5d2bbc -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj (.../Ringtoets.HeightStructures.Forms.Test.csproj) (revision 01c86929c554e5092193f6c7e0c673f58b5d2bbc) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj (.../Ringtoets.HeightStructures.Forms.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -92,10 +92,6 @@ - - {03DBE353-99F7-47D6-B826-60D694FFB9AC} - Application.Ringtoets.Storage.TestUtil - {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base @@ -141,10 +137,6 @@ {4843D6E5-066F-4795-94F5-1D53932DD03C} Ringtoets.Common.Data.TestUtil - - {888d4097-8bc2-4703-9fb1-8744c94d525e} - Ringtoets.HydraRing.Calculation - {70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2} Ringtoets.HydraRing.Data Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rcc8077f0d935a92dd18a5d551788e3548645a5d2 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision cc8077f0d935a92dd18a5d551788e3548645a5d2) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -76,6 +76,7 @@ using Ringtoets.Integration.Service.MessageProviders; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; +using Ringtoets.Revetment.Data; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Forms.PresentationObjects; using Ringtoets.StabilityStoneCover.Data; @@ -901,65 +902,38 @@ private static void OnStabilityStoneCoverForeshoreProfileRemoved(ForeshoreProfile nodeData, ObservableList foreshoreProfiles, StabilityStoneCoverFailureMechanism failureMechanism) { - var changedObservables = new List(); - StabilityStoneCoverWaveConditionsCalculation[] calculations = failureMechanism.Calculations - .Cast() - .ToArray(); - StabilityStoneCoverWaveConditionsCalculation[] calculationWithRemovedForeshoreProfile = calculations - .Where(c => ReferenceEquals(c.InputParameters.ForeshoreProfile, nodeData)) - .ToArray(); - foreach (StabilityStoneCoverWaveConditionsCalculation calculation in calculationWithRemovedForeshoreProfile) - { - calculation.InputParameters.ForeshoreProfile = null; - changedObservables.Add(calculation.InputParameters); - } - - foreshoreProfiles.Remove(nodeData); - changedObservables.Add(foreshoreProfiles); - - foreach (IObservable observable in changedObservables) - { - observable.NotifyObservers(); - } + WaveConditionsInput[] calculationInputs = failureMechanism.Calculations + .Cast() + .Select(c => c.InputParameters) + .ToArray(); + OnWaveConditionsInputForeshoreProfileRemoved(nodeData, foreshoreProfiles, calculationInputs); } private static void OnWaveImpactAsphaltCoverForeshoreProfileRemoved(ForeshoreProfile nodeData, ObservableList foreshoreProfiles, WaveImpactAsphaltCoverFailureMechanism failureMechanism) { - var changedObservables = new List(); - WaveImpactAsphaltCoverWaveConditionsCalculation[] calculations = failureMechanism.Calculations - .Cast() - .ToArray(); - WaveImpactAsphaltCoverWaveConditionsCalculation[] calculationWithRemovedForeshoreProfile = calculations - .Where(c => ReferenceEquals(c.InputParameters.ForeshoreProfile, nodeData)) - .ToArray(); - foreach (WaveImpactAsphaltCoverWaveConditionsCalculation calculation in calculationWithRemovedForeshoreProfile) - { - calculation.InputParameters.ForeshoreProfile = null; - changedObservables.Add(calculation.InputParameters); - } - - foreshoreProfiles.Remove(nodeData); - changedObservables.Add(foreshoreProfiles); - - foreach (IObservable observable in changedObservables) - { - observable.NotifyObservers(); - } + WaveConditionsInput[] calculationInputs = failureMechanism.Calculations + .Cast() + .Select(c => c.InputParameters) + .ToArray(); + OnWaveConditionsInputForeshoreProfileRemoved(nodeData, foreshoreProfiles, calculationInputs); } private static void OnGrassCoverErosionOutwardsForeshoreProfileRemoved(ForeshoreProfile nodeData, ObservableList foreshoreProfiles, GrassCoverErosionOutwardsFailureMechanism failureMechanism) { + WaveConditionsInput[] calculationInputs = failureMechanism.Calculations + .Cast() + .Select(c => c.InputParameters) + .ToArray(); + OnWaveConditionsInputForeshoreProfileRemoved(nodeData, foreshoreProfiles, calculationInputs); + } + + private static void OnWaveConditionsInputForeshoreProfileRemoved(ForeshoreProfile nodeData, ObservableList foreshoreProfiles, WaveConditionsInput[] calculationInputs) + { var changedObservables = new List(); - GrassCoverErosionOutwardsWaveConditionsCalculation[] calculations = failureMechanism.Calculations - .Cast() - .ToArray(); - GrassCoverErosionOutwardsWaveConditionsCalculation[] calculationWithRemovedForeshoreProfile = calculations - .Where(c => ReferenceEquals(c.InputParameters.ForeshoreProfile, nodeData)) - .ToArray(); - foreach (GrassCoverErosionOutwardsWaveConditionsCalculation calculation in calculationWithRemovedForeshoreProfile) + foreach (WaveConditionsInput input in calculationInputs.Where(input => ReferenceEquals(input.ForeshoreProfile, nodeData))) { - calculation.InputParameters.ForeshoreProfile = null; - changedObservables.Add(calculation.InputParameters); + input.ForeshoreProfile = null; + changedObservables.Add(input); } foreshoreProfiles.Remove(nodeData); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj =================================================================== diff -u -r8723c31042f8aa4174e6d51a42f20d3665ec2da0 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -101,7 +101,7 @@ - + @@ -193,10 +193,6 @@ {22E191F2-B2E3-413C-9511-4C2CDEDB2EFF} Ringtoets.ClosingStructures.Forms - - {888d4097-8bc2-4703-9fb1-8744c94d525e} - Ringtoets.HydraRing.Calculation - {74CBA865-9338-447F-BAD9-28312446AE84} Ringtoets.HydraRing.Calculation.TestUtil Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -0,0 +1,788 @@ +// 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.Drawing; +using System.Linq; +using Core.Common.Base; +using Core.Common.Controls.TreeView; +using Core.Common.Gui; +using Core.Common.Gui.ContextMenu; +using Core.Common.TestUtil; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.DikeProfiles; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Forms.PresentationObjects; +using Ringtoets.GrassCoverErosionOutwards.Data; +using Ringtoets.HeightStructures.Data; +using Ringtoets.Integration.Plugin; +using Ringtoets.Integration.Plugin.Properties; +using Ringtoets.StabilityPointStructures.Data; +using Ringtoets.StabilityStoneCover.Data; +using Ringtoets.WaveImpactAsphaltCover.Data; + +namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos +{ + [TestFixture] + public class ForeshoreProfileTreeNodeInfoTest + { + private RingtoetsPlugin plugin; + private TreeNodeInfo info; + + [SetUp] + public void SetUp() + { + plugin = new RingtoetsPlugin(); + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ForeshoreProfile)); + } + + [TearDown] + public void TearDown() + { + plugin.Dispose(); + } + + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.AreEqual(typeof(ForeshoreProfile), info.TagType); + Assert.IsNotNull(info.Text); + Assert.IsNotNull(info.Image); + Assert.IsNotNull(info.ContextMenuStrip); + Assert.IsNull(info.ForeColor); + Assert.IsNull(info.ChildNodeObjects); + Assert.IsNull(info.EnsureVisibleOnCreate); + Assert.IsNull(info.CanRename); + Assert.IsNull(info.OnNodeRenamed); + Assert.IsNull(info.CanCheck); + Assert.IsNull(info.IsChecked); + Assert.IsNull(info.OnNodeChecked); + Assert.IsNull(info.CanDrag); + Assert.IsNull(info.CanDrop); + Assert.IsNull(info.CanInsert); + Assert.IsNull(info.OnDrop); + } + + [Test] + public void Text_Always_ReturnForeshoreProfileName() + { + // Setup + const string profileName = "Random profile name"; + ForeshoreProfile foreshoreProfile = new TestForeshoreProfile(profileName); + + // Call + string text = info.Text(foreshoreProfile); + + // Assert + Assert.AreEqual(profileName, text); + } + + [Test] + public void Image_Always_ReturnExpectedImage() + { + // Call + Image image = info.Image(null); + + // Assert + TestHelper.AssertImagesAreEqual(Resources.Foreshore, image); + } + + [Test] + public void CanRemove_ParentFailureMechanismIsStabilityStoneCover_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new StabilityStoneCoverFailureMechanism(); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + bool canRemove = info.CanRemove(null, parentData); + + // Assert + Assert.IsTrue(canRemove); + mocks.VerifyAll(); + } + + [Test] + public void CanRemove_ParentFailureMechanismIsWaveImpactAsphaltCover_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + bool canRemove = info.CanRemove(null, parentData); + + // Assert + Assert.IsTrue(canRemove); + mocks.VerifyAll(); + } + + [Test] + public void CanRemove_ParentFailureMechanismIsGrassCoverErosionOutwards_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + bool canRemove = info.CanRemove(null, parentData); + + // Assert + Assert.IsTrue(canRemove); + mocks.VerifyAll(); + } + + [Test] + public void CanRemove_ParentFailureMechanismIsHeightStructures_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new HeightStructuresFailureMechanism(); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + bool canRemove = info.CanRemove(null, parentData); + + // Assert + Assert.IsTrue(canRemove); + mocks.VerifyAll(); + } + + [Test] + public void CanRemove_ParentFailureMechanismIsClosingStructures_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new ClosingStructuresFailureMechanism(); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + bool canRemove = info.CanRemove(null, parentData); + + // Assert + Assert.IsTrue(canRemove); + mocks.VerifyAll(); + } + + [Test] + public void CanRemove_ParentFailureMechanismIsStabilityPointStructures_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new StabilityPointStructuresFailureMechanism(); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + bool canRemove = info.CanRemove(null, parentData); + + // Assert + Assert.IsTrue(canRemove); + mocks.VerifyAll(); + } + + [Test] + public void CanRemove_UnsupportedFailureMechanism_ReturnFalse() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + var failureMechanism = mocks.Stub(); + mocks.ReplayAll(); + + var list = new ObservableList(); + + var parentData = new ForeshoreProfilesContext(list, failureMechanism, assessmentSection); + + // Call + bool canRemove = info.CanRemove(null, parentData); + + // Assert + Assert.IsFalse(canRemove); + mocks.VerifyAll(); + } + + [Test] + public void OnNodeRemoved_ForeshoreProfileOfStabilityStoneCoverWaveConditionsCalculation_ForeshoreProfileRemovedFromFailureMechanismAndCalculationForeshoreProfileCleared() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + var observer = mocks.Stub(); + observer.Expect(o => o.UpdateObserver()); + var calculation1Observer = mocks.StrictMock(); + calculation1Observer.Expect(o => o.UpdateObserver()); + var calculation2Observer = mocks.StrictMock(); + calculation2Observer.Expect(o => o.UpdateObserver()); + var calculation3Observer = mocks.StrictMock(); + calculation3Observer.Expect(o => o.UpdateObserver()).Repeat.Never(); + mocks.ReplayAll(); + + ForeshoreProfile nodeData = new TestForeshoreProfile("A"); + ForeshoreProfile otherProfile = new TestForeshoreProfile("B"); + + var calculation1 = new StabilityStoneCoverWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation1.InputParameters.Attach(calculation1Observer); + var calculation2 = new StabilityStoneCoverWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation2.InputParameters.Attach(calculation2Observer); + var calculation3 = new StabilityStoneCoverWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = otherProfile + } + }; + calculation3.InputParameters.Attach(calculation3Observer); + + var failureMechanism = new StabilityStoneCoverFailureMechanism + { + ForeshoreProfiles = + { + nodeData, + otherProfile + }, + WaveConditionsCalculationGroup = + { + Children = + { + calculation1, + new CalculationGroup("A", true) + { + Children = + { + calculation2 + } + }, + calculation3 + } + } + }; + failureMechanism.ForeshoreProfiles.Attach(observer); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + info.OnNodeRemoved(nodeData, parentData); + + // Assert + CollectionAssert.DoesNotContain(failureMechanism.ForeshoreProfiles, nodeData); + + Assert.IsNull(calculation1.InputParameters.ForeshoreProfile); + Assert.IsNull(calculation2.InputParameters.ForeshoreProfile); + Assert.AreSame(otherProfile, calculation3.InputParameters.ForeshoreProfile); + mocks.VerifyAll(); + } + + [Test] + public void OnNodeRemoved_ForeshoreProfileOfWaveImpactAsphaltCoverWaveConditionsCalculation_ForeshoreProfileRemovedFromFailureMechanismAndCalculationForeshoreProfileCleared() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + var observer = mocks.Stub(); + observer.Expect(o => o.UpdateObserver()); + var calculation1Observer = mocks.StrictMock(); + calculation1Observer.Expect(o => o.UpdateObserver()); + var calculation2Observer = mocks.StrictMock(); + calculation2Observer.Expect(o => o.UpdateObserver()); + var calculation3Observer = mocks.StrictMock(); + calculation3Observer.Expect(o => o.UpdateObserver()).Repeat.Never(); + mocks.ReplayAll(); + + ForeshoreProfile nodeData = new TestForeshoreProfile("A"); + ForeshoreProfile otherProfile = new TestForeshoreProfile("B"); + + var calculation1 = new WaveImpactAsphaltCoverWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation1.InputParameters.Attach(calculation1Observer); + var calculation2 = new WaveImpactAsphaltCoverWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation2.InputParameters.Attach(calculation2Observer); + var calculation3 = new WaveImpactAsphaltCoverWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = otherProfile + } + }; + calculation3.InputParameters.Attach(calculation3Observer); + + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism + { + ForeshoreProfiles = + { + nodeData, + otherProfile + }, + WaveConditionsCalculationGroup = + { + Children = + { + calculation1, + new CalculationGroup("A", true) + { + Children = + { + calculation2 + } + }, + calculation3 + } + } + }; + failureMechanism.ForeshoreProfiles.Attach(observer); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + info.OnNodeRemoved(nodeData, parentData); + + // Assert + CollectionAssert.DoesNotContain(failureMechanism.ForeshoreProfiles, nodeData); + + Assert.IsNull(calculation1.InputParameters.ForeshoreProfile); + Assert.IsNull(calculation2.InputParameters.ForeshoreProfile); + Assert.AreSame(otherProfile, calculation3.InputParameters.ForeshoreProfile); + mocks.VerifyAll(); + } + + [Test] + public void OnNodeRemoved_ForeshoreProfileOfGrassCoverErosionOutwardsWaveConditionsCalculation_ForeshoreProfileRemovedFromFailureMechanismAndCalculationForeshoreProfileCleared() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + var observer = mocks.Stub(); + observer.Expect(o => o.UpdateObserver()); + var calculation1Observer = mocks.StrictMock(); + calculation1Observer.Expect(o => o.UpdateObserver()); + var calculation2Observer = mocks.StrictMock(); + calculation2Observer.Expect(o => o.UpdateObserver()); + var calculation3Observer = mocks.StrictMock(); + calculation3Observer.Expect(o => o.UpdateObserver()).Repeat.Never(); + mocks.ReplayAll(); + + ForeshoreProfile nodeData = new TestForeshoreProfile("A"); + ForeshoreProfile otherProfile = new TestForeshoreProfile("B"); + + var calculation1 = new GrassCoverErosionOutwardsWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation1.InputParameters.Attach(calculation1Observer); + var calculation2 = new GrassCoverErosionOutwardsWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation2.InputParameters.Attach(calculation2Observer); + var calculation3 = new GrassCoverErosionOutwardsWaveConditionsCalculation + { + InputParameters = + { + ForeshoreProfile = otherProfile + } + }; + calculation3.InputParameters.Attach(calculation3Observer); + + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism + { + ForeshoreProfiles = + { + nodeData, + otherProfile + }, + WaveConditionsCalculationGroup = + { + Children = + { + calculation1, + new CalculationGroup("A", true) + { + Children = + { + calculation2 + } + }, + calculation3 + } + } + }; + failureMechanism.ForeshoreProfiles.Attach(observer); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + info.OnNodeRemoved(nodeData, parentData); + + // Assert + CollectionAssert.DoesNotContain(failureMechanism.ForeshoreProfiles, nodeData); + + Assert.IsNull(calculation1.InputParameters.ForeshoreProfile); + Assert.IsNull(calculation2.InputParameters.ForeshoreProfile); + Assert.AreSame(otherProfile, calculation3.InputParameters.ForeshoreProfile); + mocks.VerifyAll(); + } + + [Test] + public void OnNodeRemoved_ForeshoreProfileOfHeightStructuresWaveConditionsCalculation_ForeshoreProfileRemovedFromFailureMechanismAndCalculationForeshoreProfileCleared() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + var observer = mocks.Stub(); + observer.Expect(o => o.UpdateObserver()); + var calculation1Observer = mocks.StrictMock(); + calculation1Observer.Expect(o => o.UpdateObserver()); + var calculation2Observer = mocks.StrictMock(); + calculation2Observer.Expect(o => o.UpdateObserver()); + var calculation3Observer = mocks.StrictMock(); + calculation3Observer.Expect(o => o.UpdateObserver()).Repeat.Never(); + mocks.ReplayAll(); + + ForeshoreProfile nodeData = new TestForeshoreProfile("A"); + ForeshoreProfile otherProfile = new TestForeshoreProfile("B"); + + var calculation1 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation1.InputParameters.Attach(calculation1Observer); + var calculation2 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation2.InputParameters.Attach(calculation2Observer); + var calculation3 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = otherProfile + } + }; + calculation3.InputParameters.Attach(calculation3Observer); + + var failureMechanism = new HeightStructuresFailureMechanism + { + ForeshoreProfiles = + { + nodeData, + otherProfile + }, + CalculationsGroup = + { + Children = + { + calculation1, + new CalculationGroup("A", true) + { + Children = + { + calculation2 + } + }, + calculation3 + } + } + }; + failureMechanism.ForeshoreProfiles.Attach(observer); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + info.OnNodeRemoved(nodeData, parentData); + + // Assert + CollectionAssert.DoesNotContain(failureMechanism.ForeshoreProfiles, nodeData); + + Assert.IsNull(calculation1.InputParameters.ForeshoreProfile); + Assert.IsNull(calculation2.InputParameters.ForeshoreProfile); + Assert.AreSame(otherProfile, calculation3.InputParameters.ForeshoreProfile); + mocks.VerifyAll(); + } + + [Test] + public void OnNodeRemoved_ForeshoreProfileOfClosingStructuresWaveConditionsCalculation_ForeshoreProfileRemovedFromFailureMechanismAndCalculationForeshoreProfileCleared() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + var observer = mocks.Stub(); + observer.Expect(o => o.UpdateObserver()); + var calculation1Observer = mocks.StrictMock(); + calculation1Observer.Expect(o => o.UpdateObserver()); + var calculation2Observer = mocks.StrictMock(); + calculation2Observer.Expect(o => o.UpdateObserver()); + var calculation3Observer = mocks.StrictMock(); + calculation3Observer.Expect(o => o.UpdateObserver()).Repeat.Never(); + mocks.ReplayAll(); + + ForeshoreProfile nodeData = new TestForeshoreProfile("A"); + ForeshoreProfile otherProfile = new TestForeshoreProfile("B"); + + var calculation1 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation1.InputParameters.Attach(calculation1Observer); + var calculation2 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation2.InputParameters.Attach(calculation2Observer); + var calculation3 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = otherProfile + } + }; + calculation3.InputParameters.Attach(calculation3Observer); + + var failureMechanism = new ClosingStructuresFailureMechanism + { + ForeshoreProfiles = + { + nodeData, + otherProfile + }, + CalculationsGroup = + { + Children = + { + calculation1, + new CalculationGroup("A", true) + { + Children = + { + calculation2 + } + }, + calculation3 + } + } + }; + failureMechanism.ForeshoreProfiles.Attach(observer); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + info.OnNodeRemoved(nodeData, parentData); + + // Assert + CollectionAssert.DoesNotContain(failureMechanism.ForeshoreProfiles, nodeData); + + Assert.IsNull(calculation1.InputParameters.ForeshoreProfile); + Assert.IsNull(calculation2.InputParameters.ForeshoreProfile); + Assert.AreSame(otherProfile, calculation3.InputParameters.ForeshoreProfile); + mocks.VerifyAll(); + } + + [Test] + public void OnNodeRemoved_ForeshoreProfileOfStabilityPointStructuresWaveConditionsCalculation_ForeshoreProfileRemovedFromFailureMechanismAndCalculationForeshoreProfileCleared() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + var observer = mocks.Stub(); + observer.Expect(o => o.UpdateObserver()); + var calculation1Observer = mocks.StrictMock(); + calculation1Observer.Expect(o => o.UpdateObserver()); + var calculation2Observer = mocks.StrictMock(); + calculation2Observer.Expect(o => o.UpdateObserver()); + var calculation3Observer = mocks.StrictMock(); + calculation3Observer.Expect(o => o.UpdateObserver()).Repeat.Never(); + mocks.ReplayAll(); + + ForeshoreProfile nodeData = new TestForeshoreProfile("A"); + ForeshoreProfile otherProfile = new TestForeshoreProfile("B"); + + var calculation1 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation1.InputParameters.Attach(calculation1Observer); + var calculation2 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = nodeData + } + }; + calculation2.InputParameters.Attach(calculation2Observer); + var calculation3 = new StructuresCalculation + { + InputParameters = + { + ForeshoreProfile = otherProfile + } + }; + calculation3.InputParameters.Attach(calculation3Observer); + + var failureMechanism = new StabilityPointStructuresFailureMechanism + { + ForeshoreProfiles = + { + nodeData, + otherProfile + }, + CalculationsGroup = + { + Children = + { + calculation1, + new CalculationGroup("A", true) + { + Children = + { + calculation2 + } + }, + calculation3 + } + } + }; + failureMechanism.ForeshoreProfiles.Attach(observer); + + var parentData = new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection); + + // Call + info.OnNodeRemoved(nodeData, parentData); + + // Assert + CollectionAssert.DoesNotContain(failureMechanism.ForeshoreProfiles, nodeData); + + Assert.IsNull(calculation1.InputParameters.ForeshoreProfile); + Assert.IsNull(calculation2.InputParameters.ForeshoreProfile); + Assert.AreSame(otherProfile, calculation3.InputParameters.ForeshoreProfile); + mocks.VerifyAll(); + } + + [Test] + public void ContextMenuStrip_Always_CallsBuilder() + { + // Setup + var mocks = new MockRepository(); + var menuBuilderMock = mocks.StrictMock(); + menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + + var gui = mocks.Stub(); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + + using (var treeViewControl = new TreeViewControl()) + { + gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); + + mocks.ReplayAll(); + + using (var p = new RingtoetsPlugin()) + { + p.Gui = gui; + var i = p.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ForeshoreProfile)); + + // Call + i.ContextMenuStrip(null, null, treeViewControl); + } + } + + // Assert + mocks.VerifyAll(); + } + } +} \ No newline at end of file Fisheye: Tag 98f01944e8ac182e2a1e9b1ed4deb48a07952529 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj =================================================================== diff -u -rc57632efa101e7ed65d5e6aecf9f2d1fb9330635 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj (.../Ringtoets.StabilityStoneCover.Forms.Test.csproj) (revision c57632efa101e7ed65d5e6aecf9f2d1fb9330635) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj (.../Ringtoets.StabilityStoneCover.Forms.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -97,10 +97,6 @@ - - {03DBE353-99F7-47D6-B826-60D694FFB9AC} - Application.Ringtoets.Storage.TestUtil - {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r64eede81657b51fb755944fd3939ceefb839e591 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 64eede81657b51fb755944fd3939ceefb839e591) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -24,7 +24,6 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; @@ -42,6 +41,7 @@ using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.HydraRing.Data; Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rffc2fa0ae32fa425918c0c067084a96ed6705cd6 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision ffc2fa0ae32fa425918c0c067084a96ed6705cd6) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -24,7 +24,6 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Controls.DataGrid; @@ -42,6 +41,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.HydraRing.Data; Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj =================================================================== diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj (.../Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj (.../Ringtoets.WaveImpactAsphaltCover.Forms.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -86,10 +86,6 @@ - - {03DBE353-99F7-47D6-B826-60D694FFB9AC} - Application.Ringtoets.Storage.TestUtil - {3BBFD65B-B277-4E50-AE6D-BD24C3434609} Core.Common.Base Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r64eede81657b51fb755944fd3939ceefb839e591 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 64eede81657b51fb755944fd3939ceefb839e591) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -24,7 +24,6 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; @@ -42,6 +41,7 @@ using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.HydraRing.Data; Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rcbdf2dd6e4431d3f3517475b5ebd5409c11df539 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision cbdf2dd6e4431d3f3517475b5ebd5409c11df539) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -24,7 +24,6 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Controls.DataGrid; @@ -42,6 +41,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.HydraRing.Data; Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/Ringtoets.WaveImpactAsphaltCover.Integration.Test.csproj =================================================================== diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/Ringtoets.WaveImpactAsphaltCover.Integration.Test.csproj (.../Ringtoets.WaveImpactAsphaltCover.Integration.Test.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/Ringtoets.WaveImpactAsphaltCover.Integration.Test.csproj (.../Ringtoets.WaveImpactAsphaltCover.Integration.Test.csproj) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -63,10 +63,6 @@ - - {03DBE353-99F7-47D6-B826-60D694FFB9AC} - Application.Ringtoets.Storage.TestUtil - {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base @@ -83,6 +79,10 @@ {52BA7627-CBAB-4209-BE77-3B5F31378277} Ringtoets.Common.IO + + {4843d6e5-066f-4795-94f5-1d53932dd03c} + Ringtoets.Common.Data.TestUtil + {888d4097-8bc2-4703-9fb1-8744c94d525e} Ringtoets.HydraRing.Calculation Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -racca39f8e27f0fc74521a290ae5404227e3e646e -r98f01944e8ac182e2a1e9b1ed4deb48a07952529 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision acca39f8e27f0fc74521a290ae5404227e3e646e) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 98f01944e8ac182e2a1e9b1ed4deb48a07952529) @@ -23,12 +23,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; using Core.Common.Base.Service; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.IO.FileImporters; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data;