Fixed tests, moved commandbar locations to AddIn

mansellan · mansellan · commit 31c017ea83fe · 2018-08-03T00:38:29.000+01:00
diff --git a/Rubberduck.Main/Root/RubberduckIoCInstaller.cs b/Rubberduck.Main/Root/RubberduckIoCInstaller.cs
@@ -314,7 +314,7 @@ private void RegisterParseTreeInspections(IWindsorContainer container, Assembly[
 
         private void RegisterRubberduckMenu(IWindsorContainer container)
         {
-            var location = _vbe.CommandBarLocations[CommandBarSite.MenuBar];
+            var location = _addin.CommandBarLocations[CommandBarSite.MenuBar];
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = RubberduckMenuItems();
@@ -380,7 +380,7 @@ private ICommandBarControls MainCommandBarControls(int commandBarIndex)
 
         private void RegisterCodePaneContextMenu(IWindsorContainer container)
         {
-            var location = _vbe.CommandBarLocations[CommandBarSite.CodeWindow];
+            var location = _addin.CommandBarLocations[CommandBarSite.CodeWindow];
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = CodePaneContextMenuItems();
@@ -401,7 +401,7 @@ private Type[] CodePaneContextMenuItems()
 
         private void RegisterFormDesignerContextMenu(IWindsorContainer container)
         {
-            var location = _vbe.CommandBarLocations[CommandBarSite.MsForms];
+            var location = _addin.CommandBarLocations[CommandBarSite.MsForms];
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = FormDesignerContextMenuItems();
@@ -419,7 +419,7 @@ private Type[] FormDesignerContextMenuItems()
 
         private void RegisterFormDesignerControlContextMenu(IWindsorContainer container)
         {
-            var location = _vbe.CommandBarLocations[CommandBarSite.MsFormsControl];
+            var location = _addin.CommandBarLocations[CommandBarSite.MsFormsControl];
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = FormDesignerContextMenuItems();
@@ -428,7 +428,7 @@ private void RegisterFormDesignerControlContextMenu(IWindsorContainer container)
 
         private void RegisterProjectExplorerContextMenu(IWindsorContainer container)
         {
-            var location = _vbe.CommandBarLocations[CommandBarSite.ProjectExplorer];
+            var location = _addin.CommandBarLocations[CommandBarSite.ProjectExplorer];
             var controls = MainCommandBarControls(location.ParentId);
             var beforeIndex = FindRubberduckMenuInsertionIndex(controls, location.BeforeControlId);
             var menuItemTypes = ProjectWindowContextMenuItems();
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IAddIn.cs b/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IAddIn.cs
@@ -1,4 +1,6 @@
 ﻿using System;
+using System.Collections.Generic;
+using Rubberduck.VBEditor.Host;
 
 namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
 {
@@ -12,5 +14,6 @@ public interface IAddIn : ISafeComWrapper, IEquatable<IAddIn>
 
         IVBE VBE { get; }
         IAddIns Collection { get; }
+        IReadOnlyDictionary<CommandBarSite, CommandBarLocation> CommandBarLocations { get; }
     }
 }
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IVBE.cs b/Rubberduck.VBEEditor/SafeComWrappers/VB/Abstract/IVBE.cs
@@ -1,6 +1,4 @@
-using Rubberduck.VBEditor.Host;
 using System;
-using System.Collections.Generic;
 
 namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
 {
@@ -22,7 +20,6 @@ public interface IVBE : ISafeComWrapper, IEquatable<IVBE>
         IWindows Windows { get; }
         IHostApplication HostApplication();
         IWindow ActiveMDIChild();
-        IReadOnlyDictionary<CommandBarSite, CommandBarLocation> CommandBarLocations { get; }
         QualifiedSelection? GetActiveSelection();
 
         bool IsInDesignMode { get; }
diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/AddIn.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/AddIn.cs
@@ -1,4 +1,7 @@
-﻿using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+﻿using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Rubberduck.VBEditor.Host;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop.VB6;
 
 // ReSharper disable once CheckNamespace - Special dispensation due to conflicting file vs namespace priorities
@@ -9,8 +12,18 @@ public class AddIn : SafeComWrapper<VB.AddIn>, IAddIn
         public AddIn(VB.AddIn target, bool rewrapping = false) 
             : base(target, rewrapping)
         {
+            CommandBarLocations = new ReadOnlyDictionary<CommandBarSite, CommandBarLocation>(new Dictionary<CommandBarSite, CommandBarLocation>
+            {
+                {CommandBarSite.MenuBar, new CommandBarLocation(1, 30009)},
+                {CommandBarSite.CodeWindow, new CommandBarLocation(15, 2529)},
+                {CommandBarSite.ProjectExplorer, new CommandBarLocation(22, 2578)},
+                {CommandBarSite.MsForms, new CommandBarLocation(20, 746)},
+                {CommandBarSite.MsFormsControl, new CommandBarLocation(21, 2558)}
+            });
         }
 
+        public IReadOnlyDictionary<CommandBarSite, CommandBarLocation> CommandBarLocations { get; }
+
         public string ProgId => IsWrappingNullReference ? string.Empty : Target.ProgId;
 
         public string Guid => IsWrappingNullReference ? string.Empty : Target.Guid;
diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBE.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBE.cs
@@ -1,10 +1,7 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using Rubberduck.VBEditor.Host;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SafeComWrappers.Office8;
 using Rubberduck.VBEditor.VB6;
@@ -20,20 +17,11 @@ public VBE(VB.VBE target, bool rewrapping = false)
             : base(target, rewrapping)
         {
             SourceCodeHandler = new SourceCodeHandler();
-            CommandBarLocations = new ReadOnlyDictionary<CommandBarSite, CommandBarLocation>(new Dictionary<CommandBarSite, CommandBarLocation>
-            { 
-                {CommandBarSite.MenuBar, new CommandBarLocation(1, 30009)},
-                {CommandBarSite.CodeWindow, new CommandBarLocation(15, 2529)},
-                {CommandBarSite.ProjectExplorer, new CommandBarLocation(22, 2578)},
-                {CommandBarSite.MsForms, new CommandBarLocation(20, 746)},
-                {CommandBarSite.MsFormsControl, new CommandBarLocation(21, 2558)}
-            });
         }
 
         public VBEKind Kind => VBEKind.Standalone;
         public object HardReference => Target;
         public ISourceCodeHandler SourceCodeHandler { get; }
-        public IReadOnlyDictionary<CommandBarSite, CommandBarLocation> CommandBarLocations { get; }
 
         public string Version => IsWrappingNullReference ? string.Empty : Target.Version;
 
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/AddIn.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/AddIn.cs
@@ -1,4 +1,7 @@
-﻿using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+﻿using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Rubberduck.VBEditor.Host;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop;
 
 // ReSharper disable once CheckNamespace - Special dispensation due to conflicting file vs namespace priorities
@@ -9,8 +12,20 @@ public class AddIn : SafeComWrapper<VB.AddIn>, IAddIn
         public AddIn(VB.AddIn target, bool rewrapping = false) 
             : base(target, rewrapping)
         {
+            CommandBarLocations = new ReadOnlyDictionary<CommandBarSite, CommandBarLocation>(new Dictionary<CommandBarSite, CommandBarLocation>
+            {
+                {CommandBarSite.MenuBar, new CommandBarLocation(1, 30009)},
+                {CommandBarSite.CodeWindow, new CommandBarLocation(9, 2529)},
+                {CommandBarSite.ProjectExplorer, new CommandBarLocation(14, 2578)},
+                {CommandBarSite.MsForms, new CommandBarLocation(17, 2558)},
+                {CommandBarSite.MsFormsControl, new CommandBarLocation(18, 2558)}
+            });
+
         }
 
+
+        public IReadOnlyDictionary<CommandBarSite, CommandBarLocation> CommandBarLocations { get; }
+
         public string ProgId => IsWrappingNullReference ? string.Empty : Target.ProgId;
 
         public string Guid => IsWrappingNullReference ? string.Empty : Target.Guid;
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBE.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBE.cs
@@ -1,11 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using Rubberduck.VBEditor.Host;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SafeComWrappers.Office12;
 using Rubberduck.VBEditor.VBA;
@@ -21,21 +19,11 @@ public VBE(VB.VBE target, bool rewrapping = false)
             : base(target, rewrapping)
         {
             SourceCodeHandler = new SourceCodeHandler();
-            CommandBarLocations = new ReadOnlyDictionary<CommandBarSite, CommandBarLocation>(new Dictionary<CommandBarSite, CommandBarLocation>
-            {
-                {CommandBarSite.MenuBar, new CommandBarLocation(1, 30009)},
-                {CommandBarSite.CodeWindow, new CommandBarLocation(9, 2529)},
-                {CommandBarSite.ProjectExplorer, new CommandBarLocation(14, 2578)},
-                {CommandBarSite.MsForms, new CommandBarLocation(17, 2558)},
-                {CommandBarSite.MsFormsControl, new CommandBarLocation(18, 2558)}
-            });
-
         }
 
         public VBEKind Kind => VBEKind.Hosted;
         public object HardReference => Target;
         public ISourceCodeHandler SourceCodeHandler { get; }
-        public IReadOnlyDictionary<CommandBarSite, CommandBarLocation> CommandBarLocations { get; }
 
         public string Version => IsWrappingNullReference ? string.Empty : Target.Version;
 
diff --git a/RubberduckTests/IoCContainer/IoCRegistrationTests.cs b/RubberduckTests/IoCContainer/IoCRegistrationTests.cs
@@ -1,11 +1,13 @@
 ﻿using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Castle.Windsor;
 using NUnit.Framework;
 using Moq;
 using Rubberduck.Settings;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.Root;
 using Rubberduck.UI;
+using Rubberduck.VBEditor.Host;
 using RubberduckTests.Mocks;
 
 namespace RubberduckTests.IoCContainer
@@ -18,8 +20,9 @@ public class IoCRegistrationTests
         public void RegistrationOfRubberduckIoCContainerWithSC_NoException()
         {
             var vbeBuilder = new MockVbeBuilder();
-            var ide = vbeBuilder.Build().Object;
-            var addin = new Mock<IAddIn>().Object;
+            var addInBuilder = new MockAddInBuilder();
+            var ide = vbeBuilder.Build().Object;            
+            var addin = addInBuilder.Build().Object;
             var initialSettings = new GeneralSettings
             {
                 EnableExperimentalFeatures = new List<ExperimentalFeatures>
@@ -41,8 +44,9 @@ public void RegistrationOfRubberduckIoCContainerWithSC_NoException()
         public void RegistrationOfRubberduckIoCContainerWithoutSC_NoException()
         {
             var vbeBuilder = new MockVbeBuilder();
+            var addInBuilder = new MockAddInBuilder();
             var ide = vbeBuilder.Build().Object;
-            var addin = new Mock<IAddIn>().Object;
+            var addin = addInBuilder.Build().Object;
             var initialSettings = new GeneralSettings {EnableExperimentalFeatures = new List<ExperimentalFeatures>()};
 
             using (var container =
diff --git a/RubberduckTests/Mocks/MockAddinBuilder.cs b/RubberduckTests/Mocks/MockAddinBuilder.cs
@@ -0,0 +1,39 @@
+﻿using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Moq;
+using Rubberduck.VBEditor.Host;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+
+namespace RubberduckTests.Mocks
+{
+    public class MockAddInBuilder
+    {
+        private readonly Mock<IAddIn> _addIn;
+
+        public MockAddInBuilder()
+        {
+            _addIn = CreateAddInMock();
+        }
+
+        private Mock<IAddIn> CreateAddInMock()
+        {
+            var addIn = new Mock<IAddIn>();
+
+            addIn.Setup(a => a.CommandBarLocations).Returns(new ReadOnlyDictionary<CommandBarSite, CommandBarLocation>(new Dictionary<CommandBarSite, CommandBarLocation>
+            {
+                {CommandBarSite.MenuBar, new CommandBarLocation(1, 1)},
+                {CommandBarSite.CodeWindow, new CommandBarLocation(2, 2)},
+                {CommandBarSite.ProjectExplorer, new CommandBarLocation(3, 3)},
+                {CommandBarSite.MsForms, new CommandBarLocation(4, 4)},
+                {CommandBarSite.MsFormsControl, new CommandBarLocation(5, 5)}
+            }));
+
+            return addIn;
+        }
+
+        public Mock<IAddIn> Build()
+        {
+            return _addIn;
+        }
+    }
+}
diff --git a/RubberduckTests/Mocks/MockVbeBuilder.cs b/RubberduckTests/Mocks/MockVbeBuilder.cs
@@ -60,12 +60,6 @@ public class MockVbeBuilder
         private Mock<ICodePanes> _vbCodePanes;
         private readonly ICollection<ICodePane> _codePanes = new List<ICodePane>();
 
-        private const int MenuBar = 1;
-        private const int CodeWindow = 9;
-        private const int ProjectWindow = 14;
-        private const int MsForms = 17;
-        private const int MsFormsControl = 18;
-
         public MockVbeBuilder()
         {
             _vbe = CreateVbeMock();
@@ -232,11 +226,7 @@ private static ICommandBars DummyCommandBars()
  
             var dummyCommandBar = DummyCommandBar();
 
-            commandBars.SetupGet(m => m[MenuBar]).Returns(dummyCommandBar);
-            commandBars.SetupGet(m => m[CodeWindow]).Returns(dummyCommandBar);
-            commandBars.SetupGet(m => m[ProjectWindow]).Returns(dummyCommandBar);
-            commandBars.SetupGet(m => m[MsForms]).Returns(dummyCommandBar);
-            commandBars.SetupGet(m => m[MsFormsControl]).Returns(dummyCommandBar);
+            commandBars.SetupGet(m => m[It.IsAny<int>()]).Returns(dummyCommandBar);
 
             return commandBars.Object;
         }
diff --git a/RubberduckTests/RubberduckTests.csproj b/RubberduckTests/RubberduckTests.csproj
@@ -105,6 +105,7 @@
     <Compile Include="CodeAnalysis\CodeMetrics\CyclomaticComplexityTests.cs" />
     <Compile Include="CodeAnalysis\CodeMetrics\LineCountTests.cs" />
     <Compile Include="CodeExplorer\CodeExplorerTests.cs" />
+    <Compile Include="Mocks\MockAddInBuilder.cs" />
     <Compile Include="Mocks\MockVbeEvents.cs" />
     <Compile Include="Inspections\SheetAccessedUsingStringInspectionTests.cs" />
     <Compile Include="Parsing\VBACodeStringParserTests.cs" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
	`3`	`+using Rubberduck.VBEditor.Host;`
`2`	`4`
`3`	`5`	`namespace Rubberduck.VBEditor.SafeComWrappers.Abstract`
`4`	`6`	`{`
`@@ -12,5 +14,6 @@ public interface IAddIn : ISafeComWrapper, IEquatable<IAddIn>`
`12`	`14`
`13`	`15`	`IVBE VBE { get; }`
`14`	`16`	`IAddIns Collection { get; }`
	`17`	`+ IReadOnlyDictionary<CommandBarSite, CommandBarLocation> CommandBarLocations { get; }`
`15`	`18`	`}`
`16`	`19`	`}`