Skip to content

Commit d9e694b

Browse files
rdmarsh2rdmarsh2
committed
Swift: update test expectation for collection content
1 parent 4b970ff commit d9e694b

File tree

1 file changed

+52
-57
lines changed

1 file changed

+52
-57
lines changed

‎swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected

Lines changed: 52 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,12 @@ edges
334334
| test.swift:642:17:642:17 | KeyPathComponent [x] | test.swift:642:11:642:17 | exit #keyPath(...) |
335335
| test.swift:643:13:643:13 | s2 [s, x] | test.swift:642:11:642:17 | enter #keyPath(...) [s, x] |
336336
| test.swift:643:13:643:13 | s2 [s, x] | test.swift:643:13:643:26 | \\...[...] |
337-
| test.swift:647:17:647:26 | [...] [Array element] | test.swift:649:15:649:15 | array [Array element] |
338-
| test.swift:647:18:647:25 | call to source() | test.swift:647:17:647:26 | [...] [Array element] |
339-
| test.swift:648:13:648:22 | enter #keyPath(...) [Array element] | test.swift:648:20:648:22 | KeyPathComponent [Array element] |
340-
| test.swift:648:20:648:22 | KeyPathComponent [Array element] | test.swift:648:13:648:22 | exit #keyPath(...) |
341-
| test.swift:649:15:649:15 | array [Array element] | test.swift:648:13:648:22 | enter #keyPath(...) [Array element] |
342-
| test.swift:649:15:649:15 | array [Array element] | test.swift:649:15:649:31 | \\...[...] |
337+
| test.swift:647:17:647:26 | [...] [Collection element] | test.swift:649:15:649:15 | array [Collection element] |
338+
| test.swift:647:18:647:25 | call to source() | test.swift:647:17:647:26 | [...] [Collection element] |
339+
| test.swift:648:13:648:22 | enter #keyPath(...) [Collection element] | test.swift:648:20:648:22 | KeyPathComponent [Collection element] |
340+
| test.swift:648:20:648:22 | KeyPathComponent [Collection element] | test.swift:648:13:648:22 | exit #keyPath(...) |
341+
| test.swift:649:15:649:15 | array [Collection element] | test.swift:648:13:648:22 | enter #keyPath(...) [Collection element] |
342+
| test.swift:649:15:649:15 | array [Collection element] | test.swift:649:15:649:31 | \\...[...] |
343343
| test.swift:655:8:655:12 | s [some:0, x] | test.swift:656:14:656:14 | s [some:0, x] |
344344
| test.swift:656:5:656:5 | [post] self [s, some:0, x] | test.swift:655:3:657:3 | self[return] [s, some:0, x] |
345345
| test.swift:656:14:656:14 | s [some:0, x] | test.swift:656:5:656:5 | [post] self [s, some:0, x] |
@@ -362,39 +362,36 @@ edges
362362
| test.swift:678:9:678:16 | call to source() | test.swift:681:15:681:15 | x |
363363
| test.swift:680:11:680:11 | x | test.swift:680:15:680:15 | [post] y |
364364
| test.swift:680:15:680:15 | [post] y | test.swift:682:15:682:15 | y |
365-
| test.swift:688:5:688:5 | [post] arr1 [Array element] | test.swift:689:15:689:15 | arr1 [Array element] |
366-
| test.swift:688:15:688:22 | call to source() | test.swift:688:5:688:5 | [post] arr1 [Array element] |
367-
| test.swift:689:15:689:15 | arr1 [Array element] | test.swift:689:15:689:21 | ...[...] |
368-
| test.swift:692:16:692:25 | [...] [Array element] | test.swift:693:15:693:15 | arr2 [Array element] |
369-
| test.swift:692:17:692:24 | call to source() | test.swift:692:16:692:25 | [...] [Array element] |
370-
| test.swift:693:15:693:15 | arr2 [Array element] | test.swift:693:15:693:21 | ...[...] |
371-
| test.swift:695:18:695:29 | [...] [Array element, Array element] | test.swift:697:15:697:15 | matrix [Array element, Array element] |
372-
| test.swift:695:19:695:28 | [...] [Array element] | test.swift:695:18:695:29 | [...] [Array element, Array element] |
373-
| test.swift:695:20:695:27 | call to source() | test.swift:695:19:695:28 | [...] [Array element] |
374-
| test.swift:697:15:697:15 | matrix [Array element, Array element] | test.swift:697:15:697:23 | ...[...] [Array element] |
375-
| test.swift:697:15:697:23 | ...[...] [Array element] | test.swift:697:15:697:26 | ...[...] |
376-
| test.swift:700:5:700:5 | [post] matrix2 [Array element, Array element] | test.swift:701:15:701:15 | matrix2 [Array element, Array element] |
377-
| test.swift:700:5:700:5 | [post] matrix2 [Collection element, Array element] | test.swift:701:15:701:15 | matrix2 [Collection element, Array element] |
378-
| test.swift:700:5:700:14 | [post] getter for ...[...] [Array element] | test.swift:700:5:700:5 | [post] matrix2 [Array element, Array element] |
379-
| test.swift:700:5:700:14 | [post] getter for ...[...] [Array element] | test.swift:700:5:700:5 | [post] matrix2 [Collection element, Array element] |
380-
| test.swift:700:21:700:28 | call to source() | test.swift:700:5:700:14 | [post] getter for ...[...] [Array element] |
381-
| test.swift:701:15:701:15 | matrix2 [Array element, Array element] | test.swift:701:15:701:24 | ...[...] [Array element] |
382-
| test.swift:701:15:701:15 | matrix2 [Collection element, Array element] | test.swift:701:15:701:24 | ...[...] [Array element] |
383-
| test.swift:701:15:701:24 | ...[...] [Array element] | test.swift:701:15:701:27 | ...[...] |
384-
| test.swift:712:5:712:5 | [post] arr6 [Array element] | test.swift:713:15:713:15 | arr6 [Array element] |
385-
| test.swift:712:17:712:24 | call to source() | test.swift:712:5:712:5 | [post] arr6 [Array element] |
386-
| test.swift:713:15:713:15 | arr6 [Array element] | test.swift:713:15:713:21 | ...[...] |
387-
| test.swift:715:16:715:25 | [...] [Array element] | test.swift:716:15:716:15 | arr7 [Array element] |
388-
| test.swift:715:17:715:24 | call to source() | test.swift:715:16:715:25 | [...] [Array element] |
389-
| test.swift:716:15:716:15 | arr7 [Array element] | test.swift:716:15:716:34 | call to randomElement() [some:0] |
365+
| test.swift:688:5:688:5 | [post] arr1 [Collection element] | test.swift:689:15:689:15 | arr1 [Collection element] |
366+
| test.swift:688:15:688:22 | call to source() | test.swift:688:5:688:5 | [post] arr1 [Collection element] |
367+
| test.swift:689:15:689:15 | arr1 [Collection element] | test.swift:689:15:689:21 | ...[...] |
368+
| test.swift:692:16:692:25 | [...] [Collection element] | test.swift:693:15:693:15 | arr2 [Collection element] |
369+
| test.swift:692:17:692:24 | call to source() | test.swift:692:16:692:25 | [...] [Collection element] |
370+
| test.swift:693:15:693:15 | arr2 [Collection element] | test.swift:693:15:693:21 | ...[...] |
371+
| test.swift:695:18:695:29 | [...] [Collection element, Collection element] | test.swift:697:15:697:15 | matrix [Collection element, Collection element] |
372+
| test.swift:695:19:695:28 | [...] [Collection element] | test.swift:695:18:695:29 | [...] [Collection element, Collection element] |
373+
| test.swift:695:20:695:27 | call to source() | test.swift:695:19:695:28 | [...] [Collection element] |
374+
| test.swift:697:15:697:15 | matrix [Collection element, Collection element] | test.swift:697:15:697:23 | ...[...] [Collection element] |
375+
| test.swift:697:15:697:23 | ...[...] [Collection element] | test.swift:697:15:697:26 | ...[...] |
376+
| test.swift:700:5:700:5 | [post] matrix2 [Collection element, Collection element] | test.swift:701:15:701:15 | matrix2 [Collection element, Collection element] |
377+
| test.swift:700:5:700:14 | [post] getter for ...[...] [Collection element] | test.swift:700:5:700:5 | [post] matrix2 [Collection element, Collection element] |
378+
| test.swift:700:21:700:28 | call to source() | test.swift:700:5:700:14 | [post] getter for ...[...] [Collection element] |
379+
| test.swift:701:15:701:15 | matrix2 [Collection element, Collection element] | test.swift:701:15:701:24 | ...[...] [Collection element] |
380+
| test.swift:701:15:701:24 | ...[...] [Collection element] | test.swift:701:15:701:27 | ...[...] |
381+
| test.swift:712:5:712:5 | [post] arr6 [Collection element] | test.swift:713:15:713:15 | arr6 [Collection element] |
382+
| test.swift:712:17:712:24 | call to source() | test.swift:712:5:712:5 | [post] arr6 [Collection element] |
383+
| test.swift:713:15:713:15 | arr6 [Collection element] | test.swift:713:15:713:21 | ...[...] |
384+
| test.swift:715:16:715:25 | [...] [Collection element] | test.swift:716:15:716:15 | arr7 [Collection element] |
385+
| test.swift:715:17:715:24 | call to source() | test.swift:715:16:715:25 | [...] [Collection element] |
386+
| test.swift:716:15:716:15 | arr7 [Collection element] | test.swift:716:15:716:34 | call to randomElement() [some:0] |
390387
| test.swift:716:15:716:34 | call to randomElement() [some:0] | test.swift:716:15:716:35 | ...! |
391388
| test.swift:722:5:722:5 | [post] set1 [Collection element] | test.swift:723:15:723:15 | set1 [Collection element] |
392389
| test.swift:722:17:722:24 | call to source() | test.swift:722:5:722:5 | [post] set1 [Collection element] |
393390
| test.swift:723:15:723:15 | set1 [Collection element] | test.swift:723:15:723:34 | call to randomElement() [some:0] |
394391
| test.swift:723:15:723:34 | call to randomElement() [some:0] | test.swift:723:15:723:35 | ...! |
395392
| test.swift:725:16:725:30 | call to Set<Element>.init(_:) [Collection element] | test.swift:726:15:726:15 | set2 [Collection element] |
396-
| test.swift:725:20:725:29 | [...] [Array element] | test.swift:725:16:725:30 | call to Set<Element>.init(_:) [Collection element] |
397-
| test.swift:725:21:725:28 | call to source() | test.swift:725:20:725:29 | [...] [Array element] |
393+
| test.swift:725:20:725:29 | [...] [Collection element] | test.swift:725:16:725:30 | call to Set<Element>.init(_:) [Collection element] |
394+
| test.swift:725:21:725:28 | call to source() | test.swift:725:20:725:29 | [...] [Collection element] |
398395
| test.swift:726:15:726:15 | set2 [Collection element] | test.swift:726:15:726:34 | call to randomElement() [some:0] |
399396
| test.swift:726:15:726:34 | call to randomElement() [some:0] | test.swift:726:15:726:35 | ...! |
400397
| test.swift:731:9:731:9 | self [v2, some:0] | file://:0:0:0:0 | self [v2, some:0] |
@@ -893,12 +890,12 @@ nodes
893890
| test.swift:642:17:642:17 | KeyPathComponent [x] | semmle.label | KeyPathComponent [x] |
894891
| test.swift:643:13:643:13 | s2 [s, x] | semmle.label | s2 [s, x] |
895892
| test.swift:643:13:643:26 | \\...[...] | semmle.label | \\...[...] |
896-
| test.swift:647:17:647:26 | [...] [Array element] | semmle.label | [...] [Array element] |
893+
| test.swift:647:17:647:26 | [...] [Collection element] | semmle.label | [...] [Collection element] |
897894
| test.swift:647:18:647:25 | call to source() | semmle.label | call to source() |
898-
| test.swift:648:13:648:22 | enter #keyPath(...) [Array element] | semmle.label | enter #keyPath(...) [Array element] |
895+
| test.swift:648:13:648:22 | enter #keyPath(...) [Collection element] | semmle.label | enter #keyPath(...) [Collection element] |
899896
| test.swift:648:13:648:22 | exit #keyPath(...) | semmle.label | exit #keyPath(...) |
900-
| test.swift:648:20:648:22 | KeyPathComponent [Array element] | semmle.label | KeyPathComponent [Array element] |
901-
| test.swift:649:15:649:15 | array [Array element] | semmle.label | array [Array element] |
897+
| test.swift:648:20:648:22 | KeyPathComponent [Collection element] | semmle.label | KeyPathComponent [Collection element] |
898+
| test.swift:649:15:649:15 | array [Collection element] | semmle.label | array [Collection element] |
902899
| test.swift:649:15:649:31 | \\...[...] | semmle.label | \\...[...] |
903900
| test.swift:655:3:657:3 | self[return] [s, some:0, x] | semmle.label | self[return] [s, some:0, x] |
904901
| test.swift:655:8:655:12 | s [some:0, x] | semmle.label | s [some:0, x] |
@@ -924,35 +921,33 @@ nodes
924921
| test.swift:680:15:680:15 | [post] y | semmle.label | [post] y |
925922
| test.swift:681:15:681:15 | x | semmle.label | x |
926923
| test.swift:682:15:682:15 | y | semmle.label | y |
927-
| test.swift:688:5:688:5 | [post] arr1 [Array element] | semmle.label | [post] arr1 [Array element] |
924+
| test.swift:688:5:688:5 | [post] arr1 [Collection element] | semmle.label | [post] arr1 [Collection element] |
928925
| test.swift:688:15:688:22 | call to source() | semmle.label | call to source() |
929-
| test.swift:689:15:689:15 | arr1 [Array element] | semmle.label | arr1 [Array element] |
926+
| test.swift:689:15:689:15 | arr1 [Collection element] | semmle.label | arr1 [Collection element] |
930927
| test.swift:689:15:689:21 | ...[...] | semmle.label | ...[...] |
931-
| test.swift:692:16:692:25 | [...] [Array element] | semmle.label | [...] [Array element] |
928+
| test.swift:692:16:692:25 | [...] [Collection element] | semmle.label | [...] [Collection element] |
932929
| test.swift:692:17:692:24 | call to source() | semmle.label | call to source() |
933-
| test.swift:693:15:693:15 | arr2 [Array element] | semmle.label | arr2 [Array element] |
930+
| test.swift:693:15:693:15 | arr2 [Collection element] | semmle.label | arr2 [Collection element] |
934931
| test.swift:693:15:693:21 | ...[...] | semmle.label | ...[...] |
935-
| test.swift:695:18:695:29 | [...] [Array element, Array element] | semmle.label | [...] [Array element, Array element] |
936-
| test.swift:695:19:695:28 | [...] [Array element] | semmle.label | [...] [Array element] |
932+
| test.swift:695:18:695:29 | [...] [Collection element, Collection element] | semmle.label | [...] [Collection element, Collection element] |
933+
| test.swift:695:19:695:28 | [...] [Collection element] | semmle.label | [...] [Collection element] |
937934
| test.swift:695:20:695:27 | call to source() | semmle.label | call to source() |
938-
| test.swift:697:15:697:15 | matrix [Array element, Array element] | semmle.label | matrix [Array element, Array element] |
939-
| test.swift:697:15:697:23 | ...[...] [Array element] | semmle.label | ...[...] [Array element] |
935+
| test.swift:697:15:697:15 | matrix [Collection element, Collection element] | semmle.label | matrix [Collection element, Collection element] |
936+
| test.swift:697:15:697:23 | ...[...] [Collection element] | semmle.label | ...[...] [Collection element] |
940937
| test.swift:697:15:697:26 | ...[...] | semmle.label | ...[...] |
941-
| test.swift:700:5:700:5 | [post] matrix2 [Array element, Array element] | semmle.label | [post] matrix2 [Array element, Array element] |
942-
| test.swift:700:5:700:5 | [post] matrix2 [Collection element, Array element] | semmle.label | [post] matrix2 [Collection element, Array element] |
943-
| test.swift:700:5:700:14 | [post] getter for ...[...] [Array element] | semmle.label | [post] getter for ...[...] [Array element] |
938+
| test.swift:700:5:700:5 | [post] matrix2 [Collection element, Collection element] | semmle.label | [post] matrix2 [Collection element, Collection element] |
939+
| test.swift:700:5:700:14 | [post] getter for ...[...] [Collection element] | semmle.label | [post] getter for ...[...] [Collection element] |
944940
| test.swift:700:21:700:28 | call to source() | semmle.label | call to source() |
945-
| test.swift:701:15:701:15 | matrix2 [Array element, Array element] | semmle.label | matrix2 [Array element, Array element] |
946-
| test.swift:701:15:701:15 | matrix2 [Collection element, Array element] | semmle.label | matrix2 [Collection element, Array element] |
947-
| test.swift:701:15:701:24 | ...[...] [Array element] | semmle.label | ...[...] [Array element] |
941+
| test.swift:701:15:701:15 | matrix2 [Collection element, Collection element] | semmle.label | matrix2 [Collection element, Collection element] |
942+
| test.swift:701:15:701:24 | ...[...] [Collection element] | semmle.label | ...[...] [Collection element] |
948943
| test.swift:701:15:701:27 | ...[...] | semmle.label | ...[...] |
949-
| test.swift:712:5:712:5 | [post] arr6 [Array element] | semmle.label | [post] arr6 [Array element] |
944+
| test.swift:712:5:712:5 | [post] arr6 [Collection element] | semmle.label | [post] arr6 [Collection element] |
950945
| test.swift:712:17:712:24 | call to source() | semmle.label | call to source() |
951-
| test.swift:713:15:713:15 | arr6 [Array element] | semmle.label | arr6 [Array element] |
946+
| test.swift:713:15:713:15 | arr6 [Collection element] | semmle.label | arr6 [Collection element] |
952947
| test.swift:713:15:713:21 | ...[...] | semmle.label | ...[...] |
953-
| test.swift:715:16:715:25 | [...] [Array element] | semmle.label | [...] [Array element] |
948+
| test.swift:715:16:715:25 | [...] [Collection element] | semmle.label | [...] [Collection element] |
954949
| test.swift:715:17:715:24 | call to source() | semmle.label | call to source() |
955-
| test.swift:716:15:716:15 | arr7 [Array element] | semmle.label | arr7 [Array element] |
950+
| test.swift:716:15:716:15 | arr7 [Collection element] | semmle.label | arr7 [Collection element] |
956951
| test.swift:716:15:716:34 | call to randomElement() [some:0] | semmle.label | call to randomElement() [some:0] |
957952
| test.swift:716:15:716:35 | ...! | semmle.label | ...! |
958953
| test.swift:722:5:722:5 | [post] set1 [Collection element] | semmle.label | [post] set1 [Collection element] |
@@ -961,7 +956,7 @@ nodes
961956
| test.swift:723:15:723:34 | call to randomElement() [some:0] | semmle.label | call to randomElement() [some:0] |
962957
| test.swift:723:15:723:35 | ...! | semmle.label | ...! |
963958
| test.swift:725:16:725:30 | call to Set<Element>.init(_:) [Collection element] | semmle.label | call to Set<Element>.init(_:) [Collection element] |
964-
| test.swift:725:20:725:29 | [...] [Array element] | semmle.label | [...] [Array element] |
959+
| test.swift:725:20:725:29 | [...] [Collection element] | semmle.label | [...] [Collection element] |
965960
| test.swift:725:21:725:28 | call to source() | semmle.label | call to source() |
966961
| test.swift:726:15:726:15 | set2 [Collection element] | semmle.label | set2 [Collection element] |
967962
| test.swift:726:15:726:34 | call to randomElement() [some:0] | semmle.label | call to randomElement() [some:0] |
@@ -1128,7 +1123,7 @@ subpaths
11281123
| test.swift:640:16:640:23 | call to source() | test.swift:617:8:617:11 | x | test.swift:617:3:619:3 | self[return] [x] | test.swift:640:11:640:24 | call to S.init(x:) [x] |
11291124
| test.swift:641:18:641:18 | s [x] | test.swift:634:8:634:11 | s [x] | test.swift:634:3:636:3 | self[return] [s, x] | test.swift:641:12:641:19 | call to S2.init(s:) [s, x] |
11301125
| test.swift:643:13:643:13 | s2 [s, x] | test.swift:642:11:642:17 | enter #keyPath(...) [s, x] | test.swift:642:11:642:17 | exit #keyPath(...) | test.swift:643:13:643:26 | \\...[...] |
1131-
| test.swift:649:15:649:15 | array [Array element] | test.swift:648:13:648:22 | enter #keyPath(...) [Array element] | test.swift:648:13:648:22 | exit #keyPath(...) | test.swift:649:15:649:31 | \\...[...] |
1126+
| test.swift:649:15:649:15 | array [Collection element] | test.swift:648:13:648:22 | enter #keyPath(...) [Collection element] | test.swift:648:13:648:22 | exit #keyPath(...) | test.swift:649:15:649:31 | \\...[...] |
11321127
| test.swift:661:18:661:25 | call to source() | test.swift:617:8:617:11 | x | test.swift:617:3:619:3 | self[return] [x] | test.swift:661:13:661:26 | call to S.init(x:) [x] |
11331128
| test.swift:662:29:662:29 | s [some:0, x] | test.swift:655:8:655:12 | s [some:0, x] | test.swift:655:3:657:3 | self[return] [s, some:0, x] | test.swift:662:14:662:30 | call to S2_Optional.init(s:) [s, some:0, x] |
11341129
| test.swift:664:15:664:15 | s2 [s, some:0, x] | test.swift:663:13:663:29 | enter #keyPath(...) [s, some:0, x] | test.swift:663:13:663:29 | exit #keyPath(...) [some:0] | test.swift:664:15:664:28 | \\...[...] [some:0] |

0 commit comments

Comments
 (0)