Skip to content

Commit b3318a5

Browse files
Hosch250Hosch250
committed
Update rename tests
1 parent 15df92a commit b3318a5

File tree

1 file changed

+68
-45
lines changed

1 file changed

+68
-45
lines changed

‎RubberduckTests/Refactoring/RenameTests.cs‎

Lines changed: 68 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
using Rubberduck.Refactorings.Rename;
77
using Rubberduck.VBEditor;
88
using Rubberduck.VBEditor.Extensions;
9+
using MockFactory = RubberduckTests.Mocks.MockFactory;
910

1011
namespace RubberduckTests.Refactoring
1112
{
1213
[TestClass]
13-
public class RenameTests : RefactoringTestBase
14+
public class RenameTests : VbeTestBase
1415
{
1516
[TestMethod]
1617
public void RenameRefactoring_RenameSub()
@@ -27,13 +28,15 @@ public void RenameRefactoring_RenameSub()
2728
End Sub";
2829

2930
//Arrange
30-
SetupProject(inputCode);
31-
var parseResult = new RubberduckParser().Parse(Project.Object);
31+
var vbe = MockFactory.CreateVbeMock();
32+
var project = SetupMockProject(inputCode);
33+
var module = project.Object.VBComponents.Item(0).CodeModule;
34+
var parseResult = new RubberduckParser().Parse(project.Object);
3235

3336
var qualifiedSelection = GetQualifiedSelection(selection);
3437

3538
//Specify Params to remove
36-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
39+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
3740

3841
//SetupFactory
3942
var factory = SetupFactory(model);
@@ -43,7 +46,7 @@ public void RenameRefactoring_RenameSub()
4346
refactoring.Refactor(qualifiedSelection);
4447

4548
//Assert
46-
Assert.AreEqual(expectedCode, Module.Object.Lines());
49+
Assert.AreEqual(expectedCode, module.Lines());
4750
}
4851

4952
[TestMethod]
@@ -63,13 +66,15 @@ Dim val2 As Integer
6366
End Sub";
6467

6568
//Arrange
66-
SetupProject(inputCode);
67-
var parseResult = new RubberduckParser().Parse(Project.Object);
69+
var vbe = MockFactory.CreateVbeMock();
70+
var project = SetupMockProject(inputCode);
71+
var module = project.Object.VBComponents.Item(0).CodeModule;
72+
var parseResult = new RubberduckParser().Parse(project.Object);
6873

6974
var qualifiedSelection = GetQualifiedSelection(selection);
7075

7176
//Specify Params to remove
72-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "val2" };
77+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "val2" };
7378

7479
//SetupFactory
7580
var factory = SetupFactory(model);
@@ -79,7 +84,7 @@ Dim val2 As Integer
7984
refactoring.Refactor(qualifiedSelection);
8085

8186
//Assert
82-
Assert.AreEqual(expectedCode, Module.Object.Lines());
87+
Assert.AreEqual(expectedCode, module.Lines());
8388
}
8489

8590
[TestMethod]
@@ -97,13 +102,15 @@ public void RenameRefactoring_RenameParameter()
97102
End Sub";
98103

99104
//Arrange
100-
SetupProject(inputCode);
101-
var parseResult = new RubberduckParser().Parse(Project.Object);
105+
var vbe = MockFactory.CreateVbeMock();
106+
var project = SetupMockProject(inputCode);
107+
var module = project.Object.VBComponents.Item(0).CodeModule;
108+
var parseResult = new RubberduckParser().Parse(project.Object);
102109

103110
var qualifiedSelection = GetQualifiedSelection(selection);
104111

105112
//Specify Params to remove
106-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "arg2" };
113+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "arg2" };
107114

108115
//SetupFactory
109116
var factory = SetupFactory(model);
@@ -113,7 +120,7 @@ public void RenameRefactoring_RenameParameter()
113120
refactoring.Refactor(qualifiedSelection);
114121

115122
//Assert
116-
Assert.AreEqual(expectedCode, Module.Object.Lines());
123+
Assert.AreEqual(expectedCode, module.Lines());
117124
}
118125

119126
[TestMethod]
@@ -141,13 +148,15 @@ End Sub
141148
";
142149

143150
//Arrange
144-
SetupProject(inputCode);
145-
var parseResult = new RubberduckParser().Parse(Project.Object);
151+
var vbe = MockFactory.CreateVbeMock();
152+
var project = SetupMockProject(inputCode);
153+
var module = project.Object.VBComponents.Item(0).CodeModule;
154+
var parseResult = new RubberduckParser().Parse(project.Object);
146155

147156
var qualifiedSelection = GetQualifiedSelection(selection);
148157

149158
//Specify Params to remove
150-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "Hoo" };
159+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "Hoo" };
151160

152161
//SetupFactory
153162
var factory = SetupFactory(model);
@@ -157,7 +166,7 @@ End Sub
157166
refactoring.Refactor(qualifiedSelection);
158167

159168
//Assert
160-
Assert.AreEqual(expectedCode, Module.Object.Lines());
169+
Assert.AreEqual(expectedCode, module.Lines());
161170
}
162171

163172
[TestMethod]
@@ -179,13 +188,15 @@ Dim val2 As Integer
179188
End Sub";
180189

181190
//Arrange
182-
SetupProject(inputCode);
183-
var parseResult = new RubberduckParser().Parse(Project.Object);
191+
var vbe = MockFactory.CreateVbeMock();
192+
var project = SetupMockProject(inputCode);
193+
var module = project.Object.VBComponents.Item(0).CodeModule;
194+
var parseResult = new RubberduckParser().Parse(project.Object);
184195

185196
var qualifiedSelection = GetQualifiedSelection(selection);
186197

187198
//Specify Params to remove
188-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "val2" };
199+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "val2" };
189200

190201
//SetupFactory
191202
var factory = SetupFactory(model);
@@ -195,7 +206,7 @@ Dim val2 As Integer
195206
refactoring.Refactor(qualifiedSelection);
196207

197208
//Assert
198-
Assert.AreEqual(expectedCode, Module.Object.Lines());
209+
Assert.AreEqual(expectedCode, module.Lines());
199210
}
200211

201212
[TestMethod]
@@ -215,13 +226,15 @@ public void RenameRefactoring_RenameParameter_UpdatesReferences()
215226
End Sub";
216227

217228
//Arrange
218-
SetupProject(inputCode);
219-
var parseResult = new RubberduckParser().Parse(Project.Object);
229+
var vbe = MockFactory.CreateVbeMock();
230+
var project = SetupMockProject(inputCode);
231+
var module = project.Object.VBComponents.Item(0).CodeModule;
232+
var parseResult = new RubberduckParser().Parse(project.Object);
220233

221234
var qualifiedSelection = GetQualifiedSelection(selection);
222235

223236
//Specify Params to remove
224-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "arg2" };
237+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "arg2" };
225238

226239
//SetupFactory
227240
var factory = SetupFactory(model);
@@ -231,7 +244,7 @@ public void RenameRefactoring_RenameParameter_UpdatesReferences()
231244
refactoring.Refactor(qualifiedSelection);
232245

233246
//Assert
234-
Assert.AreEqual(expectedCode, Module.Object.Lines());
247+
Assert.AreEqual(expectedCode, module.Lines());
235248
}
236249

237250
[TestMethod]
@@ -255,13 +268,15 @@ Private Property Set Goo(ByVal arg1 As Integer, ByVal arg2 As String)
255268
End Property";
256269

257270
//Arrange
258-
SetupProject(inputCode);
259-
var parseResult = new RubberduckParser().Parse(Project.Object);
271+
var vbe = MockFactory.CreateVbeMock();
272+
var project = SetupMockProject(inputCode);
273+
var module = project.Object.VBComponents.Item(0).CodeModule;
274+
var parseResult = new RubberduckParser().Parse(project.Object);
260275

261276
var qualifiedSelection = GetQualifiedSelection(selection);
262277

263278
//Specify Params to remove
264-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
279+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
265280

266281
//SetupFactory
267282
var factory = SetupFactory(model);
@@ -271,7 +286,7 @@ Private Property Set Goo(ByVal arg1 As Integer, ByVal arg2 As String)
271286
refactoring.Refactor(qualifiedSelection);
272287

273288
//Assert
274-
Assert.AreEqual(expectedCode, Module.Object.Lines());
289+
Assert.AreEqual(expectedCode, module.Lines());
275290
}
276291

277292
[TestMethod]
@@ -295,13 +310,15 @@ Private Property Let Goo(ByVal arg1 As String)
295310
End Property";
296311

297312
//Arrange
298-
SetupProject(inputCode);
299-
var parseResult = new RubberduckParser().Parse(Project.Object);
313+
var vbe = MockFactory.CreateVbeMock();
314+
var project = SetupMockProject(inputCode);
315+
var module = project.Object.VBComponents.Item(0).CodeModule;
316+
var parseResult = new RubberduckParser().Parse(project.Object);
300317

301318
var qualifiedSelection = GetQualifiedSelection(selection);
302319

303320
//Specify Params to remove
304-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
321+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
305322

306323
//SetupFactory
307324
var factory = SetupFactory(model);
@@ -311,7 +328,7 @@ Private Property Let Goo(ByVal arg1 As String)
311328
refactoring.Refactor(qualifiedSelection);
312329

313330
//Assert
314-
Assert.AreEqual(expectedCode, Module.Object.Lines());
331+
Assert.AreEqual(expectedCode, module.Lines());
315332
}
316333

317334
[TestMethod]
@@ -331,13 +348,15 @@ public void RenameRefactoring_RenameFunction()
331348
End Function";
332349

333350
//Arrange
334-
SetupProject(inputCode);
335-
var parseResult = new RubberduckParser().Parse(Project.Object);
351+
var vbe = MockFactory.CreateVbeMock();
352+
var project = SetupMockProject(inputCode);
353+
var module = project.Object.VBComponents.Item(0).CodeModule;
354+
var parseResult = new RubberduckParser().Parse(project.Object);
336355

337356
var qualifiedSelection = GetQualifiedSelection(selection);
338357

339358
//Specify Params to remove
340-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
359+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
341360

342361
//SetupFactory
343362
var factory = SetupFactory(model);
@@ -347,7 +366,7 @@ public void RenameRefactoring_RenameFunction()
347366
refactoring.Refactor(qualifiedSelection);
348367

349368
//Assert
350-
Assert.AreEqual(expectedCode, Module.Object.Lines());
369+
Assert.AreEqual(expectedCode, module.Lines());
351370
}
352371

353372
[TestMethod]
@@ -379,13 +398,15 @@ End Sub
379398
";
380399

381400
//Arrange
382-
SetupProject(inputCode);
383-
var parseResult = new RubberduckParser().Parse(Project.Object);
401+
var vbe = MockFactory.CreateVbeMock();
402+
var project = SetupMockProject(inputCode);
403+
var module = project.Object.VBComponents.Item(0).CodeModule;
404+
var parseResult = new RubberduckParser().Parse(project.Object);
384405

385406
var qualifiedSelection = GetQualifiedSelection(selection);
386407

387408
//Specify Params to remove
388-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "Hoo" };
409+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "Hoo" };
389410

390411
//SetupFactory
391412
var factory = SetupFactory(model);
@@ -395,7 +416,7 @@ End Sub
395416
refactoring.Refactor(qualifiedSelection);
396417

397418
//Assert
398-
Assert.AreEqual(expectedCode, Module.Object.Lines());
419+
Assert.AreEqual(expectedCode, module.Lines());
399420
}
400421

401422
[TestMethod]
@@ -413,13 +434,15 @@ public void RenameRefactoring_RefactorWithDeclaration()
413434
End Sub";
414435

415436
//Arrange
416-
SetupProject(inputCode);
417-
var parseResult = new RubberduckParser().Parse(Project.Object);
437+
var vbe = MockFactory.CreateVbeMock();
438+
var project = SetupMockProject(inputCode);
439+
var module = project.Object.VBComponents.Item(0).CodeModule;
440+
var parseResult = new RubberduckParser().Parse(project.Object);
418441

419442
var qualifiedSelection = GetQualifiedSelection(selection);
420443

421444
//Specify Params to remove
422-
var model = new RenameModel(IDE.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
445+
var model = new RenameModel(vbe.Object, parseResult, qualifiedSelection) { NewName = "Goo" };
423446

424447
//SetupFactory
425448
var factory = SetupFactory(model);
@@ -429,7 +452,7 @@ public void RenameRefactoring_RefactorWithDeclaration()
429452
refactoring.Refactor(model.Target);
430453

431454
//Assert
432-
Assert.AreEqual(expectedCode, Module.Object.Lines());
455+
Assert.AreEqual(expectedCode, module.Lines());
433456
}
434457

435458
#region setup

0 commit comments

Comments
 (0)