Don't assume that the temporary directory doesn't include symlinks

tristanlabelle · compnerd · commit f7d28f0df9f8 · 2023-03-23T07:48:19.000-04:00
diff --git a/Tests/Foundation/Tests/TestURL.swift b/Tests/Foundation/Tests/TestURL.swift
@@ -559,7 +559,7 @@ class TestURL : XCTestCase {
 
         let url = URL(fileURLWithPath: "foo/bar/baz")
         let result = url.resolvingSymlinksInPath()
-        XCTAssertEqual(result, URL(fileURLWithPath: writableTestDirectoryURL.path + "/foo/bar/baz"))
+        XCTAssertEqual(result, URL(fileURLWithPath: writableTestDirectoryURL.path + "/foo/bar/baz").resolvingSymlinksInPath())
     }
 
     func test_resolvingSymlinksInPathShouldAppendTrailingSlashWhenExistingDirectory() throws {
@@ -573,7 +573,7 @@ class TestURL : XCTestCase {
         }
         let url = URL(fileURLWithPath: path)
         let result = url.resolvingSymlinksInPath()
-        XCTAssertEqual(result, URL(fileURLWithPath: path + "/"))
+        XCTAssertEqual(result, URL(fileURLWithPath: path + "/").resolvingSymlinksInPath())
     }
 
     func test_resolvingSymlinksInPathShouldResolveSymlinks() throws {
@@ -588,7 +588,7 @@ class TestURL : XCTestCase {
         try fileManager.createSymbolicLink(at: symbolicLink, withDestinationURL: destination)
 
         let result = symbolicLink.resolvingSymlinksInPath()
-        XCTAssertEqual(result, URL(fileURLWithPath: writableTestDirectoryURL.path + "/destination"))
+        XCTAssertEqual(result, URL(fileURLWithPath: writableTestDirectoryURL.path + "/destination").resolvingSymlinksInPath())
     }
 
     func test_resolvingSymlinksInPathShouldRemovePrivatePrefix() {

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ class TestURL : XCTestCase {`
`559`	`559`
`560`	`560`	`let url = URL(fileURLWithPath: "foo/bar/baz")`
`561`	`561`	`let result = url.resolvingSymlinksInPath()`
`562`		`- XCTAssertEqual(result, URL(fileURLWithPath: writableTestDirectoryURL.path + "/foo/bar/baz"))`
	`562`	`+ XCTAssertEqual(result, URL(fileURLWithPath: writableTestDirectoryURL.path + "/foo/bar/baz").resolvingSymlinksInPath())`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`func test_resolvingSymlinksInPathShouldAppendTrailingSlashWhenExistingDirectory() throws {`
`@@ -573,7 +573,7 @@ class TestURL : XCTestCase {`
`573`	`573`	`}`
`574`	`574`	`let url = URL(fileURLWithPath: path)`
`575`	`575`	`let result = url.resolvingSymlinksInPath()`
`576`		`- XCTAssertEqual(result, URL(fileURLWithPath: path + "/"))`
	`576`	`+ XCTAssertEqual(result, URL(fileURLWithPath: path + "/").resolvingSymlinksInPath())`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`func test_resolvingSymlinksInPathShouldResolveSymlinks() throws {`
`@@ -588,7 +588,7 @@ class TestURL : XCTestCase {`
`588`	`588`	`try fileManager.createSymbolicLink(at: symbolicLink, withDestinationURL: destination)`
`589`	`589`
`590`	`590`	`let result = symbolicLink.resolvingSymlinksInPath()`
`591`		`- XCTAssertEqual(result, URL(fileURLWithPath: writableTestDirectoryURL.path + "/destination"))`
	`591`	`+ XCTAssertEqual(result, URL(fileURLWithPath: writableTestDirectoryURL.path + "/destination").resolvingSymlinksInPath())`
`592`	`592`	`}`
`593`	`593`
`594`	`594`	`func test_resolvingSymlinksInPathShouldRemovePrivatePrefix() {`