Merge pull request #2342 from retailcoder/next

down to 11 failing tests

Author: retailcoder

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -282,8 +282,6 @@
     <Compile Include="VBA\IAttributeParser.cs" />
     <Compile Include="VBA\IModuleExporter.cs" />
     <Compile Include="VBA\ModuleState.cs" />
-    <Compile Include="VBA\Nodes\INode.cs" />
-    <Compile Include="VBA\Nodes\Node.cs" />
     <Compile Include="VBA\ParseErrorEventArgs.cs" />
     <Compile Include="VBA\ParserState.cs" />
     <Compile Include="VBA\ReferencePriorityMap.cs" />

Rubberduck.Parsing/VBA/Nodes/INode.cs

@@ -135,7 +135,6 @@
     <Compile Include="Inspections\VariableNotAssignedInspectionTests.cs" />
     <Compile Include="Inspections\VariableNotUsedInspectionTests.cs" />
     <Compile Include="Inspections\VariableTypeNotDeclaredInspectionTests.cs" />
-    <Compile Include="Mocks\MockFactory.cs" />
     <Compile Include="Mocks\MockProjectBuilder.cs" />
     <Compile Include="Mocks\MockUserFormBuilder.cs" />
     <Compile Include="Mocks\MockVbeBuilder.cs" />

Rubberduck.Parsing/VBA/Nodes/Node.cs

@@ -11,19 +11,17 @@
 using Rubberduck.UI.SourceControl;
 using Rubberduck.VBEditor.Application;
 using Rubberduck.VBEditor.Events;
+using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
 using RubberduckTests.Mocks;
-using Windows = RubberduckTests.Mocks.Windows;
 
 namespace RubberduckTests.SourceControl
 {
     [TestClass]
     public class SourceControlViewModelTests
     {
         private Mock<IVBE> _vbe;
-        private Windows _windows;
-        private Mock<IWindow> _window;
+
 #pragma warning disable 169
         private object _toolWindow;
 #pragma warning restore 169
@@ -46,9 +44,12 @@ public class SourceControlViewModelTests
         [TestInitialize]
         public void InitializeMocks()
         {
-            _window = Mocks.MockFactory.CreateWindowMock();
-            _windows = new Windows() { _window.Object };
-            _vbe = Mocks.MockFactory.CreateVbeMock(_windows);
+            _vbe = new MockVbeBuilder()
+                .ProjectBuilder("TestProject1", ProjectProtection.Unprotected)
+                .AddComponent("Module1", ComponentType.StandardModule, string.Empty)
+                .MockVbeBuilder()
+                .Build();
+            
 
             var mockHost = new Mock<IHostApplication>();
             mockHost.SetupAllProperties();
@@ -500,7 +501,7 @@ public void OpenWorkingDir_WhenProviderCreationFails_MessageIsShown()
             _folderBrowser.Setup(b => b.ShowDialog()).Returns(DialogResult.OK);
             _folderBrowser.SetupProperty(b => b.SelectedPath, @"C:\path\to\repo\");
 
-            _providerFactory.Setup(f => f.CreateProvider(It.IsAny<VBProject>(), It.IsAny<IRepository>()))
+            _providerFactory.Setup(f => f.CreateProvider(It.IsAny<IVBProject>(), It.IsAny<IRepository>()))
                 .Throws(new SourceControlException(expectedTitle,
                     new LibGit2Sharp.LibGit2SharpException(expectedMessage))
                     );
@@ -609,7 +610,7 @@ public void UnsyncedPresenter_AfterLogin_NewPresenterIsCreatedWithCredentials()
             _vm.CreateProviderWithCredentials(new SecureCredentials(username, password));
 
             //assert
-            _providerFactory.Verify(f => f.CreateProvider(It.IsAny<VBProject>(), It.IsAny<IRepository>(), It.IsAny<SecureCredentials>()));
+            _providerFactory.Verify(f => f.CreateProvider(It.IsAny<IVBProject>(), It.IsAny<IRepository>(), It.IsAny<SecureCredentials>()));
         }
 
         [TestMethod]
@@ -929,7 +930,7 @@ public void OpenDirAssignedToRepo_WhenProviderCreationFails_MessageIsShown()
             _folderBrowser.Setup(b => b.ShowDialog()).Returns(DialogResult.OK);
             _folderBrowser.SetupProperty(b => b.SelectedPath, @"C:\path\to\repo\");
 
-            _providerFactory.Setup(f => f.CreateProvider(It.IsAny<VBProject>(), It.IsAny<IRepository>()))
+            _providerFactory.Setup(f => f.CreateProvider(It.IsAny<IVBProject>(), It.IsAny<IRepository>()))
                 .Throws(new SourceControlException(expectedTitle,
                     new LibGit2Sharp.LibGit2SharpException(expectedMessage))
                     );