[GH-30] - additional tests for Visual Basic implementation

nsubstitute · Aug 24, 2018 · 0cb651d · 0cb651d
1 parent d188f6d
commit 0cb651d
Show file tree

Hide file tree

Showing 2 changed files with 327 additions and 381 deletions.
diff --git a/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/CallInfoCallFinder.cs b/src/NSubstitute.Analyzers.VisualBasic/DiagnosticAnalyzers/CallInfoCallFinder.cs
@@ -41,30 +41,32 @@ public override void VisitInvocationExpression(InvocationExpressionSyntax node)
 
                 if (symbol != null && symbol.ContainingType.ToString().Equals(MetadataNames.NSubstituteCoreFullTypeName))
                 {
-                    if (symbol.Name == MetadataNames.CallInfoArgAtMethod)
+                    switch (symbol.Name)
                     {
-                        ArgAtInvocations.Add(node);
-                    }
-
-                    if (symbol.Name == MetadataNames.CallInfoArgMethod)
-                    {
-                        ArgInvocations.Add(node);
+                        case MetadataNames.CallInfoArgAtMethod:
+                            ArgAtInvocations.Add(node);
+                            break;
+                        case MetadataNames.CallInfoArgMethod:
+                            ArgInvocations.Add(node);
+                            break;
+                        case "Item":
+                            DirectIndexerAccesses.Add(node);
+                            break;
                     }
                 }
 
-                var expressionSymbol = _semanticModel.GetSymbolInfo(node.Expression).Symbol;
-                if (symbol == null && expressionSymbol != null && expressionSymbol.ContainingType.ToString().Equals(MetadataNames.NSubstituteCoreFullTypeName))
+                if (symbol == null)
                 {
-                    DirectIndexerAccesses.Add(node);
+                    var expressionSymbol = _semanticModel.GetSymbolInfo(node.Expression).Symbol;
+
+                    if (expressionSymbol != null && expressionSymbol.ContainingType.ToString().Equals(MetadataNames.NSubstituteCoreFullTypeName))
+                    {
+                        DirectIndexerAccesses.Add(node);
+                    }
                 }
 
                 base.VisitInvocationExpression(node);
             }
-
-            public override void VisitMemberAccessExpression(MemberAccessExpressionSyntax node)
-            {
-                base.VisitMemberAccessExpression(node);
-            }
         }
     }
 }