Skip to content

Commit a78c369

Browse files
committed
Moved VariableNotUsedInspectionTests for QuickFixes into relevant files under RD.QuickFixes
Additionally cleared up some confused test names
1 parent 0d7d8e7 commit a78c369

File tree

3 files changed

+52
-51
lines changed

3 files changed

+52
-51
lines changed

RubberduckTests/Inspections/VariableNotUsedInspectionTests.cs

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Linq;
22
using Microsoft.VisualStudio.TestTools.UnitTesting;
33
using Rubberduck.Inspections.Concrete;
4-
using Rubberduck.Inspections.QuickFixes;
54
using Rubberduck.Parsing.Inspections.Resources;
65
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
76
using RubberduckTests.Mocks;
@@ -142,55 +141,6 @@ Dim var1 As String
142141
Assert.IsFalse(inspectionResults.Any());
143142
}
144143

145-
[TestMethod]
146-
[TestCategory("Inspections")]
147-
public void UnassignedVariable_QuickFixWorks()
148-
{
149-
const string inputCode =
150-
@"Sub Foo()
151-
Dim var1 As String
152-
End Sub";
153-
154-
const string expectedCode =
155-
@"Sub Foo()
156-
End Sub";
157-
158-
IVBComponent component;
159-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
160-
var state = MockParser.CreateAndParse(vbe.Object);
161-
162-
var inspection = new VariableNotUsedInspection(state);
163-
new RemoveUnusedDeclarationQuickFix(state).Fix(inspection.GetInspectionResults().First());
164-
165-
var rewriter = state.GetRewriter(component);
166-
Assert.AreEqual(expectedCode, rewriter.GetText());
167-
}
168-
169-
[TestMethod]
170-
[TestCategory("Inspections")]
171-
public void UnassignedVariable_IgnoreQuickFixWorks()
172-
{
173-
const string inputCode =
174-
@"Sub Foo()
175-
Dim var1 As String
176-
End Sub";
177-
178-
const string expectedCode =
179-
@"Sub Foo()
180-
'@Ignore VariableNotUsed
181-
Dim var1 As String
182-
End Sub";
183-
184-
IVBComponent component;
185-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
186-
var state = MockParser.CreateAndParse(vbe.Object);
187-
188-
var inspection = new VariableNotUsedInspection(state);
189-
new IgnoreOnceQuickFix(state, new[] {inspection}).Fix(inspection.GetInspectionResults().First());
190-
191-
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
192-
}
193-
194144
[TestMethod]
195145
[TestCategory("Inspections")]
196146
public void InspectionType()

RubberduckTests/QuickFixes/IgnoreOnceQuickFixTests.cs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,33 @@ Dim var1 as Integer
10581058
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
10591059
}
10601060

1061+
[TestMethod]
1062+
[TestCategory("QuickFixes")]
1063+
public void UnusedVariable_IgnoreQuickFixWorks()
1064+
{
1065+
const string inputCode =
1066+
@"Sub Foo()
1067+
Dim var1 As String
1068+
End Sub";
1069+
1070+
const string expectedCode =
1071+
@"Sub Foo()
1072+
'@Ignore VariableNotUsed
1073+
Dim var1 As String
1074+
End Sub";
1075+
1076+
IVBComponent component;
1077+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
1078+
var state = MockParser.CreateAndParse(vbe.Object);
1079+
1080+
var inspection = new VariableNotUsedInspection(state);
1081+
new IgnoreOnceQuickFix(state, new[] { inspection }).Fix(inspection.GetInspectionResults().First());
1082+
1083+
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
1084+
}
1085+
1086+
1087+
10611088
}
10621089
}
10631090

RubberduckTests/QuickFixes/RemoveUnusedDeclarationQuickFixTests.cs

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Microsoft.VisualStudio.TestTools.UnitTesting;
33
using Rubberduck.Inspections.Concrete;
44
using Rubberduck.Inspections.QuickFixes;
5-
using Rubberduck.Parsing.Inspections.Resources;
65
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
76
using RubberduckTests.Mocks;
87

@@ -118,5 +117,30 @@ public void ProcedureNotUsed_QuickFixWorks()
118117
Assert.AreEqual(expectedCode, rewriter.GetText());
119118
}
120119

120+
[TestMethod]
121+
[TestCategory("QuickFixes")]
122+
public void UnassignedVariable_QuickFixWorks()
123+
{
124+
const string inputCode =
125+
@"Sub Foo()
126+
Dim var1 As String
127+
End Sub";
128+
129+
const string expectedCode =
130+
@"Sub Foo()
131+
End Sub";
132+
133+
IVBComponent component;
134+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
135+
var state = MockParser.CreateAndParse(vbe.Object);
136+
137+
var inspection = new VariableNotUsedInspection(state);
138+
new RemoveUnusedDeclarationQuickFix(state).Fix(inspection.GetInspectionResults().First());
139+
140+
var rewriter = state.GetRewriter(component);
141+
Assert.AreEqual(expectedCode, rewriter.GetText());
142+
}
143+
144+
121145
}
122146
}

0 commit comments

Comments
 (0)