Swift: Make the tests more accurate.

Author: geoffw0

swift/ql/test/library-tests/dataflow/taint/libraries/files.swift

@@ -9,7 +9,7 @@ enum CInterop {
   typealias PlatformChar = CInterop.Char
 }
 
-struct FilePath {
+struct FilePath : CustomStringConvertible, CustomDebugStringConvertible {
 	struct Component {
 		init?(_ string: String) { }
 
@@ -184,8 +184,8 @@ func test_files(e1: Encoder) {
 
 	// --- FilePath member variables ---
 
-	sink(string: tainted.description) // $ MISSING: tainted=133
-	sink(string: tainted.debugDescription) // $ MISSING: tainted=133
+	sink(string: tainted.description) // $ tainted=133
+	sink(string: tainted.debugDescription) // $ tainted=133
 	sink(string: tainted.extension!) // $ tainted=133
 	sink(string: tainted.stem!) // $ tainted=133
 	sink(string: tainted.string) // $ tainted=133

swift/ql/test/library-tests/dataflow/taint/libraries/url.swift

@@ -154,7 +154,7 @@ struct URLResource {
 	let subdirectory: String?
 }
 
-struct URLRequest {
+struct URLRequest : CustomStringConvertible, CustomDebugStringConvertible {
 	enum CachePolicy { case none }
 	enum NetworkServiceType { case none }
 	enum Attribution { case none }
@@ -463,9 +463,9 @@ func taintThroughUrlRequest() {
 	sink(any: clean.attribution)
 	sink(any: tainted.attribution)
 	sink(any: clean.description)
-	sink(any: tainted.description)
+	sink(any: tainted.description) // $ tainted=431
 	sink(any: clean.debugDescription)
-	sink(any: tainted.debugDescription)
+	sink(any: tainted.debugDescription) // $ tainted=431
 	sink(any: clean.customMirror)
 	sink(any: tainted.customMirror)
 	sink(any: clean.hashValue)