Skip to content

Update swift-test/main.swift to handle Apple Silicon hosts #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Update swift-test/main.swift to handle Apple Silicon hosts #110

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
293ed24
Update `swift-test/main.swift` to handle Apple Silicon
andrewheard Jun 23, 2023
5c29e18
Fix macOS vs. simulator test behavior
andrewheard Jun 23, 2023
0010b5d
Refactor test as simulator vs. real device
andrewheard Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions SwiftPMTests/swift-test/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,31 @@ class importTest: XCTestCase {
XCTAssertFalse(GULAppEnvironmentUtil.isFromAppStore())
#if targetEnvironment(simulator)
XCTAssertTrue(GULAppEnvironmentUtil.isSimulator())
// Device model should return the host's build architecture (x86_64 or arm64) for iOS, tvOS
// watchOS, and visionOS simulators.
XCTAssertEqual(GULAppEnvironmentUtil.deviceModel(), buildArchitecture())
#else
XCTAssertFalse(GULAppEnvironmentUtil.isSimulator())
// Device model should return the appropriate hardware model (e.g., "iPhone12,3" or
// "MacBookPro18,2") on real devices.
XCTAssertNotEqual(GULAppEnvironmentUtil.deviceModel(), buildArchitecture())
#endif
XCTAssertFalse(GULAppEnvironmentUtil.isAppExtension())

#if os(macOS) || targetEnvironment(macCatalyst)
// Device model should now return the appropriate hardware model on macOS.
XCTAssertNotEqual(GULAppEnvironmentUtil.deviceModel(), "x86_64")
print("System version? Answer: \(GULAppEnvironmentUtil.systemVersion())")
}

func buildArchitecture() -> String {
#if arch(arm64)
return "arm64"
#elseif arch(x86_64)
return "x86_64"
#else
// Device model should show up as x86_64 for iOS, tvOS, and watchOS
// simulators.
XCTAssertEqual(GULAppEnvironmentUtil.deviceModel(), "x86_64")
throw TestError(errorDescription: "Unexpected build architecture.")
#endif
}

print("System version? Answer: \(GULAppEnvironmentUtil.systemVersion())")
struct TestError: Error {
var errorDescription: String?
}
}