Amend a test to avoid external paths and accept changes

smowton · igfoo · commit 2bcc3d425eaf · 2022-05-10T19:51:03.000+01:00
diff --git a/java/ql/test/kotlin/library-tests/generics/generics.expected b/java/ql/test/kotlin/library-tests/generics/generics.expected
@@ -3,9 +3,21 @@ genericType
 | generics.kt:13:1:18:1 | C1 | generics.kt:13:10:13:10 | T | 0 |
 | generics.kt:13:1:18:1 | C1 | generics.kt:13:13:13:13 | W | 1 |
 parameterizedType
-| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | generics.kt:11:15:11:15 | V |
-| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 0 | generics.kt:13:10:13:10 | T |
-| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | generics.kt:13:13:13:13 | W |
+| generics.kt:11:1:11:19 | C0 | generics.kt:11:1:11:19 | C0 | 0 | V |
+| generics.kt:11:1:11:19 | C0<?> | generics.kt:11:1:11:19 | C0 | 0 | ? |
+| generics.kt:11:1:11:19 | C0<Integer> | generics.kt:11:1:11:19 | C0 | 0 | Integer |
+| generics.kt:11:1:11:19 | C0<S> | generics.kt:11:1:11:19 | C0 | 0 | S |
+| generics.kt:11:1:11:19 | C0<W> | generics.kt:11:1:11:19 | C0 | 0 | W |
+| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 0 | T |
+| generics.kt:13:1:18:1 | C1 | generics.kt:13:1:18:1 | C1 | 1 | W |
+| generics.kt:13:1:18:1 | C1<Integer,Integer> | generics.kt:13:1:18:1 | C1 | 0 | Integer |
+| generics.kt:13:1:18:1 | C1<Integer,Integer> | generics.kt:13:1:18:1 | C1 | 1 | Integer |
+| generics.kt:13:1:18:1 | C1<String,Integer> | generics.kt:13:1:18:1 | C1 | 0 | String |
+| generics.kt:13:1:18:1 | C1<String,Integer> | generics.kt:13:1:18:1 | C1 | 1 | Integer |
+| generics.kt:13:1:18:1 | C1<String,String> | generics.kt:13:1:18:1 | C1 | 0 | String |
+| generics.kt:13:1:18:1 | C1<String,String> | generics.kt:13:1:18:1 | C1 | 1 | String |
+| generics.kt:13:1:18:1 | C1<U,U> | generics.kt:13:1:18:1 | C1 | 0 | U |
+| generics.kt:13:1:18:1 | C1<U,U> | generics.kt:13:1:18:1 | C1 | 1 | U |
 genericFunction
 | generics.kt:3:1:5:1 | f0 | generics.kt:3:6:3:6 | S | 0 |
 | generics.kt:7:1:9:1 | f1 | generics.kt:7:6:7:6 | S | 0 |
diff --git a/java/ql/test/kotlin/library-tests/generics/generics.ql b/java/ql/test/kotlin/library-tests/generics/generics.ql
@@ -4,9 +4,9 @@ query predicate genericType(GenericType t, TypeVariable tv, int i) {
   t.getTypeParameter(i) = tv and t.getFile().getExtension() = "kt"
 }
 
-query predicate parameterizedType(ParameterizedType t, GenericType gt, int i, RefType ta) {
+query predicate parameterizedType(ParameterizedType t, GenericType gt, int i, string ta) {
   t.getGenericType() = gt and
-  t.getTypeArgument(i) = ta and
+  t.getTypeArgument(i).toString() = ta and
   t.getFile().getExtension() = "kt"
 }
 
diff --git a/java/ql/test/kotlin/library-tests/instances/classes.expected b/java/ql/test/kotlin/library-tests/instances/classes.expected
@@ -1,5 +1,5 @@
 | TestClassA.kt:0:0:0:0 | TestClassAKt |
 | TestClassA.kt:2:1:3:1 | TestClassA |
+| TestClassA.kt:2:1:3:1 | TestClassA<TestClassAUser> |
 | TestClassAUser.kt:0:0:0:0 | TestClassAUserKt |
 | TestClassAUser.kt:15:1:15:24 | TestClassAUser |
-| file://:0:0:0:0 | TestClassA<TestClassAUser> |

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ query predicate genericType(GenericType t, TypeVariable tv, int i) {`
`4`	`4`	`t.getTypeParameter(i) = tv and t.getFile().getExtension() = "kt"`
`5`	`5`	`}`
`6`	`6`
`7`		`-query predicate parameterizedType(ParameterizedType t, GenericType gt, int i, RefType ta) {`
	`7`	`+query predicate parameterizedType(ParameterizedType t, GenericType gt, int i, string ta) {`
`8`	`8`	`t.getGenericType() = gt and`
`9`		`- t.getTypeArgument(i) = ta and`
	`9`	`+ t.getTypeArgument(i).toString() = ta and`
`10`	`10`	`t.getFile().getExtension() = "kt"`
`11`	`11`	`}`
`12`	`12`