Skip to content

Commit b50ddc6

Browse files
youming-linyouming-lin
committed
Fix warnings and errors on Linux
1 parent b41f430 commit b50ddc6

File tree

5 files changed

+51
-20
lines changed

5 files changed

+51
-20
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ matrix:
1616
- os: linux
1717
dist: trusty
1818
sudo: required
19-
env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-29-a
19+
env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-09-06-a
2020
- os: osx
2121
osx_image: xcode8.3
2222
sudo: required
2323
- os: osx
2424
osx_image: xcode9
2525
sudo: required
26-
env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-29-a
26+
env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-09-06-a
2727

2828
before_install:
2929
- git clone https://github.com/IBM-Swift/Package-Builder.git

‎Sources/SwiftyJSON/SwiftyJSON.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public struct JSON {
189189
self.rawString = value as! String
190190
case .unknown:
191191
_error = NSError(domain: ErrorDomain, code: ErrorUnsupportedType, userInfo: [NSLocalizedDescriptionKey: "It is a unsupported type"])
192-
print("==> error=\(String(describing: _error)). type=\(type(of: newValue))")
192+
print("==> error=\(String(describing: _error)). type=\(Swift.type(of: newValue))")
193193
}
194194
#else
195195
if Swift.type(of: newValue) == Bool.self {

‎Tests/SwiftyJSONTests/BaseTests.swift‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import Foundation
2727

2828
class BaseTests: XCTestCase {
2929

30-
// GENERATED: allTests required for Swift 3.0
30+
// GENERATED: allTests required for Swift 3.0
3131
static var allTests : [(String, (BaseTests) -> () throws -> Void)] {
3232
return [
3333
("testInit", testInit),
@@ -44,7 +44,7 @@ class BaseTests: XCTestCase {
4444
("testNumberCompare", testNumberCompare),
4545
]
4646
}
47-
// END OF GENERATED CODE
47+
// END OF GENERATED CODE
4848

4949
var testData: Data!
5050

@@ -209,9 +209,9 @@ class BaseTests: XCTestCase {
209209
XCTAssertEqual(JSON(1).description,"1")
210210
XCTAssertEqual(JSON(22).description,"22")
211211
#if (arch(x86_64) || arch(arm64))
212-
XCTAssertEqual(JSON(9.22337203685478E18).description,"9.22337203685478e+18")
212+
XCTAssertEqual(JSON(9.22337203685478E18).description,"9.22337203685478e+18")
213213
#elseif (arch(i386) || arch(arm))
214-
XCTAssertEqual(JSON(2147483647).description,"2147483647")
214+
XCTAssertEqual(JSON(2147483647).description,"2147483647")
215215
#endif
216216
XCTAssertEqual(JSON(-1).description,"-1")
217217
XCTAssertEqual(JSON(-934834834).description,"-934834834")
@@ -225,7 +225,7 @@ class BaseTests: XCTestCase {
225225
#if !os(Linux)
226226
// blocked by defect https://bugs.swift.org/browse/SR-1464?jql=text%20~%20%22NSNumber%22
227227
//TODO: remove ifdef once the defect is resolved
228-
XCTAssertEqual(JSON(-9999999991999999999999999.88888883433343439438493483483943948341).stringValue,"-9.999999991999999e+24")
228+
XCTAssertEqual(JSON(-9999999991999999999999999.88888883433343439438493483483943948341).stringValue,"-9.999999991999999e+24")
229229
#endif
230230

231231
XCTAssertEqual(JSON(NSNumber(value:Int.max)).description,"\(Int.max)")
@@ -236,9 +236,9 @@ class BaseTests: XCTestCase {
236236
// blocked by defect https://bugs.swift.org/browse/SR-1464?jql=text%20~%20%22NSNumber%22
237237
//TODO: remove ifdef once the defect is resolved
238238

239-
XCTAssertEqual(JSON(NSNumber(value: UInt.max)).description,"\(UInt.max)")
240-
XCTAssertEqual(JSON(NSNumber(value: UInt64.max)).description,"\(UInt64.max)")
241-
XCTAssertEqual(JSON(NSNumber(value: UInt64.max)).description,"\(UInt64.max)")
239+
XCTAssertEqual(JSON(NSNumber(value: UInt.max)).description,"\(UInt.max)")
240+
XCTAssertEqual(JSON(NSNumber(value: UInt64.max)).description,"\(UInt64.max)")
241+
XCTAssertEqual(JSON(NSNumber(value: UInt64.max)).description,"\(UInt64.max)")
242242
#endif
243243

244244
XCTAssertEqual(JSON(Double.infinity as Any).description,"inf")
@@ -300,8 +300,13 @@ class BaseTests: XCTestCase {
300300
XCTAssertNotEqual(NSNumber(value: 888332.1), NSNumber(value:888332))
301301
XCTAssertLessThan(NSNumber(value: 888332).doubleValue, NSNumber(value:888332.1).doubleValue)
302302
XCTAssertGreaterThan(NSNumber(value: 888332.1).doubleValue, NSNumber(value:888332).doubleValue)
303-
XCTAssertFalse(NSNumber(value: 1) == NSNumber(value:true))
304-
XCTAssertFalse(NSNumber(value: 0) == NSNumber(value:false))
303+
304+
// Blocked by https://bugs.swift.org/browse/SR-5803
305+
#if !(os(Linux) && swift(>=3.2))
306+
XCTAssertFalse(NSNumber(value: 1) == NSNumber(value:true))
307+
XCTAssertFalse(NSNumber(value: 0) == NSNumber(value:false))
308+
#endif
309+
305310
XCTAssertEqual(NSNumber(value: false), NSNumber(value:false))
306311
XCTAssertEqual(NSNumber(value: true), NSNumber(value:true))
307312
}

‎Tests/SwiftyJSONTests/NumberTests.swift‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,21 @@ class NumberTests: XCTestCase {
9090
var json = JSON(true)
9191
XCTAssertEqual(json.bool!, true)
9292
XCTAssertEqual(json.boolValue, true)
93-
XCTAssertEqual(json.numberValue, true as NSNumber)
93+
94+
// Blocked by https://bugs.swift.org/browse/SR-5803
95+
#if !(os(Linux) && swift(>=3.2))
96+
XCTAssertEqual(json.numberValue, true as NSNumber)
97+
#endif
9498
XCTAssertEqual(json.stringValue, "true")
9599

96100
json.bool = false
97101
XCTAssertEqual(json.bool!, false)
98102
XCTAssertEqual(json.boolValue, false)
99-
XCTAssertEqual(json.numberValue, false as NSNumber)
103+
104+
// Blocked by https://bugs.swift.org/browse/SR-5803
105+
#if !(os(Linux) && swift(>=3.2))
106+
XCTAssertEqual(json.numberValue, false as NSNumber)
107+
#endif
100108

101109
json.bool = nil
102110
XCTAssertTrue(json.bool == nil)
@@ -106,7 +114,11 @@ class NumberTests: XCTestCase {
106114
json.boolValue = true
107115
XCTAssertEqual(json.bool!, true)
108116
XCTAssertEqual(json.boolValue, true)
109-
XCTAssertEqual(json.numberValue, true as NSNumber)
117+
118+
// Blocked by https://bugs.swift.org/browse/SR-5803
119+
#if !(os(Linux) && swift(>=3.2))
120+
XCTAssertEqual(json.numberValue, true as NSNumber)
121+
#endif
110122
}
111123

112124
func testDouble() {
@@ -245,7 +257,10 @@ class NumberTests: XCTestCase {
245257

246258
XCTAssertEqual(json.numberValue, n0)
247259
#if (arch(x86_64) || arch(arm64))
248-
XCTAssertEqual(json.stringValue, "false")
260+
// Blocked by https://bugs.swift.org/browse/SR-5803
261+
#if !(os(Linux) && swift(>=3.2))
262+
XCTAssertEqual(json.stringValue, "false")
263+
#endif
249264
#elseif (arch(i386) || arch(arm))
250265
XCTAssertEqual(json.stringValue, "0")
251266
#endif
@@ -261,7 +276,10 @@ class NumberTests: XCTestCase {
261276

262277
XCTAssertEqual(json.numberValue, n1)
263278
#if (arch(x86_64) || arch(arm64))
264-
XCTAssertEqual(json.stringValue, "true")
279+
// Blocked by https://bugs.swift.org/browse/SR-5803
280+
#if !(os(Linux) && swift(>=3.2))
281+
XCTAssertEqual(json.stringValue, "true")
282+
#endif
265283
#elseif (arch(i386) || arch(arm))
266284
XCTAssertEqual(json.stringValue, "1")
267285
#endif

‎Tests/SwiftyJSONTests/RawRepresentableTests.swift‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,23 @@ class RawRepresentableTests: XCTestCase {
6161
func testBool() {
6262
var jsonTrue:JSON = JSON(rawValue: true as NSNumber)!
6363

64-
XCTAssertEqual(jsonTrue.bool!, true)
64+
// Blocked by https://bugs.swift.org/browse/SR-5803
65+
#if !(os(Linux) && swift(>=3.2))
66+
XCTAssertEqual(jsonTrue.bool, true)
67+
#endif
68+
6569
XCTAssertEqual(jsonTrue.boolValue, true)
6670

6771
var jsonFalse:JSON = JSON(rawValue: false)!
6872
XCTAssertEqual(jsonFalse.bool!, false)
6973
XCTAssertEqual(jsonFalse.boolValue, false)
7074

7175
let objectTrue = jsonTrue.rawValue
72-
XCTAssertEqual(objectTrue as? Bool, true)
76+
77+
// Blocked by https://bugs.swift.org/browse/SR-5803
78+
#if !(os(Linux) && swift(>=3.2))
79+
XCTAssertEqual(objectTrue as? Bool, true)
80+
#endif
7381

7482
#if !os(Linux)
7583
// Bool to NSNumber conversion doesn't work on Linux

0 commit comments

Comments
 (0)