Fix MethodTypes test

Author: owen-mc

go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected

@@ -31,12 +31,12 @@
 | interface.go:101:6:101:8 | i19 | StringB | func() string |
 | interface.go:105:6:105:8 | i20 | StringB | func() string |
 | main.go:17:6:17:20 | EmbedsNameClash | NCMethod | func()  |
+| pkg1/embedding.go:8:6:8:9 | base | f | func() int |
 | pkg1/embedding.go:19:6:19:13 | embedder | f | func() int |
 | pkg1/embedding.go:22:6:22:16 | ptrembedder | f | func() int |
 | pkg1/embedding.go:22:6:22:16 | ptrembedder | g | func() int |
 | pkg1/embedding.go:25:6:25:14 | embedder2 | f | func() int |
 | pkg1/embedding.go:28:6:28:14 | embedder3 | f | func() int |
-| pkg1/embedding.go:35:6:35:14 | embedder4 | f | func() int |
 | pkg1/interfaces.go:3:6:3:6 | A | m | func()  |
 | pkg1/interfaces.go:7:6:7:6 | B | m | func()  |
 | pkg1/interfaces.go:7:6:7:6 | B | n | func()  |
@@ -51,10 +51,13 @@
 | pkg1/interfaces.go:31:6:31:7 | A2 | m | func()  |
 | pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | Exported | func()  |
 | pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | notExported | func()  |
+| pkg1/promotedStructs.go:4:6:4:6 | S | SMethod | func() interface { } |
 | pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | SMethod | func() interface { } |
 | pkg1/tst.go:5:6:5:6 | T | half | func() Foo |
 | pkg1/tst.go:16:6:16:7 | T3 | half | func() Foo |
 | pkg1/tst.go:21:6:21:7 | T4 | half | func() Foo |
+| pkg1/tst.go:26:6:26:8 | Foo | half | func() Foo |
 | pkg1/tst.go:61:6:61:14 | NameClash | NCMethod | func()  |
 | pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | Exported | func()  |
 | pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | notExported | func()  |
+| pkg2/tst.go:16:6:16:14 | NameClash | NCMethod | func()  |

go/ql/test/library-tests/semmle/go/Types/MethodTypes.ql

@@ -1,7 +1,7 @@
 import go
 
-from DefinedType t, string m, Type tp
+from Type t, string m, Type tp
 where
   exists(t.getEntity().getDeclaration()) and
-  t.getBaseType().hasMethod(m, tp)
+  t.hasMethod(m, tp)
 select t, m, tp.pp()