Skip to content

Commit

Permalink
Update RTL6c for 0.9 (#547)
Browse files Browse the repository at this point in the history 
* Update RTL6c2

* Update RTL6c4

* RTL6c3 for Detached

* Update RTL6c4 for channel Failed

* Better code completion
  • Loading branch information
@ricardopereira
ricardopereira authored Dec 21, 2016
1 parent ed040e7 commit a9dc94c
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Source/ARTRealtimeChannel+Private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ ART_ASSUME_NONNULL_BEGIN
- (void)failQueuedMessages:(ARTStatus *)status;
- (void)sendMessage:(ARTProtocolMessage *)pm callback:(void (^)(ARTStatus *))cb;

- (void)setSuspended:(ARTStatus *)error;
- (void)setFailed:(ARTStatus *)error;
- (void)setSuspended:(ARTStatus *)status;
- (void)setFailed:(ARTStatus *)status;
- (void)throwOnDisconnectedOrFailed;

- (void)broadcastPresence:(ARTPresenceMessage *)pm;
- (void)detachChannel:(ARTStatus *) error;
- (void)detachChannel:(ARTStatus *)status;

- (void)requestContinueSync;

Expand Down
12 changes: 6 additions & 6 deletions Source/ARTRealtimeChannel.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,14 +449,14 @@ - (void)setDetached:(ARTProtocolMessage *)message {
[_detachedEventEmitter emit:[NSNull null] with:nil];
}

- (void)detachChannel:(ARTStatus *)error {
[self failQueuedMessages:error];
[self transition:ARTRealtimeChannelDetached status:error];
- (void)detachChannel:(ARTStatus *)status {
[self failQueuedMessages:status];
[self transition:ARTRealtimeChannelDetached status:status];
}

- (void)setFailed:(ARTStatus *)error {
[self failQueuedMessages:error];
[self transition:ARTRealtimeChannelFailed status:error];
- (void)setFailed:(ARTStatus *)status {
[self failQueuedMessages:status];
[self transition:ARTRealtimeChannelFailed status:status];
}

- (void)setSuspended:(ARTStatus *)status {
Expand Down
96 changes: 89 additions & 7 deletions Spec/RealtimeClientChannel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1575,6 +1575,7 @@ class RealtimeClientChannel: QuickSpec {
// RTL6c2
context("the message should be queued and delivered as soon as the connection state returns to CONNECTED if the connection is") {
let options = AblyTests.commonAppSetup()
options.useTokenAuth = true
options.disconnectedRetryTimeout = 0.3
options.autoConnect = false
var client: ARTRealtime!
Expand Down Expand Up @@ -1636,6 +1637,39 @@ class RealtimeClientChannel: QuickSpec {
expect(channel.queuedMessages).to(haveCount(1))
}
}

it("ATTACHED") {
waitUntil(timeout: testTimeout) { done in
channel.attach() { error in
expect(error).to(beNil())
done()
}
client.connect()
}

waitUntil(timeout: testTimeout) { done in
let tokenParams = ARTTokenParams()
tokenParams.ttl = 5.0
client.auth.authorize(tokenParams, options: nil) { tokenDetails, error in
expect(error).to(beNil())
expect(tokenDetails).toNot(beNil())
done()
}
}

waitUntil(timeout: testTimeout) { done in
client.connection.once(.Disconnected) { _ in
done()
}
}

expect(channel.state).to(equal(ARTRealtimeChannelState.Attached))

waitUntil(timeout: testTimeout) { done in
publish(done)
expect(channel.queuedMessages).to(haveCount(1))
}
}
}

// RTL6c3
Expand All @@ -1661,8 +1695,33 @@ class RealtimeClientChannel: QuickSpec {
}
}

// RTL6c3
it("implicitly attaches the channel; if the channel is in or moves to the DETACHED state before the operation succeeds, it should result in an error") {
let client = ARTRealtime(options: AblyTests.commonAppSetup())
defer { client.dispose(); client.close() }
let channel = client.channels.get("test")

waitUntil(timeout: testTimeout) { done in
let partialDone = AblyTests.splitDone(2, done: done)
expect(channel.state).to(equal(ARTRealtimeChannelState.Initialized))
channel.once(.Attaching) { stateChange in
expect(stateChange?.reason).to(beNil())
channel.detach()
partialDone()
}
channel.publish(nil, data: "message") { error in
guard let error = error else {
fail("Error is nil"); done(); return
}
expect(error.message).to(contain("channel has detached"))
expect(channel.state).to(equal(ARTRealtimeChannelState.Detaching))
partialDone()
}
}
}

// RTL6c4
context("will result in an error if the connection is") {
context("will result in an error if the") {
let options = AblyTests.commonAppSetup()
options.disconnectedRetryTimeout = 0.1
options.suspendedRetryTimeout = 0.3
Expand All @@ -1689,7 +1748,7 @@ class RealtimeClientChannel: QuickSpec {
}
}

it("SUSPENDED") {
it("connection is SUSPENDED") {
client.connect()
expect(client.connection.state).toEventually(equal(ARTRealtimeConnectionState.Connected), timeout: testTimeout)
client.onSuspended()
Expand All @@ -1699,7 +1758,7 @@ class RealtimeClientChannel: QuickSpec {
}
}

it("CLOSING") {
it("connection is CLOSING") {
client.connect()
expect(client.connection.state).toEventually(equal(ARTRealtimeConnectionState.Connected), timeout: testTimeout)
client.close()
Expand All @@ -1709,7 +1768,7 @@ class RealtimeClientChannel: QuickSpec {
}
}

it("CLOSED") {
it("connection is CLOSED") {
client.connect()
expect(client.connection.state).toEventually(equal(ARTRealtimeConnectionState.Connected), timeout: testTimeout)
client.close()
Expand All @@ -1719,7 +1778,7 @@ class RealtimeClientChannel: QuickSpec {
}
}

it("FAILED") {
it("connection is FAILED") {
client.connect()
expect(client.connection.state).toEventually(equal(ARTRealtimeConnectionState.Connected), timeout: testTimeout)
client.onError(AblyTests.newErrorProtocolMessage())
Expand All @@ -1729,7 +1788,7 @@ class RealtimeClientChannel: QuickSpec {
}
}

it("DETACHING") {
it("channel is DETACHING") {
client.connect()
channel.attach()
expect(channel.state).toEventually(equal(ARTRealtimeChannelState.Attached), timeout: testTimeout)
Expand All @@ -1740,7 +1799,7 @@ class RealtimeClientChannel: QuickSpec {
}
}

it("DETACHED") {
it("channel is DETACHED") {
client.connect()
channel.attach()
expect(channel.state).toEventually(equal(ARTRealtimeChannelState.Attached), timeout: testTimeout)
Expand All @@ -1750,6 +1809,29 @@ class RealtimeClientChannel: QuickSpec {
publish(done)
}
}

it("channel is SUSPENDED") {
client.connect()
channel.attach()
expect(channel.state).toEventually(equal(ARTRealtimeChannelState.Attached), timeout: testTimeout)
channel.setSuspended(ARTStatus.state(.Ok))
expect(channel.state).toEventually(equal(ARTRealtimeChannelState.Suspended), timeout: testTimeout)
waitUntil(timeout: testTimeout) { done in
publish(done)
}
}

it("channel is FAILED") {
client.connect()
channel.attach()
expect(channel.state).toEventually(equal(ARTRealtimeChannelState.Attached), timeout: testTimeout)
let protocolError = AblyTests.newErrorProtocolMessage()
channel.onError(protocolError)
expect(channel.state).toEventually(equal(ARTRealtimeChannelState.Failed), timeout: testTimeout)
waitUntil(timeout: testTimeout) { done in
publish(done)
}
}
}
}

Expand Down

0 comments on commit a9dc94c

Please sign in to comment.