fix: CI build

.circleci/config.yml

@@ -67,7 +67,7 @@ jobs:
  parameters:
  swift-image:
  type: string
- default: &default-swift-image "swift:5.7"
+ default: &default-swift-image "swift:5.10"
  influxdb-image:
  type: string
  default: &default-influxdb-image "influxdb:latest"
@@ -126,7 +126,7 @@ jobs:
  parameters:
  xcode-version:
  type: string
- default: &default-xcode "13.4.1"
+ default: &default-xcode "15.3.0"
  influxdb-package-version:
  type: string
  default: "2.0.4"
@@ -319,19 +319,14 @@ workflows:
  - check-examples
  - check-examples-macOS
  - tests-linux:
- name: tests-linux-5.3
- swift-image: "swift:5.3"
+ name: tests-linux-5.8
+ swift-image: "swift:5.8"
  - tests-linux:
- name: tests-linux-5.4
- swift-image: "swift:5.4"
+ name: tests-linux-5.9
+ swift-image: "swift:5.9"
  - tests-linux:
- name: tests-linux-5.5
- swift-image: "swift:5.5"
- - tests-linux:
- name: tests-linux-5.6
- swift-image: "swift:5.6"
- - tests-linux:
- name: tests-linux-5.7
+ name: tests-linux-5.10
+ swift-image: "swift:5.10"
  - tests-macOS
  nightly:
  when:

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 1.7.0 [unreleased]
 
+### CI
+1. [#55](https://github.com/influxdata/influxdb-client-swift/pull/55): Use Swift 5.8, 5.9 and 5.10 in CI and update XCode to 15.3.0
+
 ## 1.6.0 [2022-12-01]
 
 ### Others

Tests/InfluxDBSwiftApisTests/InfluxDB2APITests.swift

@@ -19,6 +19,12 @@ final class InfluxDB2APITests: XCTestCase {
  }
  }
 
+ override func tearDownWithError() throws {
+ if let client = client {
+ client.close()
+ }
+ }
+
  func testCreateInstance() {
  let api = InfluxDB2API(client: client!)
  XCTAssertNotNil(api)
@@ -79,13 +85,13 @@ class APIXCTestCase: XCTestCase {
  XCTFail("Request is not defined!")
  }
 
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
 
  if let request = request {
  request(nil, nil, checkResponse(check: checker, expectation: expectation))
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 
  func checkPost<BodyType: Codable, ResponseType: Codable>(_ request: ((BodyType,
@@ -100,13 +106,13 @@ class APIXCTestCase: XCTestCase {
  return
  }
 
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
 
  if let request = request {
  request(body, nil, checkResponse(check: checker, expectation: expectation))
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 
  func checkPost<BodyType: Codable, ResponseType: Codable>(_ request: ((BodyType,
@@ -122,13 +128,13 @@ class APIXCTestCase: XCTestCase {
  return
  }
 
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
 
  if let request = request {
  request(body, nil, nil, checkResponse(check: checker, expectation: expectation))
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 
  private func checkResponse<ResponseType: Codable>(check: @escaping (ResponseType) -> Void,
@@ -153,7 +159,7 @@ class APIXCTestCase: XCTestCase {
  guard Self.orgID.isEmpty else {
  return
  }
- let expectation = self.expectation(description: "Cannot find my-org")
+ let expectation = XCTestExpectation(description: "Cannot find my-org")
  api.organizationsAPI.getOrgs(limit: 100) { organizations, error in
  if let error = error {
  XCTFail("\(error)")
@@ -165,14 +171,14 @@ class APIXCTestCase: XCTestCase {
  expectation.fulfill()
  }
  }
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 
  private func findMyBucket() {
  guard Self.bucketID.isEmpty else {
  return
  }
- let expectation = self.expectation(description: "Cannot find my-bucket")
+ let expectation = XCTestExpectation(description: "Cannot find my-bucket")
  api.bucketsAPI.getBuckets(limit: 100) { response, error in
  if let error = error {
  XCTFail("\(error)")
@@ -184,7 +190,7 @@ class APIXCTestCase: XCTestCase {
  expectation.fulfill()
  }
  }
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 }
 

Tests/InfluxDBSwiftApisTests/PingAPITests.swift

@@ -8,7 +8,7 @@ import XCTest
 
 final class PingAPITests: APIXCTestCase {
  func testPing() {
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
 
  api.pingAPI.getPing { headers, error -> Void in
  if let error = error {
@@ -23,7 +23,7 @@ final class PingAPITests: APIXCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 
  #if swift(>=5.5)

Tests/InfluxDBSwiftApisTests/SecretsAPITests.swift

@@ -25,7 +25,7 @@ class SecretsAPITests: APIXCTestCase {
  func testCreateSecret() {
  let request = [generateName("secret"): generateName("secret")]
 
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
 
  self.api.secretsAPI.patchOrgsIDSecrets(orgID: Self.orgID, requestBody: request) { _, error in
  if let error = error {
@@ -35,6 +35,6 @@ class SecretsAPITests: APIXCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 }

Tests/InfluxDBSwiftTests/DeleteAPITests.swift

@@ -30,7 +30,7 @@ final class DeleteAPITests: XCTestCase {
  }
 
  func testBucketOrgParameters() {
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
  expectation.expectedFulfillmentCount = 2
 
  MockURLProtocol.handler = { request, _ in
@@ -53,11 +53,11 @@ final class DeleteAPITests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 1, handler: nil)
+ wait(for: [expectation], timeout: 1)
  }
 
  func testBucketIDOrgIDParameters() {
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
  expectation.expectedFulfillmentCount = 2
 
  MockURLProtocol.handler = { request, _ in
@@ -80,11 +80,11 @@ final class DeleteAPITests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 1, handler: nil)
+ wait(for: [expectation], timeout: 1)
  }
 
  func testWithoutBucketOrgParameters() {
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
  expectation.expectedFulfillmentCount = 2
 
  MockURLProtocol.handler = { request, _ in
@@ -106,11 +106,11 @@ final class DeleteAPITests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 1, handler: nil)
+ wait(for: [expectation], timeout: 1)
  }
 
  func testPredicateRequestSerialization() {
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
  expectation.expectedFulfillmentCount = 2
 
  MockURLProtocol.handler = { _, bodyData in
@@ -140,11 +140,11 @@ final class DeleteAPITests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 1, handler: nil)
+ wait(for: [expectation], timeout: 1)
  }
 
  func testErrorResponse() {
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
  expectation.expectedFulfillmentCount = 2
 
  MockURLProtocol.handler = { request, _ in
@@ -165,12 +165,12 @@ final class DeleteAPITests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 1, handler: nil)
+ wait(for: [expectation], timeout: 1)
  }
 
  #if swift(>=5.5)
  func testDeleteAsync() async throws {
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
  expectation.expectedFulfillmentCount = 1
 
  MockURLProtocol.handler = { _, _ in
@@ -187,7 +187,7 @@ final class DeleteAPITests: XCTestCase {
 
  try await client.deleteAPI.delete(predicate: predicate)
 
- await waitForExpectations(timeout: 1, handler: nil)
+ await wait(for: [expectation], timeout: 1)
  }
  #endif
 }

Tests/InfluxDBSwiftTests/InfluxDBClientTests.swift

@@ -100,7 +100,7 @@ final class InfluxDBClientTests: XCTestCase {
  options: InfluxDBClient.InfluxDBOptions(bucket: "my-bucket", org: "my-org"),
  protocolClasses: [MockURLProtocol.self])
 
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
  expectation.expectedFulfillmentCount = 3
 
  MockURLProtocol.handler = { request, _ in
@@ -126,12 +126,13 @@ final class InfluxDBClientTests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 1, handler: nil)
+ wait(for: [expectation], timeout: 1)
  }
 
  func testDisableRedirect() {
- let expectation = self.expectation(description: "Redirect response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Redirect response from API doesn't arrive")
  expectation.expectedFulfillmentCount = 2
+ expectation.assertForOverFulfill = false
 
  class DisableRedirect: NSObject, URLSessionTaskDelegate {
  let expectation: XCTestExpectation
@@ -174,12 +175,13 @@ final class InfluxDBClientTests: XCTestCase {
  client.queryAPI.query(query: "from ...") { _, _ in
  }
 
- waitForExpectations(timeout: 1, handler: nil)
+ wait(for: [expectation], timeout: 1)
  }
 
  func testHTTPLogging() {
  TestLogHandler.content = ""
- let expectation = self.expectation(description: "Success response from API doesn't arrive")
+ let expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
+ expectation.assertForOverFulfill = false
  LoggingSystem.bootstrap(TestLogHandler.init)
 
  client = InfluxDBClient(url: Self.dbURL(), token: "my-token", debugging: true)
@@ -199,7 +201,7 @@ final class InfluxDBClientTests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 1, handler: nil)
+ wait(for: [expectation], timeout: 5)
 
  XCTAssertTrue(TestLogHandler.content.contains("Authorization: ***"), TestLogHandler.content)
  }

Tests/InfluxDBSwiftTests/IntegrationTests.swift

@@ -33,7 +33,7 @@ final class IntegrationTests: XCTestCase {
  }
 
  func testQueryWriteIntegration() {
- var expectation = self.expectation(description: "Success response from API doesn't arrive")
+ var expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
 
  let measurement = "h2o_\(Date().timeIntervalSince1970)"
 
@@ -52,8 +52,8 @@ final class IntegrationTests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 5, handler: nil)
- expectation = self.expectation(description: "Success response from API doesn't arrive")
+ wait(for: [expectation], timeout: 5)
+ expectation = XCTestExpectation(description: "Success response from API doesn't arrive")
 
  let query = """
  from(bucket: "my-bucket")
@@ -84,11 +84,11 @@ final class IntegrationTests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 
  func testDelete() {
- var expectation = self.expectation(description: "Success response from Write API doesn't arrive")
+ var expectation = XCTestExpectation(description: "Success response from Write API doesn't arrive")
 
  let measurement = "h2o_\(Date().timeIntervalSince1970)"
 
@@ -117,8 +117,8 @@ final class IntegrationTests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 5, handler: nil)
- expectation = self.expectation(description: "Success response from Query API doesn't arrive")
+ wait(for: [expectation], timeout: 5)
+ expectation = XCTestExpectation(description: "Success response from Query API doesn't arrive")
 
  let query = """
  from(bucket: "my-bucket")
@@ -146,9 +146,9 @@ final class IntegrationTests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
 
- expectation = self.expectation(description: "Success response from Delete API doesn't arrive")
+ expectation = XCTestExpectation(description: "Success response from Delete API doesn't arrive")
 
  let predicate = DeletePredicateRequest(
  start: Date(2019, 10, 5),
@@ -162,9 +162,9 @@ final class IntegrationTests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
 
- expectation = self.expectation(description: "Success response from Query API doesn't arrive")
+ expectation = XCTestExpectation(description: "Success response from Query API doesn't arrive")
 
  client.queryAPI.query(query: query) { response, error in
  if let error = error {
@@ -185,6 +185,6 @@ final class IntegrationTests: XCTestCase {
  expectation.fulfill()
  }
 
- waitForExpectations(timeout: 5, handler: nil)
+ wait(for: [expectation], timeout: 5)
  }
 }