Kotlin: Add tests with suspend functions

Author: tamasvajk

java/ql/test/kotlin/library-tests/dataflow/func/functionReference.kt

@@ -2,10 +2,11 @@ class FunctionReference {
 
     fun fn1(s: String) = s
 
-    fun test() {
+    suspend fun test() {
         fun fn2(s: String) = s
 
         Helper.sink(Processor().process(this::fn1, Helper.taint()))
+        Helper.sink(Processor().processSusp(this::fn1Susp, Helper.taint()))
         Helper.sink(Processor().process(FunctionReference::fn1, this, Helper.taint()))
         Helper.sink(Processor().process(this::fn1, Helper.notaint()))
         Helper.sink(Processor().process(::fn2, Helper.taint()))
@@ -16,4 +17,6 @@ class FunctionReference {
 
     val prop: String
         get() = Helper.taint()
+
+    suspend fun fn1Susp(s: String) = s
 }

java/ql/test/kotlin/library-tests/dataflow/func/lambda.kt

@@ -1,7 +1,8 @@
 class Lambda {
-    fun test() {
+    suspend fun test() {
         Helper.sink(Processor().process({ it: String -> Helper.notaint() }, ""))
         Helper.sink(Processor().process({ it: String -> Helper.taint() }, ""))
+        Helper.sink(Processor().processSusp({ it: String -> Helper.taint() }, ""))
         Helper.sink(Processor().process({ i -> i }, Helper.taint()))
         Helper.sink(Processor().process(fun (i: String) = i, Helper.taint()))
 
@@ -29,4 +30,4 @@ class ManualBigLambda {
         Helper.sink(invoke(arrayOf(Helper.taint(), Helper.notaint())))
         Helper.sink(invoke(arrayOf(Helper.notaint(), Helper.taint())))      // False positive
     }
-}
+}

java/ql/test/kotlin/library-tests/dataflow/func/localFunction.kt

@@ -1,9 +1,15 @@
 class LocalFunction {
-    fun test() {
+    suspend fun test() {
         fun fn1() = Helper.taint()
         fun fn2(s: String) = s
 
         Helper.sink(fn1())
         Helper.sink(fn2(Helper.taint()))
+
+        suspend fun fn3() = Helper.taint()
+        suspend fun fn4(s: String) = s
+
+        Helper.sink(fn3())
+        Helper.sink(fn4(Helper.taint()))
     }
 }

java/ql/test/kotlin/library-tests/dataflow/func/samConversion.kt

@@ -2,12 +2,22 @@ fun interface Predicate {
     fun go(s: String): String
 }
 
+fun interface PredicateSusp {
+    suspend fun go(s: String): String
+}
+
 class SamConversion {
-    fun test() {
+    suspend fun test() {
         val p1 = Predicate { Helper.taint() }
         val p2 = Predicate { it -> it }
 
         Helper.sink(p1.go(""))
-        Helper.sink(p1.go(Helper.taint()))
+        Helper.sink(p2.go(Helper.taint()))
+
+        val p3 = PredicateSusp { Helper.taint() }
+        val p4 = PredicateSusp { it -> it }
+
+        Helper.sink(p3.go(""))
+        Helper.sink(p4.go(Helper.taint()))
     }
 }

java/ql/test/kotlin/library-tests/dataflow/func/test.expected

@@ -1,18 +1,20 @@
 | functionReference.kt:8:59:8:65 | taint(...) | functionReference.kt:8:33:8:66 | process(...) |
-| functionReference.kt:9:78:9:84 | taint(...) | functionReference.kt:9:33:9:85 | process(...) |
-| functionReference.kt:11:55:11:61 | taint(...) | functionReference.kt:11:33:11:62 | process(...) |
-| functionReference.kt:18:24:18:30 | taint(...) | functionReference.kt:14:33:14:51 | process(...) |
+| functionReference.kt:10:78:10:84 | taint(...) | functionReference.kt:10:33:10:85 | process(...) |
+| functionReference.kt:12:55:12:61 | taint(...) | functionReference.kt:12:33:12:62 | process(...) |
+| functionReference.kt:19:24:19:30 | taint(...) | functionReference.kt:15:33:15:51 | process(...) |
 | lambda.kt:4:64:4:70 | taint(...) | lambda.kt:4:33:4:77 | process(...) |
-| lambda.kt:5:60:5:66 | taint(...) | lambda.kt:5:33:5:67 | process(...) |
-| lambda.kt:6:69:6:75 | taint(...) | lambda.kt:6:33:6:76 | process(...) |
-| lambda.kt:9:81:9:87 | taint(...) | lambda.kt:9:33:9:88 | processExt(...) |
-| lambda.kt:10:66:10:72 | taint(...) | lambda.kt:10:33:10:91 | processExt(...) |
-| lambda.kt:13:145:13:151 | taint(...) | lambda.kt:13:33:13:170 | process(...) |
-| lambda.kt:14:163:14:169 | taint(...) | lambda.kt:14:33:14:170 | process(...) |
-| lambda.kt:27:35:27:41 | taint(...) | lambda.kt:27:21:27:60 | invoke(...) |
-| lambda.kt:29:43:29:49 | taint(...) | lambda.kt:29:21:29:69 | invoke(...) |
-| lambda.kt:30:61:30:67 | taint(...) | lambda.kt:30:21:30:69 | invoke(...) |
+| lambda.kt:6:60:6:66 | taint(...) | lambda.kt:6:33:6:67 | process(...) |
+| lambda.kt:7:69:7:75 | taint(...) | lambda.kt:7:33:7:76 | process(...) |
+| lambda.kt:10:81:10:87 | taint(...) | lambda.kt:10:33:10:88 | processExt(...) |
+| lambda.kt:11:66:11:72 | taint(...) | lambda.kt:11:33:11:91 | processExt(...) |
+| lambda.kt:14:145:14:151 | taint(...) | lambda.kt:14:33:14:170 | process(...) |
+| lambda.kt:15:163:15:169 | taint(...) | lambda.kt:15:33:15:170 | process(...) |
+| lambda.kt:28:35:28:41 | taint(...) | lambda.kt:28:21:28:60 | invoke(...) |
+| lambda.kt:30:43:30:49 | taint(...) | lambda.kt:30:21:30:69 | invoke(...) |
+| lambda.kt:31:61:31:67 | taint(...) | lambda.kt:31:21:31:69 | invoke(...) |
 | localFunction.kt:3:28:3:34 | taint(...) | localFunction.kt:6:21:6:25 | fn1(...) |
 | localFunction.kt:7:32:7:38 | taint(...) | localFunction.kt:7:21:7:39 | fn2(...) |
-| samConversion.kt:7:37:7:43 | taint(...) | samConversion.kt:10:24:10:29 | go(...) |
-| samConversion.kt:7:37:7:43 | taint(...) | samConversion.kt:11:24:11:41 | go(...) |
+| localFunction.kt:9:36:9:42 | taint(...) | localFunction.kt:12:21:12:25 | fn3(...) |
+| localFunction.kt:13:32:13:38 | taint(...) | localFunction.kt:13:21:13:39 | fn4(...) |
+| samConversion.kt:11:37:11:43 | taint(...) | samConversion.kt:14:24:14:29 | go(...) |
+| samConversion.kt:15:34:15:40 | taint(...) | samConversion.kt:15:24:15:41 | go(...) |

java/ql/test/kotlin/library-tests/dataflow/func/util.kt

@@ -7,6 +7,10 @@ class Processor {
         return f(arg)
     }
 
+    suspend fun <T, R2> processSusp(f: suspend (T) -> R2, arg: T) : R2 {
+        return f(arg)
+    }
+
     fun <T0, T1, R3> process(f: (T0, T1) -> R3, arg0: T0, arg1: T1) : R3 {
         return f(arg0, arg1)
     }