Skip to content

Commit

Permalink
remove unnecessary close
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiazhvera
xiazhvera committed May 20, 2024
1 parent d40e004 commit aff8999
Showing 1 changed file with 39 additions and 42 deletions.
81 changes: 39 additions & 42 deletions Test/AwsCommonRuntimeKitTests/mqtt/Mqtt5ClientTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ class Mqtt5ClientTests: XCBaseTestCase {
XCTAssertNotNil(clientOptions)
let mqtt5client = try Mqtt5Client(clientOptions: clientOptions);
XCTAssertNotNil(mqtt5client)
mqtt5client.close()
}

/*
Expand Down Expand Up @@ -371,7 +370,6 @@ class Mqtt5ClientTests: XCBaseTestCase {
let context = MqttTestContext()
let mqtt5client = try createClient(clientOptions: clientOptions, testContext: context)
XCTAssertNotNil(mqtt5client)
mqtt5client.close()
}

/*===============================================================
Expand All @@ -390,7 +388,6 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }
try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand Down Expand Up @@ -418,7 +415,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand All @@ -442,7 +439,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand All @@ -469,7 +466,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand Down Expand Up @@ -501,7 +498,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand Down Expand Up @@ -559,7 +556,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand All @@ -582,7 +579,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()
testContext.withWebsocketTransform(isSuccess: true)
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand Down Expand Up @@ -612,7 +609,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()
testContext.withWebsocketTransform(isSuccess: true)
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand Down Expand Up @@ -640,7 +637,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
testContext.withWebsocketTransform(isSuccess: true)

let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand Down Expand Up @@ -681,7 +678,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
testContext.withIoTSigv4WebsocketTransform(region: region, provider: provider)

let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

testContext.onWebSocketHandshake = nil
try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
Expand Down Expand Up @@ -725,7 +722,7 @@ class Mqtt5ClientTests: XCBaseTestCase {


let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

testContext.onWebSocketHandshake = nil
try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
Expand Down Expand Up @@ -785,7 +782,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()
testContext.withWebsocketTransform(isSuccess: true)
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)
try disconnectClientCleanup(client:client, testContext: testContext)
}
Expand All @@ -807,7 +804,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()

let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try client.start()

if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
Expand Down Expand Up @@ -839,7 +836,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()

let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try client.start()

if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
Expand Down Expand Up @@ -875,7 +872,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()
testContext.withWebsocketTransform(isSuccess: true)
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }


try client.start()

Expand Down Expand Up @@ -910,7 +907,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()

let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try client.start()

if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
Expand Down Expand Up @@ -943,7 +940,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()

let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try client.start()

if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
Expand Down Expand Up @@ -977,7 +974,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
let testContext = MqttTestContext()
testContext.withWebsocketTransform(isSuccess: false)
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try client.start()

if testContext.semaphoreConnectionFailure.wait(timeout: .now() + 5) == .timedOut {
Expand Down Expand Up @@ -1028,7 +1025,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext(contextName: "client1")
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

// Create a second client with the same client id
Expand Down Expand Up @@ -1076,7 +1073,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
connectOptions: connectOptions)

let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative keepAliveInterval didn't throw an error.")
return
}
Expand All @@ -1090,7 +1087,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
port: UInt32(8883),
connectOptions: connectOptions)
let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative sessionExpiryInterval didn't throw an error.")
return
} catch {
Expand All @@ -1103,7 +1100,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
port: UInt32(8883),
connectOptions: connectOptions)
let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative willDelayInterval didn't throw an error.")
return
} catch {
Expand All @@ -1115,7 +1112,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
port: UInt32(8883),
minReconnectDelay: -1)
let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative minReconnectDelay didn't throw an error.")
return
} catch {
Expand All @@ -1127,7 +1124,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
port: UInt32(8883),
maxReconnectDelay: -1)
let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative maxReconnectDelay didn't throw an error.")
return
} catch {
Expand All @@ -1139,7 +1136,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
port: UInt32(8883),
minConnectedTimeToResetReconnectDelay: -1)
let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative minConnectedTimeToResetReconnectDelay didn't throw an error.")
return
} catch {
Expand All @@ -1151,7 +1148,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
port: UInt32(8883),
pingTimeout: -1)
let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative pingTimeout didn't throw an error.")
return
} catch {
Expand All @@ -1163,7 +1160,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
port: UInt32(8883),
connackTimeout: -1)
let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative connackTimeout didn't throw an error.")
return
} catch {
Expand All @@ -1175,7 +1172,7 @@ class Mqtt5ClientTests: XCBaseTestCase {
port: UInt32(8883),
ackTimeout: -1)
let client = try Mqtt5Client(clientOptions: clientOptions)
defer { client.close() }

XCTFail("Negative ackTimeout didn't throw an error.")
return
} catch {
Expand Down Expand Up @@ -1205,7 +1202,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

let disconnectPacket = DisconnectPacket(sessionExpiryInterval: -1)
Expand Down Expand Up @@ -1240,7 +1237,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

let publishPacket = PublishPacket(qos: .atMostOnce,
Expand Down Expand Up @@ -1281,7 +1278,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

if let negotiatedSettings = testContext.negotiatedSettings {
Expand Down Expand Up @@ -1317,7 +1314,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

if let negotiatedSettings = testContext.negotiatedSettings {
Expand Down Expand Up @@ -1367,7 +1364,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

if let negotiatedSettings = testContext.negotiatedSettings {
Expand Down Expand Up @@ -1408,7 +1405,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

let topic = "test/MQTT5_Binding_Swift_" + UUID().uuidString
Expand Down Expand Up @@ -1533,7 +1530,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

let topic = "test/MQTT5_Binding_Swift_" + UUID().uuidString
Expand Down Expand Up @@ -1581,7 +1578,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

let topic1 = "test/MQTT5_Binding_Swift_" + UUID().uuidString
Expand Down Expand Up @@ -1645,7 +1642,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

let publishPacket = PublishPacket(qos: .atLeastOnce, topic: "")
Expand Down Expand Up @@ -1677,7 +1674,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

let subscribePacket = SubscribePacket(topicFilter: "", qos: .atLeastOnce)
Expand Down Expand Up @@ -1709,7 +1706,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }

try connectClient(client: client, testContext: testContext)

let unsubscribePacket = UnsubscribePacket(topicFilter: "")
Expand Down Expand Up @@ -1931,7 +1928,6 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
defer { client.close() }
try connectClient(client: client, testContext: testContext)
}

Expand All @@ -1949,6 +1945,7 @@ class Mqtt5ClientTests: XCBaseTestCase {

let testContext = MqttTestContext()
let client = try createClient(clientOptions: clientOptions, testContext: testContext)
// offline operation would never complete. Use close to force quit
defer { client.close() }
try connectClient(client: client, testContext: testContext)
try stopClient(client: client, testContext: testContext)
Expand Down

0 comments on commit aff8999

Please sign in to comment.