Skip to content

Commit 75c4622

Browse files
Hosch250Hosch250
committed
Merge with conflicts.
2 parents 116d3f1 + 47d59dd commit 75c4622

File tree

83 files changed

+6735
-6356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+6735
-6356
lines changed

‎RubberduckTests/Inspections/ApplicationWorksheetFunctionInspectionTests.cs

Lines changed: 0 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Threading;
33
using Microsoft.VisualStudio.TestTools.UnitTesting;
44
using Rubberduck.Inspections.Concrete;
5-
using Rubberduck.Inspections.QuickFixes;
65
using Rubberduck.Parsing.VBA;
76
using Rubberduck.VBEditor.SafeComWrappers;
87
using RubberduckTests.Mocks;
@@ -227,176 +226,5 @@ End Sub
227226

228227
Assert.IsFalse(inspectionResults.Any());
229228
}
230-
231-
[TestMethod]
232-
[DeploymentItem(@"Testfiles\")]
233-
[TestCategory("Inspections")]
234-
public void ApplicationWorksheetFunction_IgnoreQuickFixWorks()
235-
{
236-
const string inputCode =
237-
@"Sub ExcelSub()
238-
Dim foo As Double
239-
foo = Application.Pi
240-
End Sub
241-
";
242-
243-
const string expectedCode =
244-
@"Sub ExcelSub()
245-
Dim foo As Double
246-
'@Ignore ApplicationWorksheetFunction
247-
foo = Application.Pi
248-
End Sub
249-
";
250-
251-
var builder = new MockVbeBuilder();
252-
var project = builder.ProjectBuilder("VBAProject", ProjectProtection.Unprotected)
253-
.AddComponent("Module1", ComponentType.StandardModule, inputCode)
254-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
255-
.Build();
256-
257-
var vbe = builder.AddProject(project).Build();
258-
var component = vbe.Object.SelectedVBComponent;
259-
260-
var parser = MockParser.Create(vbe.Object);
261-
262-
parser.State.AddTestLibrary("Excel.1.8.xml");
263-
264-
parser.Parse(new CancellationTokenSource());
265-
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
266-
267-
var inspection = new ApplicationWorksheetFunctionInspection(parser.State);
268-
var inspectionResults = inspection.GetInspectionResults();
269-
270-
new IgnoreOnceQuickFix(parser.State, new[] { inspection }).Fix(inspectionResults.First());
271-
272-
Assert.AreEqual(expectedCode, parser.State.GetRewriter(component).GetText());
273-
}
274-
275-
[TestMethod]
276-
[DeploymentItem(@"Testfiles\")]
277-
[TestCategory("Inspections")]
278-
public void ApplicationWorksheetFunction_UseExplicitlyQuickFixWorks()
279-
{
280-
const string inputCode =
281-
@"Sub ExcelSub()
282-
Dim foo As Double
283-
foo = Application.Pi
284-
End Sub
285-
";
286-
287-
const string expectedCode =
288-
@"Sub ExcelSub()
289-
Dim foo As Double
290-
foo = Application.WorksheetFunction.Pi
291-
End Sub
292-
";
293-
294-
var builder = new MockVbeBuilder();
295-
var project = builder.ProjectBuilder("VBAProject", ProjectProtection.Unprotected)
296-
.AddComponent("Module1", ComponentType.StandardModule, inputCode)
297-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
298-
.Build();
299-
300-
var vbe = builder.AddProject(project).Build();
301-
302-
var parser = MockParser.Create(vbe.Object);
303-
304-
parser.State.AddTestLibrary("Excel.1.8.xml");
305-
306-
parser.Parse(new CancellationTokenSource());
307-
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
308-
309-
var inspection = new ApplicationWorksheetFunctionInspection(parser.State);
310-
var inspectionResults = inspection.GetInspectionResults();
311-
312-
new ApplicationWorksheetFunctionQuickFix(parser.State).Fix(inspectionResults.First());
313-
Assert.AreEqual(expectedCode, parser.State.GetRewriter(project.Object.VBComponents.First()).GetText());
314-
}
315-
316-
[TestMethod]
317-
[DeploymentItem(@"Testfiles\")]
318-
[TestCategory("Inspections")]
319-
public void ApplicationWorksheetFunction_UseExplicitlyQuickFixWorks_WithBlock()
320-
{
321-
const string inputCode =
322-
@"Sub ExcelSub()
323-
Dim foo As Double
324-
With Application
325-
foo = .Pi
326-
End With
327-
End Sub
328-
";
329-
330-
const string expectedCode =
331-
@"Sub ExcelSub()
332-
Dim foo As Double
333-
With Application
334-
foo = .WorksheetFunction.Pi
335-
End With
336-
End Sub
337-
";
338-
339-
var builder = new MockVbeBuilder();
340-
var project = builder.ProjectBuilder("VBAProject", ProjectProtection.Unprotected)
341-
.AddComponent("Module1", ComponentType.StandardModule, inputCode)
342-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
343-
.Build();
344-
345-
var vbe = builder.AddProject(project).Build();
346-
347-
var parser = MockParser.Create(vbe.Object);
348-
349-
parser.State.AddTestLibrary("Excel.1.8.xml");
350-
351-
parser.Parse(new CancellationTokenSource());
352-
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
353-
354-
var inspection = new ApplicationWorksheetFunctionInspection(parser.State);
355-
var inspectionResults = inspection.GetInspectionResults();
356-
357-
new ApplicationWorksheetFunctionQuickFix(parser.State).Fix(inspectionResults.First());
358-
Assert.AreEqual(expectedCode, parser.State.GetRewriter(project.Object.VBComponents.First()).GetText());
359-
}
360-
361-
[TestMethod]
362-
[DeploymentItem(@"Testfiles\")]
363-
[TestCategory("Inspections")]
364-
public void ApplicationWorksheetFunction_UseExplicitlyQuickFixWorks_HasParameters()
365-
{
366-
const string inputCode =
367-
@"Sub ExcelSub()
368-
Dim foo As String
369-
foo = Application.Proper(""foobar"")
370-
End Sub
371-
";
372-
373-
const string expectedCode =
374-
@"Sub ExcelSub()
375-
Dim foo As String
376-
foo = Application.WorksheetFunction.Proper(""foobar"")
377-
End Sub
378-
";
379-
380-
var builder = new MockVbeBuilder();
381-
var project = builder.ProjectBuilder("VBAProject", ProjectProtection.Unprotected)
382-
.AddComponent("Module1", ComponentType.StandardModule, inputCode)
383-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
384-
.Build();
385-
386-
var vbe = builder.AddProject(project).Build();
387-
388-
var parser = MockParser.Create(vbe.Object);
389-
390-
parser.State.AddTestLibrary("Excel.1.8.xml");
391-
392-
parser.Parse(new CancellationTokenSource());
393-
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
394-
395-
var inspection = new ApplicationWorksheetFunctionInspection(parser.State);
396-
var inspectionResults = inspection.GetInspectionResults();
397-
398-
new ApplicationWorksheetFunctionQuickFix(parser.State).Fix(inspectionResults.First());
399-
Assert.AreEqual(expectedCode, parser.State.GetRewriter(project.Object.VBComponents.First()).GetText());
400-
}
401229
}
402230
}

‎RubberduckTests/Inspections/AssignedByValParameterInspectionTests.cs

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Linq;
22
using Microsoft.VisualStudio.TestTools.UnitTesting;
3-
using Rubberduck.Inspections.QuickFixes;
4-
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
53
using RubberduckTests.Mocks;
64
using Rubberduck.Inspections.Concrete;
75
using Rubberduck.Parsing.Inspections.Resources;
@@ -21,8 +19,7 @@ public void AssignedByValParameter_ReturnsResult_Sub()
2119
Let arg1 = ""test""
2220
End Sub";
2321

24-
IVBComponent component;
25-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
22+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
2623

2724
var state = MockParser.CreateAndParse(vbe.Object);
2825
var inspection = new AssignedByValParameterInspection(state);
@@ -40,8 +37,7 @@ public void AssignedByValParameter_ReturnsResult_Function()
4037
Let arg1 = 9
4138
End Function";
4239

43-
IVBComponent component;
44-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
40+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
4541

4642
var state = MockParser.CreateAndParse(vbe.Object);
4743
var inspection = new AssignedByValParameterInspection(state);
@@ -60,8 +56,7 @@ public void AssignedByValParameter_ReturnsResult_MultipleParams()
6056
Let arg2 = 9
6157
End Sub";
6258

63-
IVBComponent component;
64-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
59+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
6560

6661
var state = MockParser.CreateAndParse(vbe.Object);
6762
var inspection = new AssignedByValParameterInspection(state);
@@ -78,8 +73,7 @@ public void AssignedByValParameter_DoesNotReturnResult()
7873
@"Public Sub Foo(ByVal arg1 As String)
7974
End Sub";
8075

81-
IVBComponent component;
82-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
76+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
8377

8478
var state = MockParser.CreateAndParse(vbe.Object);
8579
var inspection = new AssignedByValParameterInspection(state);
@@ -98,8 +92,7 @@ Public Sub Foo(ByVal arg1 As String)
9892
Let arg1 = ""test""
9993
End Sub";
10094

101-
IVBComponent component;
102-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
95+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
10396

10497
var state = MockParser.CreateAndParse(vbe.Object);
10598
var inspection = new AssignedByValParameterInspection(state);
@@ -120,8 +113,7 @@ Dim var1 As Integer
120113
var1 = arg2
121114
End Sub";
122115

123-
IVBComponent component;
124-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
116+
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
125117

126118
var state = MockParser.CreateAndParse(vbe.Object);
127119
var inspection = new AssignedByValParameterInspection(state);
@@ -164,32 +156,6 @@ End Sub
164156
Assert.IsFalse(inspectionResults.Any());
165157
}
166158

167-
[TestMethod]
168-
[TestCategory("Inspections")]
169-
public void AssignedByValParameter_IgnoreQuickFixWorks()
170-
{
171-
const string inputCode =
172-
@"Public Sub Foo(ByVal arg1 As String)
173-
Let arg1 = ""test""
174-
End Sub";
175-
176-
const string expectedCode =
177-
@"'@Ignore AssignedByValParameter
178-
Public Sub Foo(ByVal arg1 As String)
179-
Let arg1 = ""test""
180-
End Sub";
181-
182-
IVBComponent component;
183-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
184-
185-
var state = MockParser.CreateAndParse(vbe.Object);
186-
var inspection = new AssignedByValParameterInspection(state);
187-
var inspectionResults = inspection.GetInspectionResults();
188-
189-
new IgnoreOnceQuickFix(state, new[] {inspection}).Fix(inspectionResults.First());
190-
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
191-
}
192-
193159
[TestMethod]
194160
[TestCategory("Inspections")]
195161
public void InspectionType()

‎RubberduckTests/Inspections/ConstantNotUsedInspectionTests.cs

Lines changed: 0 additions & 53 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 RubberduckTests.Mocks;
76

@@ -172,58 +171,6 @@ public void ConstantNotUsed_Ignored_DoesNotReturnResult()
172171
Assert.IsFalse(inspectionResults.Any());
173172
}
174173

175-
[TestMethod]
176-
[TestCategory("Inspections")]
177-
public void ConstantNotUsed_QuickFixWorks()
178-
{
179-
const string inputCode =
180-
@"Public Sub Foo()
181-
Const const1 As Integer = 9
182-
End Sub";
183-
184-
const string expectedCode =
185-
@"Public Sub Foo()
186-
End Sub";
187-
188-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
189-
var state = MockParser.CreateAndParse(vbe.Object);
190-
191-
var inspection = new ConstantNotUsedInspection(state);
192-
var inspectionResults = inspection.GetInspectionResults();
193-
194-
new RemoveUnusedDeclarationQuickFix(state).Fix(inspectionResults.First());
195-
196-
var rewriter = state.GetRewriter(component);
197-
var rewrittenCode = rewriter.GetText();
198-
Assert.AreEqual(expectedCode, rewrittenCode);
199-
}
200-
201-
[TestMethod]
202-
[TestCategory("Inspections")]
203-
public void ConstantNotUsed_IgnoreQuickFixWorks()
204-
{
205-
const string inputCode =
206-
@"Public Sub Foo()
207-
Const const1 As Integer = 9
208-
End Sub";
209-
210-
const string expectedCode =
211-
@"Public Sub Foo()
212-
'@Ignore ConstantNotUsed
213-
Const const1 As Integer = 9
214-
End Sub";
215-
216-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
217-
var state = MockParser.CreateAndParse(vbe.Object);
218-
219-
var inspection = new ConstantNotUsedInspection(state);
220-
var inspectionResults = inspection.GetInspectionResults();
221-
222-
new IgnoreOnceQuickFix(state, new[] { inspection }).Fix(inspectionResults.First());
223-
224-
Assert.AreEqual(expectedCode, state.GetRewriter(component).GetText());
225-
}
226-
227174
[TestMethod]
228175
[TestCategory("Inspections")]
229176
public void InspectionType()

‎RubberduckTests/Inspections/EmptyElseBlockInspectionTests.cs

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Microsoft.VisualStudio.TestTools.UnitTesting;
44
using RubberduckTests.Mocks;
55
using Rubberduck.Inspections.Concrete;
6-
using Rubberduck.Inspections.QuickFixes;
76
using Rubberduck.Parsing.Inspections.Resources;
87

98
namespace RubberduckTests.Inspections
@@ -234,36 +233,5 @@ End If
234233

235234
Assert.AreEqual(expectedCount, actualResults.Count());
236235
}
237-
238-
[TestMethod]
239-
[TestCategory("Inspections")]
240-
public void EmptyElseBlock_QuickFixRemovesElse()
241-
{
242-
const string inputCode =
243-
@"Sub Foo()
244-
If True Then
245-
Else
246-
End If
247-
End Sub";
248-
249-
const string expectedCode =
250-
@"Sub Foo()
251-
If True Then
252-
End If
253-
End Sub";
254-
255-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component);
256-
var state = MockParser.CreateAndParse(vbe.Object);
257-
258-
var inspection = new EmptyElseBlockInspection(state);
259-
var inspector = InspectionsHelper.GetInspector(inspection);
260-
var actualResults = inspector.FindIssuesAsync(state, CancellationToken.None).Result;
261-
262-
new RemoveEmptyElseBlockQuickFix(state).Fix(actualResults.First());
263-
264-
string actualRewrite = state.GetRewriter(component).GetText();
265-
266-
Assert.AreEqual(expectedCode, actualRewrite);
267-
}
268236
}
269237
}

0 commit comments

Comments
 (0)