Skip to content

Commit 721474c

Browse files
Hosch250Hosch250
committed
Fix tests
1 parent b0c331b commit 721474c

File tree

6 files changed

+39
-35
lines changed

6 files changed

+39
-35
lines changed

‎RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ namespace Rubberduck.Inspections
99

1010
public sealed class EncapsulatePublicFieldInspection : InspectionBase
1111
{
12-
private readonly Indenter _indenter;
12+
private readonly IIndenter _indenter;
1313

14-
public EncapsulatePublicFieldInspection(RubberduckParserState state, Indenter indenter)
14+
public EncapsulatePublicFieldInspection(RubberduckParserState state, IIndenter indenter)
1515
: base(state, CodeInspectionSeverity.Suggestion)
1616
{
1717
_indenter = indenter;

‎RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class EncapsulatePublicFieldInspectionResult : InspectionResultBase
1515
{
1616
private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
1717

18-
public EncapsulatePublicFieldInspectionResult(IInspection inspection, Declaration target, RubberduckParserState state, Indenter indenter)
18+
public EncapsulatePublicFieldInspectionResult(IInspection inspection, Declaration target, RubberduckParserState state, IIndenter indenter)
1919
: base(inspection, target)
2020
{
2121
_quickFixes = new CodeInspectionQuickFix[]
@@ -40,9 +40,9 @@ public class EncapsulateFieldQuickFix : CodeInspectionQuickFix
4040
{
4141
private readonly Declaration _target;
4242
private readonly RubberduckParserState _state;
43-
private readonly Indenter _indenter;
43+
private readonly IIndenter _indenter;
4444

45-
public EncapsulateFieldQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state, Indenter indenter)
45+
public EncapsulateFieldQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state, IIndenter indenter)
4646
: base(context, selection, string.Format(InspectionsUI.EncapsulatePublicFieldInspectionQuickFix, target.IdentifierName))
4747
{
4848
_target = target;

‎RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ namespace Rubberduck.Refactorings.EncapsulateField
1313
public class EncapsulateFieldRefactoring : IRefactoring
1414
{
1515
private readonly VBE _vbe;
16-
private readonly Indenter _indenter;
16+
private readonly IIndenter _indenter;
1717
private readonly IRefactoringPresenterFactory<IEncapsulateFieldPresenter> _factory;
1818
private EncapsulateFieldModel _model;
1919

20-
public EncapsulateFieldRefactoring(VBE vbe, Indenter indenter, IRefactoringPresenterFactory<IEncapsulateFieldPresenter> factory)
20+
public EncapsulateFieldRefactoring(VBE vbe, IIndenter indenter, IRefactoringPresenterFactory<IEncapsulateFieldPresenter> factory)
2121
{
2222
_vbe = vbe;
2323
_indenter = indenter;

‎RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Rubberduck.UI.Refactorings
1111

1212
public partial class EncapsulateFieldDialog : Form, IEncapsulateFieldDialog
1313
{
14-
private readonly Indenter _indenter;
14+
private readonly IIndenter _indenter;
1515

1616
public string NewPropertyName
1717
{
@@ -79,7 +79,7 @@ public bool MustImplementSetSetterType
7979
}
8080
}
8181

82-
public EncapsulateFieldDialog(Indenter indenter)
82+
public EncapsulateFieldDialog(IIndenter indenter)
8383
{
8484
_indenter = indenter;
8585
InitializeComponent();

‎RubberduckTests/Inspections/EncapsulatePublicFieldInspectionTests.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
using Microsoft.VisualStudio.TestTools.UnitTesting;
55
using Moq;
66
using Rubberduck.Inspections;
7-
using Rubberduck.Inspections.Rubberduck.Inspections;
87
using Rubberduck.Parsing;
98
using Rubberduck.Parsing.VBA;
10-
using Rubberduck.Settings;
119
using Rubberduck.VBEditor.Extensions;
1210
using Rubberduck.VBEditor.VBEHost;
1311
using RubberduckTests.Mocks;
@@ -35,7 +33,7 @@ public void PublicField_ReturnsResult()
3533
parser.Parse(new CancellationTokenSource());
3634
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
3735

38-
var inspection = new EncapsulatePublicFieldInspection(parser.State);
36+
var inspection = new EncapsulatePublicFieldInspection(parser.State, null);
3937
var inspectionResults = inspection.GetInspectionResults();
4038

4139
Assert.AreEqual(1, inspectionResults.Count());
@@ -61,7 +59,7 @@ public void MultiplePublicFields_ReturnMultipleResult()
6159
parser.Parse(new CancellationTokenSource());
6260
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
6361

64-
var inspection = new EncapsulatePublicFieldInspection(parser.State);
62+
var inspection = new EncapsulatePublicFieldInspection(parser.State, null);
6563
var inspectionResults = inspection.GetInspectionResults();
6664

6765
Assert.AreEqual(3, inspectionResults.Count());
@@ -85,7 +83,7 @@ public void PrivateField_DoesNotReturnResult()
8583
parser.Parse(new CancellationTokenSource());
8684
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
8785

88-
var inspection = new EncapsulatePublicFieldInspection(parser.State);
86+
var inspection = new EncapsulatePublicFieldInspection(parser.State, null);
8987
var inspectionResults = inspection.GetInspectionResults();
9088

9189
Assert.AreEqual(0, inspectionResults.Count());
@@ -110,7 +108,7 @@ public void PublicNonField_DoesNotReturnResult()
110108
parser.Parse(new CancellationTokenSource());
111109
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
112110

113-
var inspection = new EncapsulatePublicFieldInspection(parser.State);
111+
var inspection = new EncapsulatePublicFieldInspection(parser.State, null);
114112
var inspectionResults = inspection.GetInspectionResults();
115113

116114
Assert.AreEqual(0, inspectionResults.Count());
@@ -135,7 +133,7 @@ public void PublicField_Ignored_DoesNotReturnResult()
135133
parser.Parse(new CancellationTokenSource());
136134
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
137135

138-
var inspection = new EncapsulatePublicFieldInspection(parser.State);
136+
var inspection = new EncapsulatePublicFieldInspection(parser.State, null);
139137
var inspectionResults = inspection.GetInspectionResults();
140138

141139
Assert.IsFalse(inspectionResults.Any());
@@ -165,7 +163,7 @@ public void EncapsulatePublicField_IgnoreQuickFixWorks()
165163
parser.Parse(new CancellationTokenSource());
166164
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
167165

168-
var inspection = new EncapsulatePublicFieldInspection(parser.State);
166+
var inspection = new EncapsulatePublicFieldInspection(parser.State, null);
169167
var inspectionResults = inspection.GetInspectionResults();
170168

171169
inspectionResults.First().QuickFixes.Single(s => s is IgnoreOnceQuickFix).Fix();
@@ -177,7 +175,7 @@ public void EncapsulatePublicField_IgnoreQuickFixWorks()
177175
[TestCategory("Inspections")]
178176
public void InspectionType()
179177
{
180-
var inspection = new EncapsulatePublicFieldInspection(null);
178+
var inspection = new EncapsulatePublicFieldInspection(null, null);
181179
Assert.AreEqual(CodeInspectionType.MaintainabilityAndReadabilityIssues, inspection.InspectionType);
182180
}
183181

@@ -186,7 +184,7 @@ public void InspectionType()
186184
public void InspectionName()
187185
{
188186
const string inspectionName = "EncapsulatePublicFieldInspection";
189-
var inspection = new EncapsulatePublicFieldInspection(null);
187+
var inspection = new EncapsulatePublicFieldInspection(null, null);
190188

191189
Assert.AreEqual(inspectionName, inspection.Name);
192190
}

‎RubberduckTests/Refactoring/EncapsulateFieldTests.cs

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
using Rubberduck.VBEditor.VBEHost;
1414
using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
1515
using RubberduckTests.Mocks;
16+
using Rubberduck.SmartIndenter;
17+
using Selection = Rubberduck.VBEditor.Selection;
1618

1719
namespace RubberduckTests.Refactoring
1820
{
@@ -68,7 +70,7 @@ End Property
6870
var factory = SetupFactory(model);
6971

7072
//Act
71-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
73+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
7274
refactoring.Refactor(qualifiedSelection);
7375

7476
//Assert
@@ -127,7 +129,7 @@ End Property
127129
var factory = SetupFactory(model);
128130

129131
//Act
130-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
132+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
131133
refactoring.Refactor(qualifiedSelection);
132134

133135
//Assert
@@ -183,7 +185,7 @@ End Property
183185
var factory = SetupFactory(model);
184186

185187
//Act
186-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
188+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
187189
refactoring.Refactor(qualifiedSelection);
188190

189191
//Assert
@@ -235,7 +237,7 @@ End Property
235237
var factory = SetupFactory(model);
236238

237239
//Act
238-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
240+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
239241
refactoring.Refactor(qualifiedSelection);
240242

241243
//Assert
@@ -304,7 +306,7 @@ Function Bar() As Integer
304306
var factory = SetupFactory(model);
305307

306308
//Act
307-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
309+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
308310
refactoring.Refactor(qualifiedSelection);
309311

310312
//Assert
@@ -379,7 +381,7 @@ Property Set Foo(ByVal vall As Variant)
379381
var factory = SetupFactory(model);
380382

381383
//Act
382-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
384+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
383385
refactoring.Refactor(qualifiedSelection);
384386

385387
//Assert
@@ -437,7 +439,7 @@ End Property
437439
var factory = SetupFactory(model);
438440

439441
//Act
440-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
442+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
441443
refactoring.Refactor(qualifiedSelection);
442444

443445
//Assert
@@ -500,7 +502,7 @@ End Property
500502
var factory = SetupFactory(model);
501503

502504
//Act
503-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
505+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
504506
refactoring.Refactor(qualifiedSelection);
505507

506508
//Assert
@@ -559,7 +561,7 @@ End Property
559561
var factory = SetupFactory(model);
560562

561563
//Act
562-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
564+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
563565
refactoring.Refactor(qualifiedSelection);
564566

565567
//Assert
@@ -618,7 +620,7 @@ End Property
618620
var factory = SetupFactory(model);
619621

620622
//Act
621-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
623+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
622624
refactoring.Refactor(qualifiedSelection);
623625

624626
//Assert
@@ -674,7 +676,7 @@ End Property
674676
var factory = SetupFactory(model);
675677

676678
//Act
677-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
679+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
678680
refactoring.Refactor(qualifiedSelection);
679681

680682
//Assert
@@ -745,7 +747,7 @@ Sub Bar(ByVal name As Integer)
745747
var factory = SetupFactory(model);
746748

747749
//Act
748-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
750+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
749751
refactoring.Refactor(qualifiedSelection);
750752

751753
//Assert
@@ -835,7 +837,7 @@ Sub Bar(ByVal v As Integer)
835837
var factory = SetupFactory(model);
836838

837839
//Act
838-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
840+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
839841
refactoring.Refactor(qualifiedSelection);
840842

841843
var actualCode1 = module1.Lines();
@@ -895,7 +897,7 @@ End Property
895897
var factory = SetupFactory(model);
896898

897899
//Act
898-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
900+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
899901
refactoring.Refactor(parser.State.AllUserDeclarations.FindVariable(qualifiedSelection));
900902

901903
//Assert
@@ -924,7 +926,7 @@ public void EncapsulateField_PresenterIsNull()
924926
var factory = new EncapsulateFieldPresenterFactory(vbe.Object, parser.State, null);
925927

926928
//act
927-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory);
929+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory);
928930
refactoring.Refactor();
929931

930932
Assert.AreEqual(inputCode, module.Lines());
@@ -956,7 +958,7 @@ public void EncapsulateField_ModelIsNull()
956958
var factory = SetupFactory(null);
957959

958960
//Act
959-
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, factory.Object);
961+
var refactoring = new EncapsulateFieldRefactoring(vbe.Object, CreateIndenter(vbe.Object), factory.Object);
960962
refactoring.Refactor(qualifiedSelection);
961963

962964
//Assert
@@ -1627,6 +1629,10 @@ private static Mock<IRefactoringPresenterFactory<IEncapsulateFieldPresenter>> Se
16271629
return factory;
16281630
}
16291631

1632+
private static IIndenter CreateIndenter(VBE vbe)
1633+
{
1634+
return new Indenter(vbe, () => new IndenterSettings());
1635+
}
16301636
#endregion
16311637
}
16321638
}

0 commit comments

Comments
 (0)