Test fixes

Author: MikhailArkhipov

src/Analysis/Engine/Impl/Values/BoundMethodInfo.cs

@@ -46,6 +46,7 @@ public override IAnalysisSet Call(Node node, AnalysisUnit unit, IAnalysisSet[] a
         public override IPythonProjectEntry DeclaringModule => Function.DeclaringModule;
         public override int DeclaringVersion => Function.DeclaringVersion;
         public override IEnumerable<ILocationInfo> Locations => Function.Locations;
+        public override BuiltinTypeId TypeId => BuiltinTypeId.Function; 
 
         public IEnumerable<KeyValuePair<string, string>> GetRichDescription() {
             if (Push()) {

src/Analysis/Engine/Impl/Values/BuiltinMethodInfo.cs

@@ -98,7 +98,7 @@ public override string Documentation {
                 return _doc;
             }
         }
-
+        public override BuiltinTypeId TypeId => BuiltinTypeId.BuiltinFunction;
         public override PythonMemberType MemberType => _memberType;
         public override string Name => _function.Name;
         public override ILocatedMember GetLocatedMember() => _function as ILocatedMember;

src/Analysis/Engine/Test/AnalysisTest.cs

@@ -2423,7 +2423,7 @@ def __invert__(self):
 
 
         [TestMethod, Priority(0)]
-        public async Task TrueDividePython3X() {
+        public async Task TrueDividePython35() {
             var text = @"
 class C:
     def __truediv__(self, other):
@@ -2443,6 +2443,27 @@ def __rtruediv__(self, other):
             }
         }
 
+        [TestMethod, Priority(0)]
+        public async Task TrueDividePython36() {
+            var text = @"
+class C:
+    def __truediv__(self, other):
+        return 42
+    def __rtruediv__(self, other):
+        return 3.0
+
+a = C()
+b = a / 'abc'
+c = 'abc' / a
+";
+
+            using (var server = await CreateServerAsync(PythonVersions.Required_Python36X)) {
+                var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(text);
+                analysis.Should().HaveVariable("b").OfType(BuiltinTypeId.Int)
+                    .And.HaveVariable("c").OfType(BuiltinTypeId.Float);
+            }
+        }
+
         [TestMethod, Priority(0)]
         public async Task BinaryOperators() {
             var operators = new[] {

src/Analysis/Engine/Test/InheritanceTests.cs

@@ -36,7 +36,7 @@ def virt():
             using (var server = await new Server().InitializeAsync(PythonVersions.Required_Python36X)) {
                 var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(code);
 
-                analysis.Should().HaveVariable("b").OfType(BuiltinTypeId.Int);
+                analysis.Should().HaveVariable("b").OfTypes(BuiltinTypeId.Int);
             }
         }
 
@@ -61,7 +61,7 @@ def virt():
             using (var server = await new Server().InitializeAsync(PythonVersions.Required_Python36X)) {
                 var analysis = await server.OpenDefaultDocumentAndGetAnalysisAsync(code);
 
-                analysis.Should().HaveVariable("b").OfType(BuiltinTypeId.Int);
+                analysis.Should().HaveVariable("b").OfTypes(BuiltinTypeId.Int, BuiltinTypeId.Function);
             }
         }
     }