Fix whenexpr test

smowton · smowton · commit 1aae3c5f5edb · 2022-06-23T15:34:40.000+01:00
Prior to Kotlin 1.7 the gratuitous `?` was ignored for typing purposes; now it yields a `String?`. We should make the test work everywhere by using a real nullable type.
diff --git a/java/ql/test/kotlin/library-tests/dataflow/whenexpr/WhenExpr.kt b/java/ql/test/kotlin/library-tests/dataflow/whenexpr/WhenExpr.kt
@@ -1,10 +1,10 @@
 class WhenExpr {
   fun taint() = Uri()
 
-  fun sink(s: String) { }
+  fun sink(s: String?) { }
 
-  fun bad() {
-    val s0 = taint()
+  fun bad(b: Boolean) {
+    val s0 = if (b) taint() else null
     sink(s0?.getQueryParameter())
   }
 }
diff --git a/java/ql/test/kotlin/library-tests/dataflow/whenexpr/test.expected b/java/ql/test/kotlin/library-tests/dataflow/whenexpr/test.expected
@@ -1 +1 @@
-| WhenExpr.kt:7:14:7:20 | taint(...) | WhenExpr.kt:8:14:8:32 | <Stmt> |
+| WhenExpr.kt:7:21:7:27 | taint(...) | WhenExpr.kt:8:14:8:32 | <Stmt> |

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`class WhenExpr {`
`2`	`2`	`fun taint() = Uri()`
`3`	`3`
`4`		`- fun sink(s: String) { }`
	`4`	`+ fun sink(s: String?) { }`
`5`	`5`
`6`		`- fun bad() {`
`7`		`- val s0 = taint()`
	`6`	`+ fun bad(b: Boolean) {`
	`7`	`+ val s0 = if (b) taint() else null`
`8`	`8`	`sink(s0?.getQueryParameter())`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| WhenExpr.kt:7:14:7:20 \| taint(...) \| WhenExpr.kt:8:14:8:32 \| <Stmt> \|`
	`1`	`+\| WhenExpr.kt:7:21:7:27 \| taint(...) \| WhenExpr.kt:8:14:8:32 \| <Stmt> \|`