Skip to content

Commit 7cb9484

Browse files
cominterncomintern
committed
Update serialized libraries.
1 parent bcbfa4c commit 7cb9484

18 files changed

+57
-12482
lines changed

‎RubberduckTests/Inspections/ImplicitActiveSheetReferenceInspectionTests.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public class ImplicitActiveSheetReferenceInspectionTests
2222
[TestCategory("Inspections")]
2323
public void ImplicitActiveSheetReference_ReportsRange()
2424
{
25-
Assert.Inconclusive("Pending reserialization.");
2625
const string inputCode =
2726
@"Sub foo()
2827
Dim arr1() As Variant
@@ -34,15 +33,15 @@ End Sub
3433
var builder = new MockVbeBuilder();
3534
var project = builder.ProjectBuilder("TestProject1", "TestProject1", ProjectProtection.Unprotected)
3635
.AddComponent("Class1", ComponentType.ClassModule, inputCode)
37-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 7, true)
36+
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
3837
.Build();
3938
var vbe = builder.AddProject(project).Build();
4039

4140
var mockHost = new Mock<IHostApplication>();
4241
mockHost.SetupAllProperties();
4342

4443
var parser = MockParser.Create(vbe.Object, new RubberduckParserState(new Mock<ISinks>().Object));
45-
parser.State.AddTestLibrary("Excel.1.7.xml");
44+
parser.State.AddTestLibrary("Excel.1.8.xml");
4645

4746
parser.Parse(new CancellationTokenSource());
4847
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
@@ -70,7 +69,7 @@ End Sub
7069
var builder = new MockVbeBuilder();
7170
var project = builder.ProjectBuilder("TestProject1", "TestProject1", ProjectProtection.Unprotected)
7271
.AddComponent("Class1", ComponentType.ClassModule, inputCode)
73-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 7, true)
72+
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
7473
.Build();
7574
var vbe = builder.AddProject(project).Build();
7675

@@ -92,7 +91,6 @@ End Sub
9291
[TestMethod]
9392
public void ImplicitActiveSheetReference_IgnoreQuickFixWorks()
9493
{
95-
Assert.Inconclusive("Pending reserialization.");
9694
const string inputCode =
9795
@"Sub foo()
9896
Dim arr1() As Variant
@@ -110,7 +108,7 @@ Dim arr1() As Variant
110108
var builder = new MockVbeBuilder();
111109
var project = builder.ProjectBuilder("TestProject1", "TestProject1", ProjectProtection.Unprotected)
112110
.AddComponent("Class1", ComponentType.ClassModule, inputCode)
113-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 7, true)
111+
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
114112
.Build();
115113
var module = project.Object.VBComponents[0].CodeModule;
116114
var vbe = builder.AddProject(project).Build();
@@ -119,7 +117,7 @@ Dim arr1() As Variant
119117
mockHost.SetupAllProperties();
120118

121119
var parser = MockParser.Create(vbe.Object, new RubberduckParserState(new Mock<ISinks>().Object));
122-
parser.State.AddTestLibrary("Excel.1.7.xml");
120+
parser.State.AddTestLibrary("Excel.1.8.xml");
123121

124122
parser.Parse(new CancellationTokenSource());
125123
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }

‎RubberduckTests/Inspections/ImplicitActiveWorkbookReferenceInspectionTests.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class ImplicitActiveWorkbookReferenceInspectionTests
2020
[TestCategory("Inspections")]
2121
public void ImplicitActiveWorkbookReference_ReportsWorksheets()
2222
{
23-
Assert.Inconclusive("Pending reserialization.");
2423
const string inputCode =
2524
@"
2625
Sub foo()
@@ -32,15 +31,15 @@ Dim sheet As Worksheet
3231
var builder = new MockVbeBuilder();
3332
var project = builder.ProjectBuilder("TestProject1", "TestProject1", ProjectProtection.Unprotected)
3433
.AddComponent("Class1", ComponentType.ClassModule, inputCode)
35-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 7, true)
34+
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
3635
.Build();
3736
var vbe = builder.AddProject(project).Build();
3837

3938
var mockHost = new Mock<IHostApplication>();
4039
mockHost.SetupAllProperties();
4140

4241
var parser = MockParser.Create(vbe.Object, new RubberduckParserState(new Mock<ISinks>().Object));
43-
parser.State.AddTestLibrary("Excel.1.7.xml");
42+
parser.State.AddTestLibrary("Excel.1.8.xml");
4443

4544
parser.Parse(new CancellationTokenSource());
4645
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
@@ -68,7 +67,7 @@ Dim sheet As Worksheet
6867
var builder = new MockVbeBuilder();
6968
var project = builder.ProjectBuilder("TestProject1", "TestProject1", ProjectProtection.Unprotected)
7069
.AddComponent("Class1", ComponentType.ClassModule, inputCode)
71-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 7, true)
70+
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
7271
.Build();
7372
var vbe = builder.AddProject(project).Build();
7473

@@ -90,7 +89,6 @@ Dim sheet As Worksheet
9089
[DeploymentItem(@"TestFiles\")]
9190
public void ImplicitActiveWorkbookReference_IgnoreQuickFixWorks()
9291
{
93-
Assert.Inconclusive("Pending reserialization.");
9492
const string inputCode =
9593
@"
9694
Sub foo()
@@ -110,7 +108,7 @@ Dim sheet As Worksheet
110108
var builder = new MockVbeBuilder();
111109
var project = builder.ProjectBuilder("TestProject1", "TestProject1", ProjectProtection.Unprotected)
112110
.AddComponent("Class1", ComponentType.ClassModule, inputCode)
113-
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 7, true)
111+
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
114112
.Build();
115113
var module = project.Object.VBComponents[0].CodeModule;
116114
var vbe = builder.AddProject(project).Build();
@@ -119,7 +117,7 @@ Dim sheet As Worksheet
119117
mockHost.SetupAllProperties();
120118

121119
var parser = MockParser.Create(vbe.Object, new RubberduckParserState(new Mock<ISinks>().Object));
122-
parser.State.AddTestLibrary("Excel.1.7.xml");
120+
parser.State.AddTestLibrary("Excel.1.8.xml");
123121

124122
parser.Parse(new CancellationTokenSource());
125123
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }

‎RubberduckTests/Inspections/MemberNotOnInterfaceInspectionTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class MemberNotOnInterfaceInspectionTests
1717
{
1818
private static ParseCoordinator ArrangeParser(string inputCode)
1919
{
20-
Assert.Inconclusive("Pending re-serialization of Scripting.1.0.xml");
2120
var builder = new MockVbeBuilder();
2221
var project = builder.ProjectBuilder("VBAProject", ProjectProtection.Unprotected)
2322
.AddComponent("Codez", ComponentType.StandardModule, inputCode)

‎RubberduckTests/Mocks/MockVbeBuilder.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ public class MockVbeBuilder
2020
private readonly Mock<IVBE> _vbe;
2121

2222
#region standard library paths (referenced in all VBA projects hosted in Microsoft Excel)
23-
public static readonly string LibraryPathVBA = @"C:\PROGRA~1\COMMON~1\MICROS~1\VBA\VBA7\VBE7.DLL"; // standard library, priority locked
24-
public static readonly string LibraryPathMsExcel = @"C:\Program Files\Microsoft Office\Office14\EXCEL.EXE"; // mock host application, priority locked
25-
public static readonly string LibraryPathMsOffice = @"C:\Program Files\Common Files\Microsoft Shared\OFFICE14\MSO.DLL";
26-
public static readonly string LibraryPathStdOle = @"C:\Windows\System32\stdole2.tlb";
27-
public static readonly string LibraryPathMsForms = @"C:\WINDOWS\system32\FM20.DLL"; // standard in projects with a UserForm module
23+
public static readonly string LibraryPathVBA = @"C:\PROGRA~2\COMMON~1\MICROS~1\VBA\VBA7.1\VBE7.DLL"; // standard library, priority locked
24+
public static readonly string LibraryPathMsExcel = @"C:\Program Files (x86)\Microsoft Office\Office15\EXCEL.EXE"; // mock host application, priority locked
25+
public static readonly string LibraryPathMsOffice = @"C:\Program Files (x86)\Common Files\Microsoft Shared\OFFICE15\MSO.DLL";
26+
public static readonly string LibraryPathStdOle = @"C:\Windows\SysWOW64\stdole2.tlb";
27+
public static readonly string LibraryPathMsForms = @"C:\Windows\SysWOW64\FM20.DLL"; // standard in projects with a UserForm module
2828
#endregion
2929

30-
public static readonly string LibraryPathVBIDE = @"C:\Program Files\Common Files\Microsoft Shared\VBA\VBA6\VBE6EXT.OLB";
31-
public static readonly string LibraryPathScripting = @"C:\Windows\System32\scrrun.dll";
32-
public static readonly string LibraryPathRegex = @"C:\Windows\System32\vbscript.dll\3";
30+
public static readonly string LibraryPathVBIDE = @"C:\Program Files (x86)\Common Files\Microsoft Shared\VBA\VBA6\VBE6EXT.OLB";
31+
public static readonly string LibraryPathScripting = @"C:\Windows\SysWOW64\scrrun.dll";
32+
public static readonly string LibraryPathRegex = @"C:\Windows\SysWOW64\vbscript.dll\3";
3333
public static readonly string LibraryPathMsXml = @"C:\Windows\System32\msxml6.dll";
34-
public static readonly string LibraryPathShDoc = @"C:\Windows\System32\ieframe.dll";
35-
public static readonly string LibraryPathAdoDb = @"C:\Program Files\Common Files\System\ado\msado15.dll";
36-
public static readonly string LibraryPathAdoRecordset = @"C:\Program Files\Common Files\System\ado\msador15.dll";
34+
public static readonly string LibraryPathShDoc = @"C:\Windows\SysWOW64\ieframe.dll";
35+
public static readonly string LibraryPathAdoDb = @"C:\Program Files (x86)\Common Files\System\ado\msado15.dll";
36+
public static readonly string LibraryPathAdoRecordset = @"C:\Program Files (x86)\Common Files\System\ado\msador15.dll";
3737

3838
//private Mock<IWindows> _vbWindows;
3939
private readonly Windows _windows = new Windows();

‎RubberduckTests/RubberduckTests.csproj

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,19 +321,40 @@
321321
<Content Include="Testfiles\Preprocessor\Reference_Module_1.txt">
322322
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
323323
</Content>
324-
<Content Include="Testfiles\Resolver\Excel.1.7.xml">
324+
<Content Include="Testfiles\Resolver\ADODB.6.1.xml">
325325
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
326326
</Content>
327-
<Content Include="Testfiles\Resolver\Office.2.5.xml">
327+
<Content Include="Testfiles\Resolver\ADOR.6.0.xml">
328+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
329+
</Content>
330+
<Content Include="Testfiles\Resolver\Excel.1.8.xml">
331+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
332+
</Content>
333+
<Content Include="Testfiles\Resolver\MSForms.2.0.xml">
334+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
335+
</Content>
336+
<Content Include="Testfiles\Resolver\MSXML2.6.0.xml">
337+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
338+
</Content>
339+
<Content Include="Testfiles\Resolver\Office.2.7.xml">
328340
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
329341
</Content>
330342
<Content Include="Testfiles\Resolver\Scripting.1.0.xml">
331343
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
332344
</Content>
345+
<Content Include="Testfiles\Resolver\SHDocVw.1.1.xml">
346+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
347+
</Content>
333348
<Content Include="Testfiles\Resolver\stdole.2.0.xml">
334349
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
335350
</Content>
336-
<Content Include="Testfiles\Resolver\VBA.4.1.xml">
351+
<Content Include="Testfiles\Resolver\VBA.4.2.xml">
352+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
353+
</Content>
354+
<Content Include="Testfiles\Resolver\VBIDE.5.3.xml">
355+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
356+
</Content>
357+
<Content Include="Testfiles\Resolver\VBScript_RegExp_55.5.5.xml">
337358
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
338359
</Content>
339360
</ItemGroup>

‎RubberduckTests/Testfiles/Resolver/ADODB.6.1.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎RubberduckTests/Testfiles/Resolver/ADOR.6.0.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎RubberduckTests/Testfiles/Resolver/Excel.1.7.xml renamed to ‎RubberduckTests/Testfiles/Resolver/Excel.1.8.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎RubberduckTests/Testfiles/Resolver/MSForms.2.0.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎RubberduckTests/Testfiles/Resolver/MSXML2.6.0.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)