Skip to content

Commit 231bac5

Browse files
retailcoderretailcoder
authored
Merge pull request #5368 from rubberduck-vba/revert-5364-RemoveRefLibraryStrings
Revert "Replace string ReferenceLibrary keys"
2 parents 3da2aa0 + 8bcd3cf commit 231bac5

33 files changed

+145
-174
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(ReferenceLibrary.VBA)
6823+
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
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(ReferenceLibrary.VBA)
6856+
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
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(ReferenceLibrary.VBA)
6893+
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
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(ReferenceLibrary.VBA)
6930+
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
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(ReferenceLibrary.VBA)
6967+
.AddReference("VBA", MockVbeBuilder.LibraryPathVBA, 4, 2, true)
69686968
.AddProjectToVbeBuilder()
69696969
.Build();
69706970

‎RubberduckTests/Inspections/ApplicationWorksheetFunctionInspectionTests.cs

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

109
namespace RubberduckTests.Inspections
1110
{
1211
[TestFixture]
1312
public class ApplicationWorksheetFunctionInspectionTests : InspectionTestsBase
1413
{
1514
private IEnumerable<IInspectionResult> GetInspectionResultsUsingExcelLibrary(string inputCode)
16-
=> InspectionResultsForModules(("Module1", inputCode, ComponentType.StandardModule), ReferenceLibrary.Excel);
15+
=> InspectionResultsForModules(("Module1", inputCode, ComponentType.StandardModule), "Excel");
1716

1817
[Test]
1918
[Category("Inspections")]

‎RubberduckTests/Inspections/ExcelMemberMayReturnNothingInspectionTests.cs

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

109
namespace RubberduckTests.Inspections
1110
{
@@ -349,7 +348,7 @@ End Sub
349348
}
350349

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

354353
protected override IInspection InspectionUnderTest(RubberduckParserState state)
355354
{

‎RubberduckTests/Inspections/ExcelUdfNameIsValidCellReferenceInspectionTests.cs

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

98
namespace RubberduckTests.Inspections
109
{
@@ -107,7 +106,7 @@ public void ExcelUdfNameIsValidCellReferenceInspection_ReturnsNoResult_NonFuncti
107106
}
108107

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

112111
protected override IInspection InspectionUnderTest(RubberduckParserState state)
113112
{

‎RubberduckTests/Inspections/HostSpecificExpressionInspectionTests.cs

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

3030
Assert.AreEqual(1, InspectionResults(vbe.Object).Count());

‎RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs

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

98
namespace RubberduckTests.Inspections
109
{
@@ -22,7 +21,7 @@ Dim arr1() As Variant
2221
End Sub
2322
";
2423
var modules = new(string, string, ComponentType)[] { ("Class1", inputCode, ComponentType.ClassModule) };
25-
Assert.AreEqual(1, InspectionResultsForModules(modules, ReferenceLibrary.Excel).Count());
24+
Assert.AreEqual(1, InspectionResultsForModules(modules, "Excel").Count());
2625
}
2726

2827
[Test]
@@ -81,7 +80,7 @@ End Sub
8180
";
8281

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

8786
[Test]

‎RubberduckTests/Inspections/ImplicitActiveWorkbookReferenceInspectionTests.cs

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

98
namespace RubberduckTests.Inspections
109
{
@@ -182,7 +181,7 @@ Dim sheet As Worksheet
182181
private int ArrangeAndGetInspectionCount(string code)
183182
{
184183
var modules = new(string, string, ComponentType)[] { ("Module1", code, ComponentType.StandardModule) };
185-
return InspectionResultsForModules(modules, ReferenceLibrary.Excel).Count();
184+
return InspectionResultsForModules(modules, "Excel").Count();
186185
}
187186

188187
[Test]

‎RubberduckTests/Inspections/InspectionTestsBase.cs

Lines changed: 5 additions & 5 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 ReferenceLibrary[] libraries)
34-
=> InspectionResultsForModules(new(string, string, ComponentType)[] { module }, libraries);
33+
public IEnumerable<IInspectionResult> InspectionResultsForModules((string name, string content, ComponentType componentType) module, params string[] libraries)
34+
=> InspectionResultsForModules(new (string, string, ComponentType)[] { module }, libraries);
3535

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

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

‎RubberduckTests/Inspections/IsMissingOnInappropriateArgumentInspectionTests.cs

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

98
namespace RubberduckTests.Inspections
109
{
@@ -209,7 +208,7 @@ private int ArrangeAndGetInspectionCount(string code)
209208
("Module1", code, ComponentType.StandardModule)
210209
};
211210

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

215214
protected override IInspection InspectionUnderTest(RubberduckParserState state)

‎RubberduckTests/Inspections/IsMissingWithNonArgumentParameterInspectionTests.cs

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

98
namespace RubberduckTests.Inspections
109
{
@@ -131,7 +130,7 @@ private int ArrangeAndGetInspectionCount(string code)
131130
("Module1", code, ComponentType.StandardModule)
132131
};
133132

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

137136
protected override IInspection InspectionUnderTest(RubberduckParserState state)

0 commit comments

Comments
 (0)