Removed Reference Ensurance tests; gave up on testing it at the TestExplorer; made some ohter changes that will make it easier to test it after an overhaul. Too many dependencies and static methods.

rubberduck203 · rubberduck203 · commit de78535cc712 · 2015-06-16T19:53:35.000-04:00
diff --git a/RetailCoder.VBE/UI/DockableWindowHost.cs b/RetailCoder.VBE/UI/DockableWindowHost.cs
@@ -48,8 +48,8 @@ internal void AddUserControl(UserControl control)
 
             if (control != null)
             {
-            control.Dock = DockStyle.Fill;
-            Controls.Add(control);
+                control.Dock = DockStyle.Fill;
+                Controls.Add(control);
             }
             AdjustSize();
         }
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs
@@ -13,11 +13,11 @@ namespace Rubberduck.UI.UnitTesting
 {
     public class TestExplorerDockablePresenter : DockablePresenterBase
     {
-        private ITestExplorerWindow Control { get { return UserControl as ITestExplorerWindow; } }
-        private GridViewSort<TestExplorerItem> _gridViewSort;
+        private readonly GridViewSort<TestExplorerItem> _gridViewSort;
         private readonly ITestEngine _testEngine;
+        private readonly ITestExplorerWindow _view;
 
-        public TestExplorerDockablePresenter(VBE vbe, AddIn addin, IDockableUserControl control, ITestEngine testEngine, GridViewSort<TestExplorerItem> gridViewSort)
+        public TestExplorerDockablePresenter(VBE vbe, AddIn addin, ITestExplorerWindow control, ITestEngine testEngine, GridViewSort<TestExplorerItem> gridViewSort)
             : base(vbe, addin, control)
         {
             _testEngine = testEngine;
@@ -28,18 +28,19 @@ public TestExplorerDockablePresenter(VBE vbe, AddIn addin, IDockableUserControl
             _testEngine.MethodInitialize += TestEngineMethodInitialize;
             _testEngine.MethodCleanup += TestEngineMethodCleanup;
 
-            Control.SortColumn += SortColumn;
+            _view = control; 
+            _view.SortColumn += SortColumn;
 
             RegisterTestExplorerEvents();
         }
 
         private void SortColumn(object sender, DataGridViewCellMouseEventArgs e)
         {
-            var columnName = Control.GridView.Columns[e.ColumnIndex].Name;
+            var columnName = _view.GridView.Columns[e.ColumnIndex].Name;
 
             // type "Image" doesn't implement "IComparable", so we need to sort by the outcome instead
             if (columnName == RubberduckUI.Result) { columnName = RubberduckUI.Outcome; }
-            Control.AllTests = new BindingList<TestExplorerItem>(_gridViewSort.Sort(Control.AllTests.AsEnumerable(), columnName).ToList());
+            _view.AllTests = new BindingList<TestExplorerItem>(_gridViewSort.Sort(_view.AllTests.AsEnumerable(), columnName).ToList());
         }
 
 
@@ -70,7 +71,7 @@ private void _testEngine_ModuleInitialize(object sender, TestModuleEventArgs e)
         private void Synchronize()
         {
             FindAllTests();
-            Control.Refresh(_testEngine.AllTests);
+            _view.Refresh(_testEngine.AllTests);
         }
 
         public override void Show()
@@ -105,12 +106,12 @@ public void RunTests()
 
         public void RunTests(IEnumerable<TestMethod> tests)
         {
-            Control.ClearResults();
+            _view.ClearResults();
 
             var testMethods = tests as IList<TestMethod> ?? tests.ToList(); //bypasses multiple enumeration
-            Control.SetPlayList(testMethods);
+            _view.SetPlayList(testMethods);
 
-            Control.ClearProgress();
+            _view.ClearProgress();
 
             var projects = testMethods.Select(t => t.QualifiedMemberName.QualifiedModuleName.Project).Distinct();
             foreach (var project in projects)
@@ -123,7 +124,7 @@ public void RunTests(IEnumerable<TestMethod> tests)
 
         private void TestComplete(object sender, TestCompletedEventArgs e)
         {
-            Control.WriteResult(e.Test, e.Result);
+            _view.WriteResult(e.Test, e.Result);
         }
 
         private void OnExplorerRefreshListButtonClick(object sender, EventArgs e)
@@ -229,20 +230,20 @@ private void OnExplorerAddTestModuleButtonClick(object sender, EventArgs e)
 
         private void RegisterTestExplorerEvents()
         {
-            Control.OnRefreshListButtonClick += OnExplorerRefreshListButtonClick;
+            _view.OnRefreshListButtonClick += OnExplorerRefreshListButtonClick;
 
-            Control.OnRunAllTestsButtonClick += OnExplorerRunAllTestsButtonClick;
-            Control.OnRunFailedTestsButtonClick += OnExplorerRunFailedTestsButtonClick;
-            Control.OnRunLastRunTestsButtonClick += OnExplorerRunLastRunTestsButtonClick;
-            Control.OnRunNotRunTestsButtonClick += OnExplorerRunNotRunTestsButtonClick;
-            Control.OnRunPassedTestsButtonClick += OnExplorerRunPassedTestsButtonClick;
-            Control.OnRunSelectedTestButtonClick += OnExplorerRunSelectedTestButtonClick;
+            _view.OnRunAllTestsButtonClick += OnExplorerRunAllTestsButtonClick;
+            _view.OnRunFailedTestsButtonClick += OnExplorerRunFailedTestsButtonClick;
+            _view.OnRunLastRunTestsButtonClick += OnExplorerRunLastRunTestsButtonClick;
+            _view.OnRunNotRunTestsButtonClick += OnExplorerRunNotRunTestsButtonClick;
+            _view.OnRunPassedTestsButtonClick += OnExplorerRunPassedTestsButtonClick;
+            _view.OnRunSelectedTestButtonClick += OnExplorerRunSelectedTestButtonClick;
 
-            Control.OnGoToSelectedTest += OnExplorerGoToSelectedTest;
+            _view.OnGoToSelectedTest += OnExplorerGoToSelectedTest;
 
-            Control.OnAddExpectedErrorTestMethodButtonClick += OnExplorerAddExpectedErrorTestMethodButtonClick;
-            Control.OnAddTestMethodButtonClick += OnExplorerAddTestMethodButtonClick;
-            Control.OnAddTestModuleButtonClick += OnExplorerAddTestModuleButtonClick;
+            _view.OnAddExpectedErrorTestMethodButtonClick += OnExplorerAddExpectedErrorTestMethodButtonClick;
+            _view.OnAddTestMethodButtonClick += OnExplorerAddTestMethodButtonClick;
+            _view.OnAddTestModuleButtonClick += OnExplorerAddTestModuleButtonClick;
 
             _testEngine.TestComplete += TestComplete;
         }
diff --git a/RubberduckTests/Mocks/MockFactory.cs b/RubberduckTests/Mocks/MockFactory.cs
@@ -90,5 +90,30 @@ internal static Mock<VBProjects> CreateProjectsMock(List<VBProject> projectList,
         //    project.SetupGet(p => p.VBComponents).Returns(components.Object);
         //    return projects;
         //}
+
+        internal static Mock<Reference> CreateMockReference(string name, string filePath)
+        {
+            var reference = new Mock<Reference>();
+            reference.SetupGet(r => r.Name).Returns(name);
+            reference.SetupGet(r => r.FullPath).Returns(filePath);
+
+            return reference;
+        }
+
+        internal static Mock<References> CreateReferencesMock(List<Reference> referenceList)
+        {
+            var references = new Mock<References>();
+            references.Setup(r => r.GetEnumerator()).Returns(referenceList.GetEnumerator());
+            references.As<IEnumerable>().Setup(r => r.GetEnumerator()).Returns(referenceList.GetEnumerator());
+            return references;
+        }
+
+        internal static Mock<VBProject> CreateProjectMock(string name, Mock<References> references)
+        {
+            var project = new Mock<VBProject>();
+            project.SetupProperty(p => p.Name, name);
+            project.SetupGet(p => p.References).Returns(references.Object);
+            return project;
+        }
     }
 }
diff --git a/RubberduckTests/RubberduckTests.csproj b/RubberduckTests/RubberduckTests.csproj
@@ -186,7 +186,6 @@
     <Compile Include="StringExtensionsTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ConfigurationTests.cs" />
-    <Compile Include="TodoExplorerTests.cs" />
     <Compile Include="UnitTesting\AssertTests.cs" />
     <Compile Include="CodeInspectionTests.cs" />
     <Compile Include="TodoControllerTests.cs" />
diff --git a/RubberduckTests/UnitTesting/EngineTests.cs b/RubberduckTests/UnitTesting/EngineTests.cs
@@ -15,8 +15,6 @@ public class EngineTests
     {
         private TestEngine _engine;
         private Mock<IHostApplication> _hostAppMock;
-        private Mock<VBProject> _project;
-        private Mock<References> _references;
         private readonly QualifiedModuleName _moduleName = new QualifiedModuleName("VBAProject", "TestModule1");
 
         private TestMethod _successfulMethod;
@@ -36,15 +34,6 @@ public void Initialize()
             _engine = new TestEngine();
             _hostAppMock = new Mock<IHostApplication>();
 
-            _references = new Mock<References>();
-            _references.Setup(r => r.GetEnumerator()).Returns(ReferenceList());
-            _references.As<IEnumerable>().Setup(r => r.GetEnumerator()).Returns(ReferenceList);
-            _references.Setup(r => r.AddFromFile(It.IsAny<string>()));
-
-            _project = new Mock<VBProject>();
-            _project.SetupProperty(p => p.Name, "VBAProject");
-            _project.SetupGet(p => p.References).Returns(_references.Object);
-
             _successfulMethod = new TestMethod(new QualifiedMemberName(_moduleName, "TestMethod1"), _hostAppMock.Object);
             _failedMethod = new TestMethod(new QualifiedMemberName(_moduleName, "TestMethod2"), _hostAppMock.Object);
             _inconclusiveMethod = new TestMethod(new QualifiedMemberName(_moduleName, "TestMethod3"), _hostAppMock.Object);
@@ -61,30 +50,6 @@ public void Initialize()
             _engine.AllTests = tests;
         }
 
-        private static IEnumerator<Reference> ReferenceList()
-        {
-            yield return
-                CreateMockReference("VBA", @"C:\Program Files\Common Files\Microsoft Shared\VBA\VBA7.1\VBE7.DLL").Object;
-
-            yield return
-                CreateMockReference("Excel", @"C:\Program Files\Microsoft Office 15\Root\Office15\EXCEL.EXE").Object;
-
-            yield return 
-                CreateMockReference("stdole", @"C:\Windows\System32\stdole2.tlb").Object;
-
-            yield return
-                CreateMockReference("Office", @"C:\Program Files\Common Files\Microsoft Shared\Office15\MSO.DLL").Object;
-        }
-
-        private static Mock<Reference> CreateMockReference(string name, string filePath)
-        {
-            var reference = new Mock<Reference>();
-            reference.SetupGet(r => r.Name).Returns(name);
-            reference.SetupGet(r => r.FullPath).Returns(filePath);
-            
-            return reference;
-        }
-
         [TestMethod]
         public void TestEngine_FailedTests()
         {
@@ -232,61 +197,6 @@ public void TestEngine_Run_WhenTestListIsEmpty_Bail()
             Assert.IsFalse(_wasEventRaised, "No methods should run when passed an empty list of tests.");
         }
 
-        //todo: move this to the "UI" layer. This code doesn't have to run for COM clients.
-        //  COM clients will have to either already have a good reference, or be late bound.
-        //  This is problematic for late bound code, because now we've *forced* them into early binding.
-        [TestMethod]
-        public void TestEngine_AfterRun_OldRubberduckReferenceIsRemoved()
-        {
-            var vbaRef = CreateMockReference("VBA", @"C:\Path\To\VBA.DLL");
-            var rubberduckPath = @"C:\Path\To\Rubberduck.dll";
-            var oldRubberduckRef = CreateMockReference("Rubberduck", rubberduckPath);
-
-            var refrenceList = new List<Reference>() {vbaRef.Object, oldRubberduckRef.Object};
-
-            var references = new Mock<References>();
-            references.Setup(r => r.GetEnumerator()).Returns(refrenceList.GetEnumerator());
-            references.As<IEnumerable>().Setup(r => r.GetEnumerator()).Returns(refrenceList.GetEnumerator());
-            references.Setup(r => r.AddFromFile(It.IsAny<string>()));
-
-            var project = new Mock<VBProject>();
-            project.SetupProperty(p => p.Name, "VBAProject");
-            project.SetupGet(p => p.References).Returns(references.Object);
-
-            //act
-            _engine.Run(_engine.AllTests.Keys);
-
-            //assert
-            references.Verify(r => r.Remove(It.Is<Reference>(arg => arg == oldRubberduckRef.Object)));
-        }
-
-        //todo: move this to the "UI" layer. This code doesn't have to run for COM clients.
-        //  COM clients will have to either already have a good reference, or be late bound.
-        //  This is problematic for late bound code, because now we've *forced* them into early binding.
-        [TestMethod]
-        public void TestEngine_AfterRun_NewRubberduckReferenceExists()
-        {
-            var vbaRef = CreateMockReference("VBA", @"C:\Path\To\VBA.DLL");
-            var rubberduckPath = @"C:\Path\To\Rubberduck.dll";
-            var oldRubberduckRef = CreateMockReference("Rubberduck", rubberduckPath);
-
-            var refrenceList = new List<Reference>() { vbaRef.Object, oldRubberduckRef.Object };
-
-            var references = new Mock<References>();
-            references.Setup(r => r.GetEnumerator()).Returns(refrenceList.GetEnumerator());
-            references.As<IEnumerable>().Setup(r => r.GetEnumerator()).Returns(refrenceList.GetEnumerator());
-
-            var project = new Mock<VBProject>();
-            project.SetupProperty(p => p.Name, "VBAProject");
-            project.SetupGet(p => p.References).Returns(references.Object);
-
-            //act
-            _engine.Run(_engine.AllTests.Keys);
-
-            //assert
-            references.Verify(r => r.AddFromFile(It.IsAny<string>()));
-        }
-
         private void EngineOnTestComplete(object sender, TestCompletedEventArgs testCompletedEventArgs)
         {
             CatchEvent();

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ internal void AddUserControl(UserControl control)`
`48`	`48`
`49`	`49`	`if (control != null)`
`50`	`50`	`{`
`51`		`- control.Dock = DockStyle.Fill;`
`52`		`- Controls.Add(control);`
	`51`	`+ control.Dock = DockStyle.Fill;`
	`52`	`+ Controls.Add(control);`
`53`	`53`	`}`
`54`	`54`	`AdjustSize();`
`55`	`55`	`}`