Added supertype tests for AccessibilityCheck and refactored.

Author: MDoerner

Rubberduck.Parsing/Symbols/AccessibilityCheck.cs

@@ -1,4 +1,6 @@
-namespace Rubberduck.Parsing.Symbols
+using System.Linq;
+
+namespace Rubberduck.Parsing.Symbols
 {
     public static class AccessibilityCheck
     {
@@ -38,7 +40,7 @@ public static bool IsMemberAccessible(Declaration callingProject, Declaration ca
             {
                 return false;
             }    
-            if (IsEnclosingModuleOfInstanceMember(callingModule, calleeMember)
+            if (IsInstanceMemberOfModuleOrOneOfItsSupertypes(callingModule, calleeMember)
                         || IsLocalMemberOfTheCallingSubroutineOrProperty(callingParent, calleeMember))
             {
                 return true;
@@ -51,21 +53,16 @@ public static bool IsMemberAccessible(Declaration callingProject, Declaration ca
                         || (IsEnclosingProject(callingProject, memberModule) && IsAccessibleThroughoutTheSameProject(calleeMember)));
         }
 
-            private static bool IsEnclosingModuleOfInstanceMember(Declaration callingModule, Declaration calleeMember)
+            private static bool IsInstanceMemberOfModuleOrOneOfItsSupertypes(Declaration module, Declaration member)
             {
-                if (callingModule.Equals(calleeMember.ParentScopeDeclaration))
-                {
-                    return true;
-                }
-                foreach (var supertype in ClassModuleDeclaration.GetSupertypes(callingModule))
+                return IsInstanceMemberOfModule(module, member)
+                       || ClassModuleDeclaration.GetSupertypes(module).Any(supertype => IsInstanceMemberOfModuleOrOneOfItsSupertypes(supertype, member));   //ClassModuleDeclaration.GetSuperTypes never returns null.
+            }
+
+                private static bool IsInstanceMemberOfModule(Declaration module, Declaration member)
                 {
-                    if (IsEnclosingModuleOfInstanceMember(supertype, calleeMember))
-                    {
-                        return true;
-                    }
+                    return member.ParentScopeDeclaration.Equals(module);
                 }
-                return false;
-            }
 
             private static bool IsLocalMemberOfTheCallingSubroutineOrProperty(Declaration callingParent, Declaration calleeMember)
             {

RubberduckTests/Symbols/AccessibilityCheckTests.cs

@@ -19,7 +19,7 @@ public void ProjectsAreAlwaysAccessible()
             Assert.IsTrue(AccessibilityCheck.IsAccessible(null,null,null,projectDeclatation));
         }
 
-            private static Declaration GetTestProject(string name)
+            private static ProjectDeclaration GetTestProject(string name)
             {
                 var qualifiedProjectName = new QualifiedMemberName(StubQualifiedModuleName(), name);
                 return new ProjectDeclaration(qualifiedProjectName, name, false);
@@ -43,7 +43,7 @@ public void ModulesCanBeAccessedFromWithinThemselves()
             Assert.IsTrue(AccessibilityCheck.IsAccessible(projectDeclatation, moduleDeclatation, null, moduleDeclatation));
         }
 
-            private static Declaration GetTestClassModule(Declaration projectDeclatation, string name, bool isExposed = false)
+            private static ClassModuleDeclaration GetTestClassModule(Declaration projectDeclatation, string name, bool isExposed = false)
             {
                 var qualifiedClassModuleMemberName = new QualifiedMemberName(StubQualifiedModuleName(), name);
                 var classModuleAttributes = new Rubberduck.Parsing.VBA.Attributes();
@@ -101,7 +101,7 @@ public void NonPrivateProceduralModulesCanBeAccessedFromOtherProjects()
             Assert.IsTrue(AccessibilityCheck.IsAccessible(callingProjectDeclatation, callingModuleDeclatation, null, calleeModuleDeclatation));
         }
 
-            private static Declaration GetTestProceduralModule(Declaration projectDeclatation, string name)
+            private static ProceduralModuleDeclaration GetTestProceduralModule(Declaration projectDeclatation, string name)
             {
                 var qualifiedClassModuleMemberName = new QualifiedMemberName(StubQualifiedModuleName(), name);
                 var proceduralModuleDeclaration = new ProceduralModuleDeclaration(qualifiedClassModuleMemberName, projectDeclatation, name, false, null, null);
@@ -126,15 +126,30 @@ public void PrivateProceduresAreAccessibleFromTheEnclosingModule()
             Assert.IsTrue(AccessibilityCheck.IsAccessible(projectDeclatation, moduleDeclatation, privateCallingFunctionDeclaration, privateCalleeFunctionDeclaration));
         }
 
-            private static Declaration GetTestFunction(Declaration moduleDeclatation, string name, Accessibility functionAccessibility)
+            private static FunctionDeclaration GetTestFunction(Declaration moduleDeclatation, string name, Accessibility functionAccessibility)
             {
                 var qualifiedFunctionMemberName = new QualifiedMemberName(StubQualifiedModuleName(), name);
                 return new FunctionDeclaration(qualifiedFunctionMemberName, moduleDeclatation, moduleDeclatation, "test", null, "test", functionAccessibility, null, Selection.Home, false, false, null, null);
             }
 
+        [TestMethod]
+        public void PrivateProceduresAreAccessibleIfTheyAreInAClassAboveTheEnclosingModuleOfTheCallerInTheClassHierarchy()
+        {
+            var projectDeclatation = GetTestProject("test_project");
+            var callingModule = GetTestClassModule(projectDeclatation, "callingModule");
+            var privateCallingFunction = GetTestFunction(callingModule, "callingFoo", Accessibility.Private);
+            var supertypeOfCallingModule = GetTestClassModule(projectDeclatation, "callingModuleSuper");
+            callingModule.AddSupertype(supertypeOfCallingModule);
+            var supertypeOfSupertypeOfCallingModule = GetTestClassModule(projectDeclatation, "callingModuleSuperSuper");
+            supertypeOfCallingModule.AddSupertype(supertypeOfSupertypeOfCallingModule);
+            var privateCalleeFunction = GetTestFunction(supertypeOfSupertypeOfCallingModule, "calleeFoo", Accessibility.Private);
+
+            Assert.IsTrue(AccessibilityCheck.IsAccessible(projectDeclatation, callingModule, privateCallingFunction, privateCalleeFunction));
+        }
+
 
         [TestMethod]
-        public void PrivateProceduresAreNotAcessibleFromOtherModules()
+        public void PrivateProceduresAreNotAcessibleFromOtherUnrelatedModules()
         {
             var projectDeclatation = GetTestProject("test_project");
             var calleeModuleDeclatation = GetTestClassModule(projectDeclatation, "callee_test_Module");
@@ -143,7 +158,7 @@ public void PrivateProceduresAreNotAcessibleFromOtherModules()
             var callingFunctionDeclaration = GetTestFunction(callingModuleDeclatation, "callingFoo", Accessibility.Private);
 
             Assert.IsFalse(AccessibilityCheck.IsAccessible(projectDeclatation, callingModuleDeclatation, callingFunctionDeclaration, calleeFunctionDeclaration));
-            }
+        }
 
 
         [TestMethod]
@@ -251,7 +266,23 @@ private static Declaration GetTestVariable(Declaration parentDeclatation, string
 
 
         [TestMethod]
-        public void PrivateInstanceVariablesAreNotAcessibleFromOtherModules()
+            public void PrivateInstanceVariablesAreAccessibleIfTheyAreInAClassAboveTheEnclosingModuleOfTheCallerInTheClassHierarchy()
+        {
+            var projectDeclatation = GetTestProject("test_project");
+            var callingModule = GetTestClassModule(projectDeclatation, "callingModule");
+            var privateCallingFunction = GetTestFunction(callingModule, "callingFoo", Accessibility.Private);
+            var supertypeOfCallingModule = GetTestClassModule(projectDeclatation, "callingModuleSuper");
+            callingModule.AddSupertype(supertypeOfCallingModule);
+            var supertypeOfSupertypeOfCallingModule = GetTestClassModule(projectDeclatation, "callingModuleSuperSuper");
+            supertypeOfCallingModule.AddSupertype(supertypeOfSupertypeOfCallingModule);
+            var privateCalleeInstanceVariable = GetTestVariable(supertypeOfSupertypeOfCallingModule, "calleeFoo", Accessibility.Private);
+
+            Assert.IsTrue(AccessibilityCheck.IsAccessible(projectDeclatation, callingModule, privateCallingFunction, privateCalleeInstanceVariable));
+        }
+
+
+        [TestMethod]
+        public void PrivateInstanceVariablesAreNotAcessibleFromOtherUnrelatedModules()
         {
             var projectDeclatation = GetTestProject("test_project");
             var calleeModuleDeclatation = GetTestClassModule(projectDeclatation, "callee_test_Module");