Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -rffe405e6b0f8b4d10e6be78cf7735c554eb42a93 -r666de532f451548d6fcf1c61f661a6715852ac5d --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision ffe405e6b0f8b4d10e6be78cf7735c554eb42a93) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -40,7 +40,7 @@ using Ringtoets.HeightStructures.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; -using Ringtoets.Integration.Service; +using Ringtoets.Integration.Plugin.Handlers; using Ringtoets.Piping.Data; using Ringtoets.Piping.Plugin.FileImporter; using Ringtoets.StabilityPointStructures.Data; Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj =================================================================== diff -u -rffe405e6b0f8b4d10e6be78cf7735c554eb42a93 -r666de532f451548d6fcf1c61f661a6715852ac5d --- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision ffe405e6b0f8b4d10e6be78cf7735c554eb42a93) +++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -177,11 +177,6 @@ Ringtoets.Integration.Plugin False - - {28811c4a-6c18-42c1-88b2-a03a3784e2d0} - Ringtoets.Integration.Service - False - {ce994cc9-6f6a-48ac-b4be-02c30a21f4db} Ringtoets.Piping.Data Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/ReferenceLineReplacementHandler.cs =================================================================== diff -u --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/ReferenceLineReplacementHandler.cs (revision 0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/ReferenceLineReplacementHandler.cs (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -0,0 +1,53 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; +using System.Windows.Forms; +using Core.Common.Base; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.IO.ReferenceLines; +using Ringtoets.Integration.Plugin.Properties; +using Ringtoets.Integration.Service; +using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; + +namespace Ringtoets.Integration.Plugin.Handlers +{ + /// + /// Class responsible for replacing a on a . + /// + public class ReferenceLineReplacementHandler : IReferenceLineReplaceHandler + { + public bool ConfirmReplace() + { + DialogResult result = MessageBox.Show(Resources.ReferenceLineReplacementHandler_Confirm_clear_referenceLine_dependent_data, + CoreCommonBaseResources.Confirm, + MessageBoxButtons.OKCancel); + return result == DialogResult.OK; + } + + public IEnumerable Replace(IAssessmentSection section, ReferenceLine newReferenceLine) + { + IEnumerable affectedObjects = RingtoetsDataSynchronizationService.ClearReferenceLine(section); + section.ReferenceLine = newReferenceLine; + return affectedObjects; + } + } +} \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -1,25 +1,4 @@ -// 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. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.18444 @@ -138,6 +117,17 @@ } /// + /// Looks up a localized string similar to Na het importeren van een aangepaste ligging van de referentielijn zullen alle geimporteerde en berekende gegevens van faalmechanismen worden gewist. + /// + ///Wilt u doorgaan?. + /// + public static string ReferenceLineReplacementHandler_Confirm_clear_referenceLine_dependent_data { + get { + return ResourceManager.GetString("ReferenceLineReplacementHandler_Confirm_clear_referenceLine_dependent_data", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Nieuw. /// public static string RingtoetsRibbon_GroupBox_New { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -142,4 +142,9 @@ Hs(norm) + + Na het importeren van een aangepaste ligging van de referentielijn zullen alle geimporteerde en berekende gegevens van faalmechanismen worden gewist. + +Wilt u doorgaan? + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj =================================================================== diff -u -rc4972d4aec336f991ac1b4ab3dcd56161c238516 -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision c4972d4aec336f991ac1b4ab3dcd56161c238516) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -54,6 +54,7 @@ Properties\GlobalAssembly.cs + True @@ -111,16 +112,6 @@ Ringtoets.ClosingStructures.Forms False - - {99573570-ee00-4264-8147-26a1b25db23f} - Ringtoets.GrassCoverErosionInwards.Utils - False - - - {87c2c553-c0bc-40bf-b1ea-b83bff357f27} - Ringtoets.Revetment.Data - False - {3D4B9740-8348-4434-8D77-B611FC6EE57F} Ringtoets.StabilityPointStructures.Data Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -reef76311cf166ff9bf9f08b3c5ca879307b7f7d7 -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision eef76311cf166ff9bf9f08b3c5ca879307b7f7d7) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -70,6 +70,7 @@ using Ringtoets.Integration.Forms.PropertyClasses; using Ringtoets.Integration.Forms.Views; using Ringtoets.Integration.Forms.Views.SectionResultViews; +using Ringtoets.Integration.Plugin.Handlers; using Ringtoets.Integration.Service; using Ringtoets.Integration.Service.MessageProviders; using Ringtoets.Piping.Data; @@ -1241,8 +1242,8 @@ } private ContextMenuStrip StandAloneFailureMechanismDisabledContextMenuStrip(FailureMechanismContext nodeData, - object parentData, - TreeViewControl treeViewControl) + object parentData, + TreeViewControl treeViewControl) { var builder = new RingtoetsContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); Fisheye: Tag 666de532f451548d6fcf1c61f661a6715852ac5d refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Service/Properties/Resources.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 666de532f451548d6fcf1c61f661a6715852ac5d refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Service/Properties/Resources.resx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 666de532f451548d6fcf1c61f661a6715852ac5d refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Service/ReferenceLineReplacementHandler.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj =================================================================== diff -u -r52cdf6d3134a95bad594aa61c9ef062a97b1a2ab -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj (.../Ringtoets.Integration.Service.csproj) (revision 52cdf6d3134a95bad594aa61c9ef062a97b1a2ab) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Ringtoets.Integration.Service.csproj (.../Ringtoets.Integration.Service.csproj) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -34,7 +34,6 @@ - @@ -43,12 +42,6 @@ - - True - True - Resources.resx - - @@ -72,11 +65,6 @@ Ringtoets.Common.Data False - - {52ba7627-cbab-4209-be77-3b5f31378277} - Ringtoets.Common.IO - False - {D951D6DA-FE83-4920-9FDB-63BF96480B54} Ringtoets.Common.Service @@ -127,11 +115,6 @@ Ringtoets.Piping.Data False - - {14c6f716-64e2-4bc4-a1ef-05865fcefa4c} - Ringtoets.Piping.Primitives - False - {10B8D63D-87E8-46DF-ACA9-A8CF22EE8FB5} Ringtoets.Piping.Service @@ -178,13 +161,6 @@ Copying.licenseheader - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -0,0 +1,255 @@ +// 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; +using System.Linq; +using Core.Common.Base; +using NUnit.Extensions.Forms; +using NUnit.Framework; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.IO.ReferenceLines; +using Ringtoets.GrassCoverErosionInwards.Data; +using Ringtoets.GrassCoverErosionOutwards.Data; +using Ringtoets.HeightStructures.Data; +using Ringtoets.Integration.Data; +using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Plugin.Handlers; +using Ringtoets.Integration.Service; +using Ringtoets.Integration.TestUtils; +using Ringtoets.Piping.Data; +using Ringtoets.StabilityPointStructures.Data; +using Ringtoets.StabilityStoneCover.Data; +using Ringtoets.WaveImpactAsphaltCover.Data; + +namespace Ringtoets.Integration.Plugin.Test.Handlers +{ + [TestFixture] + public class ReferenceLineReplacementHandlerTest : NUnitFormTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Call + var handler = new ReferenceLineReplacementHandler(); + + // Assert + Assert.IsInstanceOf(handler); + } + + [Test] + [TestCase(true)] + [TestCase(false)] + public void ConfirmReplace_ClickDialog_ReturnTrueIfOkAndFalseIfCancel(bool clickOk) + { + // Setup + string dialogTitle = null, dialogMessage = null; + DialogBoxHandler = (name, wnd) => + { + var tester = new MessageBoxTester(wnd); + dialogTitle = tester.Title; + dialogMessage = tester.Text; + if (clickOk) + { + tester.ClickOk(); + } + else + { + tester.ClickCancel(); + } + }; + + var handler = new ReferenceLineReplacementHandler(); + + // Call + bool result = handler.ConfirmReplace(); + + // Assert + Assert.AreEqual(clickOk, result); + + Assert.AreEqual("Bevestigen", dialogTitle); + Assert.AreEqual("Na het importeren van een aangepaste ligging van de referentielijn zullen alle geimporteerde en berekende gegevens van faalmechanismen worden gewist." + Environment.NewLine + + Environment.NewLine + + "Wilt u doorgaan?", + dialogMessage); + } + + [Test] + public void ClearReferenceLine_AssessmentSectionNull_ThrowArgumentNullException() + { + // Call + TestDelegate call = () => RingtoetsDataSynchronizationService.ClearReferenceLine(null); + + // Assert + string parmaName = Assert.Throws(call).ParamName; + Assert.AreEqual("assessmentSection", parmaName); + } + + [Test] + public void ClearReferenceLine_FullyConfiguredAssessmentSection_AllReferenceLineDependentDataCleared() + { + // Setup + AssessmentSection assessmentSection = TestDataGenerator.GetFullyConfiguredAssessmentSection(); + var handler = new ReferenceLineReplacementHandler(); + + var referenceLine = new ReferenceLine(); + + // Call + IObservable[] observables = handler.Replace(assessmentSection, referenceLine).ToArray(); + + // Assert + Assert.AreEqual(39, observables.Length); + + PipingFailureMechanism pipingFailureMechanism = assessmentSection.PipingFailureMechanism; + CollectionAssert.IsEmpty(pipingFailureMechanism.Sections); + CollectionAssert.IsEmpty(pipingFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, pipingFailureMechanism); + CollectionAssert.IsEmpty(pipingFailureMechanism.CalculationsGroup.Children); + CollectionAssert.Contains(observables, pipingFailureMechanism.CalculationsGroup); + CollectionAssert.IsEmpty(pipingFailureMechanism.StochasticSoilModels); + CollectionAssert.Contains(observables, pipingFailureMechanism.StochasticSoilModels); + CollectionAssert.IsEmpty(pipingFailureMechanism.SurfaceLines); + CollectionAssert.Contains(observables, pipingFailureMechanism.SurfaceLines); + + GrassCoverErosionInwardsFailureMechanism grassCoverErosionInwardsFailureMechanism = assessmentSection.GrassCoverErosionInwards; + CollectionAssert.IsEmpty(grassCoverErosionInwardsFailureMechanism.Sections); + CollectionAssert.IsEmpty(grassCoverErosionInwardsFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, grassCoverErosionInwardsFailureMechanism); + CollectionAssert.IsEmpty(grassCoverErosionInwardsFailureMechanism.CalculationsGroup.Children); + CollectionAssert.Contains(observables, grassCoverErosionInwardsFailureMechanism.CalculationsGroup); + CollectionAssert.IsEmpty(grassCoverErosionInwardsFailureMechanism.DikeProfiles); + CollectionAssert.Contains(observables, grassCoverErosionInwardsFailureMechanism.DikeProfiles); + + GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; + CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.Sections); + CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, grassCoverErosionOutwardsFailureMechanism); + CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children); + CollectionAssert.Contains(observables, grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup); + CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles); + CollectionAssert.Contains(observables, grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles); + + WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCoverFailureMechanism = assessmentSection.WaveImpactAsphaltCover; + CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.Sections); + CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, waveImpactAsphaltCoverFailureMechanism); + CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children); + CollectionAssert.Contains(observables, waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup); + CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.ForeshoreProfiles); + CollectionAssert.Contains(observables, waveImpactAsphaltCoverFailureMechanism.ForeshoreProfiles); + + StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = assessmentSection.StabilityStoneCover; + CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.Sections); + CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism); + CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children); + CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup); + CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.ForeshoreProfiles); + CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.ForeshoreProfiles); + + ClosingStructuresFailureMechanism closingStructuresFailureMechanism = assessmentSection.ClosingStructures; + CollectionAssert.IsEmpty(closingStructuresFailureMechanism.Sections); + CollectionAssert.IsEmpty(closingStructuresFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, closingStructuresFailureMechanism); + CollectionAssert.IsEmpty(closingStructuresFailureMechanism.CalculationsGroup.Children); + CollectionAssert.Contains(observables, closingStructuresFailureMechanism.CalculationsGroup); + CollectionAssert.IsEmpty(closingStructuresFailureMechanism.ForeshoreProfiles); + CollectionAssert.Contains(observables, closingStructuresFailureMechanism.ForeshoreProfiles); + CollectionAssert.IsEmpty(closingStructuresFailureMechanism.ClosingStructures); + CollectionAssert.Contains(observables, closingStructuresFailureMechanism.ClosingStructures); + + HeightStructuresFailureMechanism heightStructuresFailureMechanism = assessmentSection.HeightStructures; + CollectionAssert.IsEmpty(heightStructuresFailureMechanism.Sections); + CollectionAssert.IsEmpty(heightStructuresFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, heightStructuresFailureMechanism); + CollectionAssert.IsEmpty(heightStructuresFailureMechanism.CalculationsGroup.Children); + CollectionAssert.Contains(observables, heightStructuresFailureMechanism.CalculationsGroup); + CollectionAssert.IsEmpty(heightStructuresFailureMechanism.ForeshoreProfiles); + CollectionAssert.Contains(observables, heightStructuresFailureMechanism.ForeshoreProfiles); + CollectionAssert.IsEmpty(heightStructuresFailureMechanism.HeightStructures); + CollectionAssert.Contains(observables, heightStructuresFailureMechanism.HeightStructures); + + StabilityPointStructuresFailureMechanism stabilityPointStructuresFailureMechanism = assessmentSection.StabilityPointStructures; + CollectionAssert.IsEmpty(stabilityPointStructuresFailureMechanism.Sections); + CollectionAssert.IsEmpty(stabilityPointStructuresFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, stabilityPointStructuresFailureMechanism); + CollectionAssert.IsEmpty(stabilityPointStructuresFailureMechanism.CalculationsGroup.Children); + CollectionAssert.Contains(observables, stabilityPointStructuresFailureMechanism.CalculationsGroup); + CollectionAssert.IsEmpty(stabilityPointStructuresFailureMechanism.ForeshoreProfiles); + CollectionAssert.Contains(observables, stabilityPointStructuresFailureMechanism.ForeshoreProfiles); + CollectionAssert.IsEmpty(stabilityPointStructuresFailureMechanism.StabilityPointStructures); + CollectionAssert.Contains(observables, stabilityPointStructuresFailureMechanism.StabilityPointStructures); + + DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; + CollectionAssert.IsEmpty(duneErosionFailureMechanism.Sections); + CollectionAssert.IsEmpty(duneErosionFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, duneErosionFailureMechanism); + + MacrostabilityInwardsFailureMechanism macrostabilityInwardsFailureMechanism = assessmentSection.MacrostabilityInwards; + CollectionAssert.IsEmpty(macrostabilityInwardsFailureMechanism.Sections); + CollectionAssert.IsEmpty(macrostabilityInwardsFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, macrostabilityInwardsFailureMechanism); + + MacrostabilityOutwardsFailureMechanism macrostabilityOutwardsFailureMechanism = assessmentSection.MacrostabilityOutwards; + CollectionAssert.IsEmpty(macrostabilityOutwardsFailureMechanism.Sections); + CollectionAssert.IsEmpty(macrostabilityOutwardsFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, macrostabilityOutwardsFailureMechanism); + + MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability; + CollectionAssert.IsEmpty(microstabilityFailureMechanism.Sections); + CollectionAssert.IsEmpty(microstabilityFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, microstabilityFailureMechanism); + + WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCoverFailureMechanism = assessmentSection.WaterPressureAsphaltCover; + CollectionAssert.IsEmpty(waterPressureAsphaltCoverFailureMechanism.Sections); + CollectionAssert.IsEmpty(waterPressureAsphaltCoverFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, waterPressureAsphaltCoverFailureMechanism); + + GrassCoverSlipOffOutwardsFailureMechanism grassCoverSlipOffOutwardsFailureMechanism = assessmentSection.GrassCoverSlipOffOutwards; + CollectionAssert.IsEmpty(grassCoverSlipOffOutwardsFailureMechanism.Sections); + CollectionAssert.IsEmpty(grassCoverSlipOffOutwardsFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, grassCoverSlipOffOutwardsFailureMechanism); + + GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwardsFailureMechanism = assessmentSection.GrassCoverSlipOffInwards; + CollectionAssert.IsEmpty(grassCoverSlipOffInwardsFailureMechanism.Sections); + CollectionAssert.IsEmpty(grassCoverSlipOffInwardsFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, grassCoverSlipOffInwardsFailureMechanism); + + StrengthStabilityLengthwiseConstructionFailureMechanism stabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction; + CollectionAssert.IsEmpty(stabilityLengthwiseConstructionFailureMechanism.Sections); + CollectionAssert.IsEmpty(stabilityLengthwiseConstructionFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, stabilityLengthwiseConstructionFailureMechanism); + + PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure; + CollectionAssert.IsEmpty(pipingStructureFailureMechanism.Sections); + CollectionAssert.IsEmpty(pipingStructureFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, pipingStructureFailureMechanism); + + TechnicalInnovationFailureMechanism technicalInnovationFailureMechanism = assessmentSection.TechnicalInnovation; + CollectionAssert.IsEmpty(technicalInnovationFailureMechanism.Sections); + CollectionAssert.IsEmpty(technicalInnovationFailureMechanism.SectionResults); + CollectionAssert.Contains(observables, technicalInnovationFailureMechanism); + + Assert.AreSame(referenceLine, assessmentSection.ReferenceLine); + CollectionAssert.Contains(observables, assessmentSection); + } + } +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj =================================================================== diff -u -r267dd861d69e6952235fb997a426aec5efdbf432 -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision 267dd861d69e6952235fb997a426aec5efdbf432) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -67,6 +67,7 @@ Properties\GlobalAssembly.cs + @@ -120,6 +121,10 @@ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5} Core.Components.Gis.Forms + + {c6309704-d67b-434c-bc98-9f8910bc1d10} + Ringtoets.ClosingStructures.Data + {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data @@ -148,6 +153,14 @@ {C540E627-B95B-4CC0-A1B6-A0BDF74936C7} Ringtoets.GrassCoverErosionInwards.Forms + + {e7225477-577f-4a17-b7ec-6721158e1543} + Ringtoets.GrassCoverErosionOutwards.Data + + + {1c0017d8-35b5-4ca0-8fc7-a83f46dbdc99} + Ringtoets.HeightStructures.Data + {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} Ringtoets.HydraRing.Data @@ -156,6 +169,22 @@ {CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB} Ringtoets.Piping.Data + + {14c6f716-64e2-4bc4-a1ef-05865fcefa4c} + Ringtoets.Piping.Primitives + + + {3d4b9740-8348-4434-8d77-b611fc6ee57f} + Ringtoets.StabilityPointStructures.Data + + + {b479e3af-7c34-488c-bb73-d324100d36c9} + Ringtoets.StabilityStoneCover.Data + + + {567e0b69-5280-41ce-add6-443725a61c86} + Ringtoets.WaveImpactAsphaltCover.Data + {11f1f874-45af-43e4-8ae5-15a5c9593e28} Ringtoets.Integration.Data @@ -168,6 +197,14 @@ {c8383b76-b3f1-4e6e-b56c-527b469fa20a} Ringtoets.Integration.Plugin + + {28811c4a-6c18-42c1-88b2-a03a3784e2d0} + Ringtoets.Integration.Service + + + {174ba68d-6176-4ac5-8dfd-98cdd2c4d971} + Ringtoets.Integration.TestUtils + Fisheye: Tag 666de532f451548d6fcf1c61f661a6715852ac5d refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/ReferenceLineReplacementHandlerTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj =================================================================== diff -u -r52cdf6d3134a95bad594aa61c9ef062a97b1a2ab -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj (.../Ringtoets.Integration.Service.Test.csproj) (revision 52cdf6d3134a95bad594aa61c9ef062a97b1a2ab) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj (.../Ringtoets.Integration.Service.Test.csproj) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -43,9 +43,6 @@ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll True - - ..\..\..\..\lib\NUnitForms.dll - @@ -55,7 +52,6 @@ - @@ -78,10 +74,6 @@ {D4200F43-3F72-4F42-AF0A-8CED416A38EC} Ringtoets.Common.Data - - {52ba7627-cbab-4209-be77-3b5f31378277} - Ringtoets.Common.IO - {d951d6da-fe83-4920-9fdb-63bf96480b54} Ringtoets.Common.Service Index: Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs =================================================================== diff -u -rabc5eb5858036cddd395a2dcf3945a57f8d4889a -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs (.../ReferenceLineImporterIntegrationTest.cs) (revision abc5eb5858036cddd395a2dcf3945a57f8d4889a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs (.../ReferenceLineImporterIntegrationTest.cs) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -32,7 +32,7 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.IO.ReferenceLines; using Ringtoets.Integration.Data; -using Ringtoets.Integration.Service; +using Ringtoets.Integration.Plugin.Handlers; using Ringtoets.Integration.TestUtils; namespace Ringtoets.Integration.Test Index: Ringtoets/Integration/test/Ringtoets.Integration.Test/Ringtoets.Integration.Test.csproj =================================================================== diff -u -rffe405e6b0f8b4d10e6be78cf7735c554eb42a93 -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/test/Ringtoets.Integration.Test/Ringtoets.Integration.Test.csproj (.../Ringtoets.Integration.Test.csproj) (revision ffe405e6b0f8b4d10e6be78cf7735c554eb42a93) +++ Ringtoets/Integration/test/Ringtoets.Integration.Test/Ringtoets.Integration.Test.csproj (.../Ringtoets.Integration.Test.csproj) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -97,9 +97,9 @@ {11f1f874-45af-43e4-8ae5-15a5c9593e28} Ringtoets.Integration.Data - - {28811c4a-6c18-42c1-88b2-a03a3784e2d0} - Ringtoets.Integration.Service + + {c8383b76-b3f1-4e6e-b56c-527b469fa20a} + Ringtoets.Integration.Plugin {174ba68d-6176-4ac5-8dfd-98cdd2c4d971} Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs =================================================================== diff -u -rffe405e6b0f8b4d10e6be78cf7735c554eb42a93 -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision ffe405e6b0f8b4d10e6be78cf7735c554eb42a93) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -28,7 +28,7 @@ using Ringtoets.Common.IO.ReferenceLines; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; -using Ringtoets.Integration.Service; +using Ringtoets.Integration.Plugin.Handlers; using Ringtoets.Piping.Data; using Ringtoets.Piping.Plugin.FileImporter; using Ringtoets.Piping.Primitives; Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj =================================================================== diff -u -r52cdf6d3134a95bad594aa61c9ef062a97b1a2ab -r666de532f451548d6fcf1c61f661a6715852ac5d --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj (.../Ringtoets.Integration.TestUtils.csproj) (revision 52cdf6d3134a95bad594aa61c9ef062a97b1a2ab) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/Ringtoets.Integration.TestUtils.csproj (.../Ringtoets.Integration.TestUtils.csproj) (revision 666de532f451548d6fcf1c61f661a6715852ac5d) @@ -149,9 +149,9 @@ {11f1f874-45af-43e4-8ae5-15a5c9593e28} Ringtoets.Integration.Data - - {28811c4a-6c18-42c1-88b2-a03a3784e2d0} - Ringtoets.Integration.Service + + {c8383b76-b3f1-4e6e-b56c-527b469fa20a} + Ringtoets.Integration.Plugin