Skip to content

Commit 8d70a34

Browse files
committed
Fix up the busted tests due to changes on the ExtractInterface where members and selection are now separate.
1 parent f58113c commit 8d70a34

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

RubberduckTests/Refactoring/ExtractInterfaceTests.cs

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
using System.Collections.ObjectModel;
22
using System.Linq;
3-
using System.Windows.Forms;
43
using NUnit.Framework;
54
using Moq;
65
using Rubberduck.Parsing.Symbols;
76
using Rubberduck.Refactorings;
87
using Rubberduck.Refactorings.ExtractInterface;
9-
using Rubberduck.UI.Refactorings;
108
using Rubberduck.VBEditor;
119
using Rubberduck.VBEditor.SafeComWrappers;
1210
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
1311
using RubberduckTests.Mocks;
14-
using Rubberduck.UI.Refactorings.ExtractInterface;
1512

1613
namespace RubberduckTests.Refactoring
1714
{
@@ -59,6 +56,10 @@ End Sub
5956

6057
//Specify Params to remove
6158
var model = new ExtractInterfaceModel(state, qualifiedSelection);
59+
foreach (var interfaceMember in model.Members)
60+
{
61+
interfaceMember.IsSelected = true;
62+
}
6263

6364
//SetupFactory
6465
var factory = SetupFactory(model);
@@ -166,6 +167,10 @@ End Property
166167

167168
//Specify Params to remove
168169
var model = new ExtractInterfaceModel(state, qualifiedSelection);
170+
foreach (var interfaceMember in model.Members)
171+
{
172+
interfaceMember.IsSelected = true;
173+
}
169174

170175
//SetupFactory
171176
var factory = SetupFactory(model);
@@ -251,9 +256,11 @@ End Function
251256

252257
//Specify Params to remove
253258
var model = new ExtractInterfaceModel(state, qualifiedSelection);
254-
model.Members = new ObservableCollection<InterfaceMember>(model.Members
255-
.Where(member => !member.FullMemberSignature.Contains("Property")).ToList());
256-
259+
foreach (var interfaceMember in model.Members.Where(member => !member.FullMemberSignature.Contains("Property")))
260+
{
261+
interfaceMember.IsSelected = true;
262+
}
263+
257264
//SetupFactory
258265
var factory = SetupFactory(model);
259266

@@ -394,8 +401,9 @@ End Sub
394401

395402
//Specify Params to remove
396403
var model = new ExtractInterfaceModel(state, qualifiedSelection);
404+
model.Members.ElementAt(0).IsSelected = true;
397405
model.Members = new ObservableCollection<InterfaceMember>(new[] {model.Members.ElementAt(0)}.ToList());
398-
406+
399407
//SetupFactory
400408
var factory = SetupFactory(model);
401409

0 commit comments

Comments
 (0)