Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r8a2d2653ceff765beecfcedab41a6be91df7d16e -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 8a2d2653ceff765beecfcedab41a6be91df7d16e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -185,6 +185,11 @@
{90DE728E-48EF-4665-AB38-3D88E41D9F4D}
Ringtoets.GrassCoverErosionInwards.Data
+
+ {1c0017d8-35b5-4ca0-8fc7-a83f46dbdc99}
+ Ringtoets.HeightStructures.Data
+ False
+
{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}
Ringtoets.HydraRing.Data
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -72,7 +72,7 @@
entity.FailureMechanismEntities.Add(section.WaveImpactAsphaltCover.Create(FailureMechanismType.WaveImpactOnAsphaltRevetment, collector));
entity.FailureMechanismEntities.Add(section.GrassCoverErosionOutwards.Create(FailureMechanismType.GrassRevetmentErosionOutwards, collector));
entity.FailureMechanismEntities.Add(section.GrassCoverSlipOffOutwards.Create(FailureMechanismType.GrassRevetmentSlidingOutwards, collector));
- entity.FailureMechanismEntities.Add(section.HeightStructure.Create(FailureMechanismType.StructureHeight, collector));
+ entity.FailureMechanismEntities.Add(section.HeightStructures.Create(FailureMechanismType.StructureHeight, collector));
entity.FailureMechanismEntities.Add(section.ClosingStructure.Create(FailureMechanismType.ReliabilityClosingOfStructure, collector));
entity.FailureMechanismEntities.Add(section.PipingStructure.Create(FailureMechanismType.PipingAtStructure, collector));
entity.FailureMechanismEntities.Add(section.StrengthStabilityPointConstruction.Create(FailureMechanismType.StrengthAndStabilityPointConstruction, collector));
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -133,7 +133,7 @@
entity.ReadStandAloneFailureMechanism(FailureMechanismType.WaveImpactOnAsphaltRevetment, assessmentSection.WaveImpactAsphaltCover);
entity.ReadStandAloneFailureMechanism(FailureMechanismType.GrassRevetmentErosionOutwards, assessmentSection.GrassCoverErosionOutwards);
entity.ReadStandAloneFailureMechanism(FailureMechanismType.GrassRevetmentSlidingOutwards, assessmentSection.GrassCoverSlipOffOutwards);
- entity.ReadStandAloneFailureMechanism(FailureMechanismType.StructureHeight, assessmentSection.HeightStructure);
+ entity.ReadStandAloneFailureMechanism(FailureMechanismType.StructureHeight, assessmentSection.HeightStructures);
entity.ReadStandAloneFailureMechanism(FailureMechanismType.ReliabilityClosingOfStructure, assessmentSection.ClosingStructure);
entity.ReadStandAloneFailureMechanism(FailureMechanismType.PipingAtStructure, assessmentSection.PipingStructure);
entity.ReadStandAloneFailureMechanism(FailureMechanismType.StrengthAndStabilityPointConstruction, assessmentSection.StrengthStabilityPointConstruction);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs (.../AssessmentSectionUpdateExtensions.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs (.../AssessmentSectionUpdateExtensions.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -80,7 +80,7 @@
section.WaveImpactAsphaltCover.Update(collector, context);
section.GrassCoverErosionOutwards.Update(collector, context);
section.GrassCoverSlipOffOutwards.Update(collector, context);
- section.HeightStructure.Update(collector, context);
+ section.HeightStructures.Update(collector, context);
section.ClosingStructure.Update(collector, context);
section.PipingStructure.Update(collector, context);
section.StrengthStabilityPointConstruction.Update(collector, context);
Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision b28f56d6bb3f14141bd003dd43378f8002a9e87a)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -46,6 +46,7 @@
using Core.Plugins.ProjectExplorer;
using log4net;
using Ringtoets.GrassCoverErosionInwards.Plugin;
+using Ringtoets.HeightStructures.Plugin;
using Ringtoets.Integration.Plugin;
using Ringtoets.Piping.Plugin;
using MessageBox = System.Windows.MessageBox;
@@ -163,6 +164,7 @@
new RingtoetsGuiPlugin(),
new GrassCoverErosionInwardsGuiPlugin(),
new PipingGuiPlugin(),
+ new HeightStructuresGuiPlugin(),
new OxyPlotGuiPlugin(),
new DotSpatialGuiPlugin()
#if INCLUDE_DEMOPROJECT
Index: Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision b28f56d6bb3f14141bd003dd43378f8002a9e87a)
+++ Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -162,6 +162,11 @@
Ringtoets.GrassCoverErosionInwards.Plugin
False
+
+ {9AF85B2B-8D78-43C5-9542-FBB3A14EAB36}
+ Ringtoets.HeightStructures.Plugin
+ False
+
{c8383b76-b3f1-4e6e-b56c-527b469fa20a}
Ringtoets.Integration.Plugin
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r8a2d2653ceff765beecfcedab41a6be91df7d16e -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 8a2d2653ceff765beecfcedab41a6be91df7d16e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -153,6 +153,10 @@
{90DE728E-48EF-4665-AB38-3D88E41D9F4D}
Ringtoets.GrassCoverErosionInwards.Data
+
+ {1c0017d8-35b5-4ca0-8fc7-a83f46dbdc99}
+ Ringtoets.HeightStructures.Data
+
{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}
Ringtoets.HydraRing.Data
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs (.../AssessmentSectionEntityTest.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs (.../AssessmentSectionEntityTest.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -301,9 +301,9 @@
Assert.AreEqual(isRelevant, section.MacrostabilityInwards.IsRelevant);
Assert.AreEqual(2, section.MacrostabilityInwards.Sections.Count());
- Assert.AreEqual(overtoppingEntityId, section.HeightStructure.StorageId);
- Assert.AreEqual(isRelevant, section.HeightStructure.IsRelevant);
- Assert.AreEqual(2, section.HeightStructure.Sections.Count());
+ Assert.AreEqual(overtoppingEntityId, section.HeightStructures.StorageId);
+ Assert.AreEqual(isRelevant, section.HeightStructures.IsRelevant);
+ Assert.AreEqual(2, section.HeightStructures.Sections.Count());
Assert.AreEqual(closingEntityId, section.ClosingStructure.StorageId);
Assert.AreEqual(isRelevant, section.ClosingStructure.IsRelevant);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs (.../AssessmentSectionUpdateExtensionsTest.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs (.../AssessmentSectionUpdateExtensionsTest.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -434,9 +434,9 @@
section.MacrostabilityInwards.StorageId = 1;
section.MacrostabilityInwards.Contribution = 0.5;
section.MacrostabilityInwards.IsRelevant = true;
- section.HeightStructure.StorageId = 2;
- section.HeightStructure.Contribution = 0.5;
- section.HeightStructure.IsRelevant = true;
+ section.HeightStructures.StorageId = 2;
+ section.HeightStructures.Contribution = 0.5;
+ section.HeightStructures.IsRelevant = true;
section.ClosingStructure.StorageId = 3;
section.ClosingStructure.Contribution = 0.5;
section.ClosingStructure.IsRelevant = true;
@@ -558,7 +558,7 @@
{
StorageId = 3
},
- HeightStructure =
+ HeightStructures =
{
StorageId = 4
},
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs (.../ProjectUpdateExtensionsTest.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs (.../ProjectUpdateExtensionsTest.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -252,7 +252,7 @@
{
StorageId = 1
},
- HeightStructure =
+ HeightStructures =
{
StorageId = 1
},
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (revision 0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -0,0 +1,56 @@
+// 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 Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.HeightStructures.Data.Properties;
+
+namespace Ringtoets.HeightStructures.Data
+{
+ ///
+ /// Failure mechanism for Height structures.
+ ///
+ public class HeightStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism
+ {
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public HeightStructuresFailureMechanism()
+ : base(Resources.HeightStructureFailureMechanism_DisplayName, Resources.HeightStructureFailureMechanism_Code)
+ { }
+
+ public override IEnumerable Calculations
+ {
+ get
+ {
+ yield break;
+ }
+ }
+
+ protected override FailureMechanismSectionResult CreateFailureMechanismSectionResult(FailureMechanismSection section)
+ {
+ return new FailureMechanismSectionResult(section);
+ }
+
+ public CalculationGroup CalculationsGroup { get; private set; }
+ }
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/AssemblyInfo.cs
===================================================================
diff -u -r07efb7c80815d1747386437cf8dcd6db25b9160a -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 07efb7c80815d1747386437cf8dcd6db25b9160a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -20,8 +20,10 @@
// All rights reserved.
using System.Reflection;
+using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
[assembly: AssemblyTitle("Ringtoets.HeightStructures.Data")]
[assembly: AssemblyProduct("Ringtoets.HeightStructures.Data")]
[assembly: Guid("418e2cad-51d3-4f2b-8fc4-0092b987f810")]
+[assembly: InternalsVisibleTo("Ringtoets.HeightStructures.Data.Test")]
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs (revision 0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.17929
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Ringtoets.HeightStructures.Data.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.HeightStructures.Data.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to HTKW.
+ ///
+ internal static string HeightStructureFailureMechanism_Code {
+ get {
+ return ResourceManager.GetString("HeightStructureFailureMechanism_Code", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Kunstwerken - Hoogte kunstwerk.
+ ///
+ internal static string HeightStructureFailureMechanism_DisplayName {
+ get {
+ return ResourceManager.GetString("HeightStructureFailureMechanism_DisplayName", resourceCulture);
+ }
+ }
+ }
+}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx
===================================================================
diff -u
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx (revision 0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ HTKW
+
+
+ Kunstwerken - Hoogte kunstwerk
+
+
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj
===================================================================
diff -u -r07efb7c80815d1747386437cf8dcd6db25b9160a -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj (.../Ringtoets.HeightStructures.Data.csproj) (revision 07efb7c80815d1747386437cf8dcd6db25b9160a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj (.../Ringtoets.HeightStructures.Data.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -39,20 +39,41 @@
Properties\GlobalAssembly.cs
+
+
+ True
+ True
+ Resources.resx
+
+
+ {3BBFD65B-B277-4E50-AE6D-BD24C3434609}
+ Core.Common.Base
+
{c90b77da-e421-43cc-b82e-529651bc21ac}
Core.Common.Version
False
+
+ {d4200f43-3f72-4f42-af0a-8ced416a38ec}
+ Ringtoets.Common.Data
+ False
+
Copying.licenseheader
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresFailureMechanismContextTest.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresFailureMechanismContextTest.cs (revision 0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresFailureMechanismContextTest.cs (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -0,0 +1,84 @@
+// 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 NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.HeightStructures.Data;
+using Ringtoets.HeightStructures.Forms.PresentationObjects;
+
+namespace Ringtoets.HeightStructures.Forms.Test.PresentationObjects
+{
+ [TestFixture]
+ public class HeightStructuresFailureMechanismContextTest
+ {
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ mocks.ReplayAll();
+
+ var failureMechanism = new HeightStructuresFailureMechanism();
+
+ // Call
+ var context = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
+
+ // Assert
+ Assert.IsInstanceOf>(context);
+ Assert.AreSame(assessmentSection, context.Parent);
+ Assert.AreSame(failureMechanism, context.WrappedData);
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void Constructor_FailureMechanismIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var assessmentSection = mocks.Stub();
+ mocks.ReplayAll();
+
+ // Call
+ TestDelegate call = () => new HeightStructuresFailureMechanismContext(null, assessmentSection);
+
+ // Assert
+ Assert.Throws(call);
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void Constructor_AssessmentSectionIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var failureMechanism = new HeightStructuresFailureMechanism();
+
+ // Call
+ TestDelegate call = () => new HeightStructuresFailureMechanismContext(failureMechanism, null);
+
+ // Assert
+ Assert.Throws(call);
+ }
+ }
+}
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj
===================================================================
diff -u -r71220a7a639b250a285a87192661f1b86ff8e767 -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj (.../Ringtoets.HeightStructures.Forms.Test.csproj) (revision 71220a7a639b250a285a87192661f1b86ff8e767)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj (.../Ringtoets.HeightStructures.Forms.Test.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -37,17 +37,53 @@
pdbonly
+
+ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+ True
+
+
+ ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll
+ True
+
+
Copying.licenseheader
+
+
+
+ {3bbfd65b-b277-4e50-ae6d-bd24c3434609}
+ Core.Common.Base
+
+
+ {9a2d67e6-26ac-4d17-b11a-2b4372f2f572}
+ Core.Common.Controls
+
+
+ {D4200F43-3F72-4F42-AF0A-8CED416A38EC}
+ Ringtoets.Common.Data
+
+
+ {4d840673-3812-4338-a352-84854e32b8a0}
+ Ringtoets.Common.Forms
+
+
+ {1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}
+ Ringtoets.HeightStructures.Data
+
+
+ {F0BCF06A-3D01-4D65-A249-E2A14AEC6EFD}
+ Ringtoets.HeightStructures.Forms
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Ringtoets.HeightStructures.IO.Test.csproj
===================================================================
diff -u -r71220a7a639b250a285a87192661f1b86ff8e767 -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Ringtoets.HeightStructures.IO.Test.csproj (.../Ringtoets.HeightStructures.IO.Test.csproj) (revision 71220a7a639b250a285a87192661f1b86ff8e767)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Ringtoets.HeightStructures.IO.Test.csproj (.../Ringtoets.HeightStructures.IO.Test.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -37,6 +37,14 @@
pdbonly
+
+ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+ True
+
+
+ ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll
+ True
+
@@ -47,6 +55,7 @@
Copying.licenseheader
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/Ringtoets.HeightStructures.Integration.Test.csproj
===================================================================
diff -u -r71220a7a639b250a285a87192661f1b86ff8e767 -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/Ringtoets.HeightStructures.Integration.Test.csproj (.../Ringtoets.HeightStructures.Integration.Test.csproj) (revision 71220a7a639b250a285a87192661f1b86ff8e767)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/Ringtoets.HeightStructures.Integration.Test.csproj (.../Ringtoets.HeightStructures.Integration.Test.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -37,6 +37,14 @@
pdbonly
+
+ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+ True
+
+
+ ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll
+ True
+
@@ -47,6 +55,7 @@
Copying.licenseheader
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs (revision 0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -0,0 +1,75 @@
+// 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.Plugin;
+using Core.Common.Controls.TreeView;
+using Core.Common.Gui;
+using Core.Common.Gui.Commands;
+using Core.Common.Gui.Plugin;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.HeightStructures.Forms.PresentationObjects;
+
+namespace Ringtoets.HeightStructures.Plugin.Test
+{
+ [TestFixture]
+ public class HeightStructuresGuiPluginTest
+ {
+ [Test]
+ public void DefaultConstructor_ExpectedValues()
+ {
+ // call
+ using (var grassCoverErosionInwardsGuiPlugin = new HeightStructuresGuiPlugin())
+ {
+ // assert
+ Assert.IsInstanceOf(grassCoverErosionInwardsGuiPlugin);
+ }
+ }
+
+ [Test]
+ public void GetTreeNodeInfos_ReturnsSupportedTreeNodeInfos()
+ {
+ // setup
+ var mocks = new MockRepository();
+ var applicationCore = new ApplicationCore();
+ var guiStub = mocks.Stub();
+ guiStub.Stub(g => g.ApplicationCommands).Return(mocks.Stub());
+
+ Expect.Call(guiStub.ApplicationCore).Return(applicationCore).Repeat.Any();
+ mocks.ReplayAll();
+
+ using (var guiPlugin = new HeightStructuresGuiPlugin
+ {
+ Gui = guiStub
+ })
+ {
+ // call
+ TreeNodeInfo[] treeNodeInfos = guiPlugin.GetTreeNodeInfos().ToArray();
+
+ // assert
+ Assert.AreEqual(1, treeNodeInfos.Length);
+ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HeightStructuresFailureMechanismContext)));
+ }
+ mocks.VerifyAll();
+ }
+ }
+}
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj
===================================================================
diff -u -r71220a7a639b250a285a87192661f1b86ff8e767 -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj (.../Ringtoets.HeightStructures.Plugin.Test.csproj) (revision 71220a7a639b250a285a87192661f1b86ff8e767)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj (.../Ringtoets.HeightStructures.Plugin.Test.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -37,17 +37,61 @@
pdbonly
+
+ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+ True
+
+
+ ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll
+ True
+
+
Copying.licenseheader
+
+
+
+ {3BBFD65B-B277-4E50-AE6D-BD24C3434609}
+ Core.Common.Base
+
+
+ {1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}
+ Core.Common.Controls.TreeView
+
+
+ {9a2d67e6-26ac-4d17-b11a-2b4372f2f572}
+ Core.Common.Controls
+
+
+ {30E4C2AE-719E-4D70-9FA9-668A9767FBFA}
+ Core.Common.Gui
+
+
+ {d4200f43-3f72-4f42-af0a-8ced416a38ec}
+ Ringtoets.Common.Data
+
+
+ {4d840673-3812-4338-a352-84854e32b8a0}
+ Ringtoets.Common.Forms
+
+
+ {F0BCF06A-3D01-4D65-A249-E2A14AEC6EFD}
+ Ringtoets.HeightStructures.Forms
+
+
+ {9AF85B2B-8D78-43C5-9542-FBB3A14EAB36}
+ Ringtoets.HeightStructures.Plugin
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/Ringtoets.HeightStructures.Service.Test.csproj
===================================================================
diff -u -r71220a7a639b250a285a87192661f1b86ff8e767 -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/Ringtoets.HeightStructures.Service.Test.csproj (.../Ringtoets.HeightStructures.Service.Test.csproj) (revision 71220a7a639b250a285a87192661f1b86ff8e767)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/Ringtoets.HeightStructures.Service.Test.csproj (.../Ringtoets.HeightStructures.Service.Test.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -37,6 +37,14 @@
pdbonly
+
+ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+ True
+
+
+ ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll
+ True
+
@@ -47,6 +55,7 @@
Copying.licenseheader
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -27,6 +27,7 @@
using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.GrassCoverErosionInwards.Data;
+using Ringtoets.HeightStructures.Data;
using Ringtoets.HydraRing.Data;
using Ringtoets.Integration.Data.Properties;
using Ringtoets.Integration.Data.StandAlone;
@@ -60,7 +61,7 @@
WaveImpactAsphaltCover = new WaveImpactAsphaltCoverFailureMechanism();
GrassCoverErosionOutwards = new GrassCoverErosionOutwardsFailureMechanism();
GrassCoverSlipOffOutwards = new GrassCoverSlipOffOutwardsFailureMechanism();
- HeightStructure = new HeightStructureFailureMechanism();
+ HeightStructures = new HeightStructuresFailureMechanism();
ClosingStructure = new ClosingStructureFailureMechanism();
StrengthStabilityPointConstruction = new StrengthStabilityPointConstructionFailureMechanism();
PipingStructure = new PipingStructureFailureMechanism();
@@ -108,7 +109,7 @@
///
/// Gets the "Kunstwerken - Hoogte kunstwerk" failure mechanism.
///
- public HeightStructureFailureMechanism HeightStructure { get; private set; }
+ public HeightStructuresFailureMechanism HeightStructures { get; private set; }
///
/// Gets the "Kunstwerken - Betrouwbaarheid sluiting kunstwerk" failure mechanism.
@@ -175,7 +176,7 @@
yield return WaveImpactAsphaltCover;
yield return GrassCoverErosionOutwards;
yield return GrassCoverSlipOffOutwards;
- yield return HeightStructure;
+ yield return HeightStructures;
yield return ClosingStructure;
yield return PipingStructure;
yield return StrengthStabilityPointConstruction;
@@ -194,7 +195,7 @@
WaveImpactAsphaltCover.Contribution = 1;
GrassCoverErosionOutwards.Contribution = 5;
GrassCoverSlipOffOutwards.Contribution = 1;
- HeightStructure.Contribution = 24;
+ HeightStructures.Contribution = 24;
ClosingStructure.Contribution = 4;
PipingStructure.Contribution = 2;
StrengthStabilityPointConstruction.Contribution = 2;
@@ -209,7 +210,7 @@
WaveImpactAsphaltCover.Contribution = 0;
GrassCoverErosionOutwards.Contribution = 0;
GrassCoverSlipOffOutwards.Contribution = 0;
- HeightStructure.Contribution = 0;
+ HeightStructures.Contribution = 0;
ClosingStructure.Contribution = 0;
PipingStructure.Contribution = 0;
StrengthStabilityPointConstruction.Contribution = 0;
@@ -224,7 +225,7 @@
WaveImpactAsphaltCover.Contribution = 1;
GrassCoverErosionOutwards.Contribution = 5;
GrassCoverSlipOffOutwards.Contribution = 1;
- HeightStructure.Contribution = 24;
+ HeightStructures.Contribution = 24;
ClosingStructure.Contribution = 4;
PipingStructure.Contribution = 2;
StrengthStabilityPointConstruction.Contribution = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.34209
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -151,24 +151,6 @@
}
///
- /// Looks up a localized string similar to HTKW.
- ///
- public static string HeightStructureFailureMechanism_Code {
- get {
- return ResourceManager.GetString("HeightStructureFailureMechanism_Code", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Kunstwerken - Hoogte kunstwerk.
- ///
- public static string HeightStructureFailureMechanism_DisplayName {
- get {
- return ResourceManager.GetString("HeightStructureFailureMechanism_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Hydraulische randvoorwaarden.
///
public static string HydraulicBoundaryDatabase_DisplayName {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -132,9 +132,6 @@
Dijken en dammen - Macrostabiliteit binnenwaarts
-
- Kunstwerken - Hoogte kunstwerk
-
Kunstwerken - Sterkte en stabiliteit puntconstructies
@@ -171,9 +168,6 @@
GABU
-
- HTKW
-
BSKW
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj (.../Ringtoets.Integration.Data.csproj) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj (.../Ringtoets.Integration.Data.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -47,7 +47,6 @@
-
@@ -92,6 +91,10 @@
Ringtoets.GrassCoverErosionInwards.Data
False
+
+ {1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}
+ Ringtoets.HeightStructures.Data
+
{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}
Ringtoets.HydraRing.Data
Fisheye: Tag 213b20e92891887167ab4b031ca4a4b6250a4c2a refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/HeightStructureFailureMechanism.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -r60f9f8cfadfe1b22e5989aa92ab9839c4623338d -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 60f9f8cfadfe1b22e5989aa92ab9839c4623338d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -135,6 +135,16 @@
Ringtoets.GrassCoverErosionInwards.Forms
False
+
+ {1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}
+ Ringtoets.HeightStructures.Data
+ False
+
+
+ {F0BCF06A-3D01-4D65-A249-E2A14AEC6EFD}
+ Ringtoets.HeightStructures.Forms
+ False
+
{888D4097-8BC2-4703-9FB1-8744C94D525E}
Ringtoets.HydraRing.Calculation
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -45,6 +45,8 @@
using Ringtoets.Common.Forms.Views;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
+using Ringtoets.HeightStructures.Data;
+using Ringtoets.HeightStructures.Forms.PresentationObjects;
using Ringtoets.HydraRing.Calculation.Activities;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
@@ -455,7 +457,6 @@
var duneErosionFailureMechanism = failureMechanism as DuneErosionFailureMechanism;
var grassCoverErosionOutwardsFailureMechanism = failureMechanism as GrassCoverErosionOutwardsFailureMechanism;
var grassCoverSlipOffOutwardsFailureMechanism = failureMechanism as GrassCoverSlipOffOutwardsFailureMechanism;
- var heightStructureFailureMechanism = failureMechanism as HeightStructureFailureMechanism;
var macroStabilityInwardsFailureMechanism = failureMechanism as MacroStabilityInwardsFailureMechanism;
var pipingStructureFailureMechanism = failureMechanism as PipingStructureFailureMechanism;
var stabilityStoneCoverFailureMechanism = failureMechanism as StabilityStoneCoverFailureMechanism;
@@ -464,6 +465,7 @@
var piping = failureMechanism as PipingFailureMechanism;
var grassCoverErosionInwards = failureMechanism as GrassCoverErosionInwardsFailureMechanism;
+ var heightStructureFailureMechanism = failureMechanism as HeightStructuresFailureMechanism;
if (closingStructureFailureMechanism != null)
{
@@ -481,10 +483,6 @@
{
yield return new SimpleFailureMechanismContext(grassCoverSlipOffOutwardsFailureMechanism, nodeData);
}
- else if (heightStructureFailureMechanism != null)
- {
- yield return new CustomFailureMechanismContext(heightStructureFailureMechanism, nodeData);
- }
else if (macroStabilityInwardsFailureMechanism != null)
{
yield return new CustomFailureMechanismContext(macroStabilityInwardsFailureMechanism, nodeData);
@@ -513,6 +511,10 @@
{
yield return new GrassCoverErosionInwardsFailureMechanismContext(grassCoverErosionInwards, nodeData);
}
+ else if (heightStructureFailureMechanism != null)
+ {
+ yield return new HeightStructuresFailureMechanismContext(heightStructureFailureMechanism, nodeData);
+ }
else
{
throw new NotImplementedException();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -128,7 +128,7 @@
Assert.AreEqual(waveImpactAsphaltName, section.WaveImpactAsphaltCover.Name);
Assert.AreEqual(grassCoverErosionOutwardsName, section.GrassCoverErosionOutwards.Name);
Assert.AreEqual(grassCoverSlipOffOutsideName, section.GrassCoverSlipOffOutwards.Name);
- Assert.AreEqual(heightStructureName, section.HeightStructure.Name);
+ Assert.AreEqual(heightStructureName, section.HeightStructures.Name);
Assert.AreEqual(closingStructureName, section.ClosingStructure.Name);
Assert.AreEqual(pipingStructureName, section.PipingStructure.Name);
Assert.AreEqual(strengthStabilityPointConstructionName, section.StrengthStabilityPointConstruction.Name);
@@ -195,7 +195,7 @@
Assert.AreSame(assessmentSection.WaveImpactAsphaltCover, failureMechanisms[4]);
Assert.AreSame(assessmentSection.GrassCoverErosionOutwards, failureMechanisms[5]);
Assert.AreSame(assessmentSection.GrassCoverSlipOffOutwards, failureMechanisms[6]);
- Assert.AreSame(assessmentSection.HeightStructure, failureMechanisms[7]);
+ Assert.AreSame(assessmentSection.HeightStructures, failureMechanisms[7]);
Assert.AreSame(assessmentSection.ClosingStructure, failureMechanisms[8]);
Assert.AreSame(assessmentSection.PipingStructure, failureMechanisms[9]);
Assert.AreSame(assessmentSection.StrengthStabilityPointConstruction, failureMechanisms[10]);
@@ -322,7 +322,7 @@
Assert.AreEqual(contributions[4], assessmentSection.WaveImpactAsphaltCover.Contribution);
Assert.AreEqual(contributions[5], assessmentSection.GrassCoverErosionOutwards.Contribution);
Assert.AreEqual(contributions[6], assessmentSection.GrassCoverSlipOffOutwards.Contribution);
- Assert.AreEqual(contributions[7], assessmentSection.HeightStructure.Contribution);
+ Assert.AreEqual(contributions[7], assessmentSection.HeightStructures.Contribution);
Assert.AreEqual(contributions[8], assessmentSection.ClosingStructure.Contribution);
Assert.AreEqual(contributions[9], assessmentSection.PipingStructure.Contribution);
Assert.AreEqual(contributions[10], assessmentSection.StrengthStabilityPointConstruction.Contribution);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj
===================================================================
diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r213b20e92891887167ab4b031ca4a4b6250a4c2a
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj (.../Ringtoets.Integration.Data.Test.csproj) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj (.../Ringtoets.Integration.Data.Test.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
@@ -57,7 +57,6 @@
-
@@ -94,6 +93,10 @@
{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Ringtoets.Common.Data
+
+ {1c0017d8-35b5-4ca0-8fc7-a83f46dbdc99}
+ Ringtoets.HeightStructures.Data
+
{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}
Ringtoets.HydraRing.Data
Fisheye: Tag 213b20e92891887167ab4b031ca4a4b6250a4c2a refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/HeightStructureFailureMechanismTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?