Skip to content

Commit 7d9d862

Browse files
amolguptaamolgupta
committed
test cases updated.
1 parent 5318433 commit 7d9d862

15 files changed

Lines changed: 130 additions & 130 deletions

‎src/targets/swift/nsurlsession.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module.exports = function (source, options) {
5555

5656
case 'application/json':
5757
if (source.postData.jsonObj) {
58-
code.push(helpers.literalDeclaration('parameters', source.postData.jsonObj, opts),'as [String : Any]')
58+
code.push(helpers.literalDeclaration('parameters', source.postData.jsonObj, opts), 'as [String : Any]')
5959
.blank()
6060
.push('let postData = JSONSerialization.data(withJSONObject: parameters, options: [])')
6161
}

‎test/fixtures/output/swift/nsurlsession/application-form-encoded.swift‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ import Foundation
22

33
let headers = ["content-type": "application/x-www-form-urlencoded"]
44

5-
var postData = NSMutableData(data: "foo=bar".dataUsingEncoding(NSUTF8StringEncoding)!)
6-
postData.appendData("&hello=world".dataUsingEncoding(NSUTF8StringEncoding)!)
5+
let postData = NSMutableData(data: "foo=bar".data(using: String.Encoding.utf8)!)
6+
postData.append("&hello=world".data(using: String.Encoding.utf8)!)
77

8-
var request = NSMutableURLRequest(URL: NSURL(string: "http://mockbin.com/har")!,
9-
cachePolicy: .UseProtocolCachePolicy,
8+
let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL,
9+
cachePolicy: .useProtocolCachePolicy,
1010
timeoutInterval: 10.0)
11-
request.HTTPMethod = "POST"
11+
request.httpMethod = "POST"
1212
request.allHTTPHeaderFields = headers
13-
request.HTTPBody = postData
13+
request.httpBody = postData as Data
1414

15-
let session = NSURLSession.sharedSession()
16-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
15+
let session = URLSession.shared
16+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
1717
if (error != nil) {
18-
println(error)
18+
print(error)
1919
} else {
20-
let httpResponse = response as? NSHTTPURLResponse
21-
println(httpResponse)
20+
let httpResponse = response as? HTTPURLResponse
21+
print(httpResponse)
2222
}
2323
})
2424

‎test/fixtures/output/swift/nsurlsession/application-json.swift‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ let parameters = [
88
"nested": ["a": "b"],
99
"arr_mix": [1, "a", ["arr_mix_nested": []]],
1010
"boolean": false
11-
]
11+
] as [String : Any]
1212

13-
let postData = NSJSONSerialization.dataWithJSONObject(parameters, options: nil, error: nil)
13+
let postData = JSONSerialization.data(withJSONObject: parameters, options: [])
1414

15-
var request = NSMutableURLRequest(URL: NSURL(string: "http://mockbin.com/har")!,
16-
cachePolicy: .UseProtocolCachePolicy,
15+
let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL,
16+
cachePolicy: .useProtocolCachePolicy,
1717
timeoutInterval: 10.0)
18-
request.HTTPMethod = "POST"
18+
request.httpMethod = "POST"
1919
request.allHTTPHeaderFields = headers
20-
request.HTTPBody = postData
20+
request.httpBody = postData as Data
2121

22-
let session = NSURLSession.sharedSession()
23-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
22+
let session = URLSession.shared
23+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
2424
if (error != nil) {
25-
println(error)
25+
print(error)
2626
} else {
27-
let httpResponse = response as? NSHTTPURLResponse
28-
println(httpResponse)
27+
let httpResponse = response as? HTTPURLResponse
28+
print(httpResponse)
2929
}
3030
})
3131

‎test/fixtures/output/swift/nsurlsession/cookies.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ import Foundation
22

33
let headers = ["cookie": "foo=bar; bar=baz"]
44

5-
var request = NSMutableURLRequest(URL: NSURL(string: "http://mockbin.com/har")!,
6-
cachePolicy: .UseProtocolCachePolicy,
5+
let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL,
6+
cachePolicy: .useProtocolCachePolicy,
77
timeoutInterval: 10.0)
8-
request.HTTPMethod = "POST"
8+
request.httpMethod = "POST"
99
request.allHTTPHeaderFields = headers
1010

11-
let session = NSURLSession.sharedSession()
12-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
11+
let session = URLSession.shared
12+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
1313
if (error != nil) {
14-
println(error)
14+
print(error)
1515
} else {
16-
let httpResponse = response as? NSHTTPURLResponse
17-
println(httpResponse)
16+
let httpResponse = response as? HTTPURLResponse
17+
print(httpResponse)
1818
}
1919
})
2020

‎test/fixtures/output/swift/nsurlsession/custom-method.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import Foundation
22

3-
var request = NSMutableURLRequest(URL: NSURL(string: "http://mockbin.com/har")!,
4-
cachePolicy: .UseProtocolCachePolicy,
3+
let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL,
4+
cachePolicy: .useProtocolCachePolicy,
55
timeoutInterval: 10.0)
6-
request.HTTPMethod = "PROPFIND"
6+
request.httpMethod = "PROPFIND"
77

8-
let session = NSURLSession.sharedSession()
9-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
8+
let session = URLSession.shared
9+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
1010
if (error != nil) {
11-
println(error)
11+
print(error)
1212
} else {
13-
let httpResponse = response as? NSHTTPURLResponse
14-
println(httpResponse)
13+
let httpResponse = response as? HTTPURLResponse
14+
print(httpResponse)
1515
}
1616
})
1717

‎test/fixtures/output/swift/nsurlsession/full.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ let headers = [
66
"content-type": "application/x-www-form-urlencoded"
77
]
88

9-
var postData = NSMutableData(data: "foo=bar".dataUsingEncoding(NSUTF8StringEncoding)!)
9+
let postData = NSMutableData(data: "foo=bar".data(using: String.Encoding.utf8)!)
1010

11-
var request = NSMutableURLRequest(URL: NSURL(string: "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value")!,
12-
cachePolicy: .UseProtocolCachePolicy,
11+
let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value")! as URL,
12+
cachePolicy: .useProtocolCachePolicy,
1313
timeoutInterval: 10.0)
14-
request.HTTPMethod = "POST"
14+
request.httpMethod = "POST"
1515
request.allHTTPHeaderFields = headers
16-
request.HTTPBody = postData
16+
request.httpBody = postData as Data
1717

18-
let session = NSURLSession.sharedSession()
19-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
18+
let session = URLSession.shared
19+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
2020
if (error != nil) {
21-
println(error)
21+
print(error)
2222
} else {
23-
let httpResponse = response as? NSHTTPURLResponse
24-
println(httpResponse)
23+
let httpResponse = response as? HTTPURLResponse
24+
print(httpResponse)
2525
}
2626
})
2727

‎test/fixtures/output/swift/nsurlsession/headers.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ let headers = [
55
"x-foo": "Bar"
66
]
77

8-
var request = NSMutableURLRequest(URL: NSURL(string: "http://mockbin.com/har")!,
9-
cachePolicy: .UseProtocolCachePolicy,
8+
let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL,
9+
cachePolicy: .useProtocolCachePolicy,
1010
timeoutInterval: 10.0)
11-
request.HTTPMethod = "GET"
11+
request.httpMethod = "GET"
1212
request.allHTTPHeaderFields = headers
1313

14-
let session = NSURLSession.sharedSession()
15-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
14+
let session = URLSession.shared
15+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
1616
if (error != nil) {
17-
println(error)
17+
print(error)
1818
} else {
19-
let httpResponse = response as? NSHTTPURLResponse
20-
println(httpResponse)
19+
let httpResponse = response as? HTTPURLResponse
20+
print(httpResponse)
2121
}
2222
})
2323

‎test/fixtures/output/swift/nsurlsession/https.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import Foundation
22

3-
var request = NSMutableURLRequest(URL: NSURL(string: "https://mockbin.com/har")!,
4-
cachePolicy: .UseProtocolCachePolicy,
3+
let request = NSMutableURLRequest(url: NSURL(string: "https://mockbin.com/har")! as URL,
4+
cachePolicy: .useProtocolCachePolicy,
55
timeoutInterval: 10.0)
6-
request.HTTPMethod = "GET"
6+
request.httpMethod = "GET"
77

8-
let session = NSURLSession.sharedSession()
9-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
8+
let session = URLSession.shared
9+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
1010
if (error != nil) {
11-
println(error)
11+
print(error)
1212
} else {
13-
let httpResponse = response as? NSHTTPURLResponse
14-
println(httpResponse)
13+
let httpResponse = response as? HTTPURLResponse
14+
print(httpResponse)
1515
}
1616
})
1717

‎test/fixtures/output/swift/nsurlsession/multipart-data.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,32 @@ for param in parameters {
2020
body += "Content-Disposition:form-data; name=\"\(paramName)\""
2121
if let filename = param["fileName"] {
2222
let contentType = param["content-type"]!
23-
let fileContent = String(contentsOfFile: filename, encoding: NSUTF8StringEncoding, error: &error)
23+
let fileContent = String(contentsOfFile: filename, encoding: String.Encoding.utf8)
2424
if (error != nil) {
25-
println(error)
25+
print(error)
2626
}
2727
body += "; filename=\"\(filename)\"\r\n"
2828
body += "Content-Type: \(contentType)\r\n\r\n"
29-
body += fileContent!
29+
body += fileContent
3030
} else if let paramValue = param["value"] {
3131
body += "\r\n\r\n\(paramValue)"
3232
}
3333
}
3434

35-
var request = NSMutableURLRequest(URL: NSURL(string: "http://mockbin.com/har")!,
36-
cachePolicy: .UseProtocolCachePolicy,
35+
let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL,
36+
cachePolicy: .useProtocolCachePolicy,
3737
timeoutInterval: 10.0)
38-
request.HTTPMethod = "POST"
38+
request.httpMethod = "POST"
3939
request.allHTTPHeaderFields = headers
40-
request.HTTPBody = postData
40+
request.httpBody = postData as Data
4141

42-
let session = NSURLSession.sharedSession()
43-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
42+
let session = URLSession.shared
43+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
4444
if (error != nil) {
45-
println(error)
45+
print(error)
4646
} else {
47-
let httpResponse = response as? NSHTTPURLResponse
48-
println(httpResponse)
47+
let httpResponse = response as? HTTPURLResponse
48+
print(httpResponse)
4949
}
5050
})
5151

‎test/fixtures/output/swift/nsurlsession/multipart-file.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@ for param in parameters {
1919
body += "Content-Disposition:form-data; name=\"\(paramName)\""
2020
if let filename = param["fileName"] {
2121
let contentType = param["content-type"]!
22-
let fileContent = String(contentsOfFile: filename, encoding: NSUTF8StringEncoding, error: &error)
22+
let fileContent = String(contentsOfFile: filename, encoding: String.Encoding.utf8)
2323
if (error != nil) {
24-
println(error)
24+
print(error)
2525
}
2626
body += "; filename=\"\(filename)\"\r\n"
2727
body += "Content-Type: \(contentType)\r\n\r\n"
28-
body += fileContent!
28+
body += fileContent
2929
} else if let paramValue = param["value"] {
3030
body += "\r\n\r\n\(paramValue)"
3131
}
3232
}
3333

34-
var request = NSMutableURLRequest(URL: NSURL(string: "http://mockbin.com/har")!,
35-
cachePolicy: .UseProtocolCachePolicy,
34+
let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har")! as URL,
35+
cachePolicy: .useProtocolCachePolicy,
3636
timeoutInterval: 10.0)
37-
request.HTTPMethod = "POST"
37+
request.httpMethod = "POST"
3838
request.allHTTPHeaderFields = headers
39-
request.HTTPBody = postData
39+
request.httpBody = postData as Data
4040

41-
let session = NSURLSession.sharedSession()
42-
let dataTask = session.dataTaskWithRequest(request, completionHandler: { (data, response, error) -> Void in
41+
let session = URLSession.shared
42+
let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in
4343
if (error != nil) {
44-
println(error)
44+
print(error)
4545
} else {
46-
let httpResponse = response as? NSHTTPURLResponse
47-
println(httpResponse)
46+
let httpResponse = response as? HTTPURLResponse
47+
print(httpResponse)
4848
}
4949
})
5050

0 commit comments

Comments
 (0)