Merge pull request #11411 from atorralba/atorralba/swift/fix-nsdata-test

atorralba · web-flow · commit cac6e946ab23 · 2022-11-24T12:34:28.000+01:00
Swift: Fix expectation in NSData tests
diff --git a/swift/ql/test/library-tests/dataflow/taint/TaintInline.expected b/swift/ql/test/library-tests/dataflow/taint/TaintInline.expected
@@ -1 +0,0 @@
-| nsdata.swift:110:45:110:45 | bytes | Unexpected result: tainted=108 |
diff --git a/swift/ql/test/library-tests/dataflow/taint/nsdata.swift b/swift/ql/test/library-tests/dataflow/taint/nsdata.swift
@@ -107,7 +107,7 @@ func test() {
     // ";NSData;true;enumerateBytes(_:);;;Argument[-1];Argument[0].Parameter[0];taint"
     let nsDataTainted17 = source() as! NSData
     nsDataTainted17.enumerateBytes {
-        bytes, byteRange, stop in sink(arg: bytes) // tainted=108
+        bytes, byteRange, stop in sink(arg: bytes) // $ tainted=108
     }
     // ";NSData;true;getBytes(_:);;;Argument[-1];Argument[0];taint",
     let nsDataTainted18 = source() as! NSData

Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-\| nsdata.swift:110:45:110:45 \| bytes \| Unexpected result: tainted=108 \|`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func test() {`
`107`	`107`	`// ";NSData;true;enumerateBytes(_:);;;Argument[-1];Argument[0].Parameter[0];taint"`
`108`	`108`	`let nsDataTainted17 = source() as! NSData`
`109`	`109`	`nsDataTainted17.enumerateBytes {`
`110`		`- bytes, byteRange, stop in sink(arg: bytes) // tainted=108`
	`110`	`+ bytes, byteRange, stop in sink(arg: bytes) // $ tainted=108`
`111`	`111`	`}`
`112`	`112`	`// ";NSData;true;getBytes(_:);;;Argument[-1];Argument[0];taint",`
`113`	`113`	`let nsDataTainted18 = source() as! NSData`