Merge pull request #839 from retailcoder/next

added missing test class

Author: retailcoder

RetailCoder.VBE/Inspections/ParameterCanBeByValInspection.cs

@@ -60,7 +60,6 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
                 !ignoredScopes.Contains(declaration.ParentScope)
                 && declaration.DeclarationType == DeclarationType.Parameter
                 && !interfaceMembers.Select(m => m.Scope).Contains(declaration.ParentScope)
-                //&& PrimitiveTypes.Contains(declaration.AsTypeName) // suggest passing object types ByRef?
                 && ((VBAParser.ArgContext) declaration.Context).BYVAL() == null
                 && !IsUsedAsByRefParam(parseResult.Declarations, declaration)
                 && !declaration.References.Any(reference => reference.IsAssignment))

RetailCoder.VBE/Inspections/VariableNotAssignedInspection.cs

@@ -28,17 +28,16 @@ public IEnumerable<CodeInspectionResultBase> GetInspectionResults(VBProjectParse
             var declarations = parseResult.Declarations.Items.Where(declaration =>
                 declaration.DeclarationType == DeclarationType.Variable
                 && !declaration.IsBuiltIn 
+                && !declaration.IsWithEvents
                 && !arrays.Contains(declaration)
                 && !parseResult.Declarations.Items.Any(item => 
                     item.IdentifierName == declaration.AsTypeName 
                     && item.DeclarationType == DeclarationType.UserDefinedType) // UDT variables don't need to be assigned
                 && !declaration.IsSelfAssigned
                 && !declaration.References.Any(reference => reference.IsAssignment));
 
-            foreach (var issue in declarations)
-            {
-                yield return new IdentifierNotAssignedInspectionResult(this, issue, issue.Context, issue.QualifiedName.QualifiedModuleName);
-            }
+            return declarations.Select(issue => 
+                new IdentifierNotAssignedInspectionResult(this, issue, issue.Context, issue.QualifiedName.QualifiedModuleName));
         }
     }
 }

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -265,6 +265,8 @@ public string Scope
                     case DeclarationType.PropertyLet:
                     case DeclarationType.PropertySet:
                         return _qualifiedName.QualifiedModuleName + "." + _identifierName;
+                    case DeclarationType.Event:
+                        return _parentScope + "." + _identifierName;
                     default:
                         return _parentScope;
                 }

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -790,7 +790,7 @@ private Declaration FindLocalScopeDeclaration(string identifierName, Declaration
             try
             {
                 var results = matches.Where(item =>
-                    item.ParentScope == localScope.Scope
+                    (item.ParentScope == localScope.Scope || (isAssignmentTarget && item.Scope == localScope.Scope))
                     && localScope.Context.GetSelection().Contains(item.Selection)
                     && !_moduleTypes.Contains(item.DeclarationType))
                     .ToList();

RubberduckTests/RubberduckParserTests.cs

@@ -0,0 +1,76 @@
+using System.Linq;
+using Microsoft.Vbe.Interop;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Rubberduck.Inspections;
+using Rubberduck.Parsing.VBA;
+using Rubberduck.VBEditor.VBEHost;
+using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
+using RubberduckTests.Mocks;
+
+namespace RubberduckTests
+{
+    [TestClass]
+    public class RubberduckParserTests
+    {
+        [TestMethod]
+        public void ParseResultDeclarations_IncludeVbaStandardLibDeclarations()
+        {
+            //Arrange
+            var builder = new MockVbeBuilder();
+            var project = builder.ProjectBuilder("TestProject1", vbext_ProjectProtection.vbext_pp_none)
+                .AddComponent("Class1", vbext_ComponentType.vbext_ct_ClassModule, "")
+                .Build().Object;
+
+            var codePaneFactory = new CodePaneWrapperFactory();
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            
+            //Act
+            var parseResult = new RubberduckParser(codePaneFactory, project.VBE).Parse(project);
+
+            //Assert
+            Assert.IsTrue(parseResult.Declarations.Items.Any(item => item.IsBuiltIn));
+        }
+
+        [TestMethod]
+        public void ParseResultDeclarations_MockHost_ExcludeExcelDeclarations()
+        {
+            //Arrange
+            var builder = new MockVbeBuilder();
+            var project = builder.ProjectBuilder("TestProject1", vbext_ProjectProtection.vbext_pp_none)
+                .AddComponent("Class1", vbext_ComponentType.vbext_ct_ClassModule, "")
+                .Build().Object;
+
+            var codePaneFactory = new CodePaneWrapperFactory();
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+
+            //Act
+            var parseResult = new RubberduckParser(codePaneFactory, project.VBE).Parse(project);
+
+            //Assert
+            Assert.IsFalse(parseResult.Declarations.Items.Any(item => item.IsBuiltIn && item.ParentScope.StartsWith("Excel")));
+        }
+
+        [TestMethod]
+        public void ParseResultDeclarations_ExcelHost_IncludesExcelDeclarations()
+        {
+            //Arrange
+            var builder = new MockVbeBuilder();
+            var project = builder.ProjectBuilder("TestProject1", vbext_ProjectProtection.vbext_pp_none)
+                .AddComponent("Class1", vbext_ComponentType.vbext_ct_ClassModule, "")
+                .AddReference("Excel", @"C:\Program Files\Microsoft Office\Office14\EXCEL.EXE", true)
+                .Build();
+            var vbe = builder.AddProject(project).Build();
+
+            var codePaneFactory = new CodePaneWrapperFactory();
+
+            //Act
+            var parseResult = new RubberduckParser(codePaneFactory, vbe.Object).Parse(project.Object);
+
+            //Assert
+            Assert.IsTrue(parseResult.Declarations.Items.Any(item => item.IsBuiltIn && item.ParentScope.StartsWith("Excel")));
+        }
+    }
+}