add test for awaited

erik-krogh · erik-krogh · commit 682cab37378c · 2022-05-02T12:45:21.000+02:00
diff --git a/python/ql/test/library-tests/frameworks/data/test.expected b/python/ql/test/library-tests/frameworks/data/test.expected
@@ -38,6 +38,7 @@ isSource
 | test.py:24:38:24:42 | ControlFlowNode for three | test-source |
 | test.py:24:45:24:48 | ControlFlowNode for four | test-source |
 | test.py:25:34:25:39 | ControlFlowNode for second | test-source |
+| test.py:39:11:39:20 | ControlFlowNode for Await | test-source |
 syntaxErrors
 | Member[foo |
 | Member[foo] .Member[bar] |
diff --git a/python/ql/test/library-tests/frameworks/data/test.py b/python/ql/test/library-tests/frameworks/data/test.py
@@ -30,4 +30,10 @@
 CallFilter.arityOne(one) # Match
 CallFilter.twoOrMore(one) # NO match
 CallFilter.twoOrMore(one, two) # Match
-CallFilter.twoOrMore(one, two, three) # Match
+CallFilter.twoOrMore(one, two, three) # Match
+
+from testlib import CommonTokens
+
+async def async_func():
+    prom = CommonTokens.makePromise(1);
+    val = await prom
diff --git a/python/ql/test/library-tests/frameworks/data/test.ql b/python/ql/test/library-tests/frameworks/data/test.ql
@@ -53,12 +53,13 @@ class Sinks extends ModelInput::SinkModelCsv {
   }
 }
 
-// TODO: Named parameters?
 // TODO: Commonly used tokens
 // TODO: Uniform tokens for fields
-// TODO: Non-positional arguments
+// TODO: Non-positional arguments (including Named parameters)
 // TODO: Any argument
 // TODO: Test taint steps.
+// TODO: Should `instance()` be shorthand for `subClass*().getReturn()`?
+// TODO: // There are no API-graph edges for: ArrayElement, Element, MapKey, MapValue (remove from valid tokens list)
 class Sources extends ModelInput::SourceModelCsv {
   // package;type;path;kind
   override predicate row(string row) {
@@ -70,6 +71,8 @@ class Sources extends ModelInput::SourceModelCsv {
         "testlib;;Member[Callbacks].Member[first].Argument[0].Parameter[0];test-source", //
         "testlib;;Member[Callbacks].Member[param1to3].Argument[0].Parameter[1..3];test-source", //
         "testlib;;Member[Callbacks].Member[nonFirst].Argument[0].Parameter[1..];test-source", //
+        // Common tokens.
+        "testlib;;Member[CommonTokens].Member[makePromise].ReturnValue.Awaited;test-source", //
       ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,13 @@ class Sinks extends ModelInput::SinkModelCsv {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`-// TODO: Named parameters?`
`57`	`56`	`// TODO: Commonly used tokens`
`58`	`57`	`// TODO: Uniform tokens for fields`
`59`		`-// TODO: Non-positional arguments`
	`58`	`+// TODO: Non-positional arguments (including Named parameters)`
`60`	`59`	`// TODO: Any argument`
`61`	`60`	`// TODO: Test taint steps.`
	`61`	+// TODO: Should `instance()` be shorthand for `subClass*().getReturn()`?
	`62`	`+// TODO: // There are no API-graph edges for: ArrayElement, Element, MapKey, MapValue (remove from valid tokens list)`
`62`	`63`	`class Sources extends ModelInput::SourceModelCsv {`
`63`	`64`	`// package;type;path;kind`
`64`	`65`	`override predicate row(string row) {`
`@@ -70,6 +71,8 @@ class Sources extends ModelInput::SourceModelCsv {`
`70`	`71`	`"testlib;;Member[Callbacks].Member[first].Argument[0].Parameter[0];test-source", //`
`71`	`72`	`"testlib;;Member[Callbacks].Member[param1to3].Argument[0].Parameter[1..3];test-source", //`
`72`	`73`	`"testlib;;Member[Callbacks].Member[nonFirst].Argument[0].Parameter[1..];test-source", //`
	`74`	`+ // Common tokens.`
	`75`	`+ "testlib;;Member[CommonTokens].Member[makePromise].ReturnValue.Awaited;test-source", //`
`73`	`76`	`]`
`74`	`77`	`}`
`75`	`78`	`}`