diff options
author | NicoleYarroch <nicole@livio.io> | 2020-07-21 14:42:17 -0400 |
---|---|---|
committer | NicoleYarroch <nicole@livio.io> | 2020-07-21 14:42:17 -0400 |
commit | 75671d23395f612e0dde84184d98fcf9ac498e75 (patch) | |
tree | 7e38fc373b572df8f45971e54a7b6834cee0a9d7 | |
parent | ab2a516859d76b512dc2e2593ca1de28ead59687 (diff) | |
download | sdl_ios-75671d23395f612e0dde84184d98fcf9ac498e75.tar.gz |
Renamed delegate methods and fixed testsbugfix/issue_1716_register_sec_transports_timer
Signed-off-by: NicoleYarroch <nicole@livio.io>
14 files changed, 209 insertions, 207 deletions
diff --git a/SmartDeviceLink/SDLEncryptionLifecycleManager.m b/SmartDeviceLink/SDLEncryptionLifecycleManager.m index ad22b0cba..b141080e4 100644 --- a/SmartDeviceLink/SDLEncryptionLifecycleManager.m +++ b/SmartDeviceLink/SDLEncryptionLifecycleManager.m @@ -174,7 +174,7 @@ typedef NSString SDLVehicleMake; #pragma mark - SDLProtocolDelegate #pragma mark Encryption Start Service ACK -- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceACK:(SDLProtocolMessage *)startServiceACK { switch (startServiceACK.header.serviceType) { case SDLServiceTypeRPC: { [self sdl_handleEncryptionStartServiceACK:startServiceACK]; @@ -197,7 +197,7 @@ typedef NSString SDLVehicleMake; #pragma mark Encryption Start Service NAK -- (void)handleProtocolStartServiceNAKMessage:(SDLProtocolMessage *)startServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceNAK:(SDLProtocolMessage *)startServiceNAK { switch (startServiceNAK.header.serviceType) { case SDLServiceTypeRPC: { [self sdl_handleEncryptionStartServiceNAK:startServiceNAK]; @@ -214,7 +214,7 @@ typedef NSString SDLVehicleMake; #pragma mark Encryption End Service -- (void)handleProtocolEndServiceACKMessage:(SDLProtocolMessage *)endServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceACK:(SDLProtocolMessage *)endServiceACK { switch (endServiceACK.header.serviceType) { case SDLServiceTypeRPC: { SDLLogW(@"Encryption RPC service ended with end service ACK"); @@ -225,7 +225,7 @@ typedef NSString SDLVehicleMake; } } -- (void)handleProtocolEndServiceNAKMessage:(SDLProtocolMessage *)endServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceNAK:(SDLProtocolMessage *)endServiceNAK { switch (endServiceNAK.header.serviceType) { case SDLServiceTypeRPC: { SDLLogW(@"Encryption RPC service ended with end service NAK"); diff --git a/SmartDeviceLink/SDLLifecycleProtocolHandler.m b/SmartDeviceLink/SDLLifecycleProtocolHandler.m index 73e065570..5a674a498 100644 --- a/SmartDeviceLink/SDLLifecycleProtocolHandler.m +++ b/SmartDeviceLink/SDLLifecycleProtocolHandler.m @@ -69,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - SDLProtocolDelegate /// Called when the transport is opened. We will send the RPC Start Service and wait for the RPC Start Service ACK -- (void)onProtocolOpened:(SDLProtocol *)protocol { +- (void)protocolDidOpen:(SDLProtocol *)protocol { if (self.protocol != protocol) { return; } SDLLogD(@"Transport opened, sending an RPC Start Service, and starting timer for RPC Start Service ACK to be received."); @@ -93,26 +93,26 @@ NS_ASSUME_NONNULL_BEGIN - (void)sdl_closeSessionWithDelay:(float)delay { __weak typeof(self) weakSelf = self; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC)), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - [weakSelf onProtocolClosed:self.protocol]; + [weakSelf protocolDidClose:self.protocol]; }); } /// Called when the transport is closed. -- (void)onProtocolClosed:(SDLProtocol *)protocol { +- (void)protocolDidClose:(SDLProtocol *)protocol { if (self.protocol != protocol) { return; } SDLLogW(@"Transport disconnected"); [self.notificationDispatcher postNotificationName:SDLTransportDidDisconnect infoObject:nil]; } -- (void)onTransportError:(NSError *)error protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol transportDidError:(NSError *)error { if (self.protocol != protocol) { return; } SDLLogW(@"Transport error: %@", error); [self.notificationDispatcher postNotificationName:SDLTransportConnectError infoObject:error]; } -- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceACK:(SDLProtocolMessage *)startServiceACK { if (self.protocol != protocol) { return; } SDLLogD(@"Start Service (ACK) SessionId: %d for serviceType %d", startServiceACK.header.sessionID, startServiceACK.header.serviceType); @@ -123,7 +123,7 @@ NS_ASSUME_NONNULL_BEGIN } } -- (void)handleProtocolStartServiceNAKMessage:(SDLProtocolMessage *)startServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceNAK:(SDLProtocolMessage *)startServiceNAK { if (self.protocol != protocol) { return; } SDLLogD(@"Start Service (NAK): SessionId: %d for serviceType %d", startServiceNAK.header.sessionID, startServiceNAK.header.serviceType); @@ -134,7 +134,7 @@ NS_ASSUME_NONNULL_BEGIN } } -- (void)handleProtocolEndServiceACKMessage:(SDLProtocolMessage *)endServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceACK:(SDLProtocolMessage *)endServiceACK { if (self.protocol != protocol) { return; } SDLLogD(@"End Service (ACK): SessionId: %d for serviceType %d", endServiceACK.header.sessionID, endServiceACK.header.serviceType); @@ -145,7 +145,7 @@ NS_ASSUME_NONNULL_BEGIN } } -- (void)handleProtocolEndServiceNAKMessage:(SDLProtocolMessage *)endServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceNAK:(SDLProtocolMessage *)endServiceNAK { if (self.protocol != protocol) { return; } if (endServiceNAK.header.serviceType == SDLServiceTypeRPC) { @@ -154,7 +154,7 @@ NS_ASSUME_NONNULL_BEGIN } } -- (void)onProtocolMessageReceived:(SDLProtocolMessage *)msg protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveMessage:(SDLProtocolMessage *)msg { if (self.protocol != protocol) { return; } NSDictionary<NSString *, id> *rpcMessageAsDictionary = [msg rpcDictionary]; diff --git a/SmartDeviceLink/SDLProtocol.m b/SmartDeviceLink/SDLProtocol.m index 82e773ca7..d9d3c03d7 100644 --- a/SmartDeviceLink/SDLProtocol.m +++ b/SmartDeviceLink/SDLProtocol.m @@ -128,8 +128,8 @@ NS_ASSUME_NONNULL_BEGIN listeners = self.protocolDelegateTable.allObjects; } for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(onProtocolOpened:)]) { - [listener onProtocolOpened:self]; + if ([listener respondsToSelector:@selector(protocolDidOpen:)]) { + [listener protocolDidOpen:self]; } } } @@ -141,8 +141,8 @@ NS_ASSUME_NONNULL_BEGIN listeners = self.protocolDelegateTable.allObjects; } for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(onProtocolClosed:)]) { - [listener onProtocolClosed:self]; + if ([listener respondsToSelector:@selector(protocolDidClose:)]) { + [listener protocolDidClose:self]; } } } @@ -154,8 +154,8 @@ NS_ASSUME_NONNULL_BEGIN - (void)onError:(NSError *)error { SDLLogV(@"Transport received an error: %@", error); for (id<SDLProtocolDelegate> listener in self.protocolDelegateTable.allObjects) { - if ([listener respondsToSelector:@selector(onTransportError:protocol:)]) { - [listener onTransportError:error protocol:self]; + if ([listener respondsToSelector:@selector(protocol:transportDidError:)]) { + [listener protocol:self transportDidError:error]; } } } @@ -505,7 +505,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - SDLProtocolDelegate from SDLReceivedProtocolMessageRouter -- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceACK:(SDLProtocolMessage *)startServiceACK { SDLLogD(@"Received start service ACK: %@", startServiceACK); // V5+ Packet @@ -546,65 +546,65 @@ NS_ASSUME_NONNULL_BEGIN // Pass along to all the listeners NSArray<id<SDLProtocolDelegate>> *listeners = [self sdl_getProtocolListeners]; for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(handleProtocolStartServiceACKMessage:protocol:)]) { - [listener handleProtocolStartServiceACKMessage:startServiceACK protocol:protocol]; + if ([listener respondsToSelector:@selector(protocol:didReceiveStartServiceACK:)]) { + [listener protocol:protocol didReceiveStartServiceACK:startServiceACK]; } } } -- (void)handleProtocolStartServiceNAKMessage:(SDLProtocolMessage *)startServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceNAK:(SDLProtocolMessage *)startServiceNAK { [self sdl_logControlNAKPayload:startServiceNAK]; NSArray<id<SDLProtocolDelegate>> *listeners = [self sdl_getProtocolListeners]; for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(handleProtocolStartServiceNAKMessage:protocol:)]) { - [listener handleProtocolStartServiceNAKMessage:startServiceNAK protocol:protocol]; + if ([listener respondsToSelector:@selector(protocol:didReceiveStartServiceNAK:)]) { + [listener protocol:protocol didReceiveStartServiceNAK:startServiceNAK]; } } } -- (void)handleProtocolEndServiceACKMessage:(SDLProtocolMessage *)endServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceACK:(SDLProtocolMessage *)endServiceACK { SDLLogD(@"End service ACK: %@", endServiceACK); // Remove the session id [self.serviceHeaders removeObjectForKey:@(endServiceACK.header.serviceType)]; NSArray<id<SDLProtocolDelegate>> *listeners = [self sdl_getProtocolListeners]; for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(handleProtocolEndServiceACKMessage:protocol:)]) { - [listener handleProtocolEndServiceACKMessage:endServiceACK protocol:protocol]; + if ([listener respondsToSelector:@selector(protocol:didReceiveEndServiceACK:)]) { + [listener protocol:protocol didReceiveEndServiceACK:endServiceACK]; } } } -- (void)handleProtocolEndServiceNAKMessage:(SDLProtocolMessage *)endServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceNAK:(SDLProtocolMessage *)endServiceNAK { [self sdl_logControlNAKPayload:endServiceNAK]; NSArray<id<SDLProtocolDelegate>> *listeners = [self sdl_getProtocolListeners]; for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(handleProtocolEndServiceNAKMessage:protocol:)]) { - [listener handleProtocolEndServiceNAKMessage:endServiceNAK protocol:protocol]; + if ([listener respondsToSelector:@selector(protocol:didReceiveEndServiceNAK:)]) { + [listener protocol:protocol didReceiveEndServiceNAK:endServiceNAK]; } } } -- (void)handleProtocolRegisterSecondaryTransportACKMessage:(SDLProtocolMessage *)registerSecondaryTransportACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveRegisterSecondaryTransportACK:(SDLProtocolMessage *)registerSecondaryTransportACK { SDLLogD(@"Register Secondary Transport ACK: %@", registerSecondaryTransportACK); NSArray<id<SDLProtocolDelegate>> *listeners = [self sdl_getProtocolListeners]; for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(handleProtocolRegisterSecondaryTransportACKMessage:protocol:)]) { - [listener handleProtocolRegisterSecondaryTransportACKMessage:registerSecondaryTransportACK protocol:protocol]; + if ([listener respondsToSelector:@selector(protocol:didReceiveRegisterSecondaryTransportACK:)]) { + [listener protocol:protocol didReceiveRegisterSecondaryTransportACK:registerSecondaryTransportACK]; } } } -- (void)handleProtocolRegisterSecondaryTransportNAKMessage:(SDLProtocolMessage *)registerSecondaryTransportNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveRegisterSecondaryTransportNAK:(SDLProtocolMessage *)registerSecondaryTransportNAK { [self sdl_logControlNAKPayload:registerSecondaryTransportNAK]; NSArray<id<SDLProtocolDelegate>> *listeners = [self sdl_getProtocolListeners]; for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(handleProtocolRegisterSecondaryTransportNAKMessage:protocol:)]) { - [listener handleProtocolRegisterSecondaryTransportNAKMessage:registerSecondaryTransportNAK protocol:protocol]; + if ([listener respondsToSelector:@selector(protocol:didReceiveRegisterSecondaryTransportNAK:)]) { + [listener protocol:protocol didReceiveRegisterSecondaryTransportNAK:registerSecondaryTransportNAK]; } } } @@ -640,18 +640,18 @@ NS_ASSUME_NONNULL_BEGIN } } -- (void)handleTransportEventUpdateMessage:(SDLProtocolMessage *)transportEventUpdate protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveTransportEventUpdate:(SDLProtocolMessage *)transportEventUpdate { SDLLogD(@"Received a transport event update: %@", transportEventUpdate); NSArray<id<SDLProtocolDelegate>> *listeners = [self sdl_getProtocolListeners]; for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(handleTransportEventUpdateMessage:protocol:)]) { - [listener handleTransportEventUpdateMessage:transportEventUpdate protocol:protocol]; + if ([listener respondsToSelector:@selector(protocol:didReceiveTransportEventUpdate:)]) { + [listener protocol:protocol didReceiveTransportEventUpdate:transportEventUpdate]; } } } -- (void)onProtocolMessageReceived:(SDLProtocolMessage *)msg protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveMessage:(SDLProtocolMessage *)msg { // Control service (but not control frame type) messages are TLS handshake messages if (msg.header.serviceType == SDLServiceTypeControl) { [self sdl_processSecurityMessage:msg]; @@ -662,8 +662,8 @@ NS_ASSUME_NONNULL_BEGIN NSArray<id<SDLProtocolDelegate>> *listeners = [self sdl_getProtocolListeners]; for (id<SDLProtocolDelegate> listener in listeners) { - if ([listener respondsToSelector:@selector(onProtocolMessageReceived:protocol:)]) { - [listener onProtocolMessageReceived:msg protocol:self]; + if ([listener respondsToSelector:@selector(protocol:didReceiveMessage:)]) { + [listener protocol:protocol didReceiveMessage:msg]; } } } diff --git a/SmartDeviceLink/SDLProtocolDelegate.h b/SmartDeviceLink/SDLProtocolDelegate.h index 1115e9122..f3c55902c 100644 --- a/SmartDeviceLink/SDLProtocolDelegate.h +++ b/SmartDeviceLink/SDLProtocolDelegate.h @@ -24,25 +24,25 @@ NS_ASSUME_NONNULL_BEGIN /// @discussion This frame can be sent on both the primary and secondary transports /// @param startServiceACK A SDLProtocolMessage object /// @param protocol The transport's protocol -- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceACK:(SDLProtocolMessage *)startServiceACK { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceACK:(SDLProtocolMessage *)startServiceACK; /// Called when the start service frame fails. /// @discussion This frame can be sent on both the primary and secondary transports /// @param startServiceNAK A SDLProtocolMessage object /// @param protocol The transport's protocol -- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceNAK:(SDLProtocolMessage *)startServiceNAK { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceNAK:(SDLProtocolMessage *)startServiceNAK; /// Called when the end service frame succeeds. /// @discussion This frame can be sent on both the primary and secondary transports /// @param endServiceACK A SDLProtocolMessage object /// @param protocol The transport's protocol -- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceACK:(SDLProtocolMessage *)endServiceACK { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceACK:(SDLProtocolMessage *)endServiceACK; /// Called when the end service frame fails. /// @discussion This frame can be sent on both the primary and secondary transports /// @param endServiceNAK A SDLProtocolMessage object /// @param protocol The transport's protocol -- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceNAK:(SDLProtocolMessage *)endServiceNAK { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceNAK:(SDLProtocolMessage *)endServiceNAK; #pragma mark Secondary Transport Messages @@ -50,30 +50,19 @@ NS_ASSUME_NONNULL_BEGIN /// @discussion This frame is only sent on the secondary transport /// @param registerSecondaryTransportACK A SDLProtocolMessage object /// @param protocol The transport's protocol -- (void)protocol:(SDLProtocol *)protocol didReceiveRegisterSecondaryTransportACK:(SDLProtocolMessage *)registerSecondaryTransportACK { +- (void)protocol:(SDLProtocol *)protocol didReceiveRegisterSecondaryTransportACK:(SDLProtocolMessage *)registerSecondaryTransportACK; /// Called when the secondary transport registration frame fails. /// @discussion This frame is only sent on the secondary transport /// @param registerSecondaryTransportNAK A SDLProtocolMessage object /// @param protocol The transport's protocol -- (void)protocol:(SDLProtocol *)protocol didReceiveRegisterSecondaryTransportNAK:(SDLProtocolMessage *)registerSecondaryTransportNAK { +- (void)protocol:(SDLProtocol *)protocol didReceiveRegisterSecondaryTransportNAK:(SDLProtocolMessage *)registerSecondaryTransportNAK; /// Called when the status or configuration of one or more transports has updated. /// @discussion This frame is only sent on the primary transport /// @param transportEventUpdate A SDLProtocolMessage object /// @param protocol The transport's protocol -- (void)protocol:(SDLProtocol *)protocol didReceiveTransportEventUpdate:(SDLProtocolMessage *)transportEventUpdate { - -#pragma mark Deprecated Messages - -/// A ping packet that is sent to ensure the connection is still active and the service is still valid. -/// @discussion Deprecated - requires protocol major version 3 -/// @param session The session number -- (void)handleHeartbeatForSession:(Byte)session; - -/// Called when the heartbeat frame was recieved successfully. -/// @discussion Deprecated - requires protocol major version 3 -- (void)handleHeartbeatACK; +- (void)protocol:(SDLProtocol *)protocol didReceiveTransportEventUpdate:(SDLProtocolMessage *)transportEventUpdate; #pragma mark - Transport Lifecycle @@ -91,6 +80,18 @@ NS_ASSUME_NONNULL_BEGIN /// @param protocol The transport's protocol - (void)protocol:(SDLProtocol *)protocol transportDidError:(NSError *)error; +#pragma mark - Deprecated Protocol Messages + +/// A ping packet that is sent to ensure the connection is still active and the service is still valid. +/// @discussion Deprecated - requires protocol major version 3 +/// @param session The session number +- (void)handleHeartbeatForSession:(Byte)session; + +/// Called when the heartbeat frame was recieved successfully. +/// @discussion Deprecated - requires protocol major version 3 +- (void)handleHeartbeatACK; + + @end diff --git a/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m b/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m index 2841c8caa..6c51f0079 100644 --- a/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m +++ b/SmartDeviceLink/SDLProtocolReceivedMessageRouter.m @@ -45,41 +45,41 @@ NS_ASSUME_NONNULL_BEGIN } - (void)sdl_dispatchProtocolMessage:(SDLProtocolMessage *)message protocol:(SDLProtocol *)protocol { - if ([self.delegate respondsToSelector:@selector(onProtocolMessageReceived:protocol:)]) { - [self.delegate onProtocolMessageReceived:message protocol:protocol]; + if ([self.delegate respondsToSelector:@selector(protocol:didReceiveMessage:)]) { + [self.delegate protocol:protocol didReceiveMessage:message]; } } - (void)sdl_dispatchControlMessage:(SDLProtocolMessage *)message protocol:(SDLProtocol *)protocol { switch (message.header.frameData) { case SDLFrameInfoStartServiceACK: { - if ([self.delegate respondsToSelector:@selector(handleProtocolStartServiceACKMessage:protocol:)]) { - [self.delegate handleProtocolStartServiceACKMessage:message protocol:protocol]; + if ([self.delegate respondsToSelector:@selector(protocol:didReceiveStartServiceACK:)]) { + [self.delegate protocol:protocol didReceiveStartServiceACK:message]; } } break; case SDLFrameInfoStartServiceNACK: { - if ([self.delegate respondsToSelector:@selector(handleProtocolStartServiceNAKMessage:protocol:)]) { - [self.delegate handleProtocolStartServiceNAKMessage:message protocol:protocol]; + if ([self.delegate respondsToSelector:@selector(protocol:didReceiveStartServiceNAK:)]) { + [self.delegate protocol:protocol didReceiveStartServiceNAK:message]; } } break; case SDLFrameInfoEndServiceACK: { - if ([self.delegate respondsToSelector:@selector(handleProtocolEndServiceACKMessage:protocol:)]) { - [self.delegate handleProtocolEndServiceACKMessage:message protocol:protocol]; + if ([self.delegate respondsToSelector:@selector(protocol:didReceiveEndServiceACK:)]) { + [self.delegate protocol:protocol didReceiveEndServiceACK:message]; } } break; case SDLFrameInfoEndServiceNACK: { - if ([self.delegate respondsToSelector:@selector(handleProtocolEndServiceNAKMessage:protocol:)]) { - [self.delegate handleProtocolEndServiceNAKMessage:message protocol:protocol]; + if ([self.delegate respondsToSelector:@selector(protocol:didReceiveEndServiceNAK:)]) { + [self.delegate protocol:protocol didReceiveEndServiceNAK:message]; } } break; case SDLFrameInfoRegisterSecondaryTransportACK: { - if ([self.delegate respondsToSelector:@selector(handleProtocolRegisterSecondaryTransportACKMessage:protocol:)]) { - [self.delegate handleProtocolRegisterSecondaryTransportACKMessage:message protocol:protocol]; + if ([self.delegate respondsToSelector:@selector(protocol:didReceiveRegisterSecondaryTransportACK:)]) { + [self.delegate protocol:protocol didReceiveRegisterSecondaryTransportACK:message]; } } break; case SDLFrameInfoRegisterSecondaryTransportNACK: { - if ([self.delegate respondsToSelector:@selector(handleProtocolRegisterSecondaryTransportNAKMessage:protocol:)]) { - [self.delegate handleProtocolRegisterSecondaryTransportNAKMessage:message protocol:protocol]; + if ([self.delegate respondsToSelector:@selector(protocol:didReceiveRegisterSecondaryTransportNAK:)]) { + [self.delegate protocol:protocol didReceiveRegisterSecondaryTransportNAK:message]; } } break; case SDLFrameInfoHeartbeat: { @@ -93,8 +93,8 @@ NS_ASSUME_NONNULL_BEGIN } } break; case SDLFrameInfoTransportEventUpdate: { - if ([self.delegate respondsToSelector:@selector(handleTransportEventUpdateMessage:protocol:)]) { - [self.delegate handleTransportEventUpdateMessage:message protocol:protocol]; + if ([self.delegate respondsToSelector:@selector(protocol:didReceiveTransportEventUpdate:)]) { + [self.delegate protocol:protocol didReceiveTransportEventUpdate:message]; } } break; default: break; // Other frame data is possible, but we don't care about them diff --git a/SmartDeviceLink/SDLSecondaryTransportManager.m b/SmartDeviceLink/SDLSecondaryTransportManager.m index fe8cd4338..2cd6b6262 100644 --- a/SmartDeviceLink/SDLSecondaryTransportManager.m +++ b/SmartDeviceLink/SDLSecondaryTransportManager.m @@ -402,7 +402,7 @@ struct TransportProtocolUpdated { #pragma mark Primary transport -- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceACK:(SDLProtocolMessage *)startServiceACK { if (startServiceACK.header.serviceType != SDLServiceTypeRPC || self.primaryProtocol != protocol) { return; } SDLLogV(@"Received Start Service ACK header of RPC service on primary (%@) transport", protocol.transport); @@ -415,7 +415,7 @@ struct TransportProtocolUpdated { [self sdl_onStartServiceAckReceived:payload]; } -- (void)handleTransportEventUpdateMessage:(SDLProtocolMessage *)transportEventUpdate protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveTransportEventUpdate:(SDLProtocolMessage *)transportEventUpdate { if (self.primaryProtocol != protocol) { return; } SDLControlFramePayloadTransportEventUpdate *payload = [[SDLControlFramePayloadTransportEventUpdate alloc] initWithData:transportEventUpdate.payload]; @@ -543,7 +543,7 @@ struct TransportProtocolUpdated { #pragma mark - SDLProtocolDelegate Implementation // called on transport's thread, notifying that the transport is established -- (void)onProtocolOpened:(SDLProtocol *)protocol { +- (void)protocolDidOpen:(SDLProtocol *)protocol { // The primary transport opened if (self.secondaryProtocol != protocol) { return; } @@ -576,7 +576,7 @@ struct TransportProtocolUpdated { /// Called on the transport's thread, notifying that the transport has errored before a connection was established. /// @param error The error /// @param protocol The protocol -- (void)onTransportError:(NSError *)error protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol transportDidError:(NSError *)error { if (self.secondaryProtocol != protocol) { return; } SDLLogE(@"The secondary transport errored."); @@ -586,7 +586,7 @@ struct TransportProtocolUpdated { /// Called on transport's thread, notifying that the transport is disconnected. /// @discussion When the transport's disconnect method is called, this method will not be called. /// @param protocol The protocol -- (void)onProtocolClosed:(SDLProtocol *)protocol{ +- (void)protocolDidClose:(SDLProtocol *)protocol { if (self.secondaryProtocol != protocol) { return; } SDLLogE(@"The secondary transport disconnected."); @@ -607,7 +607,7 @@ struct TransportProtocolUpdated { } // called from SDLProtocol's _receiveQueue of secondary transport -- (void)handleProtocolRegisterSecondaryTransportACKMessage:(SDLProtocolMessage *)registerSecondaryTransportACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveRegisterSecondaryTransportACK:(SDLProtocolMessage *)registerSecondaryTransportACK { if (self.secondaryProtocol != protocol) { return; } SDLLogD(@"Received Register Secondary Transport ACK frame"); @@ -618,7 +618,7 @@ struct TransportProtocolUpdated { } // called from SDLProtocol's _receiveQueue of secondary transport -- (void)handleProtocolRegisterSecondaryTransportNAKMessage:(SDLProtocolMessage *)registerSecondaryTransportNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveRegisterSecondaryTransportNAK:(SDLProtocolMessage *)registerSecondaryTransportNAK { if (self.secondaryProtocol != protocol) { return; } SDLLogW(@"Received Register Secondary Transport NAK frame"); diff --git a/SmartDeviceLink/SDLStreamingAudioLifecycleManager.m b/SmartDeviceLink/SDLStreamingAudioLifecycleManager.m index 40189298b..2a24b2761 100644 --- a/SmartDeviceLink/SDLStreamingAudioLifecycleManager.m +++ b/SmartDeviceLink/SDLStreamingAudioLifecycleManager.m @@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - SDLProtocolDelegate #pragma mark Start Service ACK/NAK -- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceACK:(SDLProtocolMessage *)startServiceACK { if (startServiceACK.header.serviceType != SDLServiceTypeAudio) { return; } self.audioEncrypted = startServiceACK.header.encrypted; @@ -208,7 +208,7 @@ NS_ASSUME_NONNULL_BEGIN [self.audioStreamStateMachine transitionToState:SDLAudioStreamManagerStateReady]; } -- (void)handleProtocolStartServiceNAKMessage:(SDLProtocolMessage *)startServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceNAK:(SDLProtocolMessage *)startServiceNAK { if (startServiceNAK.header.serviceType != SDLServiceTypeAudio) { return; } SDLLogE(@"Request to start audio service NAKed on transport %@", protocol.transport); @@ -217,14 +217,14 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark End Service ACK/NAK -- (void)handleProtocolEndServiceACKMessage:(SDLProtocolMessage *)endServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceACK:(SDLProtocolMessage *)endServiceACK { if (endServiceACK.header.serviceType != SDLServiceTypeAudio) { return; } SDLLogD(@"Request to end audio service ACKed on transport %@", protocol.transport); [self.audioStreamStateMachine transitionToState:SDLAudioStreamManagerStateStopped]; } -- (void)handleProtocolEndServiceNAKMessage:(SDLProtocolMessage *)endServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceNAK:(SDLProtocolMessage *)endServiceNAK { if (endServiceNAK.header.serviceType != SDLServiceTypeAudio) { return; } SDLControlFramePayloadNak *nakPayload = [[SDLControlFramePayloadNak alloc] initWithData:endServiceNAK.payload]; diff --git a/SmartDeviceLink/SDLStreamingVideoLifecycleManager.m b/SmartDeviceLink/SDLStreamingVideoLifecycleManager.m index 7b2695b09..1342ac965 100644 --- a/SmartDeviceLink/SDLStreamingVideoLifecycleManager.m +++ b/SmartDeviceLink/SDLStreamingVideoLifecycleManager.m @@ -512,7 +512,7 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N #pragma mark - SDLProtocolDelegate #pragma mark Start Service ACK/NAK -- (void)handleProtocolStartServiceACKMessage:(SDLProtocolMessage *)startServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceACK:(SDLProtocolMessage *)startServiceACK { if (startServiceACK.header.serviceType != SDLServiceTypeVideo) { return; } self.videoEncrypted = startServiceACK.header.encrypted; @@ -545,7 +545,7 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N [self.videoStreamStateMachine transitionToState:SDLVideoStreamManagerStateReady]; } -- (void)handleProtocolStartServiceNAKMessage:(SDLProtocolMessage *)startServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveStartServiceNAK:(SDLProtocolMessage *)startServiceNAK { if (startServiceNAK.header.serviceType != SDLServiceTypeVideo) { return; } SDLControlFramePayloadNak *nakPayload = [[SDLControlFramePayloadNak alloc] initWithData:startServiceNAK.payload]; @@ -573,14 +573,14 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N #pragma mark End Service ACK/NAK -- (void)handleProtocolEndServiceACKMessage:(SDLProtocolMessage *)endServiceACK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceACK:(SDLProtocolMessage *)endServiceACK { if (endServiceACK.header.serviceType != SDLServiceTypeVideo) { return; } SDLLogD(@"Request to end video service ACKed on transport %@", protocol.transport); [self.videoStreamStateMachine transitionToState:SDLVideoStreamManagerStateStopped]; } -- (void)handleProtocolEndServiceNAKMessage:(SDLProtocolMessage *)endServiceNAK protocol:(SDLProtocol *)protocol { +- (void)protocol:(SDLProtocol *)protocol didReceiveEndServiceNAK:(SDLProtocolMessage *)endServiceNAK { if (endServiceNAK.header.serviceType != SDLServiceTypeVideo) { return; } SDLControlFramePayloadNak *nakPayload = [[SDLControlFramePayloadNak alloc] initWithData:endServiceNAK.payload]; diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleProtocolHandlerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleProtocolHandlerSpec.m index b6da34f74..6cd4665ae 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleProtocolHandlerSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleProtocolHandlerSpec.m @@ -80,7 +80,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ OCMExpect([mockNotificationDispatcher postNotificationName:[OCMArg isEqual:SDLTransportDidConnect] infoObject:[OCMArg isNil]]); OCMExpect([mockProtocol startServiceWithType:0 payload:[OCMArg any]]).ignoringNonObjectArgs(); OCMExpect([(SDLTimer *)mockTimer start]); - [testHandler onProtocolOpened:mockProtocol]; + [testHandler protocolDidOpen:mockProtocol]; }); it(@"should set everything up", ^{ @@ -93,7 +93,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ context(@"of the transport closing", ^{ beforeEach(^{ OCMExpect([mockNotificationDispatcher postNotificationName:[OCMArg isEqual:SDLTransportDidDisconnect] infoObject:[OCMArg isNil]]); - [testHandler onProtocolClosed:mockProtocol]; + [testHandler protocolDidClose:mockProtocol]; }); it(@"should send a notification", ^{ @@ -104,7 +104,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ context(@"of the transport erroring", ^{ beforeEach(^{ OCMExpect([mockNotificationDispatcher postNotificationName:[OCMArg isEqual:SDLTransportConnectError] infoObject:[OCMArg isNotNil]]); - [testHandler onTransportError:[NSError errorWithDomain:@"test" code:1 userInfo:nil] protocol:mockProtocol]; + [testHandler protocol:mockProtocol transportDidError:[NSError errorWithDomain:@"test" code:1 userInfo:nil]]; }); it(@"should send a notification", ^{ @@ -122,7 +122,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ OCMExpect([mockNotificationDispatcher postNotificationName:[OCMArg isEqual:SDLRPCServiceDidConnect] infoObject:[OCMArg isNil]]); OCMExpect([(SDLTimer *)mockTimer cancel]); - [testHandler handleProtocolStartServiceACKMessage:message protocol:mockProtocol]; + [testHandler protocol:mockProtocol didReceiveStartServiceACK:message]; }); it(@"should stop the timer and send a notification", ^{ @@ -141,7 +141,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ OCMExpect([mockNotificationDispatcher postNotificationName:[OCMArg isEqual:SDLRPCServiceConnectionDidError] infoObject:[OCMArg isNil]]); OCMExpect([(SDLTimer *)mockTimer cancel]); - [testHandler handleProtocolStartServiceNAKMessage:message protocol:mockProtocol]; + [testHandler protocol:mockProtocol didReceiveStartServiceNAK:message]; }); it(@"should stop the timer and send a notification", ^{ @@ -158,7 +158,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ it(@"should send a transport disconnected notification when the timer elapses", ^{ OCMExpect([mockNotificationDispatcher postNotificationName:[OCMArg isEqual:SDLTransportDidDisconnect] infoObject:[OCMArg isNil]]); - [testHandler onProtocolOpened:mockProtocol]; + [testHandler protocolDidOpen:mockProtocol]; OCMVerifyAllWithDelay(mockNotificationDispatcher, 11.0); }); @@ -174,7 +174,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ OCMExpect([mockNotificationDispatcher postNotificationName:[OCMArg isEqual:SDLRPCServiceDidDisconnect] infoObject:[OCMArg isNil]]); OCMExpect([(SDLTimer *)mockTimer cancel]); - [testHandler handleProtocolEndServiceACKMessage:message protocol:mockProtocol]; + [testHandler protocol:mockProtocol didReceiveEndServiceACK:message]; }); it(@"should stop the timer and send a notification", ^{ @@ -192,7 +192,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ OCMExpect([mockNotificationDispatcher postNotificationName:[OCMArg isEqual:SDLRPCServiceConnectionDidError] infoObject:[OCMArg any]]); - [testHandler handleProtocolEndServiceNAKMessage:message protocol:mockProtocol]; + [testHandler protocol:mockProtocol didReceiveEndServiceNAK:message]; }); it(@"should send a RPC service connection error notification", ^{ @@ -220,7 +220,7 @@ describe(@"SDLLifecycleProtocolHandler tests", ^{ OCMExpect([mockNotificationDispatcher postRPCRequestNotification:[OCMArg isEqual:SDLDidReceiveShowRequest] request:[OCMArg isNotNil]]); - [testHandler onProtocolMessageReceived:testMessage protocol:mockProtocol]; + [testHandler protocol:mockProtocol didReceiveMessage:testMessage]; }); it(@"should send the notification", ^{ diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingAudioLifecycleManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingAudioLifecycleManagerSpec.m index e37abed75..93d5e5829 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingAudioLifecycleManagerSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingAudioLifecycleManagerSpec.m @@ -311,7 +311,7 @@ describe(@"the streaming audio manager", ^{ testAudioStartServicePayload = [[SDLControlFramePayloadAudioStartServiceAck alloc] initWithMTU:testMTU]; testAudioMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testAudioHeader andPayload:testAudioStartServicePayload.data]; - [streamingLifecycleManager handleProtocolStartServiceACKMessage:testAudioMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceACK:testAudioMessage]; }); it(@"should have set all the right properties", ^{ @@ -335,7 +335,7 @@ describe(@"the streaming audio manager", ^{ testAudioHeader.serviceType = SDLServiceTypeAudio; testAudioMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testAudioHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceACKMessage:testAudioMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceACK:testAudioMessage]; }); it(@"should have set all the right properties", ^{ @@ -357,7 +357,7 @@ describe(@"the streaming audio manager", ^{ testAudioHeader.serviceType = SDLServiceTypeAudio; testAudioMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testAudioHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceACKMessage:testAudioMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceACK:testAudioMessage]; }); it(@"should have set all the right properties", ^{ @@ -379,7 +379,7 @@ describe(@"the streaming audio manager", ^{ testAudioHeader.serviceType = SDLServiceTypeAudio; testAudioMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testAudioHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceNAKMessage:testAudioMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceNAK:testAudioMessage]; }); it(@"should have set all the right properties", ^{ @@ -464,7 +464,7 @@ describe(@"the streaming audio manager", ^{ testAudioHeader.serviceType = SDLServiceTypeAudio; testAudioMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testAudioHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceACKMessage:testAudioMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceACK:testAudioMessage]; }); it(@"should transistion to the stopped state", ^{ @@ -484,7 +484,7 @@ describe(@"the streaming audio manager", ^{ testAudioHeader.serviceType = SDLServiceTypeAudio; testAudioMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testAudioHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceNAKMessage:testAudioMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceNAK:testAudioMessage]; }); it(@"should transistion to the stopped state", ^{ diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m index 08c8d82c5..f138e873d 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLStreamingVideoLifecycleManagerSpec.m @@ -552,7 +552,7 @@ describe(@"the streaming video manager", ^{ beforeEach(^{ testVideoStartServicePayload = [[SDLControlFramePayloadVideoStartServiceAck alloc] initWithMTU:testMTU height:testVideoHeight width:testVideoWidth protocol:testVideoProtocol codec:testVideoCodec]; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:testVideoStartServicePayload.data]; - [streamingLifecycleManager handleProtocolStartServiceACKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceACK:testVideoMessage]; }); it(@"should have set all the right properties", ^{ @@ -568,7 +568,7 @@ describe(@"the streaming video manager", ^{ beforeEach(^{ testVideoStartServicePayload = [[SDLControlFramePayloadVideoStartServiceAck alloc] initWithMTU:testMTU height:testVideoHeight width:testVideoWidth protocol:nil codec:nil]; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:testVideoStartServicePayload.data]; - [streamingLifecycleManager handleProtocolStartServiceACKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceACK:testVideoMessage]; }); it(@"should fall back correctly", ^{ @@ -589,7 +589,7 @@ describe(@"the streaming video manager", ^{ context(@"If no preferred resolutions were set in the data source", ^{ beforeEach(^{ streamingLifecycleManager.dataSource = nil; - [streamingLifecycleManager handleProtocolStartServiceACKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceACK:testVideoMessage]; }); it(@"should not replace the existing screen resolution", ^{ expect(@(CGSizeEqualToSize(streamingLifecycleManager.videoScaleManager.displayViewportResolution, CGSizeZero))).to(beTrue()); @@ -606,7 +606,7 @@ describe(@"the streaming video manager", ^{ streamingLifecycleManager.dataSource = testDataSource; streamingLifecycleManager.preferredResolutions = @[preferredResolutionLow, preferredResolutionHigh]; - [streamingLifecycleManager handleProtocolStartServiceACKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceACK:testVideoMessage]; }); it(@"should set the screen size using the first provided preferred resolution", ^{ CGSize preferredFormat = CGSizeMake(preferredResolutionLow.resolutionWidth.floatValue, preferredResolutionLow.resolutionHeight.floatValue); @@ -648,7 +648,7 @@ describe(@"the streaming video manager", ^{ testVideoStartNakPayload = [[SDLControlFramePayloadNak alloc] initWithRejectedParams:@[[NSString stringWithUTF8String:SDLControlFrameHeightKey], [NSString stringWithUTF8String:SDLControlFrameVideoCodecKey]]]; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:testVideoStartNakPayload.data]; - [streamingLifecycleManager handleProtocolStartServiceNAKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceNAK:testVideoMessage]; }); it(@"should have retried with new properties", ^{ @@ -670,7 +670,7 @@ describe(@"the streaming video manager", ^{ testVideoStartNakPayload = [[SDLControlFramePayloadNak alloc] initWithRejectedParams:@[[NSString stringWithUTF8String:SDLControlFrameVideoCodecKey]]]; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:testVideoStartNakPayload.data]; - [streamingLifecycleManager handleProtocolStartServiceNAKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceNAK:testVideoMessage]; }); it(@"should have retried with new properties", ^{ @@ -691,7 +691,7 @@ describe(@"the streaming video manager", ^{ testVideoStartNakPayload = [[SDLControlFramePayloadNak alloc] initWithRejectedParams:@[[NSString stringWithUTF8String:SDLControlFrameVideoCodecKey]]]; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:testVideoStartNakPayload.data]; - [streamingLifecycleManager handleProtocolStartServiceNAKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceNAK:testVideoMessage]; }); it(@"should end the service", ^{ @@ -706,7 +706,7 @@ describe(@"the streaming video manager", ^{ testVideoStartNakPayload = [[SDLControlFramePayloadNak alloc] initWithRejectedParams:nil]; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:testVideoStartNakPayload.data]; - [streamingLifecycleManager handleProtocolStartServiceNAKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveStartServiceNAK:testVideoMessage]; }); it(@"should end the service", ^{ @@ -729,7 +729,7 @@ describe(@"the streaming video manager", ^{ testVideoHeader.serviceType = SDLServiceTypeVideo; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceACKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceACK:testVideoMessage]; }); it(@"should have set all the right properties", ^{ @@ -751,7 +751,7 @@ describe(@"the streaming video manager", ^{ testVideoHeader.serviceType = SDLServiceTypeVideo; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceNAKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceNAK:testVideoMessage]; }); it(@"should have set all the right properties", ^{ @@ -837,7 +837,7 @@ describe(@"the streaming video manager", ^{ testVideoHeader.serviceType = SDLServiceTypeVideo; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceACKMessage:testVideoMessage protocol:protocolMock]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceACK:testVideoMessage]; }); it(@"should transistion to the stopped state", ^{ @@ -857,7 +857,7 @@ describe(@"the streaming video manager", ^{ testVideoHeader.serviceType = SDLServiceTypeVideo; testVideoMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testVideoHeader andPayload:nil]; - [streamingLifecycleManager handleProtocolEndServiceNAKMessage:testVideoMessage protocol:protocolMock ]; + [streamingLifecycleManager protocol:protocolMock didReceiveEndServiceNAK:testVideoMessage]; }); it(@"should transistion to the stopped state", ^{ diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m index cd95ff9bb..b4e542012 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m @@ -129,7 +129,7 @@ describe(@"Send EndSession Tests", ^ { SDLV1ProtocolHeader *testHeader = [[SDLV1ProtocolHeader alloc] init]; testHeader.serviceType = SDLServiceTypeRPC; testHeader.sessionID = 0x03; - [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil] protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]]; [testProtocol endServiceWithType:SDLServiceTypeRPC]; @@ -157,7 +157,7 @@ describe(@"Send EndSession Tests", ^ { SDLV2ProtocolHeader *testHeader = [[SDLV2ProtocolHeader alloc] initWithVersion:2]; testHeader.serviceType = SDLServiceTypeRPC; testHeader.sessionID = 0x61; - [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil] protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]]; [testProtocol endServiceWithType:SDLServiceTypeRPC]; @@ -188,7 +188,7 @@ describe(@"Send Register Secondary Transport Tests", ^ { refHeader.serviceType = SDLServiceTypeRPC; refHeader.frameData = SDLFrameInfoStartServiceACK; refHeader.sessionID = 0x11; - [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:refHeader andPayload:nil] protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:[SDLProtocolMessage messageWithHeader:refHeader andPayload:nil]]; // store the header to apply Session ID value to Register Secondary Transport frame [testProtocol storeHeader:refHeader forServiceType:SDLServiceTypeControl]; @@ -233,7 +233,7 @@ describe(@"SendRPCRequest Tests", ^ { SDLV1ProtocolHeader *testHeader = [[SDLV1ProtocolHeader alloc] init]; testHeader.serviceType = SDLServiceTypeRPC; testHeader.sessionID = 0xFF; - [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil] protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]]; [testProtocol sendRPC:mockRequest]; @@ -279,7 +279,7 @@ describe(@"SendRPCRequest Tests", ^ { SDLV2ProtocolHeader *testHeader = [[SDLV2ProtocolHeader alloc] initWithVersion:2]; testHeader.serviceType = SDLServiceTypeRPC; testHeader.sessionID = 0x01; - [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil] protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]]; [testProtocol sendRPC:mockRequest]; @@ -430,10 +430,10 @@ describe(@"HandleProtocolSessionStarted tests", ^ { testHeader.bytesInPayload = (UInt32)testData.length; SDLProtocolMessage *ackMessage = [SDLProtocolMessage messageWithHeader:testHeader andPayload:testData]; - OCMExpect([delegateMock handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveStartServiceACK:ackMessage]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:ackMessage]; OCMVerifyAllWithDelay(delegateMock, 0.1); @@ -454,10 +454,10 @@ describe(@"HandleProtocolSessionStarted tests", ^ { testHeader.bytesInPayload = (UInt32)testData.length; SDLProtocolMessage *ackMessage = [SDLProtocolMessage messageWithHeader:testHeader andPayload:testData]; - OCMExpect([delegateMock handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveStartServiceACK:ackMessage]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:ackMessage]; OCMVerifyAllWithDelay(delegateMock, 0.1); @@ -478,10 +478,10 @@ describe(@"HandleProtocolSessionStarted tests", ^ { testHeader.bytesInPayload = (UInt32)testData.length; SDLProtocolMessage *ackMessage = [SDLProtocolMessage messageWithHeader:testHeader andPayload:testData]; - OCMExpect([delegateMock handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveStartServiceACK:ackMessage]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:ackMessage]; OCMVerifyAllWithDelay(delegateMock, 0.1); @@ -504,10 +504,10 @@ describe(@"HandleProtocolSessionStarted tests", ^ { testHeader.bytesInPayload = (UInt32)testData.length; SDLProtocolMessage *ackMessage = [SDLProtocolMessage messageWithHeader:testHeader andPayload:testData]; - OCMExpect([delegateMock handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveStartServiceACK:ackMessage]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:ackMessage]; OCMVerifyAllWithDelay(delegateMock, 0.1); @@ -533,10 +533,10 @@ describe(@"HandleProtocolSessionStarted tests", ^ { testHeader.bytesInPayload = (UInt32)testData.length; SDLProtocolMessage *ackMessage = [SDLProtocolMessage messageWithHeader:testHeader andPayload:testData]; - OCMExpect([delegateMock handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveStartServiceACK:ackMessage]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:ackMessage]; OCMVerifyAllWithDelay(delegateMock, 0.1); @@ -558,10 +558,10 @@ describe(@"HandleProtocolSessionStarted tests", ^ { testHeader.bytesInPayload = (UInt32)testData.length; SDLProtocolMessage *ackMessage = [SDLProtocolMessage messageWithHeader:testHeader andPayload:testData]; - OCMExpect([delegateMock handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveStartServiceACK:ackMessage]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol handleProtocolStartServiceACKMessage:ackMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveStartServiceACK:ackMessage]; // Should keep their default values expect([SDLGlobals sharedGlobals].protocolVersion.stringVersion).to(equal(@"1.0.0")); @@ -593,10 +593,10 @@ describe(@"HandleProtocolRegisterSecondaryTransport Tests", ^{ testHeader.bytesInPayload = 0; SDLProtocolMessage *ackMessage = [SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]; - OCMExpect([delegateMock handleProtocolRegisterSecondaryTransportACKMessage:ackMessage protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveRegisterSecondaryTransportACK:ackMessage]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol handleProtocolRegisterSecondaryTransportACKMessage:ackMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveRegisterSecondaryTransportACK:ackMessage]; OCMVerifyAllWithDelay(delegateMock, 0.1); }); @@ -615,10 +615,10 @@ describe(@"HandleProtocolRegisterSecondaryTransport Tests", ^{ NSData *payloadData = payload.data; SDLProtocolMessage *nakMessage = [SDLProtocolMessage messageWithHeader:testHeader andPayload:payloadData]; - OCMExpect([delegateMock handleProtocolRegisterSecondaryTransportNAKMessage:nakMessage protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveRegisterSecondaryTransportNAK:nakMessage]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol handleProtocolRegisterSecondaryTransportNAKMessage:nakMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveRegisterSecondaryTransportNAK:nakMessage]; OCMVerifyAllWithDelay(delegateMock, 0.1); }); @@ -660,10 +660,10 @@ describe(@"OnProtocolMessageReceived Tests", ^ { testMessage.header = testHeader; id delegateMock = OCMProtocolMock(@protocol(SDLProtocolDelegate)); - OCMExpect([delegateMock onProtocolMessageReceived:[OCMArg any] protocol:testProtocol]); + OCMExpect([delegateMock protocol:testProtocol didReceiveMessage:[OCMArg any]]); [testProtocol.protocolDelegateTable addObject:delegateMock]; - [testProtocol onProtocolMessageReceived:testMessage protocol:testProtocol]; + [testProtocol protocol:testProtocol didReceiveMessage:testMessage]; }); it(@"Should pass information along to delegate", ^ { @@ -681,7 +681,7 @@ describe(@"OnProtocolOpened Tests", ^ { testProtocol = [[SDLProtocol alloc] initWithTransport:transportMock encryptionManager:nil]; id delegateMock = OCMProtocolMock(@protocol(SDLProtocolDelegate)); - OCMExpect([delegateMock onProtocolOpened:testProtocol]); + OCMExpect([delegateMock protocolDidOpen:testProtocol]); [testProtocol.protocolDelegateTable addObject:delegateMock]; [testProtocol onTransportConnected]; @@ -702,7 +702,7 @@ describe(@"OnProtocolClosed Tests", ^ { testProtocol = [[SDLProtocol alloc] initWithTransport:transportMock encryptionManager:nil]; delegateMock = OCMProtocolMock(@protocol(SDLProtocolDelegate)); - OCMExpect([delegateMock onProtocolClosed:testProtocol]); + OCMExpect([delegateMock protocolDidClose:testProtocol]); [testProtocol.protocolDelegateTable addObject:delegateMock]; [testProtocol onTransportDisconnected]; diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolReceivedMessageRouterSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolReceivedMessageRouterSpec.m index ed7ad4dff..c1e9f6f1e 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolReceivedMessageRouterSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolReceivedMessageRouterSpec.m @@ -17,7 +17,7 @@ QuickSpecBegin(SDLProtocolReceivedMessageRouterSpec) -describe(@"HandleReceivedMessage Tests", ^{ +describe(@"Handle received message tests", ^{ __block SDLProtocolReceivedMessageRouter *router = nil; __block id delegateMock = nil; __block SDLProtocol *mockProtocol = nil; @@ -29,20 +29,20 @@ describe(@"HandleReceivedMessage Tests", ^{ mockProtocol = OCMStrictClassMock([SDLProtocol class]); }); - context(@"When handling control message", ^{ + context(@"When handling a control message", ^{ __block SDLV2ProtocolMessage *testMessage = nil; __block SDLV2ProtocolHeader *testHeader = nil; beforeEach(^{ - testMessage = [[SDLV2ProtocolMessage alloc] init]; - testMessage.payload = [NSData data]; - + testHeader = [[SDLV2ProtocolHeader alloc] init]; testHeader.frameType = SDLFrameTypeControl; testHeader.serviceType = SDLServiceTypeRPC; testHeader.sessionID = 0x93; testHeader.bytesInPayload = 0; + + testMessage = [[SDLV2ProtocolMessage alloc] init]; + testMessage.payload = [NSData data]; testMessage.header = testHeader; - testHeader = [[SDLV2ProtocolHeader alloc] init]; }); it(@"Should route a start service ACK message correctly", ^{ @@ -51,7 +51,7 @@ describe(@"HandleReceivedMessage Tests", ^{ [router handleReceivedMessage:testMessage protocol:mockProtocol]; - OCMVerify([delegateMock handleProtocolStartServiceACKMessage:testMessage protocol:mockProtocol]); + OCMVerify([delegateMock protocol:mockProtocol didReceiveStartServiceACK:testMessage]); }); it(@"Should route a start service NAK message correctly", ^{ @@ -60,7 +60,7 @@ describe(@"HandleReceivedMessage Tests", ^{ [router handleReceivedMessage:testMessage protocol:mockProtocol]; - OCMVerify([delegateMock handleProtocolStartServiceNAKMessage:testMessage protocol:mockProtocol]); + OCMVerify([delegateMock protocol:mockProtocol didReceiveStartServiceNAK:testMessage]); }); it(@"Should route an end service ACK message correctly", ^{ @@ -69,7 +69,7 @@ describe(@"HandleReceivedMessage Tests", ^{ [router handleReceivedMessage:testMessage protocol:mockProtocol]; - OCMVerify([delegateMock handleProtocolEndServiceACKMessage:testMessage protocol:mockProtocol]); + OCMVerify([delegateMock protocol:mockProtocol didReceiveEndServiceACK:testMessage]); }); it(@"Should route an end service NAK message correctly", ^{ @@ -77,8 +77,8 @@ describe(@"HandleReceivedMessage Tests", ^{ testMessage.header = testHeader; [router handleReceivedMessage:testMessage protocol:mockProtocol]; - - OCMVerify([delegateMock handleProtocolEndServiceNAKMessage:testMessage protocol:mockProtocol]); + + OCMVerify([delegateMock protocol:mockProtocol didReceiveEndServiceNAK:testMessage]); }); it(@"Should route register secondary transport ACK message correctly", ^{ @@ -87,7 +87,7 @@ describe(@"HandleReceivedMessage Tests", ^{ [router handleReceivedMessage:testMessage protocol:mockProtocol]; - OCMVerify([delegateMock handleProtocolRegisterSecondaryTransportACKMessage:testMessage protocol:mockProtocol]); + OCMVerify([delegateMock protocol:mockProtocol didReceiveRegisterSecondaryTransportACK:testMessage]); }); it(@"Should route register secondary transport NAK message correctly", ^{ @@ -96,7 +96,7 @@ describe(@"HandleReceivedMessage Tests", ^{ [router handleReceivedMessage:testMessage protocol:mockProtocol]; - OCMVerify([delegateMock handleProtocolRegisterSecondaryTransportNAKMessage:testMessage protocol:mockProtocol]); + OCMVerify([delegateMock protocol:mockProtocol didReceiveRegisterSecondaryTransportNAK:testMessage]); }); it(@"Should route a transport event update message correctly", ^{ @@ -104,8 +104,8 @@ describe(@"HandleReceivedMessage Tests", ^{ testMessage.header = testHeader; [router handleReceivedMessage:testMessage protocol:mockProtocol]; - - OCMVerify([delegateMock handleTransportEventUpdateMessage:testMessage protocol:mockProtocol]); + + OCMVerify([delegateMock protocol:mockProtocol didReceiveTransportEventUpdate:testMessage]); }); it(@"Should route a heartbeat message correctly", ^{ @@ -127,61 +127,63 @@ describe(@"HandleReceivedMessage Tests", ^{ }); }); - context(@"When handling single frame message", ^{ - it(@"Should route message correctly", ^{ - SDLV2ProtocolMessage* testMessage = [[SDLV2ProtocolMessage alloc] init]; - SDLV2ProtocolHeader* testHeader = [[SDLV2ProtocolHeader alloc] init]; - + context(@"When handling a single frame message", ^{ + __block SDLV2ProtocolMessage *testMessage = nil; + __block SDLV2ProtocolHeader *testHeader = nil; + + beforeEach(^{ + testHeader = [[SDLV2ProtocolHeader alloc] init]; testHeader.frameType = SDLFrameTypeSingle; testHeader.serviceType = SDLServiceTypeRPC; - testHeader.frameData = SDLFrameInfoSingleFrame; testHeader.sessionID = 0x07; testHeader.bytesInPayload = 0; - - testMessage.header = testHeader; - + + testMessage = [[SDLV2ProtocolMessage alloc] init]; testMessage.payload = [NSData data]; - + testMessage.header = testHeader; + }); + + it(@"Should route the message correctly", ^{ __block BOOL verified = NO; - [[[[delegateMock stub] andDo: ^(NSInvocation* invocation) { + [OCMStub([delegateMock protocol:mockProtocol didReceiveMessage:testMessage]) andDo:^(NSInvocation *invocation) { verified = YES; - - __unsafe_unretained SDLProtocolMessage* message; - - [invocation getArgument:&message atIndex:2]; - - SDLV2ProtocolMessage* messageReceived = (SDLV2ProtocolMessage *)message; - + __unsafe_unretained SDLProtocolMessage *message; + [invocation getArgument:&message atIndex:3]; + SDLV2ProtocolMessage *messageReceived = (SDLV2ProtocolMessage *)message; + expect(messageReceived).to(beIdenticalTo(testMessage)); - }] ignoringNonObjectArgs] onProtocolMessageReceived:[OCMArg any] protocol:mockProtocol]; - + }]; + [router handleReceivedMessage:testMessage protocol:mockProtocol]; - expect(@(verified)).to(beTruthy()); + expect(verified).toEventually(beTrue()); }); }); - context(@"When handling multi-frame message", ^{ - it(@"Should route message correctly", ^{ - //Allocate 2000 bytes and use it as test data + context(@"When handling a multi-frame message", ^{ + __block SDLV2ProtocolMessage *testMessage = nil; + __block SDLV2ProtocolHeader *testHeader = nil; + + beforeEach(^{ + testMessage = [[SDLV2ProtocolMessage alloc] init]; + testHeader = [[SDLV2ProtocolHeader alloc] init]; + }); + + it(@"Should route the message correctly", ^{ + // Allocate 2000 bytes and use it as test data const NSUInteger dataLength = 2000; char dummyBytes[dataLength]; const char testPayloadHeader[12] = {0x20, 0x55, 0x64, 0x73, 0x12, 0x34, 0x43, 0x21, (dataLength >> 24) & 0xFF, (dataLength >> 16) & 0xFF, (dataLength >> 8) & 0xFF, dataLength & 0xFF}; - - NSMutableData* payloadData = [NSMutableData dataWithBytes:testPayloadHeader length:12]; + NSMutableData *payloadData = [NSMutableData dataWithBytes:testPayloadHeader length:12]; [payloadData appendBytes:dummyBytes length:dataLength]; - - SDLV2ProtocolMessage* testMessage = [[SDLV2ProtocolMessage alloc] init]; - SDLV2ProtocolHeader* testHeader = [[SDLV2ProtocolHeader alloc] init]; - - //First frame + + // First frame testHeader.frameType = SDLFrameTypeFirst; testHeader.serviceType = SDLServiceTypeBulkData; testHeader.frameData = 1; testHeader.sessionID = 0x33; testHeader.bytesInPayload = 8; - testMessage.header = testHeader; const char firstPayload[8] = {(payloadData.length >> 24) & 0xFF, (payloadData.length >> 16) & 0xFF, (payloadData.length >> 8) & 0xFF, payloadData.length & 0xFF, 0x00, 0x00, 0x00, ceil(payloadData.length / 500.0)}; @@ -195,7 +197,7 @@ describe(@"HandleReceivedMessage Tests", ^{ NSUInteger frameNumber = 1; NSUInteger offset = 0; while ((offset + 500) < payloadData.length) { - //Consectutive frames + // Consectutive frames testMessage.header.frameData = frameNumber; testMessage.payload = [payloadData subdataWithRange:NSMakeRange(offset, 500)]; [router handleReceivedMessage:testMessage protocol:mockProtocol]; @@ -204,18 +206,18 @@ describe(@"HandleReceivedMessage Tests", ^{ offset += 500; } - //Final frame + // Final frame testMessage.header.frameData = 0; testMessage.payload = [payloadData subdataWithRange:NSMakeRange(offset, payloadData.length - offset)]; - + __block BOOL verified = NO; - [[[delegateMock stub] andDo:^(NSInvocation* invocation) { + [OCMStub([delegateMock protocol:mockProtocol didReceiveMessage:[OCMArg any]]) andDo:^(NSInvocation *invocation) { verified = YES; - //Without the __unsafe_unretained, a double release will occur. More information: https://github.com/erikdoe/ocmock/issues/123 - __unsafe_unretained SDLProtocolMessage* message; - [invocation getArgument:&message atIndex:2]; - SDLProtocolMessage* assembledMessage = message; + // Without the __unsafe_unretained, a double release will occur. More information: https://github.com/erikdoe/ocmock/issues/123 + __unsafe_unretained SDLProtocolMessage *message; + [invocation getArgument:&message atIndex:3]; + SDLProtocolMessage *assembledMessage = message; expect(assembledMessage.payload).to(equal(payloadData)); expect(@(assembledMessage.header.frameType)).to(equal(@(SDLFrameTypeSingle))); @@ -223,12 +225,11 @@ describe(@"HandleReceivedMessage Tests", ^{ expect(@(assembledMessage.header.frameData)).to(equal(@(SDLFrameInfoSingleFrame))); expect(@(assembledMessage.header.sessionID)).to(equal(@0x33)); expect(@(assembledMessage.header.bytesInPayload)).to(equal(@(payloadData.length))); - }] onProtocolMessageReceived:[OCMArg any] protocol:mockProtocol]; - - router.delegate = delegateMock; + }]; + [router handleReceivedMessage:testMessage protocol:mockProtocol]; - expect(@(verified)).to(beTruthy()); + expect(verified).toEventually(beTrue()); }); }); }); diff --git a/SmartDeviceLinkTests/SDLEncryptionLifecycleManagerSpec.m b/SmartDeviceLinkTests/SDLEncryptionLifecycleManagerSpec.m index e58d1f108..15295118b 100644 --- a/SmartDeviceLinkTests/SDLEncryptionLifecycleManagerSpec.m +++ b/SmartDeviceLinkTests/SDLEncryptionLifecycleManagerSpec.m @@ -91,7 +91,7 @@ describe(@"the encryption lifecycle manager", ^{ testRPCHeader.serviceType = SDLServiceTypeRPC; testRPCMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testRPCHeader andPayload:nil]; - [encryptionLifecycleManager handleProtocolStartServiceACKMessage:testRPCMessage protocol:protocolMock]; + [encryptionLifecycleManager protocol:protocolMock didReceiveStartServiceACK:testRPCMessage]; }); it(@"should have set all the right properties", ^{ @@ -114,7 +114,7 @@ describe(@"the encryption lifecycle manager", ^{ testRPCHeader.serviceType = SDLServiceTypeRPC; testRPCMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testRPCHeader andPayload:nil]; - [encryptionLifecycleManager handleProtocolEndServiceACKMessage:testRPCMessage protocol:protocolMock]; + [encryptionLifecycleManager protocol:protocolMock didReceiveEndServiceACK:testRPCMessage]; }); it(@"should have set all the right properties", ^{ @@ -136,7 +136,7 @@ describe(@"the encryption lifecycle manager", ^{ testRPCHeader.serviceType = SDLServiceTypeRPC; testRPCMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testRPCHeader andPayload:nil]; - [encryptionLifecycleManager handleProtocolEndServiceACKMessage:testRPCMessage protocol:protocolMock]; + [encryptionLifecycleManager protocol:protocolMock didReceiveEndServiceACK:testRPCMessage]; }); it(@"should have set all the right properties", ^{ @@ -158,7 +158,7 @@ describe(@"the encryption lifecycle manager", ^{ testRPCHeader.serviceType = SDLServiceTypeRPC; testRPCMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testRPCHeader andPayload:nil]; - [encryptionLifecycleManager handleProtocolEndServiceNAKMessage:testRPCMessage protocol:protocolMock]; + [encryptionLifecycleManager protocol:protocolMock didReceiveEndServiceNAK:testRPCMessage]; }); it(@"should have set all the right properties", ^{ |