|
1 | 1 | using System.Collections.ObjectModel;
|
2 | 2 | using System.Linq;
|
3 |
| -using System.Windows.Forms; |
4 | 3 | using NUnit.Framework;
|
5 | 4 | using Moq;
|
6 | 5 | using Rubberduck.Parsing.Symbols;
|
7 | 6 | using Rubberduck.Refactorings;
|
8 | 7 | using Rubberduck.Refactorings.ExtractInterface;
|
9 |
| -using Rubberduck.UI.Refactorings; |
10 | 8 | using Rubberduck.VBEditor;
|
11 | 9 | using Rubberduck.VBEditor.SafeComWrappers;
|
12 | 10 | using Rubberduck.VBEditor.SafeComWrappers.Abstract;
|
13 | 11 | using RubberduckTests.Mocks;
|
14 |
| -using Rubberduck.UI.Refactorings.ExtractInterface; |
15 | 12 |
|
16 | 13 | namespace RubberduckTests.Refactoring
|
17 | 14 | {
|
@@ -59,6 +56,10 @@ End Sub
|
59 | 56 |
|
60 | 57 | //Specify Params to remove
|
61 | 58 | var model = new ExtractInterfaceModel(state, qualifiedSelection);
|
| 59 | + foreach (var interfaceMember in model.Members) |
| 60 | + { |
| 61 | + interfaceMember.IsSelected = true; |
| 62 | + } |
62 | 63 |
|
63 | 64 | //SetupFactory
|
64 | 65 | var factory = SetupFactory(model);
|
@@ -166,6 +167,10 @@ End Property
|
166 | 167 |
|
167 | 168 | //Specify Params to remove
|
168 | 169 | var model = new ExtractInterfaceModel(state, qualifiedSelection);
|
| 170 | + foreach (var interfaceMember in model.Members) |
| 171 | + { |
| 172 | + interfaceMember.IsSelected = true; |
| 173 | + } |
169 | 174 |
|
170 | 175 | //SetupFactory
|
171 | 176 | var factory = SetupFactory(model);
|
@@ -251,9 +256,11 @@ End Function
|
251 | 256 |
|
252 | 257 | //Specify Params to remove
|
253 | 258 | 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 | + |
257 | 264 | //SetupFactory
|
258 | 265 | var factory = SetupFactory(model);
|
259 | 266 |
|
@@ -394,8 +401,9 @@ End Sub
|
394 | 401 |
|
395 | 402 | //Specify Params to remove
|
396 | 403 | var model = new ExtractInterfaceModel(state, qualifiedSelection);
|
| 404 | + model.Members.ElementAt(0).IsSelected = true; |
397 | 405 | model.Members = new ObservableCollection<InterfaceMember>(new[] {model.Members.ElementAt(0)}.ToList());
|
398 |
| - |
| 406 | + |
399 | 407 | //SetupFactory
|
400 | 408 | var factory = SetupFactory(model);
|
401 | 409 |
|
|
0 commit comments