Skip to content

Commit

Permalink
Merge pull request #4186 from MDoerner/FixReferenceVersionsInTests
Browse files Browse the repository at this point in the history 
Makes major and minor version numbers mandatory when adding references in tests
  • Loading branch information
@retailcoder
retailcoder committed Jul 16, 2018
2 parents 693d266 + 99b41b4 commit 90fe9e3
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion RubberduckTests/Binding/MemberAccessTypeBindingTests.cs
View file
Expand Up @@ -106,7 +106,7 @@ public void LExpressionIsProjectAndUnrestrictedNameIsType()

var enclosingProject = builder
.ProjectBuilder("AnyProjectName", ProjectProtection.Unprotected)
.AddReference(referencedProjectName, ReferencedProjectFilepath)
.AddReference(referencedProjectName, ReferencedProjectFilepath, 0, 0)
.AddComponent(TestClassName, ComponentType.ClassModule, code)
.Build();
builder.AddProject(enclosingProject);
Expand Down
6 changes: 3 additions & 3 deletions RubberduckTests/Binding/SimpleNameDefaultBindingTests.cs
View file
Expand Up @@ -92,7 +92,7 @@ public void OtherModuleInEnclosingProjectComesBeforeReferencedProjectModule()
builder.AddProject(referencedProject);

var enclosingProjectBuilder = builder.ProjectBuilder("AnyProjectName", ProjectProtection.Unprotected);
enclosingProjectBuilder.AddReference(referencedProjectName, ReferencedProjectFilepath);
enclosingProjectBuilder.AddReference(referencedProjectName, ReferencedProjectFilepath, 0, 0);
enclosingProjectBuilder.AddComponent(TestClassName, ComponentType.ClassModule, CreateTestProcedure(BindingTargetName));
enclosingProjectBuilder.AddComponent("AnyModule", ComponentType.StandardModule, CreateEnumType(BindingTargetName));
var enclosingProject = enclosingProjectBuilder.Build();
Expand Down Expand Up @@ -123,7 +123,7 @@ public void ReferencedProjectModuleComesBeforeReferencedProjectType()

var enclosingProject = builder
.ProjectBuilder("AnyProjectName", ProjectProtection.Unprotected)
.AddReference(referencedProjectName, ReferencedProjectFilepath)
.AddReference(referencedProjectName, ReferencedProjectFilepath, 0, 0)
.AddComponent(TestClassName, ComponentType.ClassModule, CreateTestProcedure(BindingTargetName))
.Build();
builder.AddProject(enclosingProject);
Expand Down Expand Up @@ -151,7 +151,7 @@ public void ReferencedProjectClassNotMarkedAsGlobalClassModuleIsNotReferenced()
builder.AddProject(referencedProject);

var enclosingProjectBuilder = builder.ProjectBuilder("AnyProjectName", ProjectProtection.Unprotected);
enclosingProjectBuilder.AddReference(referencedProjectName, ReferencedProjectFilepath);
enclosingProjectBuilder.AddReference(referencedProjectName, ReferencedProjectFilepath, 0, 0);
enclosingProjectBuilder.AddComponent(TestClassName, ComponentType.ClassModule, CreateTestProcedure(BindingTargetName));
var enclosingProject = enclosingProjectBuilder.Build();
builder.AddProject(enclosingProject);
Expand Down
6 changes: 3 additions & 3 deletions RubberduckTests/Binding/SimpleNameTypeBindingTests.cs
View file
Expand Up @@ -72,7 +72,7 @@ public void OtherModuleInEnclosingProjectComesBeforeReferencedProjectModule()
builder.AddProject(referencedProject);

var enclosingProjectBuilder = builder.ProjectBuilder("AnyProjectName", ProjectProtection.Unprotected);
enclosingProjectBuilder.AddReference(REFERENCED_PROJECT_NAME, ReferencedProjectFilepath);
enclosingProjectBuilder.AddReference(REFERENCED_PROJECT_NAME, ReferencedProjectFilepath, 0, 0);
enclosingProjectBuilder.AddComponent(TEST_CLASS_NAME, ComponentType.ClassModule, "Public WithEvents anything As " + BINDING_TARGET_NAME);
enclosingProjectBuilder.AddComponent("AnyModule", ComponentType.StandardModule, CreateEnumType(BINDING_TARGET_NAME));
var enclosingProject = enclosingProjectBuilder.Build();
Expand Down Expand Up @@ -101,7 +101,7 @@ public void ReferencedProjectModuleComesBeforeReferencedProjectType()
builder.AddProject(referencedProject);

var enclosingProjectBuilder = builder.ProjectBuilder("AnyProjectName", ProjectProtection.Unprotected);
enclosingProjectBuilder.AddReference(REFERENCED_PROJECT_NAME, ReferencedProjectFilepath);
enclosingProjectBuilder.AddReference(REFERENCED_PROJECT_NAME, ReferencedProjectFilepath, 0, 0);
enclosingProjectBuilder.AddComponent(TEST_CLASS_NAME, ComponentType.ClassModule, "Public WithEvents anything As " + BINDING_TARGET_NAME);
var enclosingProject = enclosingProjectBuilder.Build();
builder.AddProject(enclosingProject);
Expand Down Expand Up @@ -132,7 +132,7 @@ public void ReferencedProjectType()
builder.AddProject(referencedProject);

var enclosingProjectBuilder = builder.ProjectBuilder("Enclosing", ProjectProtection.Unprotected);
enclosingProjectBuilder.AddReference(referencedProjectName, ReferencedProjectFilepath);
enclosingProjectBuilder.AddReference(referencedProjectName, ReferencedProjectFilepath, 0, 0);
enclosingProjectBuilder.AddComponent(TEST_CLASS_NAME, ComponentType.ClassModule, enclosingCode);
var enclosingProject = enclosingProjectBuilder.Build();
builder.AddProject(enclosingProject);
Expand Down
2 changes: 1 addition & 1 deletion RubberduckTests/Inspections/MemberNotOnInterfaceInspectionTests.cs
View file
Expand Up @@ -290,7 +290,7 @@ End Sub
projectBuilder.MockUserFormBuilder("UserForm1", userForm1Code).AddFormToProjectBuilder()
.AddComponent("ReferencingModule", ComponentType.StandardModule, analyzedCode)
//.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel)
.AddReference("MSForms", MockVbeBuilder.LibraryPathMsForms);
.AddReference("MSForms", MockVbeBuilder.LibraryPathMsForms, 2, 0);

mockVbe.AddProject(projectBuilder.Build());

Expand Down
12 changes: 6 additions & 6 deletions RubberduckTests/Inspections/ShadowedDeclarationInspectionTests.cs
View file
Expand Up @@ -134,10 +134,10 @@ public void ShadowedDeclaration_ReturnsCorrectResult_DeclarationsWithSameNameAsR
foreach (var expectedResultCount in expectedResultCountsByDeclarationIdentifierName)
{
var referencedProject = builder.ProjectBuilder(expectedResultCount.Key, ProjectProtection.Unprotected)
.AddComponent("Foo" + expectedResultCount.Key, ComponentType.StandardModule, "")
.AddComponent("Foo" + expectedResultCount.Key, ComponentType.StandardModule, string.Empty)
.Build();
builder.AddProject(referencedProject);
userProjectBuilder = userProjectBuilder.AddReference(expectedResultCount.Key, "");
userProjectBuilder = userProjectBuilder.AddReference(expectedResultCount.Key, string.Empty, 0, 0);
}

var userProject = userProjectBuilder.Build();
Expand Down Expand Up @@ -5046,7 +5046,7 @@ public void ShadowedDeclaration_DoesNotReturnResult_EventParameterWithSameNameAs
builder.AddProject(referencedProject);
var userProject = builder.ProjectBuilder("Baz", ProjectProtection.Unprotected)
.AddComponent("Qux", ComponentType.ClassModule, $"Public Event E ({sameName} As String)")
.AddReference("Foo", "")
.AddReference("Foo", string.Empty, 0, 0)
.Build();
builder.AddProject(userProject);

Expand Down Expand Up @@ -5125,7 +5125,7 @@ public void ShadowedDeclaration_Ignored_DoesNotReturnResult()
builder.AddProject(referencedProject);
var userProject = builder.ProjectBuilder("Baz", ProjectProtection.Unprotected)
.AddComponent("Qux", ComponentType.StandardModule, ignoredDeclarationCode)
.AddReference("Foo", string.Empty)
.AddReference("Foo", string.Empty, 0, 0)
.Build();
builder.AddProject(userProject);

Expand Down Expand Up @@ -5198,7 +5198,7 @@ private MockVbeBuilder TestVbeWithUserProjectAndReferencedProjectWithComponentsO
}
var referencedProject = referencedProjectBuilder.Build();
builder.AddProject(referencedProject);
var userProject = CreateUserProject(builder, userProjectName).AddReference(referencedProjectName, string.Empty).Build();
var userProject = CreateUserProject(builder, userProjectName).AddReference(referencedProjectName, string.Empty, 0, 0).Build();
builder.AddProject(userProject);

return builder;
Expand Down Expand Up @@ -5233,7 +5233,7 @@ private MockVbeBuilder TestVbeWithUserProjectAndReferencedProjectWithComponentWi
referencedProjectBuilder.AddComponent(referencedComponentName, referencedComponentComponentType, referencedComponentCode);
var referencedProject = referencedProjectBuilder.Build();
builder.AddProject(referencedProject);
var userProject = CreateUserProject(builder, userProjectName).AddReference(referencedProjectName, string.Empty).Build();
var userProject = CreateUserProject(builder, userProjectName).AddReference(referencedProjectName, string.Empty, 0, 0).Build();
builder.AddProject(userProject);

return builder;
Expand Down
2 changes: 1 addition & 1 deletion RubberduckTests/Inspections/SheetAccessedUsingStringInspectionTests.cs
View file
Expand Up @@ -171,7 +171,7 @@ private static RubberduckParserState ArrangeParserAndParse(string inputCode)
CreateVBComponentPropertyMock("Name", "Sheet1").Object,
CreateVBComponentPropertyMock("CodeName", "Sheet1").Object
})
.AddReference("ReferencedProject", "")
.AddReference("ReferencedProject", string.Empty, 0, 0)
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8, true)
.Build();

Expand Down
2 changes: 1 addition & 1 deletion RubberduckTests/Mocks/MockProjectBuilder.cs
View file
Expand Up @@ -106,7 +106,7 @@ public MockProjectBuilder AddComponent(Mock<IVBComponent> component, Mock<ICodeM
/// <param name="filePath">The path to the referenced library.</param>
/// <param name="isBuiltIn">Indicates whether the reference is a built-in reference.</param>
/// <returns>Returns the <see cref="MockProjectBuilder"/> instance.</returns>
public MockProjectBuilder AddReference(string name, string filePath, int major = 0, int minor = 0, bool isBuiltIn = false)
public MockProjectBuilder AddReference(string name, string filePath, int major, int minor, bool isBuiltIn = false)
{
var reference = CreateReferenceMock(name, filePath, major, minor, isBuiltIn);
_references.Add(reference.Object);
Expand Down
5 changes: 3 additions & 2 deletions RubberduckTests/Symbols/DeclarationFinderTests.cs
View file
Expand Up @@ -1224,7 +1224,7 @@ public void Identify_NamedParameter_Parameter_FromExcel()
var vbe = new MockVbeBuilder()
.ProjectBuilder("TestProject", ProjectProtection.Unprotected)
.AddComponent("TestModule", ComponentType.StandardModule, code, new Selection(5, 16))
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel)
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8)
.AddProjectToVbeBuilder()
.Build();

Expand All @@ -1235,6 +1235,7 @@ public void Identify_NamedParameter_Parameter_FromExcel()

Assert.AreEqual(expected, actual, "Expected {0}, resolved to {1}", expected.DeclarationType, actual.DeclarationType);
}

[Category("Resolver")]
[Test]
[Ignore("Need to fix the default member access for function calls; see case #3937")]
Expand All @@ -1252,7 +1253,7 @@ public void Identify_NamedParameter_Parameter_FromExcel_DefaultAccess()
var vbe = new MockVbeBuilder()
.ProjectBuilder("TestProject", ProjectProtection.Unprotected)
.AddComponent("TestModule", ComponentType.StandardModule, code, new Selection(6, 22))
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel)
.AddReference("Excel", MockVbeBuilder.LibraryPathMsExcel, 1, 8)
.AddProjectToVbeBuilder()
.Build();

Expand Down

0 comments on commit 90fe9e3

Please sign in to comment.