Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitef6d359

Browse files
committed
Enable GitHub Action CI and fix tests
1 parentc761b43 commitef6d359

File tree

6 files changed

+41
-8
lines changed

6 files changed

+41
-8
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name:CI
2+
3+
on:
4+
push:
5+
branches:[ main, master ]
6+
pull_request:
7+
branches:[ main, master ]
8+
9+
jobs:
10+
build-and-test:
11+
runs-on:macos-latest
12+
steps:
13+
-name:Checkout code
14+
uses:actions/checkout@v4
15+
16+
-name:Set up Swift
17+
uses:swift-actions/setup-swift@v2
18+
with:
19+
swift-version:'6.0'
20+
21+
-name:Build
22+
run:swift build --build-tests
23+
24+
-name:Run tests
25+
run:swift test

‎Package.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@ let package = Package(
1313
.copy("PrivacyInfo.xcprivacy")
1414
]
1515
),
16-
.testTarget(name:"SwiftJSONTests", dependencies:["SwiftyJSON"])
16+
.testTarget(
17+
name:"SwiftJSONTests",
18+
dependencies:["SwiftyJSON"],
19+
resources:[
20+
.copy("Tests.json")
21+
]
22+
)
1723
],
1824
swiftLanguageVersions:[.v5]
1925
)

‎Tests/SwiftJSONTests/BaseTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class BaseTests: XCTestCase {
3333

3434
// let file = "./Tests/Tes/Tests.json"
3535
// self.testData = try? Data(contentsOf: URL(fileURLWithPath: file))
36-
iflet file=Bundle(for:BaseTests.self).path(forResource:"Tests",ofType:"json"){
37-
self.testData=try?Data(contentsOf:URL(fileURLWithPath:file))
36+
iflet file=Bundle.module.url(forResource:"Tests",withExtension:"json"){
37+
self.testData=try?Data(contentsOf: file)
3838
}else{
3939
XCTFail("Can't find the test JSON file")
4040
}

‎Tests/SwiftJSONTests/PerformanceTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class PerformanceTests: XCTestCase {
3030
overridefunc setUp(){
3131
super.setUp()
3232

33-
iflet file=Bundle(for:PerformanceTests.self).path(forResource:"Tests",ofType:"json"){
34-
self.testData=try?Data(contentsOf:URL(fileURLWithPath:file))
33+
iflet file=Bundle.module.url(forResource:"Tests",withExtension:"json"){
34+
self.testData=try?Data(contentsOf: file)
3535
}else{
3636
XCTFail("Can't find the test JSON file")
3737
}

‎Tests/SwiftJSONTests/SequenceTypeTests.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ import SwiftyJSON
2525

2626
classSequenceTypeTests:XCTestCase{
2727

28+
vartestData:Data?
29+
2830
func testJSONFile(){
29-
iflet file=Bundle(for:BaseTests.self).path(forResource:"Tests",ofType:"json"){
30-
lettestData=try?Data(contentsOf:URL(fileURLWithPath:file))
31-
guardlet json=try?JSON(data: testData!)else{
31+
iflet file=Bundle.module.url(forResource:"Tests",withExtension:"json"){
32+
self.testData=try?Data(contentsOf: file)
33+
guardlet json=try?JSON(data:self.testData!)else{
3234
XCTFail("Unable to parse the data")
3335
return
3436
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp