Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rde581b98583a4421a3e5f08bc003794f773d2439 -r6bf5966d33caf2914b0405b7dfd5a8a47c22a4ae
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision de581b98583a4421a3e5f08bc003794f773d2439)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 6bf5966d33caf2914b0405b7dfd5a8a47c22a4ae)
@@ -905,20 +905,6 @@
 
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
-            yield return new TreeNodeInfo<AssessmentSection>
-            {
-                Text = assessmentSection => assessmentSection.Name,
-                Image = assessmentSection => RiskeerFormsResources.AssessmentSectionFolderIcon,
-                EnsureVisibleOnCreate = (assessmentSection, parent) => true,
-                ExpandOnCreate = assessmentSection => true,
-                ChildNodeObjects = AssessmentSectionChildNodeObjects,
-                ContextMenuStrip = AssessmentSectionContextMenuStrip,
-                CanRename = (assessmentSection, parentData) => true,
-                OnNodeRenamed = AssessmentSectionOnNodeRenamed,
-                CanRemove = (assessmentSection, parentNodeData) => true,
-                OnNodeRemoved = AssessmentSectionOnNodeRemoved
-            };
-
             yield return CreateStateRootTreeNodeInfo<AssessmentSectionStateRootContext>(
                 AssessmentSectionStateRootContextChildNodeObjects,
                 AssessmentSectionStateRootContextMenuStrip);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rde581b98583a4421a3e5f08bc003794f773d2439 -r6bf5966d33caf2914b0405b7dfd5a8a47c22a4ae
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision de581b98583a4421a3e5f08bc003794f773d2439)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 6bf5966d33caf2914b0405b7dfd5a8a47c22a4ae)
@@ -599,8 +599,7 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(44, treeNodeInfos.Length);
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSection)));
+                Assert.AreEqual(43, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSectionStateRootContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CalculationsStateRootContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailurePathsStateRootContext)));
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionStateRootContextTreeNodeInfoTest.cs
===================================================================
diff -u -r095f760adcd5d00754c997c0214156cd7faaf873 -r6bf5966d33caf2914b0405b7dfd5a8a47c22a4ae
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionStateRootContextTreeNodeInfoTest.cs	(.../AssessmentSectionStateRootContextTreeNodeInfoTest.cs)	(revision 095f760adcd5d00754c997c0214156cd7faaf873)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionStateRootContextTreeNodeInfoTest.cs	(.../AssessmentSectionStateRootContextTreeNodeInfoTest.cs)	(revision 6bf5966d33caf2914b0405b7dfd5a8a47c22a4ae)
@@ -45,14 +45,7 @@
     public class AssessmentSectionStateRootContextTreeNodeInfoTest
     {
         private const int contextMenuImportAssessmentSectionIndex = 2;
-        private MockRepository mocks;
 
-        [SetUp]
-        public void SetUp()
-        {
-            mocks = new MockRepository();
-        }
-
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
@@ -84,7 +77,7 @@
         }
 
         [Test]
-        public void Text_Always_ReturnsName()
+        public void Text_WithContext_ReturnsName()
         {
             // Setup
             const string testName = "ttt";
@@ -112,15 +105,12 @@
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            var assessmentSectionContext = new AssessmentSectionStateRootContext(assessmentSection);
-
             using (var plugin = new RiskeerPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
 
                 // Call
-                Image image = info.Image(assessmentSectionContext);
+                Image image = info.Image(null);
 
                 // Assert
                 TestHelper.AssertImagesAreEqual(RiskeerIntegrationFormsResources.AssessmentSectionFolderIcon, image);
@@ -131,8 +121,6 @@
         public void EnsureVisibleOnCreate_Always_ReturnsTrue()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RiskeerPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -143,16 +131,12 @@
                 // Assert
                 Assert.IsTrue(result);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void ExpandOnCreate_Always_ReturnsTrue()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RiskeerPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -163,12 +147,10 @@
                 // Assert
                 Assert.IsTrue(result);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
-        public void ChildNodeObjects_Always_ReturnsChildrenOfData()
+        public void ChildNodeObjects_WithContext_ReturnsChildrenOfData()
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
@@ -207,6 +189,7 @@
         public void ContextMenuStrip_Always_CallsBuilder()
         {
             // Setup
+            var mocks = new MockRepository();
             var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
             using (mocks.Ordered())
             {
@@ -255,6 +238,7 @@
                 var assessmentSectionContext = new AssessmentSectionStateRootContext(assessmentSection);
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
+                var mocks = new MockRepository();
                 var gui = mocks.Stub<IGui>();
                 gui.Stub(cmp => cmp.Get(assessmentSectionContext, treeView)).Return(menuBuilder);
                 gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
@@ -284,8 +268,6 @@
         public void CanRename_Always_ReturnsTrue()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RiskeerPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
@@ -296,14 +278,13 @@
                 // Assert
                 Assert.IsTrue(canRename);
             }
-
-            mocks.VerifyAll();
         }
 
         [Test]
         public void OnNodeRenamed_WithData_SetProjectNameWithNotification()
         {
             // Setup
+            var mocks = new MockRepository();
             var observer = mocks.Stub<IObserver>();
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
@@ -315,6 +296,7 @@
             using (var plugin = new RiskeerPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
+                
                 // Call
                 const string newName = "New Name";
                 info.OnNodeRenamed(assessmentSectionContext, newName);
@@ -330,19 +312,16 @@
         public void CanRemove_Always_ReturnsFalse()
         {
             // Setup
-            mocks.ReplayAll();
-
             using (var plugin = new RiskeerPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
+                
                 // Call
                 bool canRemove = info.CanRemove(null, null);
 
                 // Assert
                 Assert.IsFalse(canRemove);
             }
-
-            mocks.VerifyAll();
         }
 
         private TreeNodeInfo GetInfo(RiskeerPlugin plugin)
Fisheye: Tag 6bf5966d33caf2914b0405b7dfd5a8a47c22a4ae refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?