Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs =================================================================== diff -u -r640d98ea54ad8f801f8be35ba9019553fba6a135 -ra1bba29ba0d84061cca88da8324957087d564db9 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs (.../RingtoetsTreeNodeInfoFactoryTest.cs) (revision 640d98ea54ad8f801f8be35ba9019553fba6a135) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs (.../RingtoetsTreeNodeInfoFactoryTest.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) @@ -53,7 +53,7 @@ Action onNodeRemoved = (context, parent) => { }; // Call - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(childNodeObjects, contextMenuStrip, onNodeRemoved); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(childNodeObjects, contextMenuStrip, onNodeRemoved); // Assert Assert.AreEqual(typeof(TestCalculationGroupContext), treeNodeInfo.TagType); @@ -81,10 +81,10 @@ Name = groupName }; var groupContext = new TestCalculationGroupContext(group, failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call - var text = treeNodeInfo.Text(groupContext); + string text = treeNodeInfo.Text(groupContext); // Assert Assert.AreEqual(groupName, text); @@ -95,10 +95,10 @@ public void Image_CalculationGroup_Always_ReturnsFolderIcon() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call - var image = treeNodeInfo.Image(null); + Image image = treeNodeInfo.Image(null); // Assert TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.GeneralFolderIcon, image); @@ -113,10 +113,10 @@ mocks.ReplayAll(); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call - var result = treeNodeInfo.EnsureVisibleOnCreate(null, calculationGroup); + bool result = treeNodeInfo.EnsureVisibleOnCreate(null, calculationGroup); // Assert Assert.IsTrue(result); @@ -127,10 +127,10 @@ public void EnsureVisibleOnCreate_CalculationGroup_AnyOtherObject_ReturnsFalse() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call - var result = treeNodeInfo.EnsureVisibleOnCreate(null, null); + bool result = treeNodeInfo.EnsureVisibleOnCreate(null, null); // Assert Assert.IsFalse(result); @@ -147,7 +147,7 @@ mocks.ReplayAll(); var groupContext = new TestCalculationGroupContext(calculationGroupMock, failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call bool isRenamingAllowed = treeNodeInfo.CanRename(null, groupContext); @@ -161,7 +161,7 @@ public void CanRenameNode_CalculationGroup_WithoutParentNodeDefaultBehavior_ReturnsFalse() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call bool isRenamingAllowed = treeNodeInfo.CanRename(null, null); @@ -188,7 +188,7 @@ nodeData.Attach(observerMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call treeNodeInfo.OnNodeRenamed(nodeData, newName); @@ -209,7 +209,7 @@ var nodeData = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock); var parentNodeData = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call bool isRemovalAllowed = treeNodeInfo.CanRemove(nodeData, parentNodeData); @@ -229,7 +229,7 @@ mocks.ReplayAll(); var nodeData = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call bool isRemovalAllowed = treeNodeInfo.CanRemove(nodeData, null); @@ -250,10 +250,10 @@ var groupContext = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock); var parentGroupContext = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call - var canDrag = treeNodeInfo.CanDrag(groupContext, parentGroupContext); + bool canDrag = treeNodeInfo.CanDrag(groupContext, parentGroupContext); // Assert Assert.IsTrue(canDrag); @@ -270,10 +270,10 @@ mocks.ReplayAll(); var groupContext = new TestCalculationGroupContext(new CalculationGroup(), failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Call - var canDrag = treeNodeInfo.CanDrag(groupContext, null); + bool canDrag = treeNodeInfo.CanDrag(groupContext, null); // Assert Assert.IsFalse(canDrag); @@ -300,13 +300,13 @@ TestCalculationGroupContext targetGroupContext; CreateCalculationGroupAndContext(out targetGroup, out targetGroupContext, failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); switch (methodToTest) { case DragDropTestMethod.CanDrop: // Call - var canDrop = treeNodeInfo.CanDrop(draggedItemContext, targetGroupContext); + bool canDrop = treeNodeInfo.CanDrop(draggedItemContext, targetGroupContext); // Assert Assert.IsTrue(canDrop); @@ -346,13 +346,13 @@ TestCalculationGroupContext targetGroupContext; CreateCalculationGroupAndContext(out targetGroup, out targetGroupContext, sourceFailureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); switch (methodToTest) { case DragDropTestMethod.CanDrop: // Call - var canDrop = treeNodeInfo.CanDrop(draggedItemContext, targetGroupContext); + bool canDrop = treeNodeInfo.CanDrop(draggedItemContext, targetGroupContext); // Assert Assert.IsFalse(canDrop); @@ -403,7 +403,7 @@ originalOwnerGroup.Attach(originalOwnerObserverMock); newOwnerGroup.Attach(newOwnerObserverMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Precondition CollectionAssert.Contains(originalOwnerGroup.Children, draggedItem); @@ -456,7 +456,7 @@ originalOwnerGroup.Attach(originalOwnerObserverMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Precondition CollectionAssert.Contains(originalOwnerGroup.Children, draggedItem); @@ -519,7 +519,7 @@ originalOwnerGroup.Attach(originalOwnerObserver); newOwnerGroup.Attach(newOwnerObserver); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(null, null, null); // Precondition CollectionAssert.Contains(originalOwnerGroup.Children, draggedItem); @@ -604,13 +604,13 @@ public void CreateCalculationContextTreeNodeInfo_Always_ExpectedPropertiesSet() { // Setup - var icon = RingtoetsFormsResources.CalculationIcon; + Bitmap icon = RingtoetsFormsResources.CalculationIcon; Func childNodeObjects = context => new object[0]; Func contextMenuStrip = (context, parent, treeViewControl) => new ContextMenuStrip(); Action onNodeRemoved = (context, parent) => { }; // Call - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(childNodeObjects, contextMenuStrip, onNodeRemoved); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(childNodeObjects, contextMenuStrip, onNodeRemoved); // Assert Assert.AreEqual(typeof(TestCalculationContext), treeNodeInfo.TagType); @@ -640,10 +640,10 @@ }; var context = new TestCalculationContext(calculation, failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); // Call - var text = treeNodeInfo.Text(context); + string text = treeNodeInfo.Text(context); // Assert Assert.AreEqual(calculationName, text); @@ -654,10 +654,10 @@ public void EnsureVisibleOnCreateOfCalculationContextTreeNodeInfo_Always_ReturnsTrue() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); // Call - var result = treeNodeInfo.EnsureVisibleOnCreate(null, null); + bool result = treeNodeInfo.EnsureVisibleOnCreate(null, null); // Assert Assert.IsTrue(result); @@ -667,10 +667,10 @@ public void CanRenameCalculationContextTreeNodeInfo_Always_ReturnTrue() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); // Call - var renameAllowed = treeNodeInfo.CanRename(null, null); + bool renameAllowed = treeNodeInfo.CanRename(null, null); // Assert Assert.IsTrue(renameAllowed); @@ -694,7 +694,7 @@ }; var context = new TestCalculationContext(calculation, failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); context.WrappedData.Attach(observerMock); @@ -722,7 +722,7 @@ mocks.ReplayAll(); var context = new TestCalculationContext(calculationToBeRemoved, failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); var groupContext = new TestCalculationGroupContext(group, failureMechanismMock); @@ -748,7 +748,7 @@ mocks.ReplayAll(); var context = new TestCalculationContext(calculationToBeRemoved, failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); var groupContext = new TestCalculationGroupContext(group, failureMechanismMock); @@ -770,7 +770,7 @@ mocks.ReplayAll(); var calculationContext = new TestCalculationContext(new TestCalculation(), failureMechanismMock); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); // Call bool removalAllowed = treeNodeInfo.CanRemove(calculationContext, dataMock); @@ -784,10 +784,10 @@ public void CanDragCalculationContextTreeNodeInfo_Always_ReturnTrue() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(null, null, null); // Call - var canDrag = treeNodeInfo.CanDrag(null, null); + bool canDrag = treeNodeInfo.CanDrag(null, null); // Assert Assert.IsTrue(canDrag); @@ -801,7 +801,7 @@ public void CreateFailureMechanismContextTreeNodeInfo_Always_ExpectedPropertiesSet() { // Call - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo>(null, null, null, null); + TreeNodeInfo> treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo>(null, null, null, null); // Assert Assert.AreEqual(typeof(FailureMechanismContext), treeNodeInfo.TagType); @@ -839,7 +839,7 @@ mocks.ReplayAll(); var context = new TestFailureMechanismContext(failureMechanism, assessmentSection); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(null, null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(null, null, null, null); // Call string text = treeNodeInfo.Text(context); @@ -853,7 +853,7 @@ public void Image_FailureMechanism_Always_ReturnsFailureMechanismIcon() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo>(null, null, null, null); + TreeNodeInfo> treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo>(null, null, null, null); // Call Image image = treeNodeInfo.Image(null); @@ -875,7 +875,7 @@ failureMechanism.IsRelevant = true; var context = new TestFailureMechanismContext(failureMechanism, assessmentSection); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(null, null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(null, null, null, null); // Call Color color = treeNodeInfo.ForeColor(context); @@ -898,7 +898,7 @@ failureMechanism.IsRelevant = false; var context = new TestFailureMechanismContext(failureMechanism, assessmentSection); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(null, null, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(null, null, null, null); // Call Color color = treeNodeInfo.ForeColor(context); @@ -933,7 +933,7 @@ }; var context = new TestFailureMechanismContext(failureMechanism, assessmentSection); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(mechanismContext => resultIsRelevant, mechanismContext => resultIsNotRelevant, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(mechanismContext => resultIsRelevant, mechanismContext => resultIsNotRelevant, null, null); // Call object[] children = treeNodeInfo.ChildNodeObjects(context); @@ -969,7 +969,7 @@ }; var context = new TestFailureMechanismContext(failureMechanism, assessmentSection); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(mechanismContext => resultIsRelevant, mechanismContext => resultIsNotRelevant, null, null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(mechanismContext => resultIsRelevant, mechanismContext => resultIsNotRelevant, null, null); // Call object[] children = treeNodeInfo.ChildNodeObjects(context); @@ -997,23 +997,25 @@ failureMechanism.IsRelevant = true; var context = new TestFailureMechanismContext(failureMechanism, assessmentSection); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(null, null, - (mechanismContext, parent, treeViewControl) => - { - Assert.AreEqual(context, mechanismContext); - Assert.AreEqual(assessmentSection, parent); - Assert.AreEqual(treeView, treeViewControl); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo( + null, + null, + (mechanismContext, parent, treeViewControl) => + { + Assert.AreEqual(context, mechanismContext); + Assert.AreEqual(assessmentSection, parent); + Assert.AreEqual(treeView, treeViewControl); - return contextMenuStripRelevant; - }, - (mechanismContext, parent, treeViewControl) => - { - Assert.AreEqual(context, mechanismContext); - Assert.AreEqual(assessmentSection, parent); - Assert.AreEqual(treeView, treeViewControl); + return contextMenuStripRelevant; + }, + (mechanismContext, parent, treeViewControl) => + { + Assert.AreEqual(context, mechanismContext); + Assert.AreEqual(assessmentSection, parent); + Assert.AreEqual(treeView, treeViewControl); - return contextMenuStripNotRelevant; - }); + return contextMenuStripNotRelevant; + }); // Call using (ContextMenuStrip contextMenuStrip = treeNodeInfo.ContextMenuStrip(context, assessmentSection, treeView)) @@ -1042,23 +1044,25 @@ failureMechanism.IsRelevant = false; var context = new TestFailureMechanismContext(failureMechanism, assessmentSection); - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo(null, null, - (mechanismContext, parent, treeViewControl) => - { - Assert.AreEqual(context, mechanismContext); - Assert.AreEqual(assessmentSection, parent); - Assert.AreEqual(treeView, treeViewControl); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo( + null, + null, + (mechanismContext, parent, treeViewControl) => + { + Assert.AreEqual(context, mechanismContext); + Assert.AreEqual(assessmentSection, parent); + Assert.AreEqual(treeView, treeViewControl); - return contextMenuStripRelevant; - }, - (mechanismContext, parent, treeViewControl) => - { - Assert.AreEqual(context, mechanismContext); - Assert.AreEqual(assessmentSection, parent); - Assert.AreEqual(treeView, treeViewControl); + return contextMenuStripRelevant; + }, + (mechanismContext, parent, treeViewControl) => + { + Assert.AreEqual(context, mechanismContext); + Assert.AreEqual(assessmentSection, parent); + Assert.AreEqual(treeView, treeViewControl); - return contextMenuStripNotRelevant; - }); + return contextMenuStripNotRelevant; + }); // Call using (ContextMenuStrip result = treeNodeInfo.ContextMenuStrip(context, assessmentSection, treeView)) @@ -1081,7 +1085,7 @@ Func contextMenuStrip = (context, parent, treeViewControl) => new ContextMenuStrip(); // Call - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateEmptyProbabilityAssessmentOutputTreeNodeInfo(contextMenuStrip); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateEmptyProbabilityAssessmentOutputTreeNodeInfo(contextMenuStrip); // Assert Assert.AreEqual(typeof(EmptyProbabilityAssessmentOutput), treeNodeInfo.TagType); @@ -1108,10 +1112,10 @@ public void TextOfCreateEmptyProbabilityAssessmentOutputTreeNodeInfo_Always_ReturnsFromResource() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateEmptyProbabilityAssessmentOutputTreeNodeInfo(null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateEmptyProbabilityAssessmentOutputTreeNodeInfo(null); // Call - var text = treeNodeInfo.Text(null); + string text = treeNodeInfo.Text(null); // Assert Assert.AreEqual("Resultaat", text); @@ -1121,10 +1125,10 @@ public void ImageOfCreateEmptyProbabilityAssessmentOutputTreeNodeInfo_Always_ReturnsGeneralOutputIcon() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateEmptyProbabilityAssessmentOutputTreeNodeInfo(null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateEmptyProbabilityAssessmentOutputTreeNodeInfo(null); // Call - var image = treeNodeInfo.Image(null); + Image image = treeNodeInfo.Image(null); // Assert TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.GeneralOutputIcon, image); @@ -1134,10 +1138,10 @@ public void ForeColorOfCreateEmptyProbabilityAssessmentOutputTreeNodeInfos_Always_ReturnsGrayText() { // Setup - var treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateEmptyProbabilityAssessmentOutputTreeNodeInfo(null); + TreeNodeInfo treeNodeInfo = RingtoetsTreeNodeInfoFactory.CreateEmptyProbabilityAssessmentOutputTreeNodeInfo(null); // Call - var textColor = treeNodeInfo.ForeColor(null); + Color textColor = treeNodeInfo.ForeColor(null); // Assert Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), textColor);