Skip to content

[pull] master from SwiftyJSON:master #8

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

Merged
pull merged 3 commits into from
Mar 4, 2026
+19 −6
Merged

[pull] master from SwiftyJSON:master #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28094b0
Fix Tests group path in Xcode project
Yoojin99 Feb 26, 2026
d971298
Fix test resource loading for Xcode and SwiftPM
Yoojin99 Feb 26, 2026
8805b54
Merge pull request #1192 from Yoojin99/codex/fix-tests-group-path
wongzigii Mar 4, 2026
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
2 changes: 1 addition & 1 deletion SwiftyJSON.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
2E4FEFEB19575BE100351305 /* Supporting Files */,
);
name = Tests;
path = Tests/Tes;
path = Tests/SwiftJSONTests;
sourceTree = "<group>";
};
2E4FEFEB19575BE100351305 /* Supporting Files */ = {
Expand Down
9 changes: 6 additions & 3 deletions Tests/SwiftJSONTests/BaseTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ class BaseTests: XCTestCase {

super.setUp()

// let file = "./Tests/Tes/Tests.json"
// self.testData = try? Data(contentsOf: URL(fileURLWithPath: file))
if let file = Bundle.module.url(forResource: "Tests", withExtension: "json") {
#if SWIFT_PACKAGE
let testBundle = Bundle.module
#else
let testBundle = Bundle(for: BaseTests.self)
#endif
if let file = testBundle.url(forResource: "Tests", withExtension: "json") {
self.testData = try? Data(contentsOf: file)
} else {
XCTFail("Can't find the test JSON file")
Expand Down
7 changes: 6 additions & 1 deletion Tests/SwiftJSONTests/PerformanceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ class PerformanceTests: XCTestCase {
override func setUp() {
super.setUp()

if let file = Bundle.module.url(forResource: "Tests", withExtension: "json") {
#if SWIFT_PACKAGE
let testBundle = Bundle.module
#else
let testBundle = Bundle(for: PerformanceTests.self)
#endif
if let file = testBundle.url(forResource: "Tests", withExtension: "json") {
self.testData = try? Data(contentsOf: file)
} else {
XCTFail("Can't find the test JSON file")
Expand Down
7 changes: 6 additions & 1 deletion Tests/SwiftJSONTests/SequenceTypeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ class SequenceTypeTests: XCTestCase {
var testData: Data?

func testJSONFile() {
if let file = Bundle.module.url(forResource: "Tests", withExtension: "json") {
#if SWIFT_PACKAGE
let testBundle = Bundle.module
#else
let testBundle = Bundle(for: SequenceTypeTests.self)
#endif
if let file = testBundle.url(forResource: "Tests", withExtension: "json") {
self.testData = try? Data(contentsOf: file)
guard let json = try? JSON(data: self.testData!) else {
XCTFail("Unable to parse the data")
Expand Down