Kotlin: Improve the supertypes test

igfoo · igfoo · commit 50c2d1077705 · 2022-05-10T19:51:06.000+01:00
Note the line
        | file://&lt;external&gt;/superChain.kt:2:1:2:60 | SuperChain2&lt;T5,String&gt; | file://&lt;external&gt;/superChain.kt:1:1:1:33 | SuperChain1&lt;T3,String&gt; |
is currently wrong; the supertype of SuperChain2&lt;T5,String&gt; should be
SuperChain1&lt;T5,String&gt;.
diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.expected b/java/ql/test/kotlin/library-tests/classes/superTypes.expected
@@ -21,6 +21,8 @@
 | classes.kt:81:16:81:38 | new Interface1(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
 | classes.kt:85:16:85:25 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
 | classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | classes.kt:61:1:61:26 | Interface3<Integer> |
+| file://<external>/superChain.kt:1:1:1:33 | SuperChain1<T3,String> | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/superChain.kt:2:1:2:60 | SuperChain2<T5,String> | file://<external>/superChain.kt:1:1:1:33 | SuperChain1<T3,String> |
 | superChain.kt:1:1:1:33 | SuperChain1 | file://<external>/Object.class:0:0:0:0 | Object |
 | superChain.kt:2:1:2:60 | SuperChain2 | file://<external>/superChain.kt:1:1:1:33 | SuperChain1<T3,String> |
 | superChain.kt:3:1:3:60 | SuperChain3 | file://<external>/superChain.kt:2:1:2:60 | SuperChain2<T5,String> |
diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.ql b/java/ql/test/kotlin/library-tests/classes/superTypes.ql
@@ -12,7 +12,7 @@ class ClassLocation extends Class {
 }
 
 from Class c, Type superType
-where c.fromSource() and
+where c.getSourceDeclaration().fromSource() and
       superType = c.getASupertype()
 select c, superType
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class ClassLocation extends Class {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`from Class c, Type superType`
`15`		`-where c.fromSource() and`
	`15`	`+where c.getSourceDeclaration().fromSource() and`
`16`	`16`	`superType = c.getASupertype()`
`17`	`17`	`select c, superType`
`18`	`18`