Fix test setup for shadowed declarations.

rubberduck-vba · Dec 19, 2018 · 35949d6 · 35949d6
1 parent 16d9f9b
commit 35949d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/RubberduckTests/Inspections/ShadowedDeclarationInspectionTests.cs b/RubberduckTests/Inspections/ShadowedDeclarationInspectionTests.cs
@@ -3319,7 +3319,7 @@ End Property
         [Test]
         [Category("Inspections")]
         public void
-            ShadowedDeclaration_ReturnsCorrectResult_DeclarationsWithSameNameAsEnumerationMemberOfPublicEnumerationInReferencedProject()
+        ShadowedDeclaration_ReturnsCorrectResult_DeclarationsWithSameNameAsEnumerationMemberOfPublicEnumerationInReferencedProject()
         {
             var expectedResultCountsByDeclarationIdentifierName = new Dictionary<string, int>
             {
@@ -5178,9 +5178,9 @@ public void InspectionName()
                 .ToDictionary(group => group.Key, group => group.Count());
         }
 
-        private MockProjectBuilder CreateUserProject(MockVbeBuilder builder, string projectName = ProjectName)
+        private MockProjectBuilder CreateUserProject(MockVbeBuilder builder, string projectName = ProjectName, string projectPath = "")
         {
-            return builder.ProjectBuilder(projectName, ProjectProtection.Unprotected)
+            return builder.ProjectBuilder(projectName, projectPath, ProjectProtection.Unprotected)
                 .AddComponent(ProceduralModuleName, ComponentType.StandardModule, _moduleCode)
                 .AddComponent(ClassModuleName, ComponentType.ClassModule, $"Public Event {EventName}()")
                 .AddComponent(UserFormName, ComponentType.UserForm, "")
@@ -5198,7 +5198,10 @@ private MockVbeBuilder TestVbeWithUserProjectAndReferencedProjectWithComponentsO
             }
             var referencedProject = referencedProjectBuilder.Build();
             builder.AddProject(referencedProject);
-            var userProject = CreateUserProject(builder, userProjectName).AddReference(referencedProjectName, string.Empty, 0, 0).Build();
+
+            var project = string.IsNullOrEmpty(referencedProjectName) ? "Irrelevant" : referencedProjectName;
+            var path = $@"C:\{project}.xlsm";
+            var userProject = CreateUserProject(builder, userProjectName, path).AddReference(project, path, 0, 0).Build();
             builder.AddProject(userProject);
 
             return builder;
@@ -5233,7 +5236,10 @@ private MockVbeBuilder TestVbeWithUserProjectAndReferencedProjectWithComponentWi
             referencedProjectBuilder.AddComponent(referencedComponentName, referencedComponentComponentType, referencedComponentCode);
             var referencedProject = referencedProjectBuilder.Build();
             builder.AddProject(referencedProject);
-            var userProject = CreateUserProject(builder, userProjectName).AddReference(referencedProjectName, $@"C:\{referencedProjectName}.xlsm", 0, 0).Build();
+
+            var project = string.IsNullOrEmpty(referencedProjectName) ? "Irrelevant" : referencedProjectName;
+            var path = $@"C:\{project}.xlsm";
+            var userProject = CreateUserProject(builder, userProjectName, path).AddReference(project, path, 0, 0).Build();
             builder.AddProject(userProject);
 
             return builder;

diff --git a/RubberduckTests/Mocks/MockParser.cs b/RubberduckTests/Mocks/MockParser.cs
@@ -46,7 +46,6 @@ public static RubberduckParserState ParseString(string inputCode, out QualifiedM
 
         public static (SynchronousParseCoordinator parser, IRewritingManager rewritingManager) CreateWithRewriteManager(IVBE vbe, string serializedComProjectsPath = null, Mock<IVBEEvents> vbeEvents = null)
         {
-            //var vbeEvents = MockVbeEvents.CreateMockVbeEvents(new Mock<IVBE>());
             var declarationFinderFactory = new DeclarationFinderFactory();
             var projectRepository = new ProjectsRepository(vbe);
             var state = new RubberduckParserState(vbe, projectRepository, declarationFinderFactory, vbeEvents?.Object ?? MockVbeEvents.CreateMockVbeEvents(new Mock<IVBE>()).Object);