Skip to content

Commit 50889b8

Browse files
committed
Swift: move regex test to integration tests
1 parent d201c1e commit 50889b8

File tree

11 files changed

+24
-27
lines changed

11 files changed

+24
-27
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
| regex.swift:1:5:1:5 | ... | getType: | Regex<Substring> | getPattern: | a.*a | getVersion: | 1 |
2+
| regex.swift:2:5:2:5 | ... | getType: | Regex<(Substring, Substring)> | getPattern: | the number (\\d+) | getVersion: | 1 |
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// generated by codegen/codegen.py
2+
import codeql.swift.elements
3+
4+
from RegexLiteralExpr x, Type getType, string getPattern, int getVersion
5+
where
6+
x.getLocation().getFile().getName().matches("%/regex.swift") and
7+
getType = x.getType() and
8+
getPattern = x.getPattern() and
9+
getVersion = x.getVersion()
10+
select x, "getType:", getType, "getPattern:", getPattern, "getVersion:", getVersion
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
_ = /a.*a/
2+
_ = /the number (\d+)/
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from create_database_utils import *
2+
3+
run_codeql_database_create([
4+
"swiftc -enable-bare-slash-regex regex.swift -o /dev/null",
5+
], lang="swift")

swift/ql/.generated.list

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,7 @@ ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/Prope
814814
ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr_getType.ql 0972415a8ac29f460d480990f85c3976ad947e26510da447bbf74ee61d9b3f4e 463b8ce871911b99c495ea84669b4e6f8eafc645df483f6a99413e930bc0275e
815815
ql/test/extractor-tests/generated/expr/PropertyWrapperValuePlaceholderExpr/PropertyWrapperValuePlaceholderExpr_getWrappedValue.ql 208153f062b04bec13a860b64ea51c1d531597140d81a6d4598294dc9f8649a2 dfaea19e1075c02dfc0366fac8fd2edfae8dde06308730eb462c54be5b571129
816816
ql/test/extractor-tests/generated/expr/RebindSelfInConstructorExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
817+
ql/test/extractor-tests/generated/expr/RegexLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
817818
ql/test/extractor-tests/generated/expr/RegexLiteralExpr/RegexLiteralExpr.ql 28c679ec360c060fa59137fcdd92d1a70c7c827fd4e0f53aea8460dab54957bc e0a3c9ae9208c852ff61e899d39019994c1bba00b00259e8c99b47905fe28111
818819
ql/test/extractor-tests/generated/expr/RegexLiteralExpr/RegexLiteralExpr_getType.ql 0df5435c0bb088170400825eb82d934592be2dea19d3d56796a93ed3d2385fc4 653d665751be03d3d083e57121250423b4de50148f8408cc3485dfed8c688083
819820
ql/test/extractor-tests/generated/expr/StringLiteralExpr/MISSING_SOURCE.txt 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd 7e714762ffb48c436102027d560fb5addc1f7dc6dd6936b06e0d3cca031d67fd
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// generated by codegen/codegen.py
2+
3+
After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
4+
will appear and this file will be deleted

swift/ql/test/extractor-tests/generated/expr/RegexLiteralExpr/RegexLiteralExpr.expected

Lines changed: 0 additions & 2 deletions
This file was deleted.

swift/ql/test/extractor-tests/generated/expr/RegexLiteralExpr/RegexLiteralExpr.ql

Lines changed: 0 additions & 12 deletions
This file was deleted.

swift/ql/test/extractor-tests/generated/expr/RegexLiteralExpr/RegexLiteralExpr_getType.expected

Lines changed: 0 additions & 2 deletions
This file was deleted.

swift/ql/test/extractor-tests/generated/expr/RegexLiteralExpr/RegexLiteralExpr_getType.ql

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)