Skip to content

Commit 2cf851b

Browse files
Vogel612Vogel612
committed
Set up MessageBox Mock without verifying it to fix MoveCloser test fluking
1 parent 05fbf33 commit 2cf851b

File tree

1 file changed

+32
-51
lines changed

1 file changed

+32
-51
lines changed

‎RubberduckTests/Refactoring/MoveCloserToUsageTests.cs

Lines changed: 32 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ Dim bar As Boolean
3535
bar = True
3636
End Sub";
3737

38-
IVBComponent component;
39-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
38+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
4039
using (var state = MockParser.CreateAndParse(vbe.Object))
4140
{
4241

@@ -73,8 +72,7 @@ Dim bar As Boolean
7372
bar = True
7473
End Sub";
7574

76-
IVBComponent component;
77-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
75+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
7876
using (var state = MockParser.CreateAndParse(vbe.Object))
7977
{
8078

@@ -160,8 +158,7 @@ Dim bar As Boolean
160158
bar = True
161159
End Sub";
162160

163-
IVBComponent component;
164-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
161+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
165162
using (var state = MockParser.CreateAndParse(vbe.Object))
166163
{
167164

@@ -200,8 +197,7 @@ Dim bar As Boolean
200197
bar = True
201198
End Sub";
202199

203-
IVBComponent component;
204-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
200+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
205201
using (var state = MockParser.CreateAndParse(vbe.Object))
206202
{
207203

@@ -240,9 +236,8 @@ Private Sub Foo()
240236
Dim bat As Boolean
241237
bat = True
242238
End Sub";
243-
244-
IVBComponent component;
245-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
239+
240+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
246241
using (var state = MockParser.CreateAndParse(vbe.Object))
247242
{
248243

@@ -282,8 +277,7 @@ Dim bar As Integer
282277
bar = 3
283278
End Sub";
284279

285-
IVBComponent component;
286-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
280+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
287281
using (var state = MockParser.CreateAndParse(vbe.Object))
288282
{
289283

@@ -323,8 +317,7 @@ Dim bat As Boolean
323317
bat = True
324318
End Sub";
325319

326-
IVBComponent component;
327-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
320+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
328321
using (var state = MockParser.CreateAndParse(vbe.Object))
329322
{
330323

@@ -363,9 +356,8 @@ Private Sub Foo()
363356
Dim bay As Date
364357
bay = #1/13/2004#
365358
End Sub";
366-
367-
IVBComponent component;
368-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
359+
360+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
369361
using (var state = MockParser.CreateAndParse(vbe.Object))
370362
{
371363

@@ -406,9 +398,8 @@ bay As Date
406398
Dim bar As Integer
407399
bar = 3
408400
End Sub";
409-
410-
IVBComponent component;
411-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
401+
402+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
412403
using (var state = MockParser.CreateAndParse(vbe.Object))
413404
{
414405

@@ -450,8 +441,7 @@ Dim bat As Boolean
450441
bat = True
451442
End Sub";
452443

453-
IVBComponent component;
454-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
444+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
455445
using (var state = MockParser.CreateAndParse(vbe.Object))
456446
{
457447

@@ -493,8 +483,7 @@ Dim bay As Date
493483
bay = #1/13/2004#
494484
End Sub";
495485

496-
IVBComponent component;
497-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
486+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
498487
using (var state = MockParser.CreateAndParse(vbe.Object))
499488
{
500489

@@ -520,8 +509,7 @@ Private Sub Foo()
520509
End Sub";
521510
var selection = new Selection(1, 1);
522511

523-
IVBComponent component;
524-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
512+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
525513
using (var state = MockParser.CreateAndParse(vbe.Object))
526514
{
527515

@@ -559,8 +547,7 @@ Private Sub Bar()
559547
End Sub";
560548
var selection = new Selection(1, 1);
561549

562-
IVBComponent component;
563-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
550+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
564551
using (var state = MockParser.CreateAndParse(vbe.Object))
565552
{
566553

@@ -600,8 +587,7 @@ Dim bar As Boolean
600587
End Sub";
601588
var selection = new Selection(1, 1);
602589

603-
IVBComponent component;
604-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
590+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
605591
using (var state = MockParser.CreateAndParse(vbe.Object))
606592
{
607593

@@ -637,9 +623,8 @@ End Sub
637623
Sub Baz(ByVal bat As Boolean)
638624
End Sub";
639625
var selection = new Selection(1, 1);
640-
641-
IVBComponent component;
642-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
626+
627+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
643628
using (var state = MockParser.CreateAndParse(vbe.Object))
644629
{
645630

@@ -679,9 +664,8 @@ End Sub
679664
Sub Baz(ByVal bat As Boolean, ByVal bas As Boolean, ByVal bac As Boolean)
680665
End Sub";
681666
var selection = new Selection(1, 1);
682-
683-
IVBComponent component;
684-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
667+
668+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
685669
using (var state = MockParser.CreateAndParse(vbe.Object))
686670
{
687671

@@ -713,9 +697,8 @@ Private Sub Foo(): Baz True, True, bar: End Sub
713697
@"Private Sub Foo(): Dim bar As Boolean
714698
Baz True, True, bar: End Sub
715699
Private Sub Baz(ByVal bat As Boolean, ByVal bas As Boolean, ByVal bac As Boolean): End Sub";
716-
717-
IVBComponent component;
718-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
700+
701+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
719702
using (var state = MockParser.CreateAndParse(vbe.Object))
720703
{
721704

@@ -758,9 +741,8 @@ End Sub
758741
Public Sub SomeSub(ByVal someParam As Long)
759742
Debug.Print someParam
760743
End Sub";
761-
762-
IVBComponent component;
763-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
744+
745+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
764746
using (var state = MockParser.CreateAndParse(vbe.Object))
765747
{
766748

@@ -797,9 +779,8 @@ Debug.Print someParam
797779
Public Sub SomeSub(ByVal someParam As Long)
798780
Debug.Print someParam
799781
End Sub";
800-
801-
IVBComponent component;
802-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
782+
783+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
803784
using (var state = MockParser.CreateAndParse(vbe.Object))
804785
{
805786

@@ -824,9 +805,8 @@ public void IntroduceFieldRefactoring_PassInTarget_Nonvariable()
824805
Private Sub Foo()
825806
bar = True
826807
End Sub";
827-
828-
IVBComponent component;
829-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
808+
809+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
830810
using (var state = MockParser.CreateAndParse(vbe.Object))
831811
{
832812

@@ -858,8 +838,7 @@ Private Sub Foo()
858838
End Sub";
859839
var selection = new Selection(2, 15);
860840

861-
IVBComponent component;
862-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
841+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
863842
using (var state = MockParser.CreateAndParse(vbe.Object))
864843
{
865844

@@ -912,6 +891,8 @@ Dim foo As Object
912891
using (var state = MockParser.CreateAndParse(vbe.Object))
913892
{
914893
var messageBox = new Mock<IMessageBox>();
894+
messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
895+
.Returns(DialogResult.OK);
915896
var refactoring = new MoveCloserToUsageRefactoring(vbe.Object, state, messageBox.Object);
916897
refactoring.Refactor(state.AllUserDeclarations.First(d => d.DeclarationType == DeclarationType.Variable));
917898
var rewriter = state.GetRewriter(component);

0 commit comments

Comments
 (0)