Skip to content

Commit 6e29b99

Browse files
committed
Fix Linux test
1 parent 4c6b4bc commit 6e29b99

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

.github/workflows/CI.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
- focal
3030
- amazonlinux2
3131
- centos8
32-
- centos7
3332
container:
3433
image: swift:5.2.5-${{ matrix.os }}
3534
steps:

Tests/TencentSCFEventsTests/APIGatewayTests.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,17 @@ class APIGatewayTests: XCTestCase {
217217
statusCode: .ok,
218218
codableBody: point
219219
)
220-
let expectedJson = #"{"body":"{\"x\":1.01,\"y\":-0.01}","headers":{"Content-Type":"application\/json"},"isBase64Encoded":false,"statusCode":200}"#
220+
let expectedJson = [
221+
#"{"body":"{\"x\":1.01,\"y\":-0.01}","headers":{"Content-Type":"application\/json"},"isBase64Encoded":false,"statusCode":200}"#,
222+
#"{"body":"{\"y\":-0.01,\"x\":1.01}","headers":{"Content-Type":"application\/json"},"isBase64Encoded":false,"statusCode":200}"#,
223+
]
221224

222225
var data: Data?
223226
XCTAssertNoThrow(data = try Self.sortedEncoder.encode(resp))
224227
if let data = data,
225228
let json = String(data: data, encoding: .utf8)
226229
{
227-
XCTAssertEqual(json, expectedJson)
230+
XCTAssertTrue(expectedJson.contains(json))
228231
} else {
229232
XCTFail("Expect output JSON")
230233
}

Tests/TencentSCFEventsTests/TencentCloudTests.swift

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ import XCTest
1717

1818
class TencentCloudTests: XCTestCase {
1919
static let allRegions = Set(TencentCloud.Region.mainland + TencentCloud.Region.overseas)
20+
struct Wrapped<T: Codable>: Codable {
21+
let value: T
22+
}
2023

2124
func testRegionCountEqual() {
2225
XCTAssertEqual(TencentCloud.Region.mainland.count + TencentCloud.Region.overseas.count, TencentCloud.Region.regular.count + TencentCloud.Region.financial.count)
@@ -27,26 +30,28 @@ class TencentCloudTests: XCTestCase {
2730
let encoder = JSONEncoder()
2831
let decoder = JSONDecoder()
2932
for region in Self.allRegions {
30-
let json = "\"\(region.rawValue)\""
31-
let encoded = try encoder.encode(region)
32-
let decoded = try decoder.decode(TencentCloud.Region.self, from: json.data(using: .utf8)!)
33+
let wrapped = Wrapped(value: region)
34+
let json = #"{"value":"\#(region.rawValue)"}"#
35+
let encoded = try encoder.encode(wrapped)
36+
let decoded = try decoder.decode(Wrapped<TencentCloud.Region>.self, from: json.data(using: .utf8)!)
3337
XCTAssertEqual(String(data: encoded, encoding: .utf8), json)
34-
XCTAssertEqual(region, decoded)
38+
XCTAssertEqual(region, decoded.value)
3539
}
3640
}
3741

3842
func testZoneWithRawAndCodable() throws {
39-
let number = 23
4043
let encoder = JSONEncoder()
4144
let decoder = JSONDecoder()
4245
for region in Self.allRegions {
46+
let number = UInt8.random(in: UInt8.min ... UInt8.max)
4347
let zone = TencentCloud.Zone(rawValue: "\(region)-\(number)")
4448
XCTAssertNotNil(zone)
45-
let json = "\"\(zone!)\""
46-
let encoded = try encoder.encode(zone)
47-
let decoded = try decoder.decode(TencentCloud.Zone.self, from: json.data(using: .utf8)!)
49+
let wrapped = Wrapped(value: zone!)
50+
let json = #"{"value":"\#(zone!.rawValue)"}"#
51+
let encoded = try encoder.encode(wrapped)
52+
let decoded = try decoder.decode(Wrapped<TencentCloud.Zone>.self, from: json.data(using: .utf8)!)
4853
XCTAssertEqual(String(data: encoded, encoding: .utf8), json)
49-
XCTAssertEqual(zone, decoded)
54+
XCTAssertEqual(zone, decoded.value)
5055
}
5156
}
5257
}

Tests/TencentSCFTestingTests/Tests.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,7 @@ class SCFTestingTests: XCTestCase {
157157
XCTAssertNoThrow(try SCF.test(myFunction, with: UUID().uuidString.lowercased(), using: config))
158158
}
159159
}
160+
161+
#if os(Linux)
162+
extension DispatchTimeInterval: Equatable {}
163+
#endif

0 commit comments

Comments
 (0)