Skip to content

Commit

Permalink
Merge pull request #86 from ably/objc-tests-questionable-api
Browse files Browse the repository at this point in the history 
ObjC tests: Questionable API usage errors
  • Loading branch information
@mattheworiordan
mattheworiordan committed Nov 26, 2015
2 parents 3e1dce3 + 6e12b6a commit 6cca442
Show file tree
Hide file tree
Showing 8 changed files with 459 additions and 572 deletions.
317 changes: 120 additions & 197 deletions ably-iosTests/ARTRealtimeChannelHistoryTest.m
View file

Large diffs are not rendered by default.

10 changes: 3 additions & 7 deletions ably-iosTests/ARTRealtimeMessageTest.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,14 @@ - (void)multipleSendName:(NSString *)name count:(int)count delay:(int)delay {
[e fulfill];
}];
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];

XCTestExpectation *expectation = [self expectationWithDescription:@"multiple_send"];
[ARTTestUtil testRealtime:^(ARTRealtime *realtime) {
_realtime = realtime;
ARTRealtimeChannel *channel = [realtime channel:name];

[channel attach];

[channel subscribeToStateChanges:^(ARTRealtimeChannelState state, ARTStatus *reason) {
if (state == ARTRealtimeChannelAttached) {
[channel subscribe:^(ARTMessage *message, ARTErrorInfo *errorInfo) {
Expand Down Expand Up @@ -114,21 +117,14 @@ - (void)testSingleSendEchoText {
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
}



- (void)testPublish_10_1000 {
[self multipleSendName:@"multiple_send_10_1000" count:10 delay:1000];
}

- (void)testPublish_20_200 {
[self multipleSendName:@"multiple_send_20_200" count:20 delay:200];
}

- (void)testMultipleText_1000_10 {
[self multipleSendName:@"multiple_send_1000_10" count:1000 delay:10];
}


- (void)testEchoMessagesDefault {
XCTestExpectation *exp = [self expectationWithDescription:@"testEchoMessagesDefault"];
NSString * channelName = @"channel";
Expand Down
159 changes: 82 additions & 77 deletions ably-iosTests/ARTRealtimePresenceTest.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,22 @@ - (void)withRealtimeClientId2:(void (^)(ARTRealtime *realtime))cb {
cb(_realtime2);
}

-(void) testTwoConnections {
- (void)testTwoConnections {
XCTestExpectation *expectation = [self expectationWithDescription:@"testSingleSendEchoText"];
NSString * channelName = @"testSingleEcho";
NSString *channelName = @"testSingleEcho";
[self withRealtimeClientId:^(ARTRealtime *realtime1) {
ARTRealtimeChannel *channel = [realtime1 channel:channelName];
[self withRealtimeClientId2:^(ARTRealtime *realtime2) {
[channel subscribe:^(ARTMessage *message, ARTErrorInfo *errorInfo) {
XCTAssertEqualObjects([message content], @"testStringEcho");
[expectation fulfill];
}];

ARTRealtimeChannel *channel2 = [realtime2 channel:channelName];
[channel2 subscribe:^(ARTMessage *message, ARTErrorInfo *errorInfo) {
XCTAssertEqualObjects([message content], @"testStringEcho");
}];

[channel2 publish:@"testStringEcho" cb:^(ARTStatus *status) {
XCTAssertEqual(ARTStateOk, status.state);
}];
Expand All @@ -102,9 +104,9 @@ -(void) testTwoConnections {
- (void)testEnterSimple {
NSString * channelName = @"presTest";
XCTestExpectation *dummyExpectation = [self expectationWithDescription:@"testEnterSimple"];
[self withRealtimeClientId:^(ARTRealtime *realtime) {
[dummyExpectation fulfill];
}];
[self withRealtimeClientId:^(ARTRealtime *realtime) {
[dummyExpectation fulfill];
}];
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
NSString * presenceEnter = @"client_has_entered";
[self withRealtimeClientId:^(ARTRealtime *realtime) {
Expand All @@ -121,7 +123,7 @@ - (void)testEnterSimple {
[channel2 attach];
[channel attach];
XCTestExpectation *expectChannel2Connected = [self expectationWithDescription:@"presence message"];

[channel2 subscribeToStateChanges:^(ARTRealtimeChannelState cState, ARTStatus *reason) {
if(cState == ARTRealtimeChannelAttached) {
[expectChannel2Connected fulfill];
Expand All @@ -133,7 +135,7 @@ - (void)testEnterSimple {

[channel2.presence subscribe:^(ARTPresenceMessage *message) {
[expectPresenceMessage fulfill];

}];
[channel.presence enter:presenceEnter cb:^(ARTStatus *status) {
XCTAssertEqual(ARTStateOk, status.state);
Expand Down Expand Up @@ -842,27 +844,47 @@ - (void)testWithNoClientIdUpdateLeaveEnterAnotherClient {
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
}


/*
- (void)test250ClientsEnter {
NSString * channelName = @"channelName";
NSString *channelName = @"channelName";
[ARTTestUtil testRealtime:^(ARTRealtime *realtime) {
XCTestExpectation *expectation = [self expectationWithDescription:@"setupChannel2"];
ARTClientOptions *options =[ARTTestUtil clientOptions];
options.clientId = @"client_string";
[ARTTestUtil testRealtime:options callback:^(ARTRealtime *realtime) {
_realtime = realtime;
ARTRealtimeChannel *channel = [realtime channel:channelName];
const int count = 250;
__block bool channel2SawAllPresences = false;
XCTestExpectation *setupChannel2 = [self expectationWithDescription:@"setupChannel2"];
[ARTTestUtil testRealtime:^(ARTRealtime *realtime2) {
_realtime2 = realtime2;
ARTRealtimeChannel *channel2 = [realtime2 channel:channelName];
__block int numReceived = 0;
[channel2 subscribeToStateChanges:^(ARTRealtimeChannelState c, ARTStatus * s) {
if (c == ARTRealtimeChannelAttached) {
//channel2 enters itself
[channel2.presence enterClient:@"channel2Enter" data:@"joins" cb:^(ARTStatus *status) {
XCTAssertEqual(ARTStateOk, status.state);
[setupChannel2 fulfill];
[ARTTestUtil bigSleep];
//channel enters itself
[channel.presence enter:@"hi" cb:^(ARTStatus *status) {
XCTAssertEqual(ARTStateOk, status.state);
//channel enters 250 others
[ARTTestUtil publishEnterMessages:@"aClientId" count:count channel:channel completion:^{
[channel.presence get:^(ARTPaginatedResult *result, NSError *error) {
XCTAssert(!error);
NSArray *messages = [result items];
XCTAssertEqual(count+2, messages.count); //count + channel1+ channel2
XCTAssertTrue(channel2SawAllPresences);
[expectation fulfill];
}];
}];
}];
}];
}
}];
Expand All @@ -874,30 +896,10 @@ - (void)test250ClientsEnter {
}];
[channel2 attach];
}];

[ARTTestUtil bigSleep];
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];

XCTestExpectation *enterAll = [self expectationWithDescription:@"enterAll"];
//channel enters itself
[channel.presence enter:@"hi" cb:^(ARTStatus *status) {
XCTAssertEqual(ARTStateOk, status.state);
//channel enters 250 others
[ARTTestUtil publishEnterMessages:@"aClientId" count:count channel:channel expectation:enterAll];
}];
[self waitForExpectationsWithTimeout:120 handler:nil];

XCTestExpectation *getPresence = [self expectationWithDescription:@"getPresence"];
[channel.presence get:^(ARTPaginatedResult *result, NSError *error) {
XCTAssert(!error);
NSArray *messages = [result items];
XCTAssertEqual(count+2, messages.count); //count + channel1+ channel2
XCTAssertTrue(channel2SawAllPresences);
[getPresence fulfill];
}];
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
}];
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
}
*/

-(void) testPresenceMap {
XCTestExpectation *exp = [self expectationWithDescription:@"testPresenceMap"];
Expand Down Expand Up @@ -1038,67 +1040,70 @@ - (void)testSubscribeToAction {
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
}

/*
- (void)testSyncResumes {
NSString * channelName = @"channelName";
NSString *channelName = @"channelName";
[ARTTestUtil testRealtime:^(ARTRealtime *realtime) {
XCTestExpectation *expectation = [self expectationWithDescription:@"enterAll"];
ARTClientOptions *options = [ARTTestUtil clientOptions];
options.clientId = @"client_string";
[ARTTestUtil testRealtime:options callback:^(ARTRealtime *realtime) {
_realtime = realtime;
ARTRealtimeChannel *channel = [realtime channel:channelName];
const int count = 120;
XCTestExpectation *enterAll = [self expectationWithDescription:@"enterAll"];
//channel enters itself
[channel.presence enter:@"hi" cb:^(ARTStatus *status) {
XCTAssertEqual(ARTStateOk, status.state);
//channel enters all others
[ARTTestUtil publishEnterMessages:@"aClientId" count:count channel:channel expectation:enterAll];
}];
[self waitForExpectationsWithTimeout:120 handler:nil];
[ARTTestUtil publishEnterMessages:@"aClientId" count:count channel:channel completion:^{
[ARTTestUtil testRealtime:^(ARTRealtime *realtime2) {
_realtime2 = realtime2;
__block bool hasFailed = false;
ARTRealtimeChannel *channel2 = [realtime2 channel:channelName];
[channel2 subscribeToStateChanges:^(ARTRealtimeChannelState c, ARTStatus * s) {
if(c == ARTRealtimeChannelAttached) {
//channel2 enters itself
[channel2.presence enterClient:@"channel2Enter" data:@"joins" cb:^(ARTStatus *status) {
XCTAssertEqual(ARTStateOk, status.state);
}];
}
}];
XCTestExpectation *setupChannel2 = [self expectationWithDescription:@"setupChannel2"];
[ARTTestUtil testRealtime:^(ARTRealtime *realtime2) {
_realtime2 = realtime2;
__block bool hasFailed = false;

ARTRealtimeChannel *channel2 = [realtime2 channel:channelName];
[channel2 subscribeToStateChanges:^(ARTRealtimeChannelState c, ARTStatus * s) {
if(c == ARTRealtimeChannelAttached) {
//channel2 enters itself
[channel2.presence enterClient:@"channel2Enter" data:@"joins" cb:^(ARTStatus *status) {
XCTAssertEqual(ARTStateOk, status.state);
[channel2 attach];
__block bool firstSyncMessageReceived = false;
__block bool syncComplete = false;
[channel2.presenceMap onSync:^{
if(!firstSyncMessageReceived) {
XCTAssertFalse([channel2.presenceMap isSyncComplete]); //confirm we still have more syncing to do.
firstSyncMessageReceived = true;
[realtime2 onError:nil withErrorInfo:nil];
}
else if([channel2.presenceMap isSyncComplete] && !syncComplete) {
XCTAssertTrue(hasFailed);
[expectation fulfill];
syncComplete = true;
}
}];
}
}];
[channel2 attach];
__block bool firstSyncMessageReceived = false;
__block bool syncComplete = false;
[channel2.presenceMap onSync:^{
if(!firstSyncMessageReceived) {
XCTAssertFalse([channel2.presenceMap isSyncComplete]); //confirm we still have more syncing to do.
firstSyncMessageReceived = true;
[realtime2 onError:nil withErrorInfo:nil];
}
else if([channel2.presenceMap isSyncComplete] && !syncComplete) {
XCTAssertTrue(hasFailed);
[setupChannel2 fulfill];
syncComplete = true;
}
}];

[realtime2.eventEmitter on:^(ARTRealtimeConnectionState state, ARTErrorInfo *errorInfo) {
if(state == ARTRealtimeFailed) {
hasFailed = true;
[realtime2 connect];
}
[realtime2.eventEmitter on:^(ARTRealtimeConnectionState state, ARTErrorInfo *errorInfo) {
if(state == ARTRealtimeFailed) {
hasFailed = true;
[realtime2 connect];
}
}];
}];
}];
}];

[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
}];
[self waitForExpectationsWithTimeout:[ARTTestUtil timeout] handler:nil];
}

*/

- (void)testPresenceNoSideEffects {
XCTestExpectation *exp = [self expectationWithDescription:@"testPresenceNoSideEffects"];
Expand Down
Loading

0 comments on commit 6cca442

Please sign in to comment.