aggregate the tests in library-tests/SensitiveActions into a single .ql file

javascript/ql/test/library-tests/SensitiveActions/CleartextPasswordExpr.expected

@@ -1,10 +0,0 @@
-| tst.js:1:1:1:8 | password |
-| tst.js:2:1:2:8 | PassWord |
-| tst.js:3:1:3:21 | myPassw ... eartext |
-| tst.js:4:1:4:10 | x.password |
-| tst.js:5:1:5:11 | getPassword |
-| tst.js:5:1:5:13 | getPassword() |
-| tst.js:6:1:6:13 | x.getPassword |
-| tst.js:6:1:6:15 | x.getPassword() |
-| tst.js:7:1:7:15 | get("password") |
-| tst.js:8:1:8:17 | x.get("password") |

javascript/ql/test/library-tests/SensitiveActions/CleartextPasswordExpr.ql

@@ -1,5 +0,0 @@
-import javascript
-import semmle.javascript.security.SensitiveActions
-
-from CleartextPasswordExpr e
-select e

javascript/ql/test/library-tests/SensitiveActions/DummyPasswords.expected

@@ -1,9 +0,0 @@
-|  | true |
-| XXXXXXXX | true |
-| abcdefgh | false |
-| admin | true |
-| change_me | true |
-| example_password | true |
-| insert-auth-from-gui | true |
-| root | true |
-| sOKY6ccizpmvF*32so%Q | false |

javascript/ql/test/library-tests/SensitiveActions/ProcessTermination.expected

@@ -1,4 +0,0 @@
-| tst.js:18:1:18:3 | e() |
-| tst.js:19:1:19:6 | exit() |
-| tst.js:23:1:23:25 | require ... .exit() |
-| tst.js:24:1:24:21 | global. ... .exit() |

javascript/ql/test/library-tests/SensitiveActions/ProcessTermination.ql

@@ -1,4 +0,0 @@
-import javascript
-
-from NodeJSLib::ProcessTermination e
-select e

javascript/ql/test/library-tests/SensitiveActions/SensitiveAction.expected

@@ -1,4 +0,0 @@
-| tst.js:18:1:18:3 | e() |
-| tst.js:19:1:19:6 | exit() |
-| tst.js:23:1:23:25 | require ... .exit() |
-| tst.js:24:1:24:21 | global. ... .exit() |

javascript/ql/test/library-tests/SensitiveActions/SensitiveAction.ql

@@ -1,3 +0,0 @@
-import javascript
-
-select any(SensitiveAction a)

javascript/ql/test/library-tests/SensitiveActions/SensitiveExpr.expected

@@ -1,11 +0,0 @@
-| tst.js:1:1:1:8 | password |
-| tst.js:2:1:2:8 | PassWord |
-| tst.js:3:1:3:21 | myPassw ... eartext |
-| tst.js:4:1:4:10 | x.password |
-| tst.js:5:1:5:11 | getPassword |
-| tst.js:5:1:5:13 | getPassword() |
-| tst.js:6:1:6:13 | x.getPassword |
-| tst.js:6:1:6:15 | x.getPassword() |
-| tst.js:7:1:7:15 | get("password") |
-| tst.js:8:1:8:17 | x.get("password") |
-| tst.js:21:1:21:6 | secret |

javascript/ql/test/library-tests/SensitiveActions/SensitiveExpr.ql

@@ -1,3 +0,0 @@
-import javascript
-
-select any(SensitiveExpr a)

javascript/ql/test/library-tests/SensitiveActions/tests.expected

@@ -0,0 +1,43 @@
+cleartextPasswordExpr
+| tst.js:1:1:1:8 | password |
+| tst.js:2:1:2:8 | PassWord |
+| tst.js:3:1:3:21 | myPassw ... eartext |
+| tst.js:4:1:4:10 | x.password |
+| tst.js:5:1:5:11 | getPassword |
+| tst.js:5:1:5:13 | getPassword() |
+| tst.js:6:1:6:13 | x.getPassword |
+| tst.js:6:1:6:15 | x.getPassword() |
+| tst.js:7:1:7:15 | get("password") |
+| tst.js:8:1:8:17 | x.get("password") |
+dummyPasswords
+|  | true |
+| XXXXXXXX | true |
+| abcdefgh | false |
+| admin | true |
+| change_me | true |
+| example_password | true |
+| insert-auth-from-gui | true |
+| root | true |
+| sOKY6ccizpmvF*32so%Q | false |
+processTermination
+| tst.js:18:1:18:3 | e() |
+| tst.js:19:1:19:6 | exit() |
+| tst.js:23:1:23:25 | require ... .exit() |
+| tst.js:24:1:24:21 | global. ... .exit() |
+sensitiveAction
+| tst.js:18:1:18:3 | e() |
+| tst.js:19:1:19:6 | exit() |
+| tst.js:23:1:23:25 | require ... .exit() |
+| tst.js:24:1:24:21 | global. ... .exit() |
+sensitiveExpr
+| tst.js:1:1:1:8 | password |
+| tst.js:2:1:2:8 | PassWord |
+| tst.js:3:1:3:21 | myPassw ... eartext |
+| tst.js:4:1:4:10 | x.password |
+| tst.js:5:1:5:11 | getPassword |
+| tst.js:5:1:5:13 | getPassword() |
+| tst.js:6:1:6:13 | x.getPassword |
+| tst.js:6:1:6:15 | x.getPassword() |
+| tst.js:7:1:7:15 | get("password") |
+| tst.js:8:1:8:17 | x.get("password") |
+| tst.js:21:1:21:6 | secret |

javascript/ql/test/library-tests/SensitiveActions/tests.ql

@@ -1,6 +1,8 @@
 import javascript
 import semmle.javascript.security.SensitiveActions
 
+query predicate cleartextPasswordExpr(CleartextPasswordExpr e) { any() }
+
 string getASamplePassword() {
   result = "abcdefgh" or
   result = "sOKY6ccizpmvF*32so%Q" or
@@ -13,8 +15,13 @@ string getASamplePassword() {
   result = "root"
 }
 
-from string password, boolean isDummy
-where
+query predicate dummyPasswords(string password, boolean isDummy) {
   password = getASamplePassword() and
   if PasswordHeuristics::isDummyPassword(password) then isDummy = true else isDummy = false
-select password, isDummy
+}
+
+query predicate processTermination(NodeJSLib::ProcessTermination term) { any() }
+
+query predicate sensitiveAction(SensitiveAction ac) { any() }
+
+query predicate sensitiveExpr(SensitiveExpr e) { any() }