Skip to content

Commit 3fe0070

Browse files
committed
fixed test explorer
1 parent f71cb70 commit 3fe0070

File tree

1 file changed

+25
-8
lines changed

1 file changed

+25
-8
lines changed

RetailCoder.VBE/UI/UnitTesting/TestMenu.cs

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
using Microsoft.Office.Core;
1+
using System.Diagnostics;
2+
using System.Drawing;
3+
using System.Runtime.InteropServices;
4+
using System.Windows.Forms;
5+
using Microsoft.Office.Core;
26
using Microsoft.Vbe.Interop;
7+
using Rubberduck.Properties;
8+
using Rubberduck.UnitTesting;
39
using CommandBarButtonClickEvent = Microsoft.Office.Core._CommandBarButtonEvents_ClickEventHandler;
410

511
namespace Rubberduck.UI.UnitTesting
@@ -19,22 +25,33 @@ public TestMenu(VBE vbe, AddIn addIn, TestExplorerWindow view, TestExplorerDocka
1925
_presenter = presenter;
2026
}
2127

28+
private CommandBarButton _runAllTestsButton;
29+
private CommandBarButton _windowsTestExplorerButton;
30+
2231
public void Initialize(CommandBarControls menuControls)
2332
{
24-
var menu = menuControls.Add(MsoControlType.msoControlButton, Temporary: true) as CommandBarButton;
25-
menu.Caption = "&Test Explorer";
26-
menu.Click += OnTestExplorerButtonClick;
33+
var menu = menuControls.Add(MsoControlType.msoControlPopup, Temporary: true) as CommandBarPopup;
34+
menu.Caption = "Te&st";
35+
36+
_windowsTestExplorerButton = AddButton(menu, "&Test Explorer", false, new CommandBarButtonClickEvent(OnTestExplorerButtonClick), Resources.TestManager_8590_32);
37+
_runAllTestsButton = AddButton(menu, "&Run All Tests", true, new CommandBarButtonClickEvent(OnRunAllTestsButtonClick), Resources.AllLoadedTests_8644_24);
38+
}
39+
40+
void OnRunAllTestsButtonClick(CommandBarButton Ctrl, ref bool CancelDefault)
41+
{
42+
_presenter.Show();
43+
_presenter.RunTests();
2744
}
2845

29-
private void OnTestExplorerButtonClick(CommandBarButton Ctrl, ref bool CancelDefault)
46+
void OnTestExplorerButtonClick(CommandBarButton Ctrl, ref bool CancelDefault)
3047
{
3148
_presenter.Show();
3249
}
3350

34-
private bool _disposed;
51+
bool disposed = false;
3552
protected override void Dispose(bool disposing)
3653
{
37-
if (_disposed)
54+
if (disposed)
3855
{
3956
return;
4057
}
@@ -52,7 +69,7 @@ protected override void Dispose(bool disposing)
5269
}
5370
}
5471

55-
_disposed = true;
72+
disposed = true;
5673
base.Dispose(disposing);
5774
}
5875
}

0 commit comments

Comments
 (0)