Fisheye: Tag 68579356ae04086051adec7a13109406a2e0614d refers to a dead (removed) revision in file `Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsCalculationInputContext.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Ringtoets.WaveImpactAsphaltCover.Forms.csproj
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r68579356ae04086051adec7a13109406a2e0614d
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Ringtoets.WaveImpactAsphaltCover.Forms.csproj (.../Ringtoets.WaveImpactAsphaltCover.Forms.csproj) (revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Ringtoets.WaveImpactAsphaltCover.Forms.csproj (.../Ringtoets.WaveImpactAsphaltCover.Forms.csproj) (revision 68579356ae04086051adec7a13109406a2e0614d)
@@ -47,7 +47,6 @@
-
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/Ringtoets.WaveImpactAsphaltCover.Plugin.csproj
===================================================================
diff -u -re8034ce53849baaa0646362ace42939abfeb2b44 -r68579356ae04086051adec7a13109406a2e0614d
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/Ringtoets.WaveImpactAsphaltCover.Plugin.csproj (.../Ringtoets.WaveImpactAsphaltCover.Plugin.csproj) (revision e8034ce53849baaa0646362ace42939abfeb2b44)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/Ringtoets.WaveImpactAsphaltCover.Plugin.csproj (.../Ringtoets.WaveImpactAsphaltCover.Plugin.csproj) (revision 68579356ae04086051adec7a13109406a2e0614d)
@@ -115,6 +115,11 @@
Ringtoets.Revetment.Data
False
+
+ {AF1ACFA2-AEE5-4DB7-98CA-8B3720E46AD9}
+ Ringtoets.Revetment.Forms
+ False
+
{e3347b16-bb18-41c1-8d34-fbcbf20db695}
Ringtoets.Revetment.IO
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r1afcd478d6992b815486c2697f3d5ce76c90b975 -r68579356ae04086051adec7a13109406a2e0614d
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 1afcd478d6992b815486c2697f3d5ce76c90b975)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 68579356ae04086051adec7a13109406a2e0614d)
@@ -38,6 +38,7 @@
using Ringtoets.Common.Forms.TreeNodeInfos;
using Ringtoets.HydraRing.Data;
using Ringtoets.HydraRing.IO;
+using Ringtoets.Revetment.Forms.PresentationObjects;
using Ringtoets.Revetment.Service;
using Ringtoets.WaveImpactAsphaltCover.Data;
using Ringtoets.WaveImpactAsphaltCover.Forms;
@@ -103,7 +104,7 @@
WaveConditionsCalculationContextContextMenuStrip,
WaveConditionsCalculationContextOnNodeRemoved);
- yield return new TreeNodeInfo
+ yield return new TreeNodeInfo
{
Text = context => RingtoetsCommonFormsResources.Calculation_Input,
Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
@@ -471,9 +472,9 @@
var childNodes = new List
+
+ {AF1ACFA2-AEE5-4DB7-98CA-8B3720E46AD9}
+ Ringtoets.Revetment.Forms
+
{EA416DD2-1633-439E-8512-B9933E37B9C5}
Ringtoets.Revetment.Service.TestUtil
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r86401a913aaf544979e4062d00acfe1fb24e1e4f -r68579356ae04086051adec7a13109406a2e0614d
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 86401a913aaf544979e4062d00acfe1fb24e1e4f)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 68579356ae04086051adec7a13109406a2e0614d)
@@ -45,6 +45,7 @@
using Ringtoets.HydraRing.Calculation.TestUtil;
using Ringtoets.HydraRing.Data;
using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Forms.PresentationObjects;
using Ringtoets.Revetment.Service.TestUtil;
using Ringtoets.WaveImpactAsphaltCover.Data;
using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
@@ -153,14 +154,35 @@
public void ChildNodeObjects_CalculationWithoutOutput_ReturnChildrenWithEmptyOutput()
{
// Setup
+ var location = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
+ var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+ {
+ Locations =
+ {
+ location
+ }
+ };
+
var assessmentSection = mocks.Stub();
+ assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
mocks.ReplayAll();
var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation
{
Output = null
};
- var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+
+ var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ Enumerable.Empty(),
+ new BreakWater(BreakWaterType.Caisson, 1),
+ new ForeshoreProfile.ConstructionProperties());
+ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism
+ {
+ ForeshoreProfiles =
+ {
+ foreshoreProfile
+ }
+ };
var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation,
failureMechanism,
assessmentSection);
@@ -174,10 +196,16 @@
var commentsContext = (CommentContext) children[0];
Assert.AreSame(calculation, commentsContext.WrappedData);
- var inputContext = (WaveImpactAsphaltCoverWaveConditionsCalculationInputContext) children[1];
+ var inputContext = (WaveConditionsInputContext)children[1];
Assert.AreSame(calculation.InputParameters, inputContext.WrappedData);
- Assert.AreSame(failureMechanism, inputContext.FailureMechanism);
- Assert.AreSame(assessmentSection, inputContext.AssessmentSection);
+ CollectionAssert.AreEqual(new[]
+ {
+ foreshoreProfile
+ }, inputContext.ForeshoreProfiles);
+ CollectionAssert.AreEqual(new[]
+ {
+ location
+ }, inputContext.HydraulicBoundaryLocations);
Assert.IsInstanceOf(children[2]);
}
@@ -186,14 +214,34 @@
public void ChildNodeObjects_CalculationWithOutput_ReturnChildrenWithOutput()
{
// Setup
+ var location = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
+ var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+ {
+ Locations =
+ {
+ location
+ }
+ };
+
var assessmentSection = mocks.Stub();
+ assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
mocks.ReplayAll();
var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation
{
Output = new WaveImpactAsphaltCoverWaveConditionsOutput(Enumerable.Empty())
};
- var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+ var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ Enumerable.Empty(),
+ new BreakWater(BreakWaterType.Caisson, 1),
+ new ForeshoreProfile.ConstructionProperties());
+ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism
+ {
+ ForeshoreProfiles =
+ {
+ foreshoreProfile
+ }
+ };
var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation,
failureMechanism,
assessmentSection);
@@ -207,10 +255,16 @@
var commentsContext = (CommentContext) children[0];
Assert.AreSame(calculation, commentsContext.WrappedData);
- var inputContext = (WaveImpactAsphaltCoverWaveConditionsCalculationInputContext) children[1];
+ var inputContext = (WaveConditionsInputContext)children[1];
Assert.AreSame(calculation.InputParameters, inputContext.WrappedData);
- Assert.AreSame(failureMechanism, inputContext.FailureMechanism);
- Assert.AreSame(assessmentSection, inputContext.AssessmentSection);
+ CollectionAssert.AreEqual(new[]
+ {
+ foreshoreProfile
+ }, inputContext.ForeshoreProfiles);
+ CollectionAssert.AreEqual(new[]
+ {
+ location
+ }, inputContext.HydraulicBoundaryLocations);
var output = (WaveImpactAsphaltCoverWaveConditionsOutput) children[2];
Assert.AreSame(calculation.Output, output);
Fisheye: Tag 68579356ae04086051adec7a13109406a2e0614d refers to a dead (removed) revision in file `Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationInputContextTreeNodeInfoTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj
===================================================================
diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r68579356ae04086051adec7a13109406a2e0614d
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj (.../Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj (.../Ringtoets.WaveImpactAsphaltCover.Plugin.Test.csproj) (revision 68579356ae04086051adec7a13109406a2e0614d)
@@ -99,6 +99,10 @@
{4D840673-3812-4338-A352-84854E32B8A0}
Ringtoets.Common.Forms
+
+ {AF1ACFA2-AEE5-4DB7-98CA-8B3720E46AD9}
+ Ringtoets.Revetment.Forms
+
{567E0B69-5280-41CE-ADD6-443725A61C86}
Ringtoets.WaveImpactAsphaltCover.Data
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs
===================================================================
diff -u -r1afcd478d6992b815486c2697f3d5ce76c90b975 -r68579356ae04086051adec7a13109406a2e0614d
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 1afcd478d6992b815486c2697f3d5ce76c90b975)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 68579356ae04086051adec7a13109406a2e0614d)
@@ -27,6 +27,7 @@
using Core.Common.TestUtil;
using NUnit.Framework;
using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.Revetment.Forms.PresentationObjects;
using Ringtoets.WaveImpactAsphaltCover.Data;
using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
using Ringtoets.WaveImpactAsphaltCover.Forms.PropertyClasses;
@@ -103,7 +104,7 @@
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext)));
- Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationInputContext)));
+ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveConditionsInputContext)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyWaveImpactAsphaltCoverOutput)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(WaveImpactAsphaltCoverWaveConditionsOutput)));
}