Skip to content

Commit 0445cda

Browse files
committed
Fixes for TestNSURL.swift on 32-bit
1 parent 76b5af2 commit 0445cda

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

TestFoundation/TestNSURL.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ class TestNSURL : XCTestCase {
259259
let cwd = NSFileManager.defaultManager().currentDirectoryPath
260260
let cwdURL = NSURL(fileURLWithPath: cwd, isDirectory: true)
261261
// 1 for path separator
262-
gRelativeOffsetFromBaseCurrentWorkingDirectory = strlen(cwdURL.fileSystemRepresentation) + 1
262+
gRelativeOffsetFromBaseCurrentWorkingDirectory = UInt(strlen(cwdURL.fileSystemRepresentation) + 1)
263263

264264
return true
265265
}
@@ -301,8 +301,8 @@ class TestNSURL : XCTestCase {
301301
let fileSystemRep = url.fileSystemRepresentation
302302
let actualLength = strlen(fileSystemRep)
303303
// 1 for path separator
304-
let expectedLength = strlen(TestNSURL.gFileDoesNotExistName) + TestNSURL.gRelativeOffsetFromBaseCurrentWorkingDirectory
305-
XCTAssertTrue(actualLength == expectedLength, "fileSystemRepresentation was too short")
304+
let expectedLength = UInt(strlen(TestNSURL.gFileDoesNotExistName)) + TestNSURL.gRelativeOffsetFromBaseCurrentWorkingDirectory
305+
XCTAssertTrue(UInt(actualLength) == expectedLength, "fileSystemRepresentation was too short")
306306
XCTAssertTrue(strncmp(TestNSURL.gBaseCurrentWorkingDirectoryPath, fileSystemRep, Int(strlen(TestNSURL.gBaseCurrentWorkingDirectoryPath))) == 0, "fileSystemRepresentation of base path is wrong")
307307
let lengthOfRelativePath = Int(strlen(TestNSURL.gFileDoesNotExistName))
308308
let relativePath = fileSystemRep.advancedBy(Int(TestNSURL.gRelativeOffsetFromBaseCurrentWorkingDirectory))
@@ -354,9 +354,9 @@ class TestNSURL : XCTestCase {
354354
url = NSURL(fileURLWithPath: path, isDirectory: true)
355355
XCTAssertTrue(url.hasDirectoryPath, "expected URL with directory path: \(url)")
356356
let fileSystemRep = url.fileSystemRepresentation
357-
let actualLength = strlen(fileSystemRep)
357+
let actualLength = UInt(strlen(fileSystemRep))
358358
// 1 for path separator
359-
let expectedLength = strlen(TestNSURL.gFileDoesNotExistName) + TestNSURL.gRelativeOffsetFromBaseCurrentWorkingDirectory
359+
let expectedLength = UInt(strlen(TestNSURL.gFileDoesNotExistName)) + TestNSURL.gRelativeOffsetFromBaseCurrentWorkingDirectory
360360
XCTAssertTrue(actualLength == expectedLength, "fileSystemRepresentation was too short")
361361
XCTAssertTrue(strncmp(TestNSURL.gBaseCurrentWorkingDirectoryPath, fileSystemRep, Int(strlen(TestNSURL.gBaseCurrentWorkingDirectoryPath))) == 0, "fileSystemRepresentation of base path is wrong")
362362
let lengthOfRelativePath = Int(strlen(TestNSURL.gFileDoesNotExistName))

0 commit comments

Comments
 (0)