From bc5ed100a0a9297b5751241ee78cfde1fa68ddf5 Mon Sep 17 00:00:00 2001 From: Erik Krogh Kristensen Date: Wed, 14 Oct 2020 14:34:28 +0200 Subject: [PATCH] aggregate the tests in library-tests/Patterns into a single .ql file --- .../Patterns/ArrayPattern_getElement.expected | 5 ---- .../Patterns/ArrayPattern_getElement.ql | 5 ---- .../Patterns/ArrayPattern_getSize.expected | 3 --- .../Patterns/ArrayPattern_getSize.ql | 4 ---- .../ArrayPattern_omittedElements.expected | 1 - .../Patterns/ArrayPattern_omittedElements.ql | 5 ---- .../ObjectPattern_getPropertyPattern.expected | 3 --- .../ObjectPattern_getPropertyPattern.ql | 5 ---- .../Patterns/PropertyPattern_getName.expected | 3 --- .../Patterns/PropertyPattern_getName.ql | 5 ---- .../PropertyPattern_isComputed.expected | 1 - .../Patterns/PropertyPattern_isComputed.ql | 5 ---- .../PropertyPattern_isShorthand.expected | 1 - .../Patterns/PropertyPattern_isShorthand.ql | 5 ---- .../library-tests/Patterns/tests.expected | 24 +++++++++++++++++++ .../ql/test/library-tests/Patterns/tests.ql | 21 ++++++++++++++++ 16 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 javascript/ql/test/library-tests/Patterns/ArrayPattern_getElement.expected delete mode 100644 javascript/ql/test/library-tests/Patterns/ArrayPattern_getElement.ql delete mode 100644 javascript/ql/test/library-tests/Patterns/ArrayPattern_getSize.expected delete mode 100644 javascript/ql/test/library-tests/Patterns/ArrayPattern_getSize.ql delete mode 100644 javascript/ql/test/library-tests/Patterns/ArrayPattern_omittedElements.expected delete mode 100644 javascript/ql/test/library-tests/Patterns/ArrayPattern_omittedElements.ql delete mode 100644 javascript/ql/test/library-tests/Patterns/ObjectPattern_getPropertyPattern.expected delete mode 100644 javascript/ql/test/library-tests/Patterns/ObjectPattern_getPropertyPattern.ql delete mode 100644 javascript/ql/test/library-tests/Patterns/PropertyPattern_getName.expected delete mode 100644 javascript/ql/test/library-tests/Patterns/PropertyPattern_getName.ql delete mode 100644 javascript/ql/test/library-tests/Patterns/PropertyPattern_isComputed.expected delete mode 100644 javascript/ql/test/library-tests/Patterns/PropertyPattern_isComputed.ql delete mode 100644 javascript/ql/test/library-tests/Patterns/PropertyPattern_isShorthand.expected delete mode 100644 javascript/ql/test/library-tests/Patterns/PropertyPattern_isShorthand.ql create mode 100644 javascript/ql/test/library-tests/Patterns/tests.expected create mode 100644 javascript/ql/test/library-tests/Patterns/tests.ql diff --git a/javascript/ql/test/library-tests/Patterns/ArrayPattern_getElement.expected b/javascript/ql/test/library-tests/Patterns/ArrayPattern_getElement.expected deleted file mode 100644 index 41076cb0be4..00000000000 --- a/javascript/ql/test/library-tests/Patterns/ArrayPattern_getElement.expected +++ /dev/null @@ -1,5 +0,0 @@ -| tst.js:1:12:1:17 | [x, y] | 0 | tst.js:1:13:1:13 | x | -| tst.js:1:12:1:17 | [x, y] | 1 | tst.js:1:16:1:16 | y | -| tst.js:2:6:2:15 | [a, [, c]] | 0 | tst.js:2:7:2:7 | a | -| tst.js:2:6:2:15 | [a, [, c]] | 1 | tst.js:2:10:2:14 | [, c] | -| tst.js:2:10:2:14 | [, c] | 1 | tst.js:2:13:2:13 | c | diff --git a/javascript/ql/test/library-tests/Patterns/ArrayPattern_getElement.ql b/javascript/ql/test/library-tests/Patterns/ArrayPattern_getElement.ql deleted file mode 100644 index 8752ee853bc..00000000000 --- a/javascript/ql/test/library-tests/Patterns/ArrayPattern_getElement.ql +++ /dev/null @@ -1,5 +0,0 @@ -import javascript - -from ArrayPattern ap, int i, BindingPattern elt -where elt = ap.getElement(i) -select ap, i, elt diff --git a/javascript/ql/test/library-tests/Patterns/ArrayPattern_getSize.expected b/javascript/ql/test/library-tests/Patterns/ArrayPattern_getSize.expected deleted file mode 100644 index e07e09bc022..00000000000 --- a/javascript/ql/test/library-tests/Patterns/ArrayPattern_getSize.expected +++ /dev/null @@ -1,3 +0,0 @@ -| tst.js:1:12:1:17 | [x, y] | 2 | -| tst.js:2:6:2:15 | [a, [, c]] | 2 | -| tst.js:2:10:2:14 | [, c] | 2 | diff --git a/javascript/ql/test/library-tests/Patterns/ArrayPattern_getSize.ql b/javascript/ql/test/library-tests/Patterns/ArrayPattern_getSize.ql deleted file mode 100644 index 46a2258f5b7..00000000000 --- a/javascript/ql/test/library-tests/Patterns/ArrayPattern_getSize.ql +++ /dev/null @@ -1,4 +0,0 @@ -import javascript - -from ArrayPattern ap -select ap, ap.getSize() diff --git a/javascript/ql/test/library-tests/Patterns/ArrayPattern_omittedElements.expected b/javascript/ql/test/library-tests/Patterns/ArrayPattern_omittedElements.expected deleted file mode 100644 index 1e623361408..00000000000 --- a/javascript/ql/test/library-tests/Patterns/ArrayPattern_omittedElements.expected +++ /dev/null @@ -1 +0,0 @@ -| tst.js:2:10:2:14 | [, c] | 0 | diff --git a/javascript/ql/test/library-tests/Patterns/ArrayPattern_omittedElements.ql b/javascript/ql/test/library-tests/Patterns/ArrayPattern_omittedElements.ql deleted file mode 100644 index 0aef6ba2731..00000000000 --- a/javascript/ql/test/library-tests/Patterns/ArrayPattern_omittedElements.ql +++ /dev/null @@ -1,5 +0,0 @@ -import javascript - -from ArrayPattern ap, int i -where ap.elementIsOmitted(i) -select ap, i diff --git a/javascript/ql/test/library-tests/Patterns/ObjectPattern_getPropertyPattern.expected b/javascript/ql/test/library-tests/Patterns/ObjectPattern_getPropertyPattern.expected deleted file mode 100644 index 7861d494596..00000000000 --- a/javascript/ql/test/library-tests/Patterns/ObjectPattern_getPropertyPattern.expected +++ /dev/null @@ -1,3 +0,0 @@ -| tst.js:10:12:10:22 | { x, y: z } | 0 | tst.js:10:14:10:14 | x | -| tst.js:10:12:10:22 | { x, y: z } | 1 | tst.js:10:17:10:20 | y: z | -| tst.js:11:6:11:15 | { [x]: w } | 0 | tst.js:11:8:11:13 | [x]: w | diff --git a/javascript/ql/test/library-tests/Patterns/ObjectPattern_getPropertyPattern.ql b/javascript/ql/test/library-tests/Patterns/ObjectPattern_getPropertyPattern.ql deleted file mode 100644 index db53fcb576a..00000000000 --- a/javascript/ql/test/library-tests/Patterns/ObjectPattern_getPropertyPattern.ql +++ /dev/null @@ -1,5 +0,0 @@ -import javascript - -from ObjectPattern op, int i, PropertyPattern pp -where pp = op.getPropertyPattern(i) -select op, i, pp diff --git a/javascript/ql/test/library-tests/Patterns/PropertyPattern_getName.expected b/javascript/ql/test/library-tests/Patterns/PropertyPattern_getName.expected deleted file mode 100644 index aa90f1a7b04..00000000000 --- a/javascript/ql/test/library-tests/Patterns/PropertyPattern_getName.expected +++ /dev/null @@ -1,3 +0,0 @@ -| tst.js:10:14:10:14 | x | x | -| tst.js:10:17:10:20 | y: z | y | -| tst.js:11:8:11:13 | [x]: w | | diff --git a/javascript/ql/test/library-tests/Patterns/PropertyPattern_getName.ql b/javascript/ql/test/library-tests/Patterns/PropertyPattern_getName.ql deleted file mode 100644 index 98d8cf8c979..00000000000 --- a/javascript/ql/test/library-tests/Patterns/PropertyPattern_getName.ql +++ /dev/null @@ -1,5 +0,0 @@ -import javascript - -from PropertyPattern pp, string name -where (if exists(pp.getName()) then name = pp.getName() else name = "") -select pp, name diff --git a/javascript/ql/test/library-tests/Patterns/PropertyPattern_isComputed.expected b/javascript/ql/test/library-tests/Patterns/PropertyPattern_isComputed.expected deleted file mode 100644 index c0339b46105..00000000000 --- a/javascript/ql/test/library-tests/Patterns/PropertyPattern_isComputed.expected +++ /dev/null @@ -1 +0,0 @@ -| tst.js:11:8:11:13 | [x]: w | diff --git a/javascript/ql/test/library-tests/Patterns/PropertyPattern_isComputed.ql b/javascript/ql/test/library-tests/Patterns/PropertyPattern_isComputed.ql deleted file mode 100644 index 5f665fa280c..00000000000 --- a/javascript/ql/test/library-tests/Patterns/PropertyPattern_isComputed.ql +++ /dev/null @@ -1,5 +0,0 @@ -import javascript - -from PropertyPattern pp -where pp.isComputed() -select pp diff --git a/javascript/ql/test/library-tests/Patterns/PropertyPattern_isShorthand.expected b/javascript/ql/test/library-tests/Patterns/PropertyPattern_isShorthand.expected deleted file mode 100644 index f6967050458..00000000000 --- a/javascript/ql/test/library-tests/Patterns/PropertyPattern_isShorthand.expected +++ /dev/null @@ -1 +0,0 @@ -| tst.js:10:14:10:14 | x | diff --git a/javascript/ql/test/library-tests/Patterns/PropertyPattern_isShorthand.ql b/javascript/ql/test/library-tests/Patterns/PropertyPattern_isShorthand.ql deleted file mode 100644 index 7add5d044dc..00000000000 --- a/javascript/ql/test/library-tests/Patterns/PropertyPattern_isShorthand.ql +++ /dev/null @@ -1,5 +0,0 @@ -import javascript - -from PropertyPattern pp -where pp.isShorthand() -select pp diff --git a/javascript/ql/test/library-tests/Patterns/tests.expected b/javascript/ql/test/library-tests/Patterns/tests.expected new file mode 100644 index 00000000000..94dc70841c0 --- /dev/null +++ b/javascript/ql/test/library-tests/Patterns/tests.expected @@ -0,0 +1,24 @@ +arrayPattern_getElement +| tst.js:1:12:1:17 | [x, y] | 0 | tst.js:1:13:1:13 | x | +| tst.js:1:12:1:17 | [x, y] | 1 | tst.js:1:16:1:16 | y | +| tst.js:2:6:2:15 | [a, [, c]] | 0 | tst.js:2:7:2:7 | a | +| tst.js:2:6:2:15 | [a, [, c]] | 1 | tst.js:2:10:2:14 | [, c] | +| tst.js:2:10:2:14 | [, c] | 1 | tst.js:2:13:2:13 | c | +arrayPattern_getSizeE +| tst.js:1:12:1:17 | [x, y] | 2 | +| tst.js:2:6:2:15 | [a, [, c]] | 2 | +| tst.js:2:10:2:14 | [, c] | 2 | +arrayPattern_omittedElements +| tst.js:2:10:2:14 | [, c] | 0 | +objectPattern_getPropertyPattern +| tst.js:10:12:10:22 | { x, y: z } | 0 | tst.js:10:14:10:14 | x | +| tst.js:10:12:10:22 | { x, y: z } | 1 | tst.js:10:17:10:20 | y: z | +| tst.js:11:6:11:15 | { [x]: w } | 0 | tst.js:11:8:11:13 | [x]: w | +propertyPattern_getName +| tst.js:10:14:10:14 | x | x | +| tst.js:10:17:10:20 | y: z | y | +| tst.js:11:8:11:13 | [x]: w | | +propertyPattern_isComputed +| tst.js:11:8:11:13 | [x]: w | +propertyPattern_isShortHand +| tst.js:10:14:10:14 | x | diff --git a/javascript/ql/test/library-tests/Patterns/tests.ql b/javascript/ql/test/library-tests/Patterns/tests.ql new file mode 100644 index 00000000000..b2b048b2ada --- /dev/null +++ b/javascript/ql/test/library-tests/Patterns/tests.ql @@ -0,0 +1,21 @@ +import javascript + +query predicate arrayPattern_getElement(ArrayPattern ap, int i, BindingPattern elt) { + elt = ap.getElement(i) +} + +query predicate arrayPattern_getSizeE(ArrayPattern ap, int size) { size = ap.getSize() } + +query predicate arrayPattern_omittedElements(ArrayPattern ap, int i) { ap.elementIsOmitted(i) } + +query predicate objectPattern_getPropertyPattern(ObjectPattern op, int i, PropertyPattern pp) { + pp = op.getPropertyPattern(i) +} + +query predicate propertyPattern_getName(PropertyPattern pp, string name) { + if exists(pp.getName()) then name = pp.getName() else name = "" +} + +query predicate propertyPattern_isComputed(PropertyPattern pp) { pp.isComputed() } + +query predicate propertyPattern_isShortHand(PropertyPattern pp) { pp.isShorthand() }