JS: Update some uses in tests

asgerf · asgerf · commit fae907df654e · 2021-03-23T14:53:13.000Z
diff --git a/javascript/ql/test/library-tests/frameworks/Electron/tests.ql b/javascript/ql/test/library-tests/frameworks/Electron/tests.ql
@@ -9,7 +9,7 @@ query predicate clientRequest_getADataNode(Electron::ElectronClientRequest cr, D
 query predicate clientRequest(Electron::ElectronClientRequest cr) { any() }
 
 query predicate ipcFlow(DataFlow::Node pred, DataFlow::Node succ) {
-  exists(DataFlow::AdditionalFlowStep afs | afs.step(pred, succ))
+  DataFlow::SharedFlowStep::step(pred, succ)
 }
 
 query predicate remoteFlowSources(RemoteFlowSource source) { any() }
diff --git a/javascript/ql/test/library-tests/frameworks/EventEmitter/test.ql b/javascript/ql/test/library-tests/frameworks/EventEmitter/test.ql
@@ -1,7 +1,7 @@
 import javascript
 
 query predicate taintSteps(DataFlow::Node pred, DataFlow::Node succ) {
-  exists(DataFlow::AdditionalFlowStep step | step.step(pred, succ))
+  DataFlow::SharedFlowStep::step(pred, succ)
 }
 
 query predicate eventEmitter(EventEmitter e) { any() }
diff --git a/javascript/ql/test/library-tests/frameworks/SocketIO/AdditionalFlowStep.qll b/javascript/ql/test/library-tests/frameworks/SocketIO/AdditionalFlowStep.qll
@@ -1,5 +1,5 @@
 import javascript
 
 query predicate test_AdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-  exists(DataFlow::AdditionalFlowStep step | step.step(pred, succ) | any())
+  DataFlow::SharedFlowStep::step(pred, succ)
 }
diff --git a/javascript/ql/test/library-tests/frameworks/WebSocket/test.ql b/javascript/ql/test/library-tests/frameworks/WebSocket/test.ql
@@ -13,7 +13,7 @@ query ServerWebSocket::SendNode serverSend() { any() }
 query ServerWebSocket::ReceiveNode serverReceive() { any() }
 
 query predicate taintStep(DataFlow::Node pred, DataFlow::Node succ) {
-  any(DataFlow::AdditionalFlowStep s).step(pred, succ)
+  DataFlow::SharedFlowStep::step(pred, succ)
 }
 
 query RemoteFlowSource remoteFlow() { any() }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ query predicate clientRequest_getADataNode(Electron::ElectronClientRequest cr, D`
`9`	`9`	`query predicate clientRequest(Electron::ElectronClientRequest cr) { any() }`
`10`	`10`
`11`	`11`	`query predicate ipcFlow(DataFlow::Node pred, DataFlow::Node succ) {`
`12`		`- exists(DataFlow::AdditionalFlowStep afs \| afs.step(pred, succ))`
	`12`	`+ DataFlow::SharedFlowStep::step(pred, succ)`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`query predicate remoteFlowSources(RemoteFlowSource source) { any() }`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import javascript`
`2`	`2`
`3`	`3`	`query predicate taintSteps(DataFlow::Node pred, DataFlow::Node succ) {`
`4`		`- exists(DataFlow::AdditionalFlowStep step \| step.step(pred, succ))`
	`4`	`+ DataFlow::SharedFlowStep::step(pred, succ)`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`query predicate eventEmitter(EventEmitter e) { any() }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import javascript`
`2`	`2`
`3`	`3`	`query predicate test_AdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {`
`4`		`- exists(DataFlow::AdditionalFlowStep step \| step.step(pred, succ) \| any())`
	`4`	`+ DataFlow::SharedFlowStep::step(pred, succ)`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ query ServerWebSocket::SendNode serverSend() { any() }`
`13`	`13`	`query ServerWebSocket::ReceiveNode serverReceive() { any() }`
`14`	`14`
`15`	`15`	`query predicate taintStep(DataFlow::Node pred, DataFlow::Node succ) {`
`16`		`- any(DataFlow::AdditionalFlowStep s).step(pred, succ)`
	`16`	`+ DataFlow::SharedFlowStep::step(pred, succ)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`query RemoteFlowSource remoteFlow() { any() }`