JS: Expand callback test case

Type-based pruning is confused by the different tests being interleaved, so we additionally want to have a test that is independent from the other parts of this test.

Author: asgerf

javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected

@@ -5,6 +5,7 @@ legacyDataFlowDifference
 | callbacks.js:37:17:37:24 | source() | callbacks.js:41:10:41:10 | x | only flow with NEW data flow library |
 | callbacks.js:44:17:44:24 | source() | callbacks.js:37:37:37:37 | x | only flow with NEW data flow library |
 | callbacks.js:44:17:44:24 | source() | callbacks.js:38:35:38:35 | x | only flow with NEW data flow library |
+| callbacks.js:73:17:73:24 | source() | callbacks.js:74:35:74:35 | x | only flow with NEW data flow library |
 | capture-flow.js:89:13:89:20 | source() | capture-flow.js:89:6:89:21 | test3c(source()) | only flow with NEW data flow library |
 | capture-flow.js:101:12:101:19 | source() | capture-flow.js:102:6:102:20 | test5("safe")() | only flow with OLD data flow library |
 | capture-flow.js:274:33:274:40 | source() | capture-flow.js:272:10:272:17 | this.foo | only flow with OLD data flow library |
@@ -92,6 +93,8 @@ flow
 | callbacks.js:50:18:50:25 | source() | callbacks.js:30:29:30:29 | y |
 | callbacks.js:51:18:51:25 | source() | callbacks.js:30:29:30:29 | y |
 | callbacks.js:53:23:53:30 | source() | callbacks.js:58:10:58:10 | x |
+| callbacks.js:73:17:73:24 | source() | callbacks.js:73:37:73:37 | x |
+| callbacks.js:73:17:73:24 | source() | callbacks.js:74:35:74:35 | x |
 | capture-flow.js:9:11:9:18 | source() | capture-flow.js:14:10:14:16 | outer() |
 | capture-flow.js:9:11:9:18 | source() | capture-flow.js:19:6:19:16 | outerMost() |
 | capture-flow.js:31:14:31:21 | source() | capture-flow.js:31:6:31:22 | confuse(source()) |

javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected

@@ -7,6 +7,7 @@ legacyDataFlowDifference
 | callbacks.js:37:17:37:24 | source() | callbacks.js:41:10:41:10 | x | only flow with NEW data flow library |
 | callbacks.js:44:17:44:24 | source() | callbacks.js:37:37:37:37 | x | only flow with NEW data flow library |
 | callbacks.js:44:17:44:24 | source() | callbacks.js:38:35:38:35 | x | only flow with NEW data flow library |
+| callbacks.js:73:17:73:24 | source() | callbacks.js:74:35:74:35 | x | only flow with NEW data flow library |
 | capture-flow.js:89:13:89:20 | source() | capture-flow.js:89:6:89:21 | test3c(source()) | only flow with NEW data flow library |
 | capture-flow.js:101:12:101:19 | source() | capture-flow.js:102:6:102:20 | test5("safe")() | only flow with OLD data flow library |
 | capture-flow.js:274:33:274:40 | source() | capture-flow.js:272:10:272:17 | this.foo | only flow with OLD data flow library |
@@ -67,6 +68,8 @@ flow
 | callbacks.js:50:18:50:25 | source() | callbacks.js:30:29:30:29 | y |
 | callbacks.js:51:18:51:25 | source() | callbacks.js:30:29:30:29 | y |
 | callbacks.js:53:23:53:30 | source() | callbacks.js:58:10:58:10 | x |
+| callbacks.js:73:17:73:24 | source() | callbacks.js:73:37:73:37 | x |
+| callbacks.js:73:17:73:24 | source() | callbacks.js:74:35:74:35 | x |
 | capture-flow.js:9:11:9:18 | source() | capture-flow.js:14:10:14:16 | outer() |
 | capture-flow.js:9:11:9:18 | source() | capture-flow.js:19:6:19:16 | outerMost() |
 | capture-flow.js:31:14:31:21 | source() | capture-flow.js:31:6:31:22 | confuse(source()) |

javascript/ql/test/library-tests/TaintTracking/callbacks.js

@@ -58,3 +58,18 @@ function test() {
     sink(x); // NOT OK
   });
 }
+
+function forwardTaint3(x, cb) {
+  cb(x); // Same as 'forwardTaint' but copied to avoid interference between tests
+  cb(x);
+}
+
+function forwardTaint4(x, cb) {
+  forwardTaint3(x, cb); // Same as 'forwardTaint2' but copied to avoid interference between tests
+  forwardTaint3(x, cb);
+}
+
+function test2() {
+  forwardTaint4(source(), x => sink(x)); // NOT OK
+  forwardTaint4("safe", x => sink(x)); // OK [INCONSISTENCY]
+}