Skip to content

Commit 39c471c

Browse files
retailcoderretailcoder
authored
Merge pull request #5370 from BZngr/5368_RefLibraryStringKeys
Replace string ReferenceLibrary keys
2 parents 231bac5 + 52bb5e1 commit 39c471c

34 files changed

+193
-163
lines changed

‎RubberduckTests/Grammar/ResolverTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6820,7 +6820,7 @@ End Function
68206820
.ProjectBuilder("TestProject", ProjectProtection.Unprotected)
68216821
.AddComponent("Class1", ComponentType.ClassModule, classCode)
68226822
.AddComponent("Module1", ComponentType.StandardModule, moduleCode)
6823-
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
6823+
.AddReference(ReferenceLibrary.VBA)
68246824
.AddProjectToVbeBuilder()
68256825
.Build();
68266826

@@ -6853,7 +6853,7 @@ End Function
68536853
.ProjectBuilder("TestProject", ProjectProtection.Unprotected)
68546854
.AddComponent("Class1", ComponentType.ClassModule, classCode)
68556855
.AddComponent("Module1", ComponentType.StandardModule, moduleCode)
6856-
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
6856+
.AddReference(ReferenceLibrary.VBA)
68576857
.AddProjectToVbeBuilder()
68586858
.Build();
68596859

@@ -6890,7 +6890,7 @@ End Function
68906890
.ProjectBuilder("TestProject", ProjectProtection.Unprotected)
68916891
.AddComponent("Class1", ComponentType.ClassModule, classCode)
68926892
.AddComponent("Module1", ComponentType.StandardModule, moduleCode)
6893-
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
6893+
.AddReference(ReferenceLibrary.VBA)
68946894
.AddProjectToVbeBuilder()
68956895
.Build();
68966896

@@ -6927,7 +6927,7 @@ End Function
69276927
.ProjectBuilder("TestProject", ProjectProtection.Unprotected)
69286928
.AddComponent("Class1", ComponentType.ClassModule, classCode)
69296929
.AddComponent("Module1", ComponentType.StandardModule, moduleCode)
6930-
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
6930+
.AddReference(ReferenceLibrary.VBA)
69316931
.AddProjectToVbeBuilder()
69326932
.Build();
69336933

@@ -6964,7 +6964,7 @@ End Function
69646964
.ProjectBuilder("TestProject", ProjectProtection.Unprotected)
69656965
.AddComponent("Class1", ComponentType.ClassModule, classCode)
69666966
.AddComponent("Module1", ComponentType.StandardModule, moduleCode)
6967-
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
6967+
.AddReference(ReferenceLibrary.VBA)
69686968
.AddProjectToVbeBuilder()
69696969
.Build();
69706970

‎RubberduckTests/Inspections/ApplicationWorksheetFunctionInspectionTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
using Rubberduck.Parsing.Inspections.Abstract;
66
using Rubberduck.Parsing.VBA;
77
using Rubberduck.VBEditor.SafeComWrappers;
8+
using RubberduckTests.Mocks;
89

910
namespace RubberduckTests.Inspections
1011
{
1112
[TestFixture]
1213
public class ApplicationWorksheetFunctionInspectionTests : InspectionTestsBase
1314
{
1415
private IEnumerable<IInspectionResult> GetInspectionResultsUsingExcelLibrary(string inputCode)
15-
=> InspectionResultsForModules(("Module1", inputCode, ComponentType.StandardModule), "Excel");
16+
=> InspectionResultsForModules(("Module1", inputCode, ComponentType.StandardModule), ReferenceLibrary.Excel);
1617

1718
[Test]
1819
[Category("Inspections")]

‎RubberduckTests/Inspections/ExcelMemberMayReturnNothingInspectionTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Rubberduck.Parsing.Inspections.Abstract;
66
using Rubberduck.Parsing.VBA;
77
using Rubberduck.VBEditor.SafeComWrappers;
8+
using RubberduckTests.Mocks;
89

910
namespace RubberduckTests.Inspections
1011
{
@@ -348,7 +349,7 @@ End Sub
348349
}
349350

350351
private IEnumerable<IInspectionResult> InspectionResults(string inputCode)
351-
=> InspectionResultsForModules(("Module1", inputCode, ComponentType.StandardModule), "Excel");
352+
=> InspectionResultsForModules(("Module1", inputCode, ComponentType.StandardModule), ReferenceLibrary.Excel);
352353

353354
protected override IInspection InspectionUnderTest(RubberduckParserState state)
354355
{

‎RubberduckTests/Inspections/ExcelUdfNameIsValidCellReferenceInspectionTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Parsing.Inspections.Abstract;
55
using Rubberduck.Parsing.VBA;
66
using Rubberduck.VBEditor.SafeComWrappers;
7+
using RubberduckTests.Mocks;
78

89
namespace RubberduckTests.Inspections
910
{
@@ -106,7 +107,7 @@ public void ExcelUdfNameIsValidCellReferenceInspection_ReturnsNoResult_NonFuncti
106107
}
107108

108109
private int InspectionResultCount(string inputCode, ComponentType moduleType)
109-
=> InspectionResultsForModules(("UnderTest", inputCode, moduleType), "Excel").Count();
110+
=> InspectionResultsForModules(("UnderTest", inputCode, moduleType), ReferenceLibrary.Excel).Count();
110111

111112
protected override IInspection InspectionUnderTest(RubberduckParserState state)
112113
{

‎RubberduckTests/Inspections/HostSpecificExpressionInspectionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Public Sub DoSomething()
2222
[A1] = 42
2323
End Sub
2424
";
25-
var vbe = MockVbeBuilder.BuildFromModules(("Module1", code, ComponentType.StandardModule), new string[] { "VBA", "Excel" });
25+
var vbe = MockVbeBuilder.BuildFromModules(("Module1", code, ComponentType.StandardModule), new ReferenceLibrary[] { ReferenceLibrary.VBA, ReferenceLibrary.Excel });
2626
var mockHost = new Mock<IHostApplication>();
2727
mockHost.SetupGet(m => m.ApplicationName).Returns("Excel");
2828
vbe.Setup(m => m.HostApplication()).Returns(() => mockHost.Object);

‎RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Parsing.Inspections.Abstract;
55
using Rubberduck.Parsing.VBA;
66
using Rubberduck.VBEditor.SafeComWrappers;
7+
using RubberduckTests.Mocks;
78

89
namespace RubberduckTests.Inspections
910
{
@@ -21,7 +22,7 @@ Dim arr1() As Variant
2122
End Sub
2223
";
2324
var modules = new(string, string, ComponentType)[] { ("Class1", inputCode, ComponentType.ClassModule) };
24-
Assert.AreEqual(1, InspectionResultsForModules(modules, "Excel").Count());
25+
Assert.AreEqual(1, InspectionResultsForModules(modules, ReferenceLibrary.Excel).Count());
2526
}
2627

2728
[Test]
@@ -35,7 +36,7 @@ Dim arr1() As Variant
3536
End Sub
3637
";
3738
var modules = new (string, string, ComponentType)[] { ("Class1", inputCode, ComponentType.ClassModule) };
38-
Assert.AreEqual(1, InspectionResultsForModules(modules, "Excel").Count());
39+
Assert.AreEqual(1, InspectionResultsForModules(modules, ReferenceLibrary.Excel).Count());
3940
}
4041

4142
[Test]
@@ -49,7 +50,7 @@ Dim arr1() As Variant
4950
End Sub
5051
";
5152
var modules = new (string, string, ComponentType)[] { ("Class1", inputCode, ComponentType.ClassModule) };
52-
Assert.AreEqual(1, InspectionResultsForModules(modules, "Excel").Count());
53+
Assert.AreEqual(1, InspectionResultsForModules(modules, ReferenceLibrary.Excel).Count());
5354
}
5455

5556
[Test]
@@ -63,7 +64,7 @@ Dim arr1() As Variant
6364
End Sub
6465
";
6566
var modules = new (string, string, ComponentType)[] { ("Class1", inputCode, ComponentType.ClassModule) };
66-
Assert.AreEqual(1, InspectionResultsForModules(modules, "Excel").Count());
67+
Assert.AreEqual(1, InspectionResultsForModules(modules, ReferenceLibrary.Excel).Count());
6768
}
6869

6970
[Test]
@@ -80,7 +81,7 @@ End Sub
8081
";
8182

8283
var modules = new(string, string, ComponentType)[] { ("Class1", inputCode, ComponentType.ClassModule) };
83-
Assert.AreEqual(0, InspectionResultsForModules(modules, "Excel").Count());
84+
Assert.AreEqual(0, InspectionResultsForModules(modules, ReferenceLibrary.Excel).Count());
8485
}
8586

8687
[Test]

‎RubberduckTests/Inspections/ImplicitActiveWorkbookReferenceInspectionTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Parsing.Inspections.Abstract;
55
using Rubberduck.Parsing.VBA;
66
using Rubberduck.VBEditor.SafeComWrappers;
7+
using RubberduckTests.Mocks;
78

89
namespace RubberduckTests.Inspections
910
{
@@ -181,7 +182,7 @@ Dim sheet As Worksheet
181182
private int ArrangeAndGetInspectionCount(string code)
182183
{
183184
var modules = new(string, string, ComponentType)[] { ("Module1", code, ComponentType.StandardModule) };
184-
return InspectionResultsForModules(modules, "Excel").Count();
185+
return InspectionResultsForModules(modules, ReferenceLibrary.Excel).Count();
185186
}
186187

187188
[Test]

‎RubberduckTests/Inspections/InspectionTestsBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ public IEnumerable<IInspectionResult> InspectionResultsForModules(IEnumerable<(s
3030
return InspectionResults(vbe);
3131
}
3232

33-
public IEnumerable<IInspectionResult> InspectionResultsForModules((string name, string content, ComponentType componentType) module, params string[] libraries)
33+
public IEnumerable<IInspectionResult> InspectionResultsForModules((string name, string content, ComponentType componentType) module, params ReferenceLibrary[] libraries)
3434
=> InspectionResultsForModules(new (string, string, ComponentType)[] { module }, libraries);
3535

36-
public IEnumerable<IInspectionResult> InspectionResultsForModules(IEnumerable<(string name, string content, ComponentType componentType)> modules, string library)
37-
=> InspectionResultsForModules(modules, new string[] { library });
36+
public IEnumerable<IInspectionResult> InspectionResultsForModules(IEnumerable<(string name, string content, ComponentType componentType)> modules, ReferenceLibrary library)
37+
=> InspectionResultsForModules(modules, new ReferenceLibrary[] { library });
3838

39-
public IEnumerable<IInspectionResult> InspectionResultsForModules(IEnumerable<(string name, string content, ComponentType componentType)> modules, IEnumerable<string> libraries)
39+
public IEnumerable<IInspectionResult> InspectionResultsForModules(IEnumerable<(string name, string content, ComponentType componentType)> modules, IEnumerable<ReferenceLibrary> libraries)
4040
{
4141
var vbe = MockVbeBuilder.BuildFromModules(modules, libraries).Object;
4242
return InspectionResults(vbe);

‎RubberduckTests/Inspections/IsMissingOnInappropriateArgumentInspectionTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Parsing.Inspections.Abstract;
55
using Rubberduck.Parsing.VBA;
66
using Rubberduck.VBEditor.SafeComWrappers;
7+
using RubberduckTests.Mocks;
78

89
namespace RubberduckTests.Inspections
910
{
@@ -208,7 +209,7 @@ private int ArrangeAndGetInspectionCount(string code)
208209
("Module1", code, ComponentType.StandardModule)
209210
};
210211

211-
return InspectionResultsForModules(modules, "VBA").Count();
212+
return InspectionResultsForModules(modules, ReferenceLibrary.VBA).Count();
212213
}
213214

214215
protected override IInspection InspectionUnderTest(RubberduckParserState state)

‎RubberduckTests/Inspections/IsMissingWithNonArgumentParameterInspectionTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Rubberduck.Parsing.Inspections.Abstract;
55
using Rubberduck.Parsing.VBA;
66
using Rubberduck.VBEditor.SafeComWrappers;
7+
using RubberduckTests.Mocks;
78

89
namespace RubberduckTests.Inspections
910
{
@@ -130,7 +131,7 @@ private int ArrangeAndGetInspectionCount(string code)
130131
("Module1", code, ComponentType.StandardModule)
131132
};
132133

133-
return InspectionResultsForModules(modules, "VBA").Count();
134+
return InspectionResultsForModules(modules, ReferenceLibrary.VBA).Count();
134135
}
135136

136137
protected override IInspection InspectionUnderTest(RubberduckParserState state)

0 commit comments

Comments
 (0)