Fix and add test for java/subtle-inherited-call involving inheritence from generic types

Author: smowton

java/ql/src/Violations of Best Practice/Naming Conventions/AmbiguousOuterSuper.ql

@@ -27,7 +27,7 @@ predicate callToInheritedMethod(RefType lexicalScope, MethodAccess ma, string si
   not ma.getMethod().isStatic() and
   not ma.hasQualifier() and
   ma.getEnclosingCallable().getDeclaringType() = lexicalScope and
-  nestedSupertypePlus(lexicalScope).getAMethod() = ma.getMethod() and
+  nestedSupertypePlus(lexicalScope).getAMethod() = ma.getMethod().getSourceDeclaration() and
   signature = ma.getMethod().getSignature()
 }
 

java/ql/test/query-tests/AmbiguousOuterSuper/AmbiguousOuterSuper.expected

@@ -0,0 +1,2 @@
+| GenericTest.java:14:7:14:9 | f(...) | A $@ is called instead of a $@. | GenericTest.class:0:0:0:0 | f | method declared in a superclass | GenericTest.java:9:8:9:8 | f | method with the same signature in an enclosing class |
+| Test.java:14:7:14:9 | f(...) | A $@ is called instead of a $@. | Test.java:3:8:3:8 | f | method declared in a superclass | Test.java:9:8:9:8 | f | method with the same signature in an enclosing class |

java/ql/test/query-tests/AmbiguousOuterSuper/AmbiguousOuterSuper.qlref

@@ -0,0 +1 @@
+Violations of Best Practice/Naming Conventions/AmbiguousOuterSuper.ql

java/ql/test/query-tests/AmbiguousOuterSuper/GenericTest.java

@@ -0,0 +1,19 @@
+public class GenericTest<T> {
+
+  void f() { }
+
+}
+
+class Outer2 {
+
+  void f() { }
+
+  class Inner<T> extends GenericTest<T> {
+
+    public void test() {
+      f();
+    }
+
+  }
+
+}

java/ql/test/query-tests/AmbiguousOuterSuper/Test.java

@@ -0,0 +1,19 @@
+public class Test {
+
+  void f() { }
+
+}
+
+class Outer {
+
+  void f() { }
+
+  class Inner extends Test {
+
+    public void test() {
+      f();
+    }
+
+  }
+
+}