diff options
364 files changed, 1339 insertions, 1325 deletions
diff --git a/SmartDeviceLink/NSThread+ThreadIndex.m b/SmartDeviceLink/NSThread+ThreadIndex.m index 89cbbd5c2..88d58c9f3 100644 --- a/SmartDeviceLink/NSThread+ThreadIndex.m +++ b/SmartDeviceLink/NSThread+ThreadIndex.m @@ -8,9 +8,9 @@ - (NSInteger)threadIndex { NSString *description = [self description]; - NSArray *keyValuePairs = [description componentsSeparatedByString:@","]; + NSArray<NSString *> *keyValuePairs = [description componentsSeparatedByString:@","]; for (NSString *keyValuePair in keyValuePairs) { - NSArray *components = [keyValuePair componentsSeparatedByString:@"="]; + NSArray<NSString *> *components = [keyValuePair componentsSeparatedByString:@"="]; NSString *key = components[0]; key = [key stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; if ([key rangeOfString:@"num"].location != NSNotFound) { diff --git a/SmartDeviceLink/SDLAbstractProtocol.h b/SmartDeviceLink/SDLAbstractProtocol.h index a8277dac3..ee9e8a79e 100644 --- a/SmartDeviceLink/SDLAbstractProtocol.h +++ b/SmartDeviceLink/SDLAbstractProtocol.h @@ -14,7 +14,7 @@ @property (strong) NSString *debugConsoleGroupName; @property (weak) SDLAbstractTransport *transport; -@property (strong) NSHashTable *protocolDelegateTable; // table of id<SDLProtocolListener> +@property (strong) NSHashTable<id<SDLProtocolListener>> *protocolDelegateTable; @property (nonatomic, strong) id<SDLSecurityType> securityManager; @property (nonatomic, copy) NSString *appId; diff --git a/SmartDeviceLink/SDLAddCommand.h b/SmartDeviceLink/SDLAddCommand.h index fec0aa8be..86b30bab9 100644 --- a/SmartDeviceLink/SDLAddCommand.h +++ b/SmartDeviceLink/SDLAddCommand.h @@ -82,7 +82,7 @@ * * Optional, Array of Strings, Max String length 99 chars, Array size 1 - 100 */ -@property (strong) NSMutableArray *vrCommands; +@property (strong) NSMutableArray<NSString *> *vrCommands; /** * @abstract Image struct containing a static or dynamic icon diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m index 9c1f7fb4e..b87d8ec4c 100644 --- a/SmartDeviceLink/SDLAddCommand.m +++ b/SmartDeviceLink/SDLAddCommand.m @@ -56,7 +56,7 @@ } } -- (void)setVrCommands:(NSMutableArray *)vrCommands { +- (void)setVrCommands:(NSMutableArray<NSString *> *)vrCommands { if (vrCommands != nil) { [parameters setObject:vrCommands forKey:SDLNameVRCommands]; } else { @@ -64,7 +64,7 @@ } } -- (NSMutableArray *)vrCommands { +- (NSMutableArray<NSString *> *)vrCommands { return [parameters objectForKey:SDLNameVRCommands]; } diff --git a/SmartDeviceLink/SDLAlert.h b/SmartDeviceLink/SDLAlert.h index 410a8e073..97cc6c7ea 100644 --- a/SmartDeviceLink/SDLAlert.h +++ b/SmartDeviceLink/SDLAlert.h @@ -4,6 +4,9 @@ #import "SDLRPCRequest.h" +@class SDLSoftButton; +@class SDLTTSChunk; + /** * Shows an alert which typically consists of text-to-speech message and text on the display. At least either alertText1, alertText2 or TTSChunks need to be provided. * @@ -83,7 +86,7 @@ * * @see SDLTTSChunk */ -@property (strong) NSMutableArray *ttsChunks; +@property (strong) NSMutableArray<SDLTTSChunk *> *ttsChunks; /** * @abstract The duration of the displayed portion of the alert, in milliseconds. @@ -125,6 +128,6 @@ * * @see SDLSoftButton */ -@property (strong) NSMutableArray *softButtons; +@property (strong) NSMutableArray<SDLSoftButton *> *softButtons; @end diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m index 33b6e47de..d9f8cc5fb 100644 --- a/SmartDeviceLink/SDLAlert.m +++ b/SmartDeviceLink/SDLAlert.m @@ -50,7 +50,7 @@ return [parameters objectForKey:SDLNameAlertText3]; } -- (void)setTtsChunks:(NSMutableArray *)ttsChunks { +- (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks { if (ttsChunks != nil) { [parameters setObject:ttsChunks forKey:SDLNameTTSChunks]; } else { @@ -58,14 +58,14 @@ } } -- (NSMutableArray *)ttsChunks { - NSMutableArray *array = [parameters objectForKey:SDLNameTTSChunks]; +- (NSMutableArray<SDLTTSChunk *> *)ttsChunks { + NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { - NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; + NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]]; + for (NSDictionary<NSString *, id> *dict in array) { + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:dict]]; } return newList; } @@ -107,7 +107,7 @@ return [parameters objectForKey:SDLNameProgressIndicator]; } -- (void)setSoftButtons:(NSMutableArray *)softButtons { +- (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons { if (softButtons != nil) { [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { @@ -115,14 +115,14 @@ } } -- (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; +- (NSMutableArray<SDLSoftButton *> *)softButtons { + NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { - NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; + NSMutableArray<SDLSoftButton *> *newList = [NSMutableArray arrayWithCapacity:[array count]]; + for (NSDictionary<NSString *, id> *dict in array) { + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLAlertManeuver.h b/SmartDeviceLink/SDLAlertManeuver.h index dffa8f21c..14252850a 100644 --- a/SmartDeviceLink/SDLAlertManeuver.h +++ b/SmartDeviceLink/SDLAlertManeuver.h @@ -4,12 +4,15 @@ #import "SDLRPCRequest.h" +@class SDLSoftButton; +@class SDLTTSChunk; + /** * @since SmartDeviceLink 1.0 */ @interface SDLAlertManeuver : SDLRPCRequest -@property (strong) NSMutableArray *ttsChunks; -@property (strong) NSMutableArray *softButtons; +@property (strong) NSMutableArray<SDLTTSChunk *> *ttsChunks; +@property (strong) NSMutableArray<SDLSoftButton *> *softButtons; @end diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m index 672fb5235..d21db33dc 100644 --- a/SmartDeviceLink/SDLAlertManeuver.m +++ b/SmartDeviceLink/SDLAlertManeuver.m @@ -16,7 +16,7 @@ return self; } -- (void)setTtsChunks:(NSMutableArray *)ttsChunks { +- (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks { if (ttsChunks != nil) { [parameters setObject:ttsChunks forKey:SDLNameTTSChunks]; } else { @@ -24,20 +24,20 @@ } } -- (NSMutableArray *)ttsChunks { - NSMutableArray *array = [parameters objectForKey:SDLNameTTSChunks]; +- (NSMutableArray<SDLTTSChunk *> *)ttsChunks { + NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { - NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; + NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]]; + for (NSDictionary<NSString *, id> *dict in array) { + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:dict]]; } return newList; } } -- (void)setSoftButtons:(NSMutableArray *)softButtons { +- (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons { if (softButtons != nil) { [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { @@ -45,14 +45,14 @@ } } -- (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; +- (NSMutableArray<SDLSoftButton *> *)softButtons { + NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { - NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; + NSMutableArray<SDLSoftButton *> *newList = [NSMutableArray arrayWithCapacity:[array count]]; + for (NSDictionary<NSString *, id> *dict in array) { + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLAmbientLightStatus.h b/SmartDeviceLink/SDLAmbientLightStatus.h index c778c2104..0793fd3f0 100644 --- a/SmartDeviceLink/SDLAmbientLightStatus.h +++ b/SmartDeviceLink/SDLAmbientLightStatus.h @@ -12,7 +12,7 @@ } + (SDLAmbientLightStatus *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLAmbientLightStatus *> *)values; + (SDLAmbientLightStatus *)NIGHT; + (SDLAmbientLightStatus *)TWILIGHT_1; diff --git a/SmartDeviceLink/SDLAmbientLightStatus.m b/SmartDeviceLink/SDLAmbientLightStatus.m index 7fa21db4a..07e1e8cd0 100644 --- a/SmartDeviceLink/SDLAmbientLightStatus.m +++ b/SmartDeviceLink/SDLAmbientLightStatus.m @@ -12,7 +12,7 @@ SDLAmbientLightStatus *SDLAmbientLightStatus_DAY = nil; SDLAmbientLightStatus *SDLAmbientLightStatus_UNKNOWN = nil; SDLAmbientLightStatus *SDLAmbientLightStatus_INVALID = nil; -NSArray *SDLAmbientLightStatus_values = nil; +NSArray<SDLAmbientLightStatus *> *SDLAmbientLightStatus_values = nil; @implementation SDLAmbientLightStatus @@ -25,7 +25,7 @@ NSArray *SDLAmbientLightStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLAmbientLightStatus *> *)values { if (SDLAmbientLightStatus_values == nil) { SDLAmbientLightStatus_values = @[ SDLAmbientLightStatus.NIGHT, diff --git a/SmartDeviceLink/SDLAppHMIType.h b/SmartDeviceLink/SDLAppHMIType.h index 3aaa45170..e2f93d71f 100644 --- a/SmartDeviceLink/SDLAppHMIType.h +++ b/SmartDeviceLink/SDLAppHMIType.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLAppHMIType */ -+ (NSArray *)values; ++ (NSArray<SDLAppHMIType *> *)values; /** * @abstract The App will have default rights. diff --git a/SmartDeviceLink/SDLAppHMIType.m b/SmartDeviceLink/SDLAppHMIType.m index f09f3af44..1328db05b 100644 --- a/SmartDeviceLink/SDLAppHMIType.m +++ b/SmartDeviceLink/SDLAppHMIType.m @@ -15,7 +15,7 @@ SDLAppHMIType *SDLAppHMIType_BACKGROUND_PROCESS = nil; SDLAppHMIType *SDLAppHMIType_TESTING = nil; SDLAppHMIType *SDLAppHMIType_SYSTEM = nil; -NSArray *SDLAppHMIType_values = nil; +NSArray<SDLAppHMIType *> *SDLAppHMIType_values = nil; @implementation SDLAppHMIType @@ -28,7 +28,7 @@ NSArray *SDLAppHMIType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLAppHMIType *> *)values { if (SDLAppHMIType_values == nil) { SDLAppHMIType_values = @[ SDLAppHMIType.DEFAULT, diff --git a/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h b/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h index 4fce3ba16..c97b87a5d 100644 --- a/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h +++ b/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.h @@ -26,7 +26,7 @@ * * @return an array that stores all possible SDLAppInterfaceUnregisteredReason */ -+ (NSArray *)values; ++ (NSArray<SDLAppInterfaceUnregisteredReason *> *)values; /** * @abstract Vehicle ignition turned off. diff --git a/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.m b/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.m index 72c19a8f5..b2d93ed33 100644 --- a/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.m +++ b/SmartDeviceLink/SDLAppInterfaceUnregisteredReason.m @@ -14,7 +14,7 @@ SDLAppInterfaceUnregisteredReason *SDLAppInterfaceUnregisteredReason_MASTER_RESE SDLAppInterfaceUnregisteredReason *SDLAppInterfaceUnregisteredReason_FACTORY_DEFAULTS = nil; SDLAppInterfaceUnregisteredReason *SDLAppInterfaceUnregisteredReason_APP_UNAUTHORIZED = nil; -NSArray *SDLAppInterfaceUnregisteredReason_values = nil; +NSArray<SDLAppInterfaceUnregisteredReason *> *SDLAppInterfaceUnregisteredReason_values = nil; @implementation SDLAppInterfaceUnregisteredReason @@ -27,7 +27,7 @@ NSArray *SDLAppInterfaceUnregisteredReason_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLAppInterfaceUnregisteredReason *> *)values { if (SDLAppInterfaceUnregisteredReason_values == nil) { SDLAppInterfaceUnregisteredReason_values = @[ SDLAppInterfaceUnregisteredReason.IGNITION_OFF, diff --git a/SmartDeviceLink/SDLAudioStreamingState.h b/SmartDeviceLink/SDLAudioStreamingState.h index 3f364495e..e62ac7387 100644 --- a/SmartDeviceLink/SDLAudioStreamingState.h +++ b/SmartDeviceLink/SDLAudioStreamingState.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLAudioStreamingState */ -+ (NSArray *)values; ++ (NSArray<SDLAudioStreamingState *> *)values; /** * @abstract Currently streaming audio, if any, is audible to user. * diff --git a/SmartDeviceLink/SDLAudioStreamingState.m b/SmartDeviceLink/SDLAudioStreamingState.m index 38b8676c3..e969fe1c4 100644 --- a/SmartDeviceLink/SDLAudioStreamingState.m +++ b/SmartDeviceLink/SDLAudioStreamingState.m @@ -8,7 +8,7 @@ SDLAudioStreamingState *SDLAudioStreamingState_AUDIBLE = nil; SDLAudioStreamingState *SDLAudioStreamingState_ATTENUATED = nil; SDLAudioStreamingState *SDLAudioStreamingState_NOT_AUDIBLE = nil; -NSArray *SDLAudioStreamingState_values = nil; +NSArray<SDLAudioStreamingState *> *SDLAudioStreamingState_values = nil; @implementation SDLAudioStreamingState @@ -21,7 +21,7 @@ NSArray *SDLAudioStreamingState_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLAudioStreamingState *> *)values { if (SDLAudioStreamingState_values == nil) { SDLAudioStreamingState_values = @[ SDLAudioStreamingState.AUDIBLE, diff --git a/SmartDeviceLink/SDLAudioType.h b/SmartDeviceLink/SDLAudioType.h index 2f1879eea..1c2d9d262 100644 --- a/SmartDeviceLink/SDLAudioType.h +++ b/SmartDeviceLink/SDLAudioType.h @@ -24,7 +24,7 @@ * * @return an array that store all possible SDLAudioType */ -+ (NSArray *)values; ++ (NSArray<SDLAudioType *> *)values; /** * @abstract PCM raw audio @@ -35,4 +35,4 @@ */ + (SDLAudioType *)PCM; -@end
\ No newline at end of file +@end diff --git a/SmartDeviceLink/SDLAudioType.m b/SmartDeviceLink/SDLAudioType.m index 5e99123c7..ba963732d 100644 --- a/SmartDeviceLink/SDLAudioType.m +++ b/SmartDeviceLink/SDLAudioType.m @@ -5,7 +5,7 @@ SDLAudioType *SDLAudioType_PCM = nil; -NSArray *SDLAudioType_values = nil; +NSArray<SDLAudioType *> *SDLAudioType_values = nil; @implementation SDLAudioType @@ -18,7 +18,7 @@ NSArray *SDLAudioType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLAudioType *> *)values { if (SDLAudioType_values == nil) { SDLAudioType_values = @[ SDLAudioType.PCM, diff --git a/SmartDeviceLink/SDLBitsPerSample.h b/SmartDeviceLink/SDLBitsPerSample.h index 9067ce17a..c17d7bb32 100644 --- a/SmartDeviceLink/SDLBitsPerSample.h +++ b/SmartDeviceLink/SDLBitsPerSample.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLBitsPerSample */ -+ (NSArray *)values; ++ (NSArray<SDLBitsPerSample *> *)values; /** * @abstract 8 bits per sample diff --git a/SmartDeviceLink/SDLBitsPerSample.m b/SmartDeviceLink/SDLBitsPerSample.m index e082aff59..358fe4fbc 100644 --- a/SmartDeviceLink/SDLBitsPerSample.m +++ b/SmartDeviceLink/SDLBitsPerSample.m @@ -7,7 +7,7 @@ SDLBitsPerSample *SDLBitsPerSample_8_BIT = nil; SDLBitsPerSample *SDLBitsPerSample_16_BIT = nil; -NSArray *SDLBitsPerSample_values = nil; +NSArray<SDLBitsPerSample *> *SDLBitsPerSample_values = nil; @implementation SDLBitsPerSample @@ -20,7 +20,7 @@ NSArray *SDLBitsPerSample_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLBitsPerSample *> *)values { if (SDLBitsPerSample_values == nil) { SDLBitsPerSample_values = @[ SDLBitsPerSample._8_BIT, diff --git a/SmartDeviceLink/SDLButtonEventMode.h b/SmartDeviceLink/SDLButtonEventMode.h index 56cd8683d..00ea7decb 100644 --- a/SmartDeviceLink/SDLButtonEventMode.h +++ b/SmartDeviceLink/SDLButtonEventMode.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLButtonEventMode * @return an array that store all possible SDLButtonEventMode */ -+ (NSArray *)values; ++ (NSArray<SDLButtonEventMode *> *)values; /** * @abstract The button was released diff --git a/SmartDeviceLink/SDLButtonEventMode.m b/SmartDeviceLink/SDLButtonEventMode.m index 1dcc13635..82b64d4f5 100644 --- a/SmartDeviceLink/SDLButtonEventMode.m +++ b/SmartDeviceLink/SDLButtonEventMode.m @@ -7,7 +7,7 @@ SDLButtonEventMode *SDLButtonEventMode_BUTTONUP = nil; SDLButtonEventMode *SDLButtonEventMode_BUTTONDOWN = nil; -NSArray *SDLButtonEventMode_values = nil; +NSArray<SDLButtonEventMode *> *SDLButtonEventMode_values = nil; @implementation SDLButtonEventMode @@ -20,7 +20,7 @@ NSArray *SDLButtonEventMode_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLButtonEventMode *> *)values { if (SDLButtonEventMode_values == nil) { SDLButtonEventMode_values = @[ SDLButtonEventMode.BUTTONUP, diff --git a/SmartDeviceLink/SDLButtonName.h b/SmartDeviceLink/SDLButtonName.h index 519a3c554..1cbbac06e 100644 --- a/SmartDeviceLink/SDLButtonName.h +++ b/SmartDeviceLink/SDLButtonName.h @@ -38,7 +38,7 @@ * * @return an array that store all possible SDLButtonName */ -+ (NSArray *)values; ++ (NSArray<SDLButtonName *> *)values; /** * @abstract Represents the button usually labeled "OK". A typical use of this button is for the user to press it to make a selection. diff --git a/SmartDeviceLink/SDLButtonName.m b/SmartDeviceLink/SDLButtonName.m index 8e0ae3454..2e6682f29 100644 --- a/SmartDeviceLink/SDLButtonName.m +++ b/SmartDeviceLink/SDLButtonName.m @@ -22,7 +22,7 @@ SDLButtonName *SDLButtonName_PRESET_9 = nil; SDLButtonName *SDLButtonName_CUSTOM_BUTTON = nil; SDLButtonName *SDLButtonName_SEARCH = nil; -NSArray *SDLButtonName_values = nil; +NSArray<SDLButtonName *> *SDLButtonName_values = nil; @implementation SDLButtonName @@ -35,7 +35,7 @@ NSArray *SDLButtonName_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLButtonName *> *)values { if (SDLButtonName_values == nil) { SDLButtonName_values = @[ SDLButtonName.OK, diff --git a/SmartDeviceLink/SDLButtonPressMode.h b/SmartDeviceLink/SDLButtonPressMode.h index 8aca9c143..02ae02129 100644 --- a/SmartDeviceLink/SDLButtonPressMode.h +++ b/SmartDeviceLink/SDLButtonPressMode.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLButtonPressMode */ -+ (NSArray *)values; ++ (NSArray<SDLButtonPressMode *> *)values; /** * @abstract A button was released, after it was pressed for a long time. Actual timing is defined by the head unit and may vary. diff --git a/SmartDeviceLink/SDLButtonPressMode.m b/SmartDeviceLink/SDLButtonPressMode.m index 15e4c2334..f8bee7c18 100644 --- a/SmartDeviceLink/SDLButtonPressMode.m +++ b/SmartDeviceLink/SDLButtonPressMode.m @@ -7,7 +7,7 @@ SDLButtonPressMode *SDLButtonPressMode_LONG = nil; SDLButtonPressMode *SDLButtonPressMode_SHORT = nil; -NSArray *SDLButtonPressMode_values = nil; +NSArray<SDLButtonPressMode *> *SDLButtonPressMode_values = nil; @implementation SDLButtonPressMode @@ -20,7 +20,7 @@ NSArray *SDLButtonPressMode_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLButtonPressMode *> *)values { if (SDLButtonPressMode_values == nil) { SDLButtonPressMode_values = @[ SDLButtonPressMode.LONG, diff --git a/SmartDeviceLink/SDLCarModeStatus.h b/SmartDeviceLink/SDLCarModeStatus.h index 15bb7b284..4a9bfd590 100644 --- a/SmartDeviceLink/SDLCarModeStatus.h +++ b/SmartDeviceLink/SDLCarModeStatus.h @@ -12,7 +12,7 @@ + (SDLCarModeStatus *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLCarModeStatus *> *)values; /** Provides carmode NORMAL to each module. */ + (SDLCarModeStatus *)NORMAL; diff --git a/SmartDeviceLink/SDLCarModeStatus.m b/SmartDeviceLink/SDLCarModeStatus.m index 4f9c03c42..90ceae32c 100644 --- a/SmartDeviceLink/SDLCarModeStatus.m +++ b/SmartDeviceLink/SDLCarModeStatus.m @@ -9,7 +9,7 @@ SDLCarModeStatus *SDLCarModeStatus_FACTORY = nil; SDLCarModeStatus *SDLCarModeStatus_TRANSPORT = nil; SDLCarModeStatus *SDLCarModeStatus_CRASH = nil; -NSArray *SDLCarModeStatus_values = nil; +NSArray<SDLCarModeStatus *> *SDLCarModeStatus_values = nil; @implementation SDLCarModeStatus @@ -22,7 +22,7 @@ NSArray *SDLCarModeStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLCarModeStatus *> *)values { if (SDLCarModeStatus_values == nil) { SDLCarModeStatus_values = @[ SDLCarModeStatus.NORMAL, diff --git a/SmartDeviceLink/SDLCharacterSet.h b/SmartDeviceLink/SDLCharacterSet.h index 300afd720..4ebac9613 100644 --- a/SmartDeviceLink/SDLCharacterSet.h +++ b/SmartDeviceLink/SDLCharacterSet.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLCharacterSet */ -+ (NSArray *)values; ++ (NSArray<SDLCharacterSet *> *)values; + (SDLCharacterSet *)TYPE2SET; diff --git a/SmartDeviceLink/SDLCharacterSet.m b/SmartDeviceLink/SDLCharacterSet.m index 18f00de90..c7e544147 100644 --- a/SmartDeviceLink/SDLCharacterSet.m +++ b/SmartDeviceLink/SDLCharacterSet.m @@ -9,7 +9,7 @@ SDLCharacterSet *SDLCharacterSet_TYPE5SET = nil; SDLCharacterSet *SDLCharacterSet_CID1SET = nil; SDLCharacterSet *SDLCharacterSet_CID2SET = nil; -NSArray *SDLCharacterSet_values = nil; +NSArray<SDLCharacterSet *> *SDLCharacterSet_values = nil; @implementation SDLCharacterSet @@ -22,7 +22,7 @@ NSArray *SDLCharacterSet_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLCharacterSet *> *)values { if (SDLCharacterSet_values == nil) { SDLCharacterSet_values = @[ SDLCharacterSet.TYPE2SET, diff --git a/SmartDeviceLink/SDLCompassDirection.h b/SmartDeviceLink/SDLCompassDirection.h index cad90cc90..3939f1619 100644 --- a/SmartDeviceLink/SDLCompassDirection.h +++ b/SmartDeviceLink/SDLCompassDirection.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLCompassDirection * @return An array that store all possible SDLCompassDirection */ -+ (NSArray *)values; ++ (NSArray<SDLCompassDirection *> *)values; /** * @abstract Direction North diff --git a/SmartDeviceLink/SDLCompassDirection.m b/SmartDeviceLink/SDLCompassDirection.m index f1c79fed1..969a3abe5 100644 --- a/SmartDeviceLink/SDLCompassDirection.m +++ b/SmartDeviceLink/SDLCompassDirection.m @@ -13,7 +13,7 @@ SDLCompassDirection *SDLCompassDirection_SOUTHEAST = nil; SDLCompassDirection *SDLCompassDirection_EAST = nil; SDLCompassDirection *SDLCompassDirection_NORTHEAST = nil; -NSArray *SDLCompassDirection_values = nil; +NSArray<SDLCompassDirection *> *SDLCompassDirection_values = nil; @implementation SDLCompassDirection @@ -26,7 +26,7 @@ NSArray *SDLCompassDirection_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLCompassDirection *> *)values { if (SDLCompassDirection_values == nil) { SDLCompassDirection_values = @[ SDLCompassDirection.NORTH, diff --git a/SmartDeviceLink/SDLComponentVolumeStatus.h b/SmartDeviceLink/SDLComponentVolumeStatus.h index 8df22663c..57290ea46 100644 --- a/SmartDeviceLink/SDLComponentVolumeStatus.h +++ b/SmartDeviceLink/SDLComponentVolumeStatus.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLComponentVolumeStatus * @return An array that store all possible SDLComponentVolumeStatus */ -+ (NSArray *)values; ++ (NSArray<SDLComponentVolumeStatus *> *)values; /** * @abstract Unknown SDLComponentVolumeStatus diff --git a/SmartDeviceLink/SDLComponentVolumeStatus.m b/SmartDeviceLink/SDLComponentVolumeStatus.m index 2e6834fb5..0cb37c541 100644 --- a/SmartDeviceLink/SDLComponentVolumeStatus.m +++ b/SmartDeviceLink/SDLComponentVolumeStatus.m @@ -11,7 +11,7 @@ SDLComponentVolumeStatus *SDLComponentVolumeStatus_FAULT = nil; SDLComponentVolumeStatus *SDLComponentVolumeStatus_ALERT = nil; SDLComponentVolumeStatus *SDLComponentVolumeStatus_NOT_SUPPORTED = nil; -NSArray *SDLComponentVolumeStatus_values = nil; +NSArray<SDLComponentVolumeStatus *> *SDLComponentVolumeStatus_values = nil; @implementation SDLComponentVolumeStatus @@ -24,7 +24,7 @@ NSArray *SDLComponentVolumeStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLComponentVolumeStatus *> *)values { if (SDLComponentVolumeStatus_values == nil) { SDLComponentVolumeStatus_values = @[ SDLComponentVolumeStatus.UNKNOWN, diff --git a/SmartDeviceLink/SDLConsoleController.h b/SmartDeviceLink/SDLConsoleController.h index 5dec97948..1376a2b5f 100644 --- a/SmartDeviceLink/SDLConsoleController.h +++ b/SmartDeviceLink/SDLConsoleController.h @@ -8,12 +8,12 @@ @interface SDLConsoleController : UITableViewController <SDLDebugToolConsole> { - NSMutableArray *messageList; + NSMutableArray<NSDictionary<NSString *, id>*> *messageList; BOOL atBottom; NSDateFormatter *dateFormatter; } -@property (strong, readonly) NSMutableArray *messageList; +@property (strong, readonly) NSMutableArray<NSDictionary<NSString *, id>*> *messageList; - (instancetype)initWithTableView:(UITableView *)tableView; diff --git a/SmartDeviceLink/SDLConsoleController.m b/SmartDeviceLink/SDLConsoleController.m index 9537e6532..2b18e4d0f 100644 --- a/SmartDeviceLink/SDLConsoleController.m +++ b/SmartDeviceLink/SDLConsoleController.m @@ -24,7 +24,7 @@ - (void)append:(id)toAppend { dispatch_async(dispatch_get_main_queue(), ^{ //Insert the new data - NSMutableDictionary *dictionary = [NSMutableDictionary dictionary]; + NSMutableDictionary<NSString *, id> *dictionary = [NSMutableDictionary dictionary]; [dictionary setObject:toAppend forKey:@"object"]; [dictionary setObject:[NSDate date] forKey:@"date"]; @@ -48,7 +48,7 @@ } else { NSIndexPath *lastIndex = [NSIndexPath indexPathForRow:(messageList.count - 1) inSection:0]; - NSArray *visibleRowIndexes = [self.tableView indexPathsForVisibleRows]; + NSArray<NSIndexPath *> *visibleRowIndexes = [self.tableView indexPathsForVisibleRows]; for (NSIndexPath *aPath in visibleRowIndexes) { if ([aPath compare:lastIndex] == NSOrderedSame) { return YES; @@ -134,7 +134,7 @@ cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier]; } - NSDictionary *currentDictionary = [messageList objectAtIndex:indexPath.row]; + NSDictionary<NSString *, id> *currentDictionary = [messageList objectAtIndex:indexPath.row]; id msg = [currentDictionary objectForKey:@"object"]; NSString *tempdetail = [@"Time: " stringByAppendingString:[dateFormatter stringFromDate:[currentDictionary objectForKey:@"date"]]]; @@ -167,7 +167,7 @@ #pragma mark Table view delegate - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - NSDictionary *currentDictionary = [messageList objectAtIndex:indexPath.row]; + NSDictionary<NSString *, id> *currentDictionary = [messageList objectAtIndex:indexPath.row]; id obj = [currentDictionary objectForKey:@"object"]; NSString *alertText = nil; diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m index dc9441f40..adb785c52 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m @@ -41,7 +41,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLChoice alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLDebugTool.m b/SmartDeviceLink/SDLDebugTool.m index c696ac6b5..a19119b8f 100644 --- a/SmartDeviceLink/SDLDebugTool.m +++ b/SmartDeviceLink/SDLDebugTool.m @@ -10,7 +10,7 @@ @property (nonatomic, assign) BOOL enabled; @property (nonatomic, assign) BOOL debugToLogFile; -@property (nonatomic, strong) NSMutableDictionary *namedConsoleSets; +@property (nonatomic, strong) NSMutableDictionary<NSString *, NSMutableSet<NSObject<SDLDebugToolConsole> *> *> *namedConsoleSets; @property (nonatomic, strong) NSDateFormatter *logDateFormatter; @property (nonatomic, strong) NSFileHandle *logFileHandle; @property (nonatomic, strong) dispatch_queue_t logQueue; @@ -87,11 +87,11 @@ [[SDLDebugTool getConsoleListenersForGroup:groupName] removeObject:console]; } -+ (NSMutableSet *)getConsoleListenersForGroup:(NSString *)groupName { ++ (NSMutableSet<NSObject<SDLDebugToolConsole> *> *)getConsoleListenersForGroup:(NSString *)groupName { return [[self sharedTool] sdl_getConsoleListenersForGroup:groupName]; } -- (NSMutableSet *)sdl_getConsoleListenersForGroup:(NSString *)groupName { +- (NSMutableSet<NSObject<SDLDebugToolConsole> *> *)sdl_getConsoleListenersForGroup:(NSString *)groupName { return [self.namedConsoleSets valueForKey:groupName]; } @@ -159,7 +159,7 @@ //Output To DebugToolConsoles if ((output & SDLDebugOutput_DebugToolConsole) == SDLDebugOutput_DebugToolConsole) { - NSSet *consoleListeners = [self getConsoleListenersForGroup:consoleGroupName]; + NSSet<NSObject<SDLDebugToolConsole> *> *consoleListeners = [self getConsoleListenersForGroup:consoleGroupName]; for (NSObject<SDLDebugToolConsole> *console in consoleListeners) { [console logInfo:outputString]; } @@ -184,7 +184,7 @@ self.debugToLogFile = YES; //Delete Log File If It Exists - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + NSArray<NSString *> *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSString *documentsDirectory = [paths objectAtIndex:0]; NSString *filePath = [documentsDirectory stringByAppendingPathComponent:@"smartdevicelink.log"]; diff --git a/SmartDeviceLink/SDLDeviceLevelStatus.h b/SmartDeviceLink/SDLDeviceLevelStatus.h index e0cb85aea..2c9d8a8ef 100644 --- a/SmartDeviceLink/SDLDeviceLevelStatus.h +++ b/SmartDeviceLink/SDLDeviceLevelStatus.h @@ -23,7 +23,7 @@ @abstract Store the enumeration of all possible SDLDeviceLevelStatus @return an array that store all possible SDLDeviceLevelStatus */ -+ (NSArray *)values; ++ (NSArray<SDLDeviceLevelStatus *> *)values; /** * @abstract Device battery level is zero bars diff --git a/SmartDeviceLink/SDLDeviceLevelStatus.m b/SmartDeviceLink/SDLDeviceLevelStatus.m index 5babd37b5..72b11b634 100644 --- a/SmartDeviceLink/SDLDeviceLevelStatus.m +++ b/SmartDeviceLink/SDLDeviceLevelStatus.m @@ -11,7 +11,7 @@ SDLDeviceLevelStatus *SDLDeviceLevelStatus_THREE_LEVEL_BARS = nil; SDLDeviceLevelStatus *SDLDeviceLevelStatus_FOUR_LEVEL_BARS = nil; SDLDeviceLevelStatus *SDLDeviceLevelStatus_NOT_PROVIDED = nil; -NSArray *SDLDeviceLevelStatus_values = nil; +NSArray<SDLDeviceLevelStatus *> *SDLDeviceLevelStatus_values = nil; @implementation SDLDeviceLevelStatus @@ -24,7 +24,7 @@ NSArray *SDLDeviceLevelStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLDeviceLevelStatus *> *)values { if (SDLDeviceLevelStatus_values == nil) { SDLDeviceLevelStatus_values = @[ SDLDeviceLevelStatus.ZERO_LEVEL_BARS, diff --git a/SmartDeviceLink/SDLDimension.h b/SmartDeviceLink/SDLDimension.h index 535f93e6e..c78ca41fc 100644 --- a/SmartDeviceLink/SDLDimension.h +++ b/SmartDeviceLink/SDLDimension.h @@ -28,7 +28,7 @@ * * @return An array that store all possible SDLDimension */ -+ (NSArray *)values; ++ (NSArray<SDLDimension *> *)values; /** * @abstract No GPS at all diff --git a/SmartDeviceLink/SDLDimension.m b/SmartDeviceLink/SDLDimension.m index 81e0114fc..0f2b44568 100644 --- a/SmartDeviceLink/SDLDimension.m +++ b/SmartDeviceLink/SDLDimension.m @@ -8,7 +8,7 @@ SDLDimension *SDLDimension_NO_FIX = nil; SDLDimension *SDLDimension_2D = nil; SDLDimension *SDLDimension_3D = nil; -NSArray *SDLDimension_values = nil; +NSArray<SDLDimension *> *SDLDimension_values = nil; @implementation SDLDimension @@ -21,7 +21,7 @@ NSArray *SDLDimension_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLDimension *> *)values { if (SDLDimension_values == nil) { SDLDimension_values = @[ SDLDimension.NO_FIX, diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m index fa3162922..31fbc862c 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.m +++ b/SmartDeviceLink/SDLDisplayCapabilities.m @@ -43,7 +43,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTextField alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -64,7 +64,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLImageField alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLDisplayType.h b/SmartDeviceLink/SDLDisplayType.h index 3bb2f2b9a..ab453251f 100644 --- a/SmartDeviceLink/SDLDisplayType.h +++ b/SmartDeviceLink/SDLDisplayType.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLDisplayType */ -+ (NSArray *)values; ++ (NSArray<SDLDisplayType *> *)values; /** * @abstract This display type provides a 2-line x 20 character "dot matrix" display. diff --git a/SmartDeviceLink/SDLDisplayType.m b/SmartDeviceLink/SDLDisplayType.m index 8059aa54b..942949caf 100644 --- a/SmartDeviceLink/SDLDisplayType.m +++ b/SmartDeviceLink/SDLDisplayType.m @@ -15,7 +15,7 @@ SDLDisplayType *SDLDisplayType_MFD4 = nil; SDLDisplayType *SDLDisplayType_MFD5 = nil; SDLDisplayType *SDLDisplayType_GEN3_8_INCH = nil; -NSArray *SDLDisplayType_values = nil; +NSArray<SDLDisplayType *> *SDLDisplayType_values = nil; @implementation SDLDisplayType @@ -28,7 +28,7 @@ NSArray *SDLDisplayType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLDisplayType *> *)values { if (SDLDisplayType_values == nil) { SDLDisplayType_values = @[ SDLDisplayType.CID, diff --git a/SmartDeviceLink/SDLDriverDistractionState.h b/SmartDeviceLink/SDLDriverDistractionState.h index 7143d09d2..49a10e8f2 100644 --- a/SmartDeviceLink/SDLDriverDistractionState.h +++ b/SmartDeviceLink/SDLDriverDistractionState.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLDriverDistractionState */ -+ (NSArray *)values; ++ (NSArray<SDLDriverDistractionState *> *)values; /** * @abstract Driver distraction rules are in effect. diff --git a/SmartDeviceLink/SDLDriverDistractionState.m b/SmartDeviceLink/SDLDriverDistractionState.m index c9a6d8714..add09616c 100644 --- a/SmartDeviceLink/SDLDriverDistractionState.m +++ b/SmartDeviceLink/SDLDriverDistractionState.m @@ -7,7 +7,7 @@ SDLDriverDistractionState *SDLDriverDistractionState_DD_ON = nil; SDLDriverDistractionState *SDLDriverDistractionState_DD_OFF = nil; -NSArray *SDLDriverDistractionState_values = nil; +NSArray<SDLDriverDistractionState *> *SDLDriverDistractionState_values = nil; @implementation SDLDriverDistractionState @@ -20,7 +20,7 @@ NSArray *SDLDriverDistractionState_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLDriverDistractionState *> *)values { if (SDLDriverDistractionState_values == nil) { SDLDriverDistractionState_values = @[ SDLDriverDistractionState.DD_ON, diff --git a/SmartDeviceLink/SDLECallConfirmationStatus.h b/SmartDeviceLink/SDLECallConfirmationStatus.h index 46fa78de6..c3abcdafd 100644 --- a/SmartDeviceLink/SDLECallConfirmationStatus.h +++ b/SmartDeviceLink/SDLECallConfirmationStatus.h @@ -12,7 +12,7 @@ } + (SDLECallConfirmationStatus *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLECallConfirmationStatus *> *)values; /** No E-Call signal triggered. */ diff --git a/SmartDeviceLink/SDLECallConfirmationStatus.m b/SmartDeviceLink/SDLECallConfirmationStatus.m index aae11a791..d8c71369f 100644 --- a/SmartDeviceLink/SDLECallConfirmationStatus.m +++ b/SmartDeviceLink/SDLECallConfirmationStatus.m @@ -12,7 +12,7 @@ SDLECallConfirmationStatus *SDLECallConfirmationStatus_CALL_UNSUCCESSFUL = nil; SDLECallConfirmationStatus *SDLECallConfirmationStatus_ECALL_CONFIGURED_OFF = nil; SDLECallConfirmationStatus *SDLECallConfirmationStatus_CALL_COMPLETE_DTMF_TIMEOUT = nil; -NSArray *SDLECallConfirmationStatus_values = nil; +NSArray<SDLECallConfirmationStatus *> *SDLECallConfirmationStatus_values = nil; @implementation SDLECallConfirmationStatus @@ -25,7 +25,7 @@ NSArray *SDLECallConfirmationStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLECallConfirmationStatus *> *)values { if (SDLECallConfirmationStatus_values == nil) { SDLECallConfirmationStatus_values = @[ SDLECallConfirmationStatus.NORMAL, diff --git a/SmartDeviceLink/SDLEmergencyEventType.h b/SmartDeviceLink/SDLEmergencyEventType.h index 1e75b3ee0..a3a76b88c 100644 --- a/SmartDeviceLink/SDLEmergencyEventType.h +++ b/SmartDeviceLink/SDLEmergencyEventType.h @@ -13,7 +13,7 @@ } + (SDLEmergencyEventType *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLEmergencyEventType *> *)values; /** No emergency event has happened. */ diff --git a/SmartDeviceLink/SDLEmergencyEventType.m b/SmartDeviceLink/SDLEmergencyEventType.m index b07979d01..f59800aea 100644 --- a/SmartDeviceLink/SDLEmergencyEventType.m +++ b/SmartDeviceLink/SDLEmergencyEventType.m @@ -12,7 +12,7 @@ SDLEmergencyEventType *SDLEmergencyEventType_ROLLOVER = nil; SDLEmergencyEventType *SDLEmergencyEventType_NOT_SUPPORTED = nil; SDLEmergencyEventType *SDLEmergencyEventType_FAULT = nil; -NSArray *SDLEmergencyEventType_values = nil; +NSArray<SDLEmergencyEventType *> *SDLEmergencyEventType_values = nil; @implementation SDLEmergencyEventType @@ -25,7 +25,7 @@ NSArray *SDLEmergencyEventType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLEmergencyEventType *> *)values { if (SDLEmergencyEventType_values == nil) { SDLEmergencyEventType_values = @[ SDLEmergencyEventType.NO_EVENT, diff --git a/SmartDeviceLink/SDLFileType.h b/SmartDeviceLink/SDLFileType.h index eb4339868..d6fc51c35 100644 --- a/SmartDeviceLink/SDLFileType.h +++ b/SmartDeviceLink/SDLFileType.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLFileType */ -+ (NSArray *)values; ++ (NSArray<SDLFileType *> *)values; /** * @abstract file type: Bitmap (BMP) diff --git a/SmartDeviceLink/SDLFileType.m b/SmartDeviceLink/SDLFileType.m index f47932e9e..38166821b 100644 --- a/SmartDeviceLink/SDLFileType.m +++ b/SmartDeviceLink/SDLFileType.m @@ -13,7 +13,7 @@ SDLFileType *SDLFileType_AUDIO_AAC = nil; SDLFileType *SDLFileType_BINARY = nil; SDLFileType *SDLFileType_JSON = nil; -NSArray *SDLFileType_values = nil; +NSArray<SDLFileType *> *SDLFileType_values = nil; @implementation SDLFileType @@ -26,7 +26,7 @@ NSArray *SDLFileType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLFileType *> *)values { if (SDLFileType_values == nil) { SDLFileType_values = @[ SDLFileType.GRAPHIC_BMP, diff --git a/SmartDeviceLink/SDLFuelCutoffStatus.h b/SmartDeviceLink/SDLFuelCutoffStatus.h index df213ff07..b6b3b1045 100644 --- a/SmartDeviceLink/SDLFuelCutoffStatus.h +++ b/SmartDeviceLink/SDLFuelCutoffStatus.h @@ -27,7 +27,7 @@ * * @return an array that stores all possible SDLFuelCutoffStatus */ -+ (NSArray *)values; ++ (NSArray<SDLFuelCutoffStatus *> *)values; /** * @abstract Fuel is cut off diff --git a/SmartDeviceLink/SDLFuelCutoffStatus.m b/SmartDeviceLink/SDLFuelCutoffStatus.m index 3bbd92bb8..255c92cc1 100644 --- a/SmartDeviceLink/SDLFuelCutoffStatus.m +++ b/SmartDeviceLink/SDLFuelCutoffStatus.m @@ -8,7 +8,7 @@ SDLFuelCutoffStatus *SDLFuelCutoffStatus_TERMINATE_FUEL = nil; SDLFuelCutoffStatus *SDLFuelCutoffStatus_NORMAL_OPERATION = nil; SDLFuelCutoffStatus *SDLFuelCutoffStatus_FAULT = nil; -NSArray *SDLFuelCutoffStatus_values = nil; +NSArray<SDLFuelCutoffStatus *> *SDLFuelCutoffStatus_values = nil; @implementation SDLFuelCutoffStatus @@ -21,7 +21,7 @@ NSArray *SDLFuelCutoffStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLFuelCutoffStatus *> *)values { if (SDLFuelCutoffStatus_values == nil) { SDLFuelCutoffStatus_values = @[ SDLFuelCutoffStatus.TERMINATE_FUEL, diff --git a/SmartDeviceLink/SDLGlobalProperty.h b/SmartDeviceLink/SDLGlobalProperty.h index 91302fa6e..29e87c545 100644 --- a/SmartDeviceLink/SDLGlobalProperty.h +++ b/SmartDeviceLink/SDLGlobalProperty.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLGlobalProperty * @return An array that store all possible SDLGlobalProperty */ -+ (NSArray *)values; ++ (NSArray<SDLGlobalProperty *> *)values; /** * @abstract The help prompt to be spoken if the user needs assistance during a user-initiated interaction. @@ -47,4 +47,4 @@ + (SDLGlobalProperty *)KEYBOARDPROPERTIES; -@end
\ No newline at end of file +@end diff --git a/SmartDeviceLink/SDLGlobalProperty.m b/SmartDeviceLink/SDLGlobalProperty.m index 59aa87e7b..dd7ca0d32 100644 --- a/SmartDeviceLink/SDLGlobalProperty.m +++ b/SmartDeviceLink/SDLGlobalProperty.m @@ -12,7 +12,7 @@ SDLGlobalProperty *SDLGlobalProperty_MENUNAME = nil; SDLGlobalProperty *SDLGlobalProperty_MENUICON = nil; SDLGlobalProperty *SDLGlobalProperty_KEYBOARDPROPERTIES = nil; -NSArray *SDLGlobalProperty_values = nil; +NSArray<SDLGlobalProperty *> *SDLGlobalProperty_values = nil; @implementation SDLGlobalProperty @@ -25,7 +25,7 @@ NSArray *SDLGlobalProperty_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLGlobalProperty *> *)values { if (SDLGlobalProperty_values == nil) { SDLGlobalProperty_values = @[ SDLGlobalProperty.HELPPROMPT, diff --git a/SmartDeviceLink/SDLHMILevel.h b/SmartDeviceLink/SDLHMILevel.h index 426217465..a20006d0e 100644 --- a/SmartDeviceLink/SDLHMILevel.h +++ b/SmartDeviceLink/SDLHMILevel.h @@ -26,7 +26,7 @@ * * @return an array with all possible HMILevel values inside */ -+ (NSArray *)values; ++ (NSArray<SDLHMILevel *> *)values; /** * The application has full use of the SDL HMI. The app may output via TTS, display, or streaming audio and may gather input via VR, Menu, and button presses diff --git a/SmartDeviceLink/SDLHMILevel.m b/SmartDeviceLink/SDLHMILevel.m index 88b0be5b6..c0ea637d6 100644 --- a/SmartDeviceLink/SDLHMILevel.m +++ b/SmartDeviceLink/SDLHMILevel.m @@ -9,7 +9,7 @@ SDLHMILevel *SDLHMILevel_LIMITED = nil; SDLHMILevel *SDLHMILevel_BACKGROUND = nil; SDLHMILevel *SDLHMILevel_NONE = nil; -NSArray *SDLHMILevel_values = nil; +NSArray<SDLHMILevel *> *SDLHMILevel_values = nil; @implementation SDLHMILevel @@ -22,7 +22,7 @@ NSArray *SDLHMILevel_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLHMILevel *> *)values { if (SDLHMILevel_values == nil) { SDLHMILevel_values = @[ [SDLHMILevel FULL], diff --git a/SmartDeviceLink/SDLHMIZoneCapabilities.h b/SmartDeviceLink/SDLHMIZoneCapabilities.h index d63655bd8..49103e5ff 100644 --- a/SmartDeviceLink/SDLHMIZoneCapabilities.h +++ b/SmartDeviceLink/SDLHMIZoneCapabilities.h @@ -23,7 +23,7 @@ * @abstract store all possible SDLHMIZoneCapabilities values * @return an array with all possible SDLHMIZoneCapabilities values inside */ -+ (NSArray *)values; ++ (NSArray<SDLHMIZoneCapabilities *> *)values; /** * @abstract Indicates HMI available for front seat passengers. diff --git a/SmartDeviceLink/SDLHMIZoneCapabilities.m b/SmartDeviceLink/SDLHMIZoneCapabilities.m index 56eacf671..69f1a1093 100644 --- a/SmartDeviceLink/SDLHMIZoneCapabilities.m +++ b/SmartDeviceLink/SDLHMIZoneCapabilities.m @@ -7,7 +7,7 @@ SDLHMIZoneCapabilities *SDLHMIZoneCapabilities_FRONT = nil; SDLHMIZoneCapabilities *SDLHMIZoneCapabilities_BACK = nil; -NSArray *SDLHMIZoneCapabilities_values = nil; +NSArray<SDLHMIZoneCapabilities *> *SDLHMIZoneCapabilities_values = nil; @implementation SDLHMIZoneCapabilities @@ -20,7 +20,7 @@ NSArray *SDLHMIZoneCapabilities_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLHMIZoneCapabilities *> *)values { if (SDLHMIZoneCapabilities_values == nil) { SDLHMIZoneCapabilities_values = @[ SDLHMIZoneCapabilities.FRONT, diff --git a/SmartDeviceLink/SDLIgnitionStableStatus.h b/SmartDeviceLink/SDLIgnitionStableStatus.h index 96dcdfaa9..63d0a7e74 100644 --- a/SmartDeviceLink/SDLIgnitionStableStatus.h +++ b/SmartDeviceLink/SDLIgnitionStableStatus.h @@ -23,7 +23,7 @@ * @abstract store all possible SDLIgnitionStableStatus values * @return an array with all possible SDLIgnitionStableStatus values inside */ -+ (NSArray *)values; ++ (NSArray<SDLIgnitionStableStatus *> *)values; /** * @abstract The current ignition switch status is considered not to be stable. diff --git a/SmartDeviceLink/SDLIgnitionStableStatus.m b/SmartDeviceLink/SDLIgnitionStableStatus.m index 868723b32..d01e45249 100644 --- a/SmartDeviceLink/SDLIgnitionStableStatus.m +++ b/SmartDeviceLink/SDLIgnitionStableStatus.m @@ -8,7 +8,7 @@ SDLIgnitionStableStatus *SDLIgnitionStableStatus_IGNITION_SWITCH_NOT_STABLE = ni SDLIgnitionStableStatus *SDLIgnitionStableStatus_IGNITION_SWITCH_STABLE = nil; SDLIgnitionStableStatus *SDLIgnitionStableStatus_MISSING_FROM_TRANSMITTER = nil; -NSArray *SDLIgnitionStableStatus_values = nil; +NSArray<SDLIgnitionStableStatus *> *SDLIgnitionStableStatus_values = nil; @implementation SDLIgnitionStableStatus @@ -21,7 +21,7 @@ NSArray *SDLIgnitionStableStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLIgnitionStableStatus *> *)values { if (SDLIgnitionStableStatus_values == nil) { SDLIgnitionStableStatus_values = @[ SDLIgnitionStableStatus.IGNITION_SWITCH_NOT_STABLE, diff --git a/SmartDeviceLink/SDLIgnitionStatus.h b/SmartDeviceLink/SDLIgnitionStatus.h index fadb3f5f4..0156b116a 100644 --- a/SmartDeviceLink/SDLIgnitionStatus.h +++ b/SmartDeviceLink/SDLIgnitionStatus.h @@ -23,7 +23,7 @@ * @abstract store all possible SDLIgnitionStatus values * @return an array with all possible SDLIgnitionStatus values inside */ -+ (NSArray *)values; ++ (NSArray<SDLIgnitionStatus *> *)values; /** * @abstract Ignition status currently unknown diff --git a/SmartDeviceLink/SDLIgnitionStatus.m b/SmartDeviceLink/SDLIgnitionStatus.m index ff069f0a0..1c36c902b 100644 --- a/SmartDeviceLink/SDLIgnitionStatus.m +++ b/SmartDeviceLink/SDLIgnitionStatus.m @@ -11,7 +11,7 @@ SDLIgnitionStatus *SDLIgnitionStatus_RUN = nil; SDLIgnitionStatus *SDLIgnitionStatus_START = nil; SDLIgnitionStatus *SDLIgnitionStatus_INVALID = nil; -NSArray *SDLIgnitionStatus_values = nil; +NSArray<SDLIgnitionStatus *> *SDLIgnitionStatus_values = nil; @implementation SDLIgnitionStatus @@ -24,7 +24,7 @@ NSArray *SDLIgnitionStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLIgnitionStatus *> *)values { if (SDLIgnitionStatus_values == nil) { SDLIgnitionStatus_values = @[ SDLIgnitionStatus.UNKNOWN, diff --git a/SmartDeviceLink/SDLImageFieldName.h b/SmartDeviceLink/SDLImageFieldName.h index 5c63a5a71..0ab7bf316 100644 --- a/SmartDeviceLink/SDLImageFieldName.h +++ b/SmartDeviceLink/SDLImageFieldName.h @@ -14,7 +14,7 @@ } + (SDLImageFieldName *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLImageFieldName *> *)values; /** The image field for SoftButton * diff --git a/SmartDeviceLink/SDLImageFieldName.m b/SmartDeviceLink/SDLImageFieldName.m index 7baa57b45..36e9ffb09 100644 --- a/SmartDeviceLink/SDLImageFieldName.m +++ b/SmartDeviceLink/SDLImageFieldName.m @@ -17,7 +17,7 @@ SDLImageFieldName *SDLImageFieldName_showConstantTBTIcon = nil; SDLImageFieldName *SDLImageFieldName_showConstantTBTNextTurnIcon = nil; SDLImageFieldName *SDLImageFieldName_locationImage = nil; -NSArray *SDLImageFieldName_values = nil; +NSArray<SDLImageFieldName *> *SDLImageFieldName_values = nil; @implementation SDLImageFieldName @@ -30,7 +30,7 @@ NSArray *SDLImageFieldName_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLImageFieldName *> *)values { if (SDLImageFieldName_values == nil) { SDLImageFieldName_values = @[ SDLImageFieldName.softButtonImage, diff --git a/SmartDeviceLink/SDLImageType.h b/SmartDeviceLink/SDLImageType.h index 2b118a456..81b21d273 100644 --- a/SmartDeviceLink/SDLImageType.h +++ b/SmartDeviceLink/SDLImageType.h @@ -26,7 +26,7 @@ * * @return An array with all possible SDLImageType values inside */ -+ (NSArray *)values; ++ (NSArray<SDLImageType *> *)values; /** * @abstract Just the static hex icon value to be used diff --git a/SmartDeviceLink/SDLImageType.m b/SmartDeviceLink/SDLImageType.m index 878eb1773..f34cb2f45 100644 --- a/SmartDeviceLink/SDLImageType.m +++ b/SmartDeviceLink/SDLImageType.m @@ -7,7 +7,7 @@ SDLImageType *SDLImageType_STATIC = nil; SDLImageType *SDLImageType_DYNAMIC = nil; -NSArray *SDLImageType_values = nil; +NSArray<SDLImageType *> *SDLImageType_values = nil; @implementation SDLImageType @@ -20,7 +20,7 @@ NSArray *SDLImageType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLImageType *> *)values { if (SDLImageType_values == nil) { SDLImageType_values = @[ SDLImageType.STATIC, diff --git a/SmartDeviceLink/SDLInteractionMode.h b/SmartDeviceLink/SDLInteractionMode.h index 442d4f8d7..aa42af988 100644 --- a/SmartDeviceLink/SDLInteractionMode.h +++ b/SmartDeviceLink/SDLInteractionMode.h @@ -23,7 +23,7 @@ * @abstract store all possible SDLInteractionMode values * @return an array with all possible SDLInteractionMode values inside */ -+ (NSArray *)values; ++ (NSArray<SDLInteractionMode *> *)values; /** * @abstract Interaction Mode : Manual Only diff --git a/SmartDeviceLink/SDLInteractionMode.m b/SmartDeviceLink/SDLInteractionMode.m index 07dc5f7b2..890cf03bd 100644 --- a/SmartDeviceLink/SDLInteractionMode.m +++ b/SmartDeviceLink/SDLInteractionMode.m @@ -8,7 +8,7 @@ SDLInteractionMode *SDLInteractionMode_MANUAL_ONLY = nil; SDLInteractionMode *SDLInteractionMode_VR_ONLY = nil; SDLInteractionMode *SDLInteractionMode_BOTH = nil; -NSArray *SDLInteractionMode_values = nil; +NSArray<SDLInteractionMode *> *SDLInteractionMode_values = nil; @implementation SDLInteractionMode @@ -21,7 +21,7 @@ NSArray *SDLInteractionMode_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLInteractionMode *> *)values { if (SDLInteractionMode_values == nil) { SDLInteractionMode_values = @[ SDLInteractionMode.MANUAL_ONLY, diff --git a/SmartDeviceLink/SDLKeyboardEvent.h b/SmartDeviceLink/SDLKeyboardEvent.h index f0d90530e..f4d7de444 100644 --- a/SmartDeviceLink/SDLKeyboardEvent.h +++ b/SmartDeviceLink/SDLKeyboardEvent.h @@ -13,7 +13,7 @@ } + (SDLKeyboardEvent *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLKeyboardEvent *> *)values; /** The use has pressed the keyboard key (applies to both SINGLE_KEYPRESS and RESEND_CURRENT_ENTRY modes). * diff --git a/SmartDeviceLink/SDLKeyboardEvent.m b/SmartDeviceLink/SDLKeyboardEvent.m index 65a7d8e89..c35e8a4e1 100644 --- a/SmartDeviceLink/SDLKeyboardEvent.m +++ b/SmartDeviceLink/SDLKeyboardEvent.m @@ -10,7 +10,7 @@ SDLKeyboardEvent *SDLKeyboardEvent_ENTRY_CANCELLED = nil; SDLKeyboardEvent *SDLKeyboardEvent_ENTRY_ABORTED = nil; SDLKeyboardEvent *SDLKeyboardEvent_ENTRY_VOICE = nil; -NSArray *SDLKeyboardEvent_values = nil; +NSArray<SDLKeyboardEvent *> *SDLKeyboardEvent_values = nil; @implementation SDLKeyboardEvent @@ -23,7 +23,7 @@ NSArray *SDLKeyboardEvent_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLKeyboardEvent *> *)values { if (SDLKeyboardEvent_values == nil) { SDLKeyboardEvent_values = @[ SDLKeyboardEvent.KEYPRESS, diff --git a/SmartDeviceLink/SDLKeyboardLayout.h b/SmartDeviceLink/SDLKeyboardLayout.h index 042caf9d0..36bfdf2bd 100644 --- a/SmartDeviceLink/SDLKeyboardLayout.h +++ b/SmartDeviceLink/SDLKeyboardLayout.h @@ -13,7 +13,7 @@ } + (SDLKeyboardLayout *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLKeyboardLayout *> *)values; /** QWERTY layout (the name comes from the first six keys<br> appearing on the top left letter row of the keyboard and read from left to right) * */ diff --git a/SmartDeviceLink/SDLKeyboardLayout.m b/SmartDeviceLink/SDLKeyboardLayout.m index 700bd2622..104447d5e 100644 --- a/SmartDeviceLink/SDLKeyboardLayout.m +++ b/SmartDeviceLink/SDLKeyboardLayout.m @@ -8,7 +8,7 @@ SDLKeyboardLayout *SDLKeyboardLayout_QWERTY = nil; SDLKeyboardLayout *SDLKeyboardLayout_QWERTZ = nil; SDLKeyboardLayout *SDLKeyboardLayout_AZERTY = nil; -NSArray *SDLKeyboardLayout_values = nil; +NSArray<SDLKeyboardLayout *> *SDLKeyboardLayout_values = nil; @implementation SDLKeyboardLayout @@ -21,7 +21,7 @@ NSArray *SDLKeyboardLayout_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLKeyboardLayout *> *)values { if (SDLKeyboardLayout_values == nil) { SDLKeyboardLayout_values = @[ SDLKeyboardLayout.QWERTY, diff --git a/SmartDeviceLink/SDLKeypressMode.h b/SmartDeviceLink/SDLKeypressMode.h index 1b4ad0fe1..76add82d8 100644 --- a/SmartDeviceLink/SDLKeypressMode.h +++ b/SmartDeviceLink/SDLKeypressMode.h @@ -15,7 +15,7 @@ } + (SDLKeypressMode *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLKeypressMode *> *)values; /** SINGLE_KEYPRESS:<br>Each and every User`s keypress must be reported (new notification for every newly entered single symbol). * diff --git a/SmartDeviceLink/SDLKeypressMode.m b/SmartDeviceLink/SDLKeypressMode.m index 9fa0034e7..c82105977 100644 --- a/SmartDeviceLink/SDLKeypressMode.m +++ b/SmartDeviceLink/SDLKeypressMode.m @@ -8,7 +8,7 @@ SDLKeypressMode *SDLKeypressMode_SINGLE_KEYPRESS = nil; SDLKeypressMode *SDLKeypressMode_QUEUE_KEYPRESSES = nil; SDLKeypressMode *SDLKeypressMode_RESEND_CURRENT_ENTRY = nil; -NSArray *SDLKeypressMode_values = nil; +NSArray<SDLKeypressMode *> *SDLKeypressMode_values = nil; @implementation SDLKeypressMode @@ -21,7 +21,7 @@ NSArray *SDLKeypressMode_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLKeypressMode *> *)values { if (SDLKeypressMode_values == nil) { SDLKeypressMode_values = @[ SDLKeypressMode.SINGLE_KEYPRESS, diff --git a/SmartDeviceLink/SDLLanguage.h b/SmartDeviceLink/SDLLanguage.h index 38d63746b..d6ac44dcf 100644 --- a/SmartDeviceLink/SDLLanguage.h +++ b/SmartDeviceLink/SDLLanguage.h @@ -26,7 +26,7 @@ * * @return an array with all possible Language values inside */ -+ (NSArray *)values; ++ (NSArray<SDLLanguage *> *)values; /*! @abstract English_US */ diff --git a/SmartDeviceLink/SDLLanguage.m b/SmartDeviceLink/SDLLanguage.m index df43adf4c..c4b1baf2c 100644 --- a/SmartDeviceLink/SDLLanguage.m +++ b/SmartDeviceLink/SDLLanguage.m @@ -29,7 +29,7 @@ SDLLanguage *SDLLanguage_CS_CZ = nil; SDLLanguage *SDLLanguage_DA_DK = nil; SDLLanguage *SDLLanguage_NO_NO = nil; -NSArray *SDLLanguage_values = nil; +NSArray<SDLLanguage *> *SDLLanguage_values = nil; @implementation SDLLanguage @@ -42,7 +42,7 @@ NSArray *SDLLanguage_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLLanguage *> *)values { if (SDLLanguage_values == nil) { SDLLanguage_values = @[ SDLLanguage.EN_US, diff --git a/SmartDeviceLink/SDLLayoutMode.h b/SmartDeviceLink/SDLLayoutMode.h index 9e0377f40..f53e75ff8 100644 --- a/SmartDeviceLink/SDLLayoutMode.h +++ b/SmartDeviceLink/SDLLayoutMode.h @@ -13,7 +13,7 @@ } + (SDLLayoutMode *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLLayoutMode *> *)values; /** * This mode causes the interaction to display the previous set of choices as icons. diff --git a/SmartDeviceLink/SDLLayoutMode.m b/SmartDeviceLink/SDLLayoutMode.m index 343f06a0f..83cf27821 100644 --- a/SmartDeviceLink/SDLLayoutMode.m +++ b/SmartDeviceLink/SDLLayoutMode.m @@ -10,7 +10,7 @@ SDLLayoutMode *SDLLayoutMode_LIST_ONLY = nil; SDLLayoutMode *SDLLayoutMode_LIST_WITH_SEARCH = nil; SDLLayoutMode *SDLLayoutMode_KEYBOARD = nil; -NSArray *SDLLayoutMode_values = nil; +NSArray<SDLLayoutMode *> *SDLLayoutMode_values = nil; @implementation SDLLayoutMode @@ -23,7 +23,7 @@ NSArray *SDLLayoutMode_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLLayoutMode *> *)values { if (SDLLayoutMode_values == nil) { SDLLayoutMode_values = @[ SDLLayoutMode.ICON_ONLY, diff --git a/SmartDeviceLink/SDLLockScreenStatus.h b/SmartDeviceLink/SDLLockScreenStatus.h index 044aa7e3e..d6a364348 100644 --- a/SmartDeviceLink/SDLLockScreenStatus.h +++ b/SmartDeviceLink/SDLLockScreenStatus.h @@ -8,7 +8,7 @@ @interface SDLLockScreenStatus : SDLEnum + (SDLLockScreenStatus *)valueOf:(NSString *)value; -+ (NSMutableArray *)values; ++ (NSMutableArray<SDLLockScreenStatus *> *)values; /** * LockScreen is Not Required */ diff --git a/SmartDeviceLink/SDLLockScreenStatus.m b/SmartDeviceLink/SDLLockScreenStatus.m index 8ef8a7d43..9806f2dd1 100644 --- a/SmartDeviceLink/SDLLockScreenStatus.m +++ b/SmartDeviceLink/SDLLockScreenStatus.m @@ -11,7 +11,7 @@ SDLLockScreenStatus *SDLLockScreenStatus_OFF = nil; SDLLockScreenStatus *SDLLockScreenStatus_OPTIONAL = nil; SDLLockScreenStatus *SDLLockScreenStatus_REQUIRED = nil; -NSArray *SDLLockScreenStatus_values = nil; +NSArray<SDLLockScreenStatus *> *SDLLockScreenStatus_values = nil; + (SDLLockScreenStatus *)valueOf:(NSString *)value { @@ -23,7 +23,7 @@ NSArray *SDLLockScreenStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLLockScreenStatus *> *)values { if (SDLLockScreenStatus_values == nil) { SDLLockScreenStatus_values = @[ SDLLockScreenStatus.OFF, diff --git a/SmartDeviceLink/SDLMaintenanceModeStatus.h b/SmartDeviceLink/SDLMaintenanceModeStatus.h index cd399e20c..1e882e805 100644 --- a/SmartDeviceLink/SDLMaintenanceModeStatus.h +++ b/SmartDeviceLink/SDLMaintenanceModeStatus.h @@ -21,7 +21,7 @@ * @abstract declare an array that store all possible Maintenance Mode Status inside * @return the array */ -+ (NSArray *)values; ++ (NSArray<SDLMaintenanceModeStatus *> *)values; /** * @abstract Maintenance Mode Status : Normal diff --git a/SmartDeviceLink/SDLMaintenanceModeStatus.m b/SmartDeviceLink/SDLMaintenanceModeStatus.m index d6e7f8ddd..83efd2c15 100644 --- a/SmartDeviceLink/SDLMaintenanceModeStatus.m +++ b/SmartDeviceLink/SDLMaintenanceModeStatus.m @@ -9,7 +9,7 @@ SDLMaintenanceModeStatus *SDLMaintenanceModeStatus_NEAR = nil; SDLMaintenanceModeStatus *SDLMaintenanceModeStatus_ACTIVE = nil; SDLMaintenanceModeStatus *SDLMaintenanceModeStatus_FEATURE_NOT_PRESENT = nil; -NSArray *SDLMaintenanceModeStatus_values = nil; +NSArray<SDLMaintenanceModeStatus *> *SDLMaintenanceModeStatus_values = nil; @implementation SDLMaintenanceModeStatus @@ -22,7 +22,7 @@ NSArray *SDLMaintenanceModeStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLMaintenanceModeStatus *> *)values { if (SDLMaintenanceModeStatus_values == nil) { SDLMaintenanceModeStatus_values = @[ SDLMaintenanceModeStatus.NORMAL, diff --git a/SmartDeviceLink/SDLMediaClockFormat.h b/SmartDeviceLink/SDLMediaClockFormat.h index 12c8b8e16..f95c7eccd 100644 --- a/SmartDeviceLink/SDLMediaClockFormat.h +++ b/SmartDeviceLink/SDLMediaClockFormat.h @@ -31,7 +31,7 @@ * * @return the array */ -+ (NSArray *)values; ++ (NSArray<SDLMediaClockFormat *> *)values; /** * @abstract Media clock format: Clock1 diff --git a/SmartDeviceLink/SDLMediaClockFormat.m b/SmartDeviceLink/SDLMediaClockFormat.m index 20ddb8005..38cc2cd4b 100644 --- a/SmartDeviceLink/SDLMediaClockFormat.m +++ b/SmartDeviceLink/SDLMediaClockFormat.m @@ -12,7 +12,7 @@ SDLMediaClockFormat *SDLMediaClockFormat_CLOCKTEXT2 = nil; SDLMediaClockFormat *SDLMediaClockFormat_CLOCKTEXT3 = nil; SDLMediaClockFormat *SDLMediaClockFormat_CLOCKTEXT4 = nil; -NSArray *SDLMediaClockFormat_values = nil; +NSArray<SDLMediaClockFormat *> *SDLMediaClockFormat_values = nil; @implementation SDLMediaClockFormat @@ -25,7 +25,7 @@ NSArray *SDLMediaClockFormat_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLMediaClockFormat *> *)values { if (SDLMediaClockFormat_values == nil) { SDLMediaClockFormat_values = @[ SDLMediaClockFormat.CLOCK1, diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m index 7d82a3927..e063f0831 100644 --- a/SmartDeviceLink/SDLOnPermissionsChange.m +++ b/SmartDeviceLink/SDLOnPermissionsChange.m @@ -28,7 +28,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLPermissionItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m index 961d45587..920a3526a 100644 --- a/SmartDeviceLink/SDLOnTouchEvent.m +++ b/SmartDeviceLink/SDLOnTouchEvent.m @@ -46,7 +46,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTouchEvent alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLPRNDL.h b/SmartDeviceLink/SDLPRNDL.h index 6095d1a82..8c36f8576 100644 --- a/SmartDeviceLink/SDLPRNDL.h +++ b/SmartDeviceLink/SDLPRNDL.h @@ -26,7 +26,7 @@ * * @return the array */ -+ (NSArray *)values; ++ (NSArray<SDLPRNDL *> *)values; /** * @abstract Park diff --git a/SmartDeviceLink/SDLPRNDL.m b/SmartDeviceLink/SDLPRNDL.m index e0588af77..5b20511d7 100644 --- a/SmartDeviceLink/SDLPRNDL.m +++ b/SmartDeviceLink/SDLPRNDL.m @@ -21,7 +21,7 @@ SDLPRNDL *SDLPRNDL_EIGHTH = nil; SDLPRNDL *SDLPRNDL_UNKNOWN = nil; SDLPRNDL *SDLPRNDL_FAULT = nil; -NSArray *SDLPRNDL_values = nil; +NSArray<SDLPRNDL *> *SDLPRNDL_values = nil; @implementation SDLPRNDL @@ -34,7 +34,7 @@ NSArray *SDLPRNDL_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLPRNDL *> *)values { if (SDLPRNDL_values == nil) { SDLPRNDL_values = @[ SDLPRNDL.PARK, diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m index ad9697889..a62b86aec 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.m +++ b/SmartDeviceLink/SDLPerformAudioPassThru.m @@ -32,7 +32,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index b4b2e2d8c..70310a6c3 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -44,7 +44,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -94,7 +94,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -115,7 +115,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -148,7 +148,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLPermissionManager.m b/SmartDeviceLink/SDLPermissionManager.m index 5939738ff..bbd0d4676 100644 --- a/SmartDeviceLink/SDLPermissionManager.m +++ b/SmartDeviceLink/SDLPermissionManager.m @@ -242,7 +242,7 @@ NS_ASSUME_NONNULL_BEGIN } } - NSArray *filtersToCall = [mutableFiltersToCall copy]; + NSArray<SDLPermissionFilter *> *filtersToCall = [mutableFiltersToCall copy]; // For all the modified filters, call if necessary for (SDLPermissionFilter *filter in filtersToCall) { diff --git a/SmartDeviceLink/SDLPermissionStatus.h b/SmartDeviceLink/SDLPermissionStatus.h index 0ac9219ec..60acd34b8 100644 --- a/SmartDeviceLink/SDLPermissionStatus.h +++ b/SmartDeviceLink/SDLPermissionStatus.h @@ -25,7 +25,7 @@ * @abstract declare an array to store all possible SDLPermissionStatus values * @return the array */ -+ (NSArray *)values; ++ (NSArray<SDLPermissionStatus *> *)values; /** diff --git a/SmartDeviceLink/SDLPermissionStatus.m b/SmartDeviceLink/SDLPermissionStatus.m index 179cf2014..f78e96bc7 100644 --- a/SmartDeviceLink/SDLPermissionStatus.m +++ b/SmartDeviceLink/SDLPermissionStatus.m @@ -9,7 +9,7 @@ SDLPermissionStatus *SDLPermissionStatus_DISALLOWED = nil; SDLPermissionStatus *SDLPermissionStatus_USER_DISALLOWED = nil; SDLPermissionStatus *SDLPermissionStatus_USER_CONSENT_PENDING = nil; -NSArray *SDLPermissionStatus_values = nil; +NSArray<SDLPermissionStatus *> *SDLPermissionStatus_values = nil; @implementation SDLPermissionStatus @@ -22,7 +22,7 @@ NSArray *SDLPermissionStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLPermissionStatus *> *)values { if (SDLPermissionStatus_values == nil) { SDLPermissionStatus_values = @[ SDLPermissionStatus.ALLOWED, diff --git a/SmartDeviceLink/SDLPolicyDataParser.m b/SmartDeviceLink/SDLPolicyDataParser.m index 92b1e1580..68cfcfa44 100644 --- a/SmartDeviceLink/SDLPolicyDataParser.m +++ b/SmartDeviceLink/SDLPolicyDataParser.m @@ -13,7 +13,7 @@ @try { NSError *errorJSONSerialization = nil; NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:wrappedData options:kNilOptions error:&errorJSONSerialization]; - NSArray *array = dictionary[@"data"]; + NSArray<NSString *> *array = dictionary[@"data"]; NSString *base64EncodedString = array[0]; if ([NSData instancesRespondToSelector:@selector(initWithBase64EncodedString:options:)]) { diff --git a/SmartDeviceLink/SDLPowerModeQualificationStatus.h b/SmartDeviceLink/SDLPowerModeQualificationStatus.h index 4e520196b..dbc7626ee 100644 --- a/SmartDeviceLink/SDLPowerModeQualificationStatus.h +++ b/SmartDeviceLink/SDLPowerModeQualificationStatus.h @@ -8,7 +8,7 @@ } + (SDLPowerModeQualificationStatus *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLPowerModeQualificationStatus *> *)values; + (SDLPowerModeQualificationStatus *)POWER_MODE_UNDEFINED; + (SDLPowerModeQualificationStatus *)POWER_MODE_EVALUATION_IN_PROGRESS; diff --git a/SmartDeviceLink/SDLPowerModeQualificationStatus.m b/SmartDeviceLink/SDLPowerModeQualificationStatus.m index d820221e9..f41e712a7 100644 --- a/SmartDeviceLink/SDLPowerModeQualificationStatus.m +++ b/SmartDeviceLink/SDLPowerModeQualificationStatus.m @@ -9,7 +9,7 @@ SDLPowerModeQualificationStatus *SDLPowerModeQualificationStatus_POWER_MODE_EVAL SDLPowerModeQualificationStatus *SDLPowerModeQualificationStatus_NOT_DEFINED = nil; SDLPowerModeQualificationStatus *SDLPowerModeQualificationStatus_POWER_MODE_OK = nil; -NSArray *SDLPowerModeQualificationStatus_values = nil; +NSArray<SDLPowerModeQualificationStatus *> *SDLPowerModeQualificationStatus_values = nil; @implementation SDLPowerModeQualificationStatus @@ -22,7 +22,7 @@ NSArray *SDLPowerModeQualificationStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLPowerModeQualificationStatus *> *)values { if (SDLPowerModeQualificationStatus_values == nil) { SDLPowerModeQualificationStatus_values = @[ SDLPowerModeQualificationStatus.POWER_MODE_UNDEFINED, diff --git a/SmartDeviceLink/SDLPowerModeStatus.h b/SmartDeviceLink/SDLPowerModeStatus.h index 8eb24fdb4..d4341ad55 100644 --- a/SmartDeviceLink/SDLPowerModeStatus.h +++ b/SmartDeviceLink/SDLPowerModeStatus.h @@ -8,7 +8,7 @@ } + (SDLPowerModeStatus *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLPowerModeStatus *> *)values; + (SDLPowerModeStatus *)KEY_OUT; + (SDLPowerModeStatus *)KEY_RECENTLY_OUT; diff --git a/SmartDeviceLink/SDLPowerModeStatus.m b/SmartDeviceLink/SDLPowerModeStatus.m index efc46a094..4a727a659 100644 --- a/SmartDeviceLink/SDLPowerModeStatus.m +++ b/SmartDeviceLink/SDLPowerModeStatus.m @@ -14,7 +14,7 @@ SDLPowerModeStatus *SDLPowerModeStatus_IGNITION_ON_2 = nil; SDLPowerModeStatus *SDLPowerModeStatus_RUNNING_2 = nil; SDLPowerModeStatus *SDLPowerModeStatus_CRANK_3 = nil; -NSArray *SDLPowerModeStatus_values = nil; +NSArray<SDLPowerModeStatus *> *SDLPowerModeStatus_values = nil; @implementation SDLPowerModeStatus @@ -27,7 +27,7 @@ NSArray *SDLPowerModeStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLPowerModeStatus *> *)values { if (SDLPowerModeStatus_values == nil) { SDLPowerModeStatus_values = @[ SDLPowerModeStatus.KEY_OUT, diff --git a/SmartDeviceLink/SDLPredefinedLayout.h b/SmartDeviceLink/SDLPredefinedLayout.h index 7d061d449..c615c08f8 100644 --- a/SmartDeviceLink/SDLPredefinedLayout.h +++ b/SmartDeviceLink/SDLPredefinedLayout.h @@ -8,7 +8,7 @@ } + (SDLPredefinedLayout *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLPredefinedLayout *> *)values; + (SDLPredefinedLayout *)DEFAULT; + (SDLPredefinedLayout *)MEDIA; diff --git a/SmartDeviceLink/SDLPredefinedLayout.m b/SmartDeviceLink/SDLPredefinedLayout.m index 57dc2b384..2dde0f940 100644 --- a/SmartDeviceLink/SDLPredefinedLayout.m +++ b/SmartDeviceLink/SDLPredefinedLayout.m @@ -25,7 +25,7 @@ SDLPredefinedLayout *SDLPredefinedLayout_LARGE_GRAPHIC_WITH_SOFTBUTTONS = nil; SDLPredefinedLayout *SDLPredefinedLayout_DOUBLE_GRAPHIC_WITH_SOFTBUTTONS = nil; SDLPredefinedLayout *SDLPredefinedLayout_LARGE_GRAPHIC_ONLY = nil; -NSArray *SDLPredefinedLayout_values = nil; +NSArray<SDLPredefinedLayout *> *SDLPredefinedLayout_values = nil; @implementation SDLPredefinedLayout @@ -38,7 +38,7 @@ NSArray *SDLPredefinedLayout_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLPredefinedLayout *> *)values { if (SDLPredefinedLayout_values == nil) { SDLPredefinedLayout_values = @[ SDLPredefinedLayout.DEFAULT, diff --git a/SmartDeviceLink/SDLPrerecordedSpeech.h b/SmartDeviceLink/SDLPrerecordedSpeech.h index 85934237a..e9166c016 100644 --- a/SmartDeviceLink/SDLPrerecordedSpeech.h +++ b/SmartDeviceLink/SDLPrerecordedSpeech.h @@ -8,7 +8,7 @@ } + (SDLPrerecordedSpeech *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLPrerecordedSpeech *> *)values; + (SDLPrerecordedSpeech *)HELP_JINGLE; + (SDLPrerecordedSpeech *)INITIAL_JINGLE; diff --git a/SmartDeviceLink/SDLPrerecordedSpeech.m b/SmartDeviceLink/SDLPrerecordedSpeech.m index 676645f76..7114a107a 100644 --- a/SmartDeviceLink/SDLPrerecordedSpeech.m +++ b/SmartDeviceLink/SDLPrerecordedSpeech.m @@ -10,7 +10,7 @@ SDLPrerecordedSpeech *SDLPrerecordedSpeech_LISTEN_JINGLE = nil; SDLPrerecordedSpeech *SDLPrerecordedSpeech_POSITIVE_JINGLE = nil; SDLPrerecordedSpeech *SDLPrerecordedSpeech_NEGATIVE_JINGLE = nil; -NSArray *SDLPrerecordedSpeech_values = nil; +NSArray<SDLPrerecordedSpeech *> *SDLPrerecordedSpeech_values = nil; @implementation SDLPrerecordedSpeech @@ -23,7 +23,7 @@ NSArray *SDLPrerecordedSpeech_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLPrerecordedSpeech *> *)values { if (SDLPrerecordedSpeech_values == nil) { SDLPrerecordedSpeech_values = @[ SDLPrerecordedSpeech.HELP_JINGLE, diff --git a/SmartDeviceLink/SDLPrimaryAudioSource.h b/SmartDeviceLink/SDLPrimaryAudioSource.h index 81e9a2257..c30f8077b 100644 --- a/SmartDeviceLink/SDLPrimaryAudioSource.h +++ b/SmartDeviceLink/SDLPrimaryAudioSource.h @@ -25,7 +25,7 @@ * @abstract declare an array to store all possible SDLPrimaryAudioSource values * @return the array */ -+ (NSArray *)values; ++ (NSArray<SDLPrimaryAudioSource *> *)values; /** * @abstract Currently no source selected diff --git a/SmartDeviceLink/SDLPrimaryAudioSource.m b/SmartDeviceLink/SDLPrimaryAudioSource.m index 4293411a8..2e924c64e 100644 --- a/SmartDeviceLink/SDLPrimaryAudioSource.m +++ b/SmartDeviceLink/SDLPrimaryAudioSource.m @@ -12,7 +12,7 @@ SDLPrimaryAudioSource *SDLPrimaryAudioSource_LINE_IN = nil; SDLPrimaryAudioSource *SDLPrimaryAudioSource_IPOD = nil; SDLPrimaryAudioSource *SDLPrimaryAudioSource_MOBILE_APP = nil; -NSArray *SDLPrimaryAudioSource_values = nil; +NSArray<SDLPrimaryAudioSource *> *SDLPrimaryAudioSource_values = nil; @implementation SDLPrimaryAudioSource @@ -25,7 +25,7 @@ NSArray *SDLPrimaryAudioSource_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLPrimaryAudioSource *> *)values { if (SDLPrimaryAudioSource_values == nil) { SDLPrimaryAudioSource_values = @[ SDLPrimaryAudioSource.NO_SOURCE_SELECTED, diff --git a/SmartDeviceLink/SDLPrioritizedObjectCollection.m b/SmartDeviceLink/SDLPrioritizedObjectCollection.m index 637596d14..c1b5b15b7 100644 --- a/SmartDeviceLink/SDLPrioritizedObjectCollection.m +++ b/SmartDeviceLink/SDLPrioritizedObjectCollection.m @@ -8,7 +8,7 @@ @interface SDLPrioritizedObjectCollection () { - NSMutableArray *privateArray; + NSMutableArray<id> *privateArray; } @end @@ -18,7 +18,7 @@ - (instancetype)init { self = [super init]; if (self) { - privateArray = [NSMutableArray new]; + privateArray = [NSMutableArray<id> new]; } return self; } diff --git a/SmartDeviceLink/SDLProtocol.m b/SmartDeviceLink/SDLProtocol.m index a1224dd34..a6e22d9c2 100644 --- a/SmartDeviceLink/SDLProtocol.m +++ b/SmartDeviceLink/SDLProtocol.m @@ -259,7 +259,7 @@ typedef NSNumber SDLServiceTypeBox; [self sdl_logRPCSend:protocolMessage]; [self sdl_sendDataToTransport:protocolMessage.data onService:SDLServiceType_RPC]; } else { - NSArray *messages = [SDLProtocolMessageDisassembler disassemble:protocolMessage withLimit:[SDLGlobals globals].maxMTUSize]; + NSArray<SDLProtocolMessage *> *messages = [SDLProtocolMessageDisassembler disassemble:protocolMessage withLimit:[SDLGlobals globals].maxMTUSize]; for (SDLProtocolMessage *smallerMessage in messages) { [self sdl_logRPCSend:smallerMessage]; [self sdl_sendDataToTransport:smallerMessage.data onService:SDLServiceType_RPC]; @@ -326,7 +326,7 @@ typedef NSNumber SDLServiceTypeBox; [self sdl_logRPCSend:message]; [self sdl_sendDataToTransport:message.data onService:header.serviceType]; } else { - NSArray *messages = [SDLProtocolMessageDisassembler disassemble:message withLimit:[SDLGlobals globals].maxMTUSize]; + NSArray<SDLProtocolMessage *> *messages = [SDLProtocolMessageDisassembler disassemble:message withLimit:[SDLGlobals globals].maxMTUSize]; for (SDLProtocolMessage *smallerMessage in messages) { [self sdl_logRPCSend:smallerMessage]; [self sdl_sendDataToTransport:smallerMessage.data onService:header.serviceType]; diff --git a/SmartDeviceLink/SDLProtocolMessage.m b/SmartDeviceLink/SDLProtocolMessage.m index 2d1007dbf..acfeb90e1 100644 --- a/SmartDeviceLink/SDLProtocolMessage.m +++ b/SmartDeviceLink/SDLProtocolMessage.m @@ -64,7 +64,7 @@ SDLName functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID]; UInt8 rpcType = rpcPayload.rpcType; - NSArray *rpcTypeNames = @[@"Request", @"Response", @"Notification"]; + NSArray<NSString *> *rpcTypeNames = @[@"Request", @"Response", @"Notification"]; NSString *rpcTypeString = nil; if (rpcType >= 0 && rpcType < rpcTypeNames.count) { rpcTypeString = rpcTypeNames[rpcType]; diff --git a/SmartDeviceLink/SDLProtocolMessageDisassembler.h b/SmartDeviceLink/SDLProtocolMessageDisassembler.h index 10f6f2860..b4b8afa5c 100644 --- a/SmartDeviceLink/SDLProtocolMessageDisassembler.h +++ b/SmartDeviceLink/SDLProtocolMessageDisassembler.h @@ -8,6 +8,6 @@ @interface SDLProtocolMessageDisassembler : NSObject -+ (NSArray *)disassemble:(SDLProtocolMessage *)protocolMessage withLimit:(NSUInteger)mtu; ++ (NSArray<SDLProtocolMessage *> *)disassemble:(SDLProtocolMessage *)protocolMessage withLimit:(NSUInteger)mtu; @end diff --git a/SmartDeviceLink/SDLProtocolMessageDisassembler.m b/SmartDeviceLink/SDLProtocolMessageDisassembler.m index 76d722956..7e3d0df3e 100644 --- a/SmartDeviceLink/SDLProtocolMessageDisassembler.m +++ b/SmartDeviceLink/SDLProtocolMessageDisassembler.m @@ -11,7 +11,7 @@ // Use to break up a large message into a sequence of smaller messages, // each of which is less than 'mtu' number of bytes total size. -+ (NSArray *)disassemble:(SDLProtocolMessage *)incomingMessage withLimit:(NSUInteger)mtu { ++ (NSArray<SDLProtocolMessage *> *)disassemble:(SDLProtocolMessage *)incomingMessage withLimit:(NSUInteger)mtu { // Questions: // What message IDs does the current system use? Same messageIDs? Same CorrelationIDs? // What gets simply copied from incoming header to created headers; and what needs adjustment? @@ -32,7 +32,7 @@ NSUInteger numberOfDataBytesPerMessage = mtu - headerSize; // Create the outgoing array to hold the messages we will create. - NSMutableArray *outgoingMessages = [NSMutableArray arrayWithCapacity:numberOfMessagesRequired + 1]; + NSMutableArray<SDLProtocolMessage *> *outgoingMessages = [NSMutableArray arrayWithCapacity:numberOfMessagesRequired + 1]; // Create the first message diff --git a/SmartDeviceLink/SDLProxy.h b/SmartDeviceLink/SDLProxy.h index ed9ae4052..eed85e928 100644 --- a/SmartDeviceLink/SDLProxy.h +++ b/SmartDeviceLink/SDLProxy.h @@ -24,7 +24,7 @@ __deprecated_msg("Use SDLManager instead") @property (strong) SDLAbstractProtocol *protocol; @property (strong) SDLAbstractTransport *transport; -@property (readonly, copy) NSSet *proxyListeners; +@property (readonly, copy) NSSet<NSObject<SDLProxyListener> *> *proxyListeners; @property (strong) SDLTimer *startSessionTimer; @property (copy) NSString *debugConsoleGroupName; @property (readonly, copy) NSString *proxyVersion; diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index e57967474..27765f537 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -58,7 +58,7 @@ const int POLICIES_CORRELATION_ID = 65535; } @property (copy, nonatomic) NSString *appId; -@property (strong, nonatomic) NSMutableSet *mutableProxyListeners; +@property (strong, nonatomic) NSMutableSet<NSObject<SDLProxyListener> *> *mutableProxyListeners; @property (nonatomic, strong, readwrite, nullable) SDLStreamingMediaManager *streamingMediaManager; @property (nonatomic, strong, nullable) SDLDisplayCapabilities *displayCapabilities; @property (nonatomic, strong) NSMutableDictionary<SDLVehicleMake *, Class> *securityManagers; @@ -166,7 +166,7 @@ const int POLICIES_CORRELATION_ID = 65535; #pragma mark - Accessors -- (NSSet *)proxyListeners { +- (NSSet<NSObject<SDLProxyListener> *> *)proxyListeners { return [self.mutableProxyListeners copy]; } @@ -184,7 +184,9 @@ const int POLICIES_CORRELATION_ID = 65535; } _streamingMediaManager = [[SDLStreamingMediaManager alloc] initWithProtocol:self.protocol displayCapabilities:self.displayCapabilities]; [self.protocol.protocolDelegateTable addObject:_streamingMediaManager]; - [self.mutableProxyListeners addObject:_streamingMediaManager.touchManager]; + + // HAX: The cast is a result of a compiler bug throwing a warning when it shouldn't + [self.mutableProxyListeners addObject:(id<SDLProxyListener>)_streamingMediaManager.touchManager]; } return _streamingMediaManager; @@ -714,7 +716,7 @@ const int POLICIES_CORRELATION_ID = 65535; // Prepare the data in the required format NSString *encodedSyncPDataString = [[NSString stringWithFormat:@"%@", encodedSyncPData] componentsSeparatedByString:@"\""][1]; - NSArray *array = [NSArray arrayWithObject:encodedSyncPDataString]; + NSArray<NSString *> *array = [NSArray arrayWithObject:encodedSyncPDataString]; NSDictionary *dictionary = @{ @"data": array }; NSError *JSONSerializationError = nil; NSData *data = [NSJSONSerialization dataWithJSONObject:dictionary options:kNilOptions error:&JSONSerializationError]; diff --git a/SmartDeviceLink/SDLRPCRequestFactory.h b/SmartDeviceLink/SDLRPCRequestFactory.h index 5b0146bbf..d34f6dbb7 100644 --- a/SmartDeviceLink/SDLRPCRequestFactory.h +++ b/SmartDeviceLink/SDLRPCRequestFactory.h @@ -4,6 +4,7 @@ #import <Foundation/Foundation.h> #import "SDLNotificationConstants.h" +#import "SDLVRHelpItem.h" @class SDLAddCommand; @class SDLAddSubMenu; @@ -14,6 +15,7 @@ @class SDLBitsPerSample; @class SDLButtonName; @class SDLChangeRegistration; +@class SDLChoice; @class SDLCreateInteractionChoiceSet; @class SDLDeleteCommand; @class SDLDeleteFile; @@ -24,6 +26,7 @@ @class SDLFileType; @class SDLGetDTCs; @class SDLGetVehicleData; +@class SDLGlobalProperty; @class SDLImage; @class SDLImageType; @class SDLInteractionMode; @@ -52,6 +55,8 @@ @class SDLSubscribeVehicleData; @class SDLSystemAction; @class SDLTextAlignment; +@class SDLTTSChunk; +@class SDLTurn; @class SDLUnregisterAppInterface; @class SDLUnsubscribeButton; @class SDLUnsubscribeVehicleData; @@ -63,18 +68,18 @@ } //***** AddCommand ***** -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:menuName:parentID:position:vrCommands:iconValue:iconType:handler: with SDLManager instead"); ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:menuName:parentID:position:vrCommands:iconValue:iconType:handler: with SDLManager instead"); ; -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray *)vrCommands correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:menuName:vrCommands:handler: with SDLManager instead"); ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:menuName:vrCommands:handler: with SDLManager instead"); -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray *)vrCommands correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:vrCommands:handler: with SDLManager instead"); ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:vrCommands:handler: with SDLManager instead"); -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType handler:(SDLRPCNotificationHandler)handler; ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType handler:(SDLRPCNotificationHandler)handler; -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray *)vrCommands handler:(SDLRPCNotificationHandler)handler; ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler; -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray *)vrCommands handler:(SDLRPCNotificationHandler)handler; ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler; //***** @@ -94,23 +99,23 @@ correlationID; //*** -+ (SDLAlert *)buildAlertWithTTSChunks:(NSArray *)ttsChunks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber *)playTone duration:(NSNumber *)duration softButtons:(NSArray *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber *)playTone duration:(NSNumber *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; -+ (SDLAlert *)buildAlertWithTTSChunks:(NSArray *)ttsChunks playTone:(NSNumber *)playTone correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks playTone:(NSNumber *)playTone correlationID:(NSNumber *)correlationID; //*** -+ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration softButtons:(NSArray *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; + (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID; + (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID; //***** -+ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray *)ttsChunks softButtons:(NSMutableArray *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; + (SDLChangeRegistration *)buildChangeRegistrationWithLanguage:(SDLLanguage *)language hmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage correlationID:(NSNumber *)correlationID; -+ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber *)interactionChoiceSetID choiceSet:(NSArray *)choices correlationID:(NSNumber *)correlationID; ++ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber *)interactionChoiceSetID choiceSet:(NSArray<SDLChoice *> *)choices correlationID:(NSNumber *)correlationID; + (SDLDeleteCommand *)buildDeleteCommandWithID:(NSNumber *)cmdID correlationID:(NSNumber *)correlationID; @@ -134,14 +139,14 @@ //***** PerformInteraction ***** -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray *)interactionChoiceSetIDList helpChunks:(NSArray *)helpChunks timeoutChunks:(NSArray *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray *)vrHelp correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID; //*** -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray *)vrHelp correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID; -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray *)vrHelp correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID; -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID; + (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID correlationID:(NSNumber *)correlationID; //***** @@ -149,21 +154,21 @@ + (SDLPutFile *)buildPutFileWithFileName:(NSString *)fileName fileType:(SDLFileType *)fileType persistentFile:(NSNumber *)persistentFile correlationId:(NSNumber *)correlationID; + (SDLPutFile *)buildPutFileWithFileName:(NSString *)syncFileName fileType:(SDLFileType *)fileType persisistentFile:(NSNumber *)persistentFile correlationID:(NSNumber *)correlationID __deprecated_msg("use buildPutFileWithFileName:fileType:persistentFile:correlationID: instead"); -+ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber *)ecuName didLocation:(NSArray *)didLocation correlationID:(NSNumber *)correlationID; ++ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber *)ecuName didLocation:(NSArray<NSNumber *> *)didLocation correlationID:(NSNumber *)correlationID; //***** RegisterAppInterface ***** -+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(NSMutableArray *)ttsName vrSynonyms:(NSMutableArray *)vrSynonyms isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage *)languageDesired hmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired appID:(NSString *)appID; ++ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(NSMutableArray<SDLTTSChunk *> *)ttsName vrSynonyms:(NSMutableArray<NSString *> *)vrSynonyms isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage *)languageDesired hmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired appID:(NSString *)appID; + (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage *)languageDesired appID:(NSString *)appID; + (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName languageDesired:(SDLLanguage *)laguageDesired appID:(NSString *)appID; //***** -+ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray *)properties correlationID:(NSNumber *)correlationID; ++ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray<SDLGlobalProperty *> *)properties correlationID:(NSNumber *)correlationID; -+ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image; ++ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray<NSString *> *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image; -+ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber *)timeout softButtons:(NSArray *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber *)timeout softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; + (SDLSetAppIcon *)buildSetAppIconWithFileName:(NSString *)syncFileName correlationID:(NSNumber *)correlationID; @@ -171,7 +176,7 @@ //***** SetGlobalProperties ***** -+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray *)vrHelp correlationID:(NSNumber *)correlationID; ++ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID; + (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText correlationID:(NSNumber *)correlationID; //***** @@ -185,7 +190,7 @@ //***** Show ***** -+ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment *)textAlignment graphic:(SDLImage *)graphic softButtons:(NSArray *)softButtons customPresets:(NSArray *)customPresets correlationID:(NSNumber *)correlationID; ++ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment *)textAlignment graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets correlationID:(NSNumber *)correlationID; + (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment *)textAlignment correlationID:(NSNumber *)correlationID; @@ -194,7 +199,7 @@ //***** Slider ***** -+ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID; ++ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray<NSString *> *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID; + (SDLSlider *)buildSliderStaticFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID; //***** @@ -202,7 +207,7 @@ + (SDLSoftButton *)buildSoftButtonWithType:(SDLSoftButtonType *)type text:(NSString *)text image:(SDLImage *)image highlighted:(BOOL)highlighted buttonID:(UInt16)buttonID systemAction:(SDLSystemAction *)systemAction handler:(SDLRPCNotificationHandler)handler; //***** Speak ***** -+ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray *)ttsChunks correlationID:(NSNumber *)correlationID; ++ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks correlationID:(NSNumber *)correlationID; //*** + (SDLSpeak *)buildSpeakWithTTS:(NSString *)ttsText correlationID:(NSNumber *)correlationID; @@ -214,7 +219,7 @@ + (SDLSubscribeVehicleData *)buildSubscribeVehicleDataWithGPS:(NSNumber *)gps speed:(NSNumber *)speed rpm:(NSNumber *)rpm fuelLevel:(NSNumber *)fuelLevel fuelLevelState:(NSNumber *)fuelLevelState instantFuelConsumption:(NSNumber *)instantFuelConsumption externalTemperature:(NSNumber *)externalTemperature prndl:(NSNumber *)prndl tirePressure:(NSNumber *)tirePressure odometer:(NSNumber *)odometer beltStatus:(NSNumber *)beltStatus bodyInformation:(NSNumber *)bodyInformation deviceStatus:(NSNumber *)deviceStatus driverBraking:(NSNumber *)driverBraking wiperStatus:(NSNumber *)wiperStatus headLampStatus:(NSNumber *)headLampStatus engineTorque:(NSNumber *)engineTorque accPedalPosition:(NSNumber *)accPedalPosition steeringWheelAngle:(NSNumber *)steeringWheelAngle correlationID:(NSNumber *)correlationID; -+ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber *)distanceToManeuver distanceToManeuverScale:(NSNumber *)distanceToManeuverScale maneuverComplete:(NSNumber *)maneuverComplete softButtons:(NSMutableArray *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber *)distanceToManeuver distanceToManeuverScale:(NSNumber *)distanceToManeuverScale maneuverComplete:(NSNumber *)maneuverComplete softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; + (SDLUnregisterAppInterface *)buildUnregisterAppInterfaceWithCorrelationID:(NSNumber *)correlationID; @@ -222,5 +227,5 @@ + (SDLUnsubscribeVehicleData *)buildUnsubscribeVehicleDataWithGPS:(NSNumber *)gps speed:(NSNumber *)speed rpm:(NSNumber *)rpm fuelLevel:(NSNumber *)fuelLevel fuelLevelState:(NSNumber *)fuelLevelState instantFuelConsumption:(NSNumber *)instantFuelConsumption externalTemperature:(NSNumber *)externalTemperature prndl:(NSNumber *)prndl tirePressure:(NSNumber *)tirePressure odometer:(NSNumber *)odometer beltStatus:(NSNumber *)beltStatus bodyInformation:(NSNumber *)bodyInformation deviceStatus:(NSNumber *)deviceStatus driverBraking:(NSNumber *)driverBraking wiperStatus:(NSNumber *)wiperStatus headLampStatus:(NSNumber *)headLampStatus engineTorque:(NSNumber *)engineTorque accPedalPosition:(NSNumber *)accPedalPosition steeringWheelAngle:(NSNumber *)steeringWheelAngle correlationID:(NSNumber *)correlationID; -+ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray *)turnList softButtons:(NSMutableArray *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray<SDLTurn *> *)turnList softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; @end diff --git a/SmartDeviceLink/SDLRPCRequestFactory.m b/SmartDeviceLink/SDLRPCRequestFactory.m index 0d94c5a39..8319ea235 100644 --- a/SmartDeviceLink/SDLRPCRequestFactory.m +++ b/SmartDeviceLink/SDLRPCRequestFactory.m @@ -64,7 +64,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt @implementation SDLRPCRequestFactory //***** AddCommand ***** -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType correlationID:(NSNumber *)correlationID { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType correlationID:(NSNumber *)correlationID { SDLAddCommand *msg = [[SDLAddCommand alloc] init]; msg.cmdID = cmdID; @@ -90,7 +90,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType handler:(SDLRPCNotificationHandler)handler { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType *)iconType handler:(SDLRPCNotificationHandler)handler { SDLAddCommand *msg = [[SDLAddCommand alloc] initWithHandler:handler]; msg.cmdID = cmdID; @@ -114,19 +114,19 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray *)vrCommands correlationID:(NSNumber *)correlationID { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber *)correlationID { return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:menuName parentID:nil position:nil vrCommands:vrCommands iconValue:nil iconType:nil correlationID:correlationID]; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray *)vrCommands handler:(SDLRPCNotificationHandler)handler { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler { return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:menuName parentID:nil position:nil vrCommands:vrCommands iconValue:nil iconType:nil handler:handler]; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray *)vrCommands correlationID:(NSNumber *)correlationID { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber *)correlationID { return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:nil vrCommands:vrCommands correlationID:correlationID]; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray *)vrCommands handler:(SDLRPCNotificationHandler)handler { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler { return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:nil vrCommands:vrCommands handler:handler]; } //***** @@ -153,7 +153,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt SDLTTSChunk *simpleChunk = [[SDLTTSChunk alloc] init]; simpleChunk.text = ttsText; simpleChunk.type = SDLSpeechCapabilities.TEXT; - NSArray *ttsChunks = [NSArray arrayWithObject:simpleChunk]; + NSArray<SDLTTSChunk *> *ttsChunks = [NSArray arrayWithObject:simpleChunk]; return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:playTone duration:duration softButtons:nil correlationID:correlationID]; } @@ -167,7 +167,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } //*** -+ (SDLAlert *)buildAlertWithTTSChunks:(NSArray *)ttsChunks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber *)playTone duration:(NSNumber *)duration softButtons:(NSArray *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber *)playTone duration:(NSNumber *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { SDLAlert *msg = [[SDLAlert alloc] init]; msg.correlationID = correlationID; msg.alertText1 = alertText1; @@ -180,12 +180,12 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLAlert *)buildAlertWithTTSChunks:(NSArray *)ttsChunks playTone:(NSNumber *)playTone correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks playTone:(NSNumber *)playTone correlationID:(NSNumber *)correlationID { return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:nil alertText2:nil alertText3:nil playTone:playTone duration:nil softButtons:nil correlationID:correlationID]; } //*** -+ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration softButtons:(NSMutableArray *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:nil duration:duration softButtons:softButtons correlationID:correlationID]; } @@ -199,7 +199,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** -+ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray *)ttsChunks softButtons:(NSMutableArray *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { SDLAlertManeuver *msg = [[SDLAlertManeuver alloc] init]; msg.ttsChunks = ttsChunks; msg.softButtons = softButtons; @@ -216,7 +216,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber *)interactionChoiceSetID choiceSet:(NSArray *)choices correlationID:(NSNumber *)correlationID { ++ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber *)interactionChoiceSetID choiceSet:(NSArray<SDLChoice *> *)choices correlationID:(NSNumber *)correlationID { SDLCreateInteractionChoiceSet *msg = [[SDLCreateInteractionChoiceSet alloc] init]; msg.interactionChoiceSetID = interactionChoiceSetID; msg.choiceSet = [choices mutableCopy]; @@ -314,7 +314,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } + (SDLPerformAudioPassThru *)buildPerformAudioPassThruWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate *)samplingRate maxDuration:(NSNumber *)maxDuration bitsPerSample:(SDLBitsPerSample *)bitsPerSample audioType:(SDLAudioType *)audioType muteAudio:(NSNumber *)muteAudio correlationID:(NSNumber *)correlationID { - NSArray *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; + NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; SDLPerformAudioPassThru *msg = [[SDLPerformAudioPassThru alloc] init]; msg.initialPrompt = [initialChunks mutableCopy]; @@ -332,7 +332,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** PerformInteraction ***** -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray *)interactionChoiceSetIDList helpChunks:(NSArray *)helpChunks timeoutChunks:(NSArray *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray *)vrHelp correlationID:(NSNumber *)correlationID { ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID { SDLPerformInteraction *msg = [[SDLPerformInteraction alloc] init]; msg.initialPrompt = [initialChunks mutableCopy]; msg.initialText = initialText; @@ -348,22 +348,22 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } //*** -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray *)vrHelp correlationID:(NSNumber *)correlationID { - NSArray *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; - NSArray *helpChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpPrompt]; - NSArray *timeoutChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutPrompt]; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID { + NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; + NSArray<SDLTTSChunk *> *helpChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpPrompt]; + NSArray<SDLTTSChunk *> *timeoutChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutPrompt]; return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp correlationID:correlationID]; } -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray *)vrHelp correlationID:(NSNumber *)correlationID { - NSArray *interactionChoiceSetIDList = [NSArray arrayWithObject:interactionChoiceSetID]; - NSArray *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID { + NSArray<NSNumber *> *interactionChoiceSetIDList = [NSArray arrayWithObject:interactionChoiceSetID]; + NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:nil timeoutChunks:nil interactionMode:SDLInteractionMode.BOTH timeout:nil vrHelp:vrHelp correlationID:correlationID]; } -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID { ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode *)interactionMode timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID { return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpPrompt:helpPrompt timeoutPrompt:timeoutPrompt interactionMode:interactionMode timeout:timeout vrHelp:nil correlationID:(NSNumber *)correlationID]; } @@ -387,7 +387,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return [self buildPutFileWithFileName:syncFileName fileType:fileType persistentFile:persistentFile correlationId:correlationID]; } -+ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber *)ecuName didLocation:(NSArray *)didLocation correlationID:(NSNumber *)correlationID { ++ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber *)ecuName didLocation:(NSArray<NSNumber *> *)didLocation correlationID:(NSNumber *)correlationID { SDLReadDID *msg = [[SDLReadDID alloc] init]; msg.ecuName = ecuName; msg.didLocation = [didLocation mutableCopy]; @@ -397,7 +397,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } //***** RegisterAppInterface ***** -+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(NSArray *)ttsName vrSynonyms:(NSArray *)vrSynonyms isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage *)languageDesired hmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired appID:(NSString *)appID { ++ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(NSArray<SDLTTSChunk *> *)ttsName vrSynonyms:(NSArray<NSString *> *)vrSynonyms isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage *)languageDesired hmiDisplayLanguageDesired:(SDLLanguage *)hmiDisplayLanguageDesired appID:(NSString *)appID { SDLRegisterAppInterface *msg = [[SDLRegisterAppInterface alloc] init]; SDLSyncMsgVersion *version = [[SDLSyncMsgVersion alloc] init]; version.majorVersion = [NSNumber numberWithInt:1]; @@ -442,7 +442,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } + (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage *)languageDesired appID:(NSString *)appID { - NSMutableArray *syns = [NSMutableArray arrayWithObject:appName]; + NSMutableArray<NSString *> *syns = [NSMutableArray arrayWithObject:appName]; return [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:appName ttsName:nil vrSynonyms:syns isMediaApp:isMediaApp languageDesired:languageDesired hmiDisplayLanguageDesired:languageDesired appID:appID]; } @@ -452,7 +452,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** -+ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray *)properties correlationID:(NSNumber *)correlationID { ++ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray<SDLGlobalProperty *> *)properties correlationID:(NSNumber *)correlationID { SDLResetGlobalProperties *msg = [[SDLResetGlobalProperties alloc] init]; msg.properties = [properties mutableCopy]; msg.correlationID = correlationID; @@ -460,7 +460,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber *)timeout softButtons:(NSArray *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber *)timeout softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { SDLScrollableMessage *msg = [[SDLScrollableMessage alloc] init]; msg.scrollableMessageBody = scrollableMessageBody; msg.timeout = timeout; @@ -470,7 +470,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image { ++ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray<NSString *> *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image { SDLSendLocation *msg = [[SDLSendLocation alloc] init]; msg.longitudeDegrees = longitude; msg.latitudeDegrees = latitude; @@ -501,7 +501,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** SetGlobalProperties ***** -+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray *)vrHelp correlationID:(NSNumber *)correlationID { ++ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID { SDLSetGlobalProperties *msg = [[SDLSetGlobalProperties alloc] init]; msg.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpText]; msg.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutText]; @@ -548,7 +548,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** Show ***** -+ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment *)textAlignment graphic:(SDLImage *)graphic softButtons:(NSArray *)softButtons customPresets:(NSArray *)customPresets correlationID:(NSNumber *)correlationID { ++ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment *)textAlignment graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets correlationID:(NSNumber *)correlationID { SDLShow *msg = [[SDLShow alloc] init]; msg.correlationID = correlationID; msg.mainField1 = mainField1; @@ -583,7 +583,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return [SDLRPCRequestFactory buildShowWithMainField1:mainField1 mainField2:mainField2 statusBar:nil mediaClock:nil mediaTrack:nil alignment:alignment correlationID:correlationID]; } -+ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber *)distanceToManeuver distanceToManeuverScale:(NSNumber *)distanceToManeuverScale maneuverComplete:(NSNumber *)maneuverComplete softButtons:(NSMutableArray *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber *)distanceToManeuver distanceToManeuverScale:(NSNumber *)distanceToManeuverScale maneuverComplete:(NSNumber *)maneuverComplete softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { SDLShowConstantTBT *msg = [[SDLShowConstantTBT alloc] init]; msg.navigationText1 = navigationText1; msg.navigationText2 = navigationText2; @@ -604,7 +604,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** Slider ***** -+ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID { ++ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray<NSString *> *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID { SDLSlider *msg = [[SDLSlider alloc] init]; msg.correlationID = correlationID; msg.numTicks = numTicks; @@ -617,7 +617,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } + (SDLSlider *)buildSliderStaticFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID { - NSArray *sliderFooters = [NSArray arrayWithObject:sliderFooter]; + NSArray<NSString *> *sliderFooters = [NSArray arrayWithObject:sliderFooter]; // Populates array with the same footer value for each position for (UInt32 i = 1; i < numTicks.unsignedIntegerValue; i++) { @@ -642,7 +642,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** Speak ***** -+ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray *)ttsChunks correlationID:(NSNumber *)correlationID { ++ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks correlationID:(NSNumber *)correlationID { SDLSpeak *msg = [[SDLSpeak alloc] init]; msg.correlationID = correlationID; msg.ttsChunks = [ttsChunks mutableCopy]; @@ -655,7 +655,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt SDLTTSChunk *simpleChunk = [[SDLTTSChunk alloc] init]; simpleChunk.text = ttsText; simpleChunk.type = SDLSpeechCapabilities.TEXT; - NSArray *ttsChunks = [NSMutableArray arrayWithObject:simpleChunk]; + NSArray<SDLTTSChunk *> *ttsChunks = [NSMutableArray arrayWithObject:simpleChunk]; return [SDLRPCRequestFactory buildSpeakWithTTSChunks:ttsChunks correlationID:correlationID]; } @@ -743,7 +743,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray *)turnList softButtons:(NSMutableArray *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray<SDLTurn *> *)turnList softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { SDLUpdateTurnList *msg = [[SDLUpdateTurnList alloc] init]; msg.turnList = [turnList mutableCopy]; msg.softButtons = [softButtons mutableCopy]; diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m index 953f47a28..e96e05446 100644 --- a/SmartDeviceLink/SDLRPCResponse.m +++ b/SmartDeviceLink/SDLRPCResponse.m @@ -21,7 +21,7 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { +- (instancetype)initWithDictionary:(NSMutableDictionary<NSString *, id> *)dict { self = [super initWithDictionary:dict]; if (!self) { return nil; diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m index 89c8b0807..0eda4f3a8 100644 --- a/SmartDeviceLink/SDLReadDIDResponse.m +++ b/SmartDeviceLink/SDLReadDIDResponse.m @@ -29,7 +29,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLDIDResult alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m index 198d3b6bd..e3cd315c6 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.m +++ b/SmartDeviceLink/SDLRegisterAppInterface.m @@ -64,7 +64,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m index 7a47dddd1..3d80425f7 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m @@ -109,7 +109,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -130,7 +130,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -252,7 +252,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLAudioPassThruCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLRequestType.h b/SmartDeviceLink/SDLRequestType.h index a8d631234..c69641cc2 100644 --- a/SmartDeviceLink/SDLRequestType.h +++ b/SmartDeviceLink/SDLRequestType.h @@ -8,7 +8,7 @@ } + (SDLRequestType *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLRequestType *> *)values; + (SDLRequestType *)HTTP; + (SDLRequestType *)FILE_RESUME; diff --git a/SmartDeviceLink/SDLRequestType.m b/SmartDeviceLink/SDLRequestType.m index 7332b9843..5f1e44c68 100644 --- a/SmartDeviceLink/SDLRequestType.m +++ b/SmartDeviceLink/SDLRequestType.m @@ -25,7 +25,7 @@ SDLRequestType *SDLRequestType_EMERGENCY = nil; SDLRequestType *SDLRequestType_MEDIA = nil; SDLRequestType *SDLRequestType_FOTA = nil; -NSArray *SDLRequestType_values = nil; +NSArray<SDLRequestType *> *SDLRequestType_values = nil; @implementation SDLRequestType @@ -39,7 +39,7 @@ NSArray *SDLRequestType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLRequestType *> *)values { if (SDLRequestType_values == nil) { SDLRequestType_values = @[ [SDLRequestType HTTP], diff --git a/SmartDeviceLink/SDLResult.h b/SmartDeviceLink/SDLResult.h index f11404c5a..26484528c 100644 --- a/SmartDeviceLink/SDLResult.h +++ b/SmartDeviceLink/SDLResult.h @@ -23,7 +23,7 @@ @abstract declare an array to store all possible SDLResult values @return the array */ -+ (NSArray *)values; ++ (NSArray<SDLResult *> *)values; /** * @abstract The request succeeded diff --git a/SmartDeviceLink/SDLResult.m b/SmartDeviceLink/SDLResult.m index 1ef2806c3..0fc3fb498 100644 --- a/SmartDeviceLink/SDLResult.m +++ b/SmartDeviceLink/SDLResult.m @@ -38,7 +38,7 @@ SDLResult *SDLResult_INVALID_CERT = nil; SDLResult *SDLResult_EXPIRED_CERT = nil; SDLResult *SDLResult_RESUME_FAILED = nil; -NSArray *SDLResult_values = nil; +NSArray<SDLResult *> *SDLResult_values = nil; @implementation SDLResult @@ -51,7 +51,7 @@ NSArray *SDLResult_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLResult *> *)values { if (SDLResult_values == nil) { SDLResult_values = @[ [SDLResult SUCCESS], diff --git a/SmartDeviceLink/SDLSamplingRate.h b/SmartDeviceLink/SDLSamplingRate.h index 28d3d35dc..9b0c2f2df 100644 --- a/SmartDeviceLink/SDLSamplingRate.h +++ b/SmartDeviceLink/SDLSamplingRate.h @@ -26,7 +26,7 @@ * * @return the array */ -+ (NSArray *)values; ++ (NSArray<SDLSamplingRate *> *)values; /** * @abstract Sampling rate of 8 kHz diff --git a/SmartDeviceLink/SDLSamplingRate.m b/SmartDeviceLink/SDLSamplingRate.m index d0a36d730..34ab0a713 100644 --- a/SmartDeviceLink/SDLSamplingRate.m +++ b/SmartDeviceLink/SDLSamplingRate.m @@ -9,7 +9,7 @@ SDLSamplingRate *SDLSamplingRate_16KHZ = nil; SDLSamplingRate *SDLSamplingRate_22KHZ = nil; SDLSamplingRate *SDLSamplingRate_44KHZ = nil; -NSArray *SDLSamplingRate_values = nil; +NSArray<SDLSamplingRate *> *SDLSamplingRate_values = nil; @implementation SDLSamplingRate @@ -22,7 +22,7 @@ NSArray *SDLSamplingRate_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLSamplingRate *> *)values { if (SDLSamplingRate_values == nil) { SDLSamplingRate_values = @[ SDLSamplingRate._8KHZ, diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m index 4ea18ca08..c55868601 100644 --- a/SmartDeviceLink/SDLScrollableMessage.m +++ b/SmartDeviceLink/SDLScrollableMessage.m @@ -53,7 +53,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m index 7b4692cf2..6e434b806 100644 --- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m +++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m @@ -49,7 +49,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -70,7 +70,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m index 9c1850b4c..43a0a6dbf 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.m +++ b/SmartDeviceLink/SDLSetGlobalProperties.m @@ -33,7 +33,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -54,7 +54,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -87,7 +87,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m index 196f9b0a0..98b9fc195 100644 --- a/SmartDeviceLink/SDLShow.m +++ b/SmartDeviceLink/SDLShow.m @@ -167,7 +167,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m index 8bd0c610c..2a9b6199e 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.m +++ b/SmartDeviceLink/SDLShowConstantTBT.m @@ -160,7 +160,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLSoftButtonType.h b/SmartDeviceLink/SDLSoftButtonType.h index d2b59a8d5..f827b2e97 100644 --- a/SmartDeviceLink/SDLSoftButtonType.h +++ b/SmartDeviceLink/SDLSoftButtonType.h @@ -20,7 +20,7 @@ @abstract declare an array to store all possible SDLSoftButtonType values @return the array */ -+ (NSArray *)values; ++ (NSArray<SDLSoftButtonType *> *)values; /** @abstract Text kind Softbutton diff --git a/SmartDeviceLink/SDLSoftButtonType.m b/SmartDeviceLink/SDLSoftButtonType.m index 9add8edfe..2277fdd9a 100644 --- a/SmartDeviceLink/SDLSoftButtonType.m +++ b/SmartDeviceLink/SDLSoftButtonType.m @@ -8,7 +8,7 @@ SDLSoftButtonType *SDLSoftButtonType_TEXT = nil; SDLSoftButtonType *SDLSoftButtonType_IMAGE = nil; SDLSoftButtonType *SDLSoftButtonType_BOTH = nil; -NSArray *SDLSoftButtonType_values = nil; +NSArray<SDLSoftButtonType *> *SDLSoftButtonType_values = nil; @implementation SDLSoftButtonType @@ -21,7 +21,7 @@ NSArray *SDLSoftButtonType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLSoftButtonType *> *)values { if (SDLSoftButtonType_values == nil) { SDLSoftButtonType_values = @[ SDLSoftButtonType.TEXT, diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m index 782223c5f..4b14932d0 100644 --- a/SmartDeviceLink/SDLSpeak.m +++ b/SmartDeviceLink/SDLSpeak.m @@ -29,7 +29,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLSpeechCapabilities.h b/SmartDeviceLink/SDLSpeechCapabilities.h index 9529e3fef..dd323de1f 100644 --- a/SmartDeviceLink/SDLSpeechCapabilities.h +++ b/SmartDeviceLink/SDLSpeechCapabilities.h @@ -26,7 +26,7 @@ * * @return the array of all possible values */ -+ (NSArray *)values; ++ (NSArray<SDLSpeechCapabilities *> *)values; /** * @abstract The SDL platform can speak text phrases. diff --git a/SmartDeviceLink/SDLSpeechCapabilities.m b/SmartDeviceLink/SDLSpeechCapabilities.m index 2018b8321..d978410eb 100644 --- a/SmartDeviceLink/SDLSpeechCapabilities.m +++ b/SmartDeviceLink/SDLSpeechCapabilities.m @@ -10,7 +10,7 @@ SDLSpeechCapabilities *SDLSpeechCapabilities_LHPLUS_PHONEMES = nil; SDLSpeechCapabilities *SDLSpeechCapabilities_PRE_RECORDED = nil; SDLSpeechCapabilities *SDLSpeechCapabilities_SILENCE = nil; -NSArray *SDLSpeechCapabilities_values = nil; +NSArray<SDLSpeechCapabilities *> *SDLSpeechCapabilities_values = nil; @implementation SDLSpeechCapabilities @@ -23,7 +23,7 @@ NSArray *SDLSpeechCapabilities_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLSpeechCapabilities *> *)values { if (SDLSpeechCapabilities_values == nil) { SDLSpeechCapabilities_values = @[ SDLSpeechCapabilities.TEXT, diff --git a/SmartDeviceLink/SDLSystemAction.h b/SmartDeviceLink/SDLSystemAction.h index 55371e87d..cdf6f4166 100644 --- a/SmartDeviceLink/SDLSystemAction.h +++ b/SmartDeviceLink/SDLSystemAction.h @@ -21,7 +21,7 @@ @abstract Store the enumeration of all possible SDLSystemAction @return an array that store all possible SDLSystemAction */ -+ (NSArray *)values; ++ (NSArray<SDLSystemAction *> *)values; /** @abstract Default_Action diff --git a/SmartDeviceLink/SDLSystemAction.m b/SmartDeviceLink/SDLSystemAction.m index 15b34b08b..17028d41e 100644 --- a/SmartDeviceLink/SDLSystemAction.m +++ b/SmartDeviceLink/SDLSystemAction.m @@ -8,7 +8,7 @@ SDLSystemAction *SDLSystemAction_DEFAULT_ACTION = nil; SDLSystemAction *SDLSystemAction_STEAL_FOCUS = nil; SDLSystemAction *SDLSystemAction_KEEP_CONTEXT = nil; -NSArray *SDLSystemAction_values = nil; +NSArray<SDLSystemAction *> *SDLSystemAction_values = nil; @implementation SDLSystemAction @@ -21,7 +21,7 @@ NSArray *SDLSystemAction_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLSystemAction *> *)values { if (SDLSystemAction_values == nil) { SDLSystemAction_values = @[ SDLSystemAction.DEFAULT_ACTION, diff --git a/SmartDeviceLink/SDLSystemContext.h b/SmartDeviceLink/SDLSystemContext.h index 89e92e420..bdef33a14 100644 --- a/SmartDeviceLink/SDLSystemContext.h +++ b/SmartDeviceLink/SDLSystemContext.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLSystemContext */ -+ (NSArray *)values; ++ (NSArray<SDLSystemContext *> *)values; /** * @abstract No user interaction (user-initiated or app-initiated) is in progress. diff --git a/SmartDeviceLink/SDLSystemContext.m b/SmartDeviceLink/SDLSystemContext.m index 76c5c9f38..2cca1cd9c 100644 --- a/SmartDeviceLink/SDLSystemContext.m +++ b/SmartDeviceLink/SDLSystemContext.m @@ -10,7 +10,7 @@ SDLSystemContext *SDLSystemContext_MENU = nil; SDLSystemContext *SDLSystemContext_HMI_OBSCURED = nil; SDLSystemContext *SDLSystemContext_ALERT = nil; -NSArray *SDLSystemContext_values = nil; +NSArray<SDLSystemContext *> *SDLSystemContext_values = nil; @implementation SDLSystemContext @@ -23,7 +23,7 @@ NSArray *SDLSystemContext_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLSystemContext *> *)values { if (SDLSystemContext_values == nil) { SDLSystemContext_values = @[ SDLSystemContext.MAIN, diff --git a/SmartDeviceLink/SDLTBTState.h b/SmartDeviceLink/SDLTBTState.h index 397f500dd..449d39058 100644 --- a/SmartDeviceLink/SDLTBTState.h +++ b/SmartDeviceLink/SDLTBTState.h @@ -8,7 +8,7 @@ } + (SDLTBTState *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLTBTState *> *)values; + (SDLTBTState *)ROUTE_UPDATE_REQUEST; + (SDLTBTState *)ROUTE_ACCEPTED; diff --git a/SmartDeviceLink/SDLTBTState.m b/SmartDeviceLink/SDLTBTState.m index 0a2a23b8b..b0bc28be7 100644 --- a/SmartDeviceLink/SDLTBTState.m +++ b/SmartDeviceLink/SDLTBTState.m @@ -15,7 +15,7 @@ SDLTBTState *SDLTBTState_ROUTE_SUMMARY_REQUEST = nil; SDLTBTState *SDLTBTState_TRIP_STATUS_REQUEST = nil; SDLTBTState *SDLTBTState_ROUTE_UPDATE_REQUEST_TIMEOUT = nil; -NSArray *SDLTBTState_values = nil; +NSArray<SDLTBTState *> *SDLTBTState_values = nil; @implementation SDLTBTState @@ -28,7 +28,7 @@ NSArray *SDLTBTState_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLTBTState *> *)values { if (SDLTBTState_values == nil) { SDLTBTState_values = @[ SDLTBTState.ROUTE_UPDATE_REQUEST, diff --git a/SmartDeviceLink/SDLTTSChunkFactory.h b/SmartDeviceLink/SDLTTSChunkFactory.h index 466ae2bae..ba0f42a8a 100644 --- a/SmartDeviceLink/SDLTTSChunkFactory.h +++ b/SmartDeviceLink/SDLTTSChunkFactory.h @@ -11,6 +11,6 @@ } + (SDLTTSChunk *)buildTTSChunkForString:(NSString *)text type:(SDLSpeechCapabilities *)type; -+ (NSMutableArray *)buildTTSChunksFromSimple:(NSString *)simple; ++ (NSMutableArray<SDLTTSChunk *> *)buildTTSChunksFromSimple:(NSString *)simple; @end diff --git a/SmartDeviceLink/SDLTTSChunkFactory.m b/SmartDeviceLink/SDLTTSChunkFactory.m index c27983d3a..17f9c68f2 100644 --- a/SmartDeviceLink/SDLTTSChunkFactory.m +++ b/SmartDeviceLink/SDLTTSChunkFactory.m @@ -17,7 +17,7 @@ return ret; } -+ (NSMutableArray *)buildTTSChunksFromSimple:(NSString *)simple { ++ (NSMutableArray<SDLTTSChunk *> *)buildTTSChunksFromSimple:(NSString *)simple { if (simple == nil) return nil; diff --git a/SmartDeviceLink/SDLTextAlignment.h b/SmartDeviceLink/SDLTextAlignment.h index 0d9913e86..0c0e04aea 100644 --- a/SmartDeviceLink/SDLTextAlignment.h +++ b/SmartDeviceLink/SDLTextAlignment.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLTextAlignment */ -+ (NSArray *)values; ++ (NSArray<SDLTextAlignment *> *)values; /** * @abstract Text aligned left. diff --git a/SmartDeviceLink/SDLTextAlignment.m b/SmartDeviceLink/SDLTextAlignment.m index 30560f4a2..46363878b 100644 --- a/SmartDeviceLink/SDLTextAlignment.m +++ b/SmartDeviceLink/SDLTextAlignment.m @@ -8,7 +8,7 @@ SDLTextAlignment *SDLTextAlignment_LEFT_ALIGNED = nil; SDLTextAlignment *SDLTextAlignment_RIGHT_ALIGNED = nil; SDLTextAlignment *SDLTextAlignment_CENTERED = nil; -NSArray *SDLTextAlignment_values = nil; +NSArray<SDLTextAlignment *> *SDLTextAlignment_values = nil; @implementation SDLTextAlignment @@ -21,7 +21,7 @@ NSArray *SDLTextAlignment_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLTextAlignment *> *)values { if (SDLTextAlignment_values == nil) { SDLTextAlignment_values = @[ SDLTextAlignment.LEFT_ALIGNED, diff --git a/SmartDeviceLink/SDLTextFieldName.h b/SmartDeviceLink/SDLTextFieldName.h index 8fc4c9def..6911d599f 100644 --- a/SmartDeviceLink/SDLTextFieldName.h +++ b/SmartDeviceLink/SDLTextFieldName.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLTextFieldName */ -+ (NSArray *)values; ++ (NSArray<SDLTextFieldName *> *)values; /** * @abstract The first line of the first set of main fields of the persistent display. Applies to SDLShow. diff --git a/SmartDeviceLink/SDLTextFieldName.m b/SmartDeviceLink/SDLTextFieldName.m index 4cc1ac369..07654aa57 100644 --- a/SmartDeviceLink/SDLTextFieldName.m +++ b/SmartDeviceLink/SDLTextFieldName.m @@ -33,7 +33,7 @@ SDLTextFieldName *SDLTextFieldName_locationDescription = nil; SDLTextFieldName *SDLTextFieldName_addressLines = nil; SDLTextFieldName *SDLTextFieldName_phoneNumber = nil; -NSArray *SDLTextFieldName_values = nil; +NSArray<SDLTextFieldName *> *SDLTextFieldName_values = nil; @implementation SDLTextFieldName @@ -46,7 +46,7 @@ NSArray *SDLTextFieldName_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLTextFieldName *> *)values { if (SDLTextFieldName_values == nil) { SDLTextFieldName_values = @[ SDLTextFieldName.mainField1, diff --git a/SmartDeviceLink/SDLTimerMode.h b/SmartDeviceLink/SDLTimerMode.h index f625f6636..1444f2d4b 100644 --- a/SmartDeviceLink/SDLTimerMode.h +++ b/SmartDeviceLink/SDLTimerMode.h @@ -8,7 +8,7 @@ } + (SDLTimerMode *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLTimerMode *> *)values; + (SDLTimerMode *)UP; + (SDLTimerMode *)DOWN; diff --git a/SmartDeviceLink/SDLTimerMode.m b/SmartDeviceLink/SDLTimerMode.m index 5787a2eb4..81f620893 100644 --- a/SmartDeviceLink/SDLTimerMode.m +++ b/SmartDeviceLink/SDLTimerMode.m @@ -8,7 +8,7 @@ SDLTimerMode *SDLTimerMode_UP = nil; SDLTimerMode *SDLTimerMode_DOWN = nil; SDLTimerMode *SDLTimerMode_NONE = nil; -NSArray *SDLTimerMode_values = nil; +NSArray<SDLTimerMode *> *SDLTimerMode_values = nil; @implementation SDLTimerMode @@ -21,7 +21,7 @@ NSArray *SDLTimerMode_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLTimerMode *> *)values { if (SDLTimerMode_values == nil) { SDLTimerMode_values = @[ SDLTimerMode.UP, diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m index 082b9755b..2dd3119a6 100644 --- a/SmartDeviceLink/SDLTouchEvent.m +++ b/SmartDeviceLink/SDLTouchEvent.m @@ -47,7 +47,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTouchCoord alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLTouchManager.h b/SmartDeviceLink/SDLTouchManager.h index 3c68f70d4..94f52b1b0 100644 --- a/SmartDeviceLink/SDLTouchManager.h +++ b/SmartDeviceLink/SDLTouchManager.h @@ -8,10 +8,11 @@ #import "SDLTouchManagerDelegate.h" #import <UIKit/UIKit.h> +#import "SDLProxyListener.h" NS_ASSUME_NONNULL_BEGIN -@interface SDLTouchManager : NSObject +@interface SDLTouchManager : NSObject <SDLProxyListener> @property (nonatomic, weak, nullable) id<SDLTouchManagerDelegate> touchEventDelegate; @@ -60,4 +61,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END
\ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTouchManager.m b/SmartDeviceLink/SDLTouchManager.m index f0b2e495c..ede657c18 100644 --- a/SmartDeviceLink/SDLTouchManager.m +++ b/SmartDeviceLink/SDLTouchManager.m @@ -14,7 +14,6 @@ #import "SDLDebugTool.h" #import "SDLOnTouchEvent.h" #import "SDLPinchGesture.h" -#import "SDLProxyListener.h" #import "SDLTouch.h" #import "SDLTouchCoord.h" #import "SDLTouchEvent.h" @@ -35,7 +34,7 @@ typedef NS_ENUM(NSUInteger, SDLPerformingTouchType) { */ static NSUInteger const MaximumNumberOfTouches = 2; -@interface SDLTouchManager () <SDLProxyListener> +@interface SDLTouchManager () /*! * @abstract @@ -283,4 +282,4 @@ static NSUInteger const MaximumNumberOfTouches = 2; @end -NS_ASSUME_NONNULL_END
\ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLTouchType.h b/SmartDeviceLink/SDLTouchType.h index bfbb91fd4..c72a94645 100644 --- a/SmartDeviceLink/SDLTouchType.h +++ b/SmartDeviceLink/SDLTouchType.h @@ -8,7 +8,7 @@ } + (SDLTouchType *)valueOf:(NSString *)value; -+ (NSArray *)values; ++ (NSArray<SDLTouchType *> *)values; + (SDLTouchType *)BEGIN; + (SDLTouchType *)MOVE; diff --git a/SmartDeviceLink/SDLTouchType.m b/SmartDeviceLink/SDLTouchType.m index d834d012d..ed2db7d84 100644 --- a/SmartDeviceLink/SDLTouchType.m +++ b/SmartDeviceLink/SDLTouchType.m @@ -8,7 +8,7 @@ SDLTouchType *SDLTouchType_BEGIN = nil; SDLTouchType *SDLTouchType_MOVE = nil; SDLTouchType *SDLTouchType_END = nil; -NSArray *SDLTouchType_values = nil; +NSArray<SDLTouchType *> *SDLTouchType_values = nil; @implementation SDLTouchType @@ -21,7 +21,7 @@ NSArray *SDLTouchType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLTouchType *> *)values { if (SDLTouchType_values == nil) { SDLTouchType_values = @[ SDLTouchType.BEGIN, diff --git a/SmartDeviceLink/SDLTriggerSource.h b/SmartDeviceLink/SDLTriggerSource.h index 36e646f17..bf7b9b92a 100644 --- a/SmartDeviceLink/SDLTriggerSource.h +++ b/SmartDeviceLink/SDLTriggerSource.h @@ -23,7 +23,7 @@ @abstract Store the enumeration of all possible SDLTriggerSource @return an array that store all possible SDLTriggerSource */ -+ (NSArray *)values; ++ (NSArray<SDLTriggerSource *> *)values; /** * @abstract Selection made via menu diff --git a/SmartDeviceLink/SDLTriggerSource.m b/SmartDeviceLink/SDLTriggerSource.m index a56b66c6f..95f6f3f6f 100644 --- a/SmartDeviceLink/SDLTriggerSource.m +++ b/SmartDeviceLink/SDLTriggerSource.m @@ -8,7 +8,7 @@ SDLTriggerSource *SDLTriggerSource_MENU = nil; SDLTriggerSource *SDLTriggerSource_VR = nil; SDLTriggerSource *SDLTriggerSource_KEYBOARD = nil; -NSArray *SDLTriggerSource_values = nil; +NSArray<SDLTriggerSource *> *SDLTriggerSource_values = nil; @implementation SDLTriggerSource @@ -21,7 +21,7 @@ NSArray *SDLTriggerSource_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLTriggerSource *> *)values { if (SDLTriggerSource_values == nil) { SDLTriggerSource_values = @[ SDLTriggerSource.MENU, diff --git a/SmartDeviceLink/SDLURLSession.m b/SmartDeviceLink/SDLURLSession.m index 2b8df45de..373ce7d44 100644 --- a/SmartDeviceLink/SDLURLSession.m +++ b/SmartDeviceLink/SDLURLSession.m @@ -18,7 +18,7 @@ static float DefaultConnectionTimeout = 45.0; @interface SDLURLSession () <SDLURLRequestTaskDelegate> -@property (strong, nonatomic) NSMutableSet *activeTasks; +@property (strong, nonatomic) NSMutableSet<SDLURLRequestTask *> *activeTasks; @end diff --git a/SmartDeviceLink/SDLUpdateMode.h b/SmartDeviceLink/SDLUpdateMode.h index 3ff84a2e9..989638ec7 100644 --- a/SmartDeviceLink/SDLUpdateMode.h +++ b/SmartDeviceLink/SDLUpdateMode.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLUpdateMode * @return an array that store all possible SDLUpdateMode */ -+ (NSArray *)values; ++ (NSArray<SDLUpdateMode *> *)values; /** * @abstract Starts the media clock timer counting upward, in increments of 1 second. diff --git a/SmartDeviceLink/SDLUpdateMode.m b/SmartDeviceLink/SDLUpdateMode.m index 2a2e8c7e5..f01d0cac5 100644 --- a/SmartDeviceLink/SDLUpdateMode.m +++ b/SmartDeviceLink/SDLUpdateMode.m @@ -10,7 +10,7 @@ SDLUpdateMode *SDLUpdateMode_PAUSE = nil; SDLUpdateMode *SDLUpdateMode_RESUME = nil; SDLUpdateMode *SDLUpdateMode_CLEAR = nil; -NSArray *SDLUpdateMode_values = nil; +NSArray<SDLUpdateMode *> *SDLUpdateMode_values = nil; @implementation SDLUpdateMode @@ -23,7 +23,7 @@ NSArray *SDLUpdateMode_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLUpdateMode *> *)values { if (SDLUpdateMode_values == nil) { SDLUpdateMode_values = @[ SDLUpdateMode.COUNTUP, diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m index f995264c4..e15904dc1 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.m +++ b/SmartDeviceLink/SDLUpdateTurnList.m @@ -30,7 +30,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLTurn alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; @@ -51,7 +51,7 @@ return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; - for (NSDictionary *dict in array) { + for (NSDictionary<NSString *, id> *dict in array) { [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; diff --git a/SmartDeviceLink/SDLV2ProtocolHeader.m b/SmartDeviceLink/SDLV2ProtocolHeader.m index 7cc1297d9..0cb690eb4 100644 --- a/SmartDeviceLink/SDLV2ProtocolHeader.m +++ b/SmartDeviceLink/SDLV2ProtocolHeader.m @@ -87,7 +87,7 @@ const int V2PROTOCOL_HEADERSIZE = 12; - (NSString *)description { NSString *frameTypeString = nil; if (self.frameType >= 0 && self.frameType <= 3) { - NSArray *frameTypeNames = @[@"Control", @"Single", @"First", @"Consecutive"]; + NSArray<NSString *> *frameTypeNames = @[@"Control", @"Single", @"First", @"Consecutive"]; frameTypeString = frameTypeNames[self.frameType]; } @@ -95,7 +95,7 @@ const int V2PROTOCOL_HEADERSIZE = 12; NSString *frameDataString = nil; if (self.frameType == SDLFrameType_Control) { if (self.frameData >= 0 && self.frameData <= 5) { - NSArray *controlFrameDataNames = @[@"Heartbeat", @"StartSession", @"StartSessionACK", @"StartSessionNACK", @"EndSession", @"EndSessionNACK"]; + NSArray<NSString *> *controlFrameDataNames = @[@"Heartbeat", @"StartSession", @"StartSessionACK", @"StartSessionNACK", @"EndSession", @"EndSessionNACK"]; frameDataString = controlFrameDataNames[self.frameData]; } else { frameDataString = @"Reserved"; diff --git a/SmartDeviceLink/SDLV2ProtocolMessage.h b/SmartDeviceLink/SDLV2ProtocolMessage.h index 6f9912cf9..2cb6136ca 100644 --- a/SmartDeviceLink/SDLV2ProtocolMessage.h +++ b/SmartDeviceLink/SDLV2ProtocolMessage.h @@ -10,6 +10,6 @@ @interface SDLV2ProtocolMessage : SDLProtocolMessage - (instancetype)initWithHeader:(SDLProtocolHeader *)header andPayload:(NSData *)payload; -- (NSDictionary *)rpcDictionary; +- (NSDictionary<NSString *, id> *)rpcDictionary; @end diff --git a/SmartDeviceLink/SDLV2ProtocolMessage.m b/SmartDeviceLink/SDLV2ProtocolMessage.m index c9d17a199..c2820dfda 100644 --- a/SmartDeviceLink/SDLV2ProtocolMessage.m +++ b/SmartDeviceLink/SDLV2ProtocolMessage.m @@ -19,19 +19,19 @@ } // Convert RPC payload to dictionary (for consumption by RPC layer) -- (NSDictionary *)rpcDictionary { +- (NSDictionary<NSString *, id> *)rpcDictionary { // Only applicable to RPCs if ((self.header.serviceType != SDLServiceType_RPC) && (self.header.serviceType != SDLServiceType_BulkData)) { return nil; } - NSMutableDictionary *rpcMessageAsDictionary = [[NSMutableDictionary alloc] init]; + NSMutableDictionary<NSString *, id> *rpcMessageAsDictionary = [[NSMutableDictionary alloc] init]; // Parse the payload as RPC struct SDLRPCPayload *rpcPayload = [SDLRPCPayload rpcPayloadWithData:self.payload]; // Create the inner dictionary with the RPC properties - NSMutableDictionary *innerDictionary = [[NSMutableDictionary alloc] init]; + NSMutableDictionary <NSString *, id> *innerDictionary = [[NSMutableDictionary alloc] init]; NSString *functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID]; [innerDictionary setObject:functionName forKey:SDLNameOperationName]; [innerDictionary setObject:[NSNumber numberWithInt:rpcPayload.correlationID] forKey:SDLNameCorrelationId]; @@ -49,7 +49,7 @@ // Store it in the containing dictionary UInt8 rpcType = rpcPayload.rpcType; - NSArray *rpcTypeNames = @[SDLNameRequest, SDLNameResponse, SDLNameNotification]; + NSArray<NSString *> *rpcTypeNames = @[SDLNameRequest, SDLNameResponse, SDLNameNotification]; [rpcMessageAsDictionary setObject:innerDictionary forKey:rpcTypeNames[rpcType]]; // The bulk data also goes in the dictionary diff --git a/SmartDeviceLink/SDLVehicleDataActiveStatus.h b/SmartDeviceLink/SDLVehicleDataActiveStatus.h index dbb36b550..39c642fab 100644 --- a/SmartDeviceLink/SDLVehicleDataActiveStatus.h +++ b/SmartDeviceLink/SDLVehicleDataActiveStatus.h @@ -20,7 +20,7 @@ /** @abstract return the array that store all possible SDLVehicleDataActiveStatus values */ -+ (NSArray *)values; ++ (NSArray<SDLVehicleDataActiveStatus *> *)values; /** @abstract SDLVehicleDataActiveStatus : Inactive not confirmed diff --git a/SmartDeviceLink/SDLVehicleDataActiveStatus.m b/SmartDeviceLink/SDLVehicleDataActiveStatus.m index 98bf85738..5af575c82 100644 --- a/SmartDeviceLink/SDLVehicleDataActiveStatus.m +++ b/SmartDeviceLink/SDLVehicleDataActiveStatus.m @@ -10,7 +10,7 @@ SDLVehicleDataActiveStatus *SDLVehicleDataActiveStatus_ACTIVE_NOT_CONFIRMED = ni SDLVehicleDataActiveStatus *SDLVehicleDataActiveStatus_ACTIVE_CONFIRMED = nil; SDLVehicleDataActiveStatus *SDLVehicleDataActiveStatus_FAULT = nil; -NSArray *SDLVehicleDataActiveStatus_values = nil; +NSArray<SDLVehicleDataActiveStatus *> *SDLVehicleDataActiveStatus_values = nil; @implementation SDLVehicleDataActiveStatus @@ -23,7 +23,7 @@ NSArray *SDLVehicleDataActiveStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLVehicleDataActiveStatus *> *)values { if (SDLVehicleDataActiveStatus_values == nil) { SDLVehicleDataActiveStatus_values = @[ SDLVehicleDataActiveStatus.INACTIVE_NOT_CONFIRMED, diff --git a/SmartDeviceLink/SDLVehicleDataEventStatus.h b/SmartDeviceLink/SDLVehicleDataEventStatus.h index 880e4ec2d..c30ab7c38 100644 --- a/SmartDeviceLink/SDLVehicleDataEventStatus.h +++ b/SmartDeviceLink/SDLVehicleDataEventStatus.h @@ -26,7 +26,7 @@ * * @return an array that store all possible SDLVehicleDataEventStatus */ -+ (NSArray *)values; ++ (NSArray<SDLVehicleDataEventStatus *> *)values; /** * @return The SDLVehicleDataEventStatus instance with value of *NO_EVENT* diff --git a/SmartDeviceLink/SDLVehicleDataEventStatus.m b/SmartDeviceLink/SDLVehicleDataEventStatus.m index a27178886..7120439e0 100644 --- a/SmartDeviceLink/SDLVehicleDataEventStatus.m +++ b/SmartDeviceLink/SDLVehicleDataEventStatus.m @@ -10,7 +10,7 @@ SDLVehicleDataEventStatus *SDLVehicleDataEventStatus_YES = nil; SDLVehicleDataEventStatus *SDLVehicleDataEventStatus_NOT_SUPPORTED = nil; SDLVehicleDataEventStatus *SDLVehicleDataEventStatus_FAULT = nil; -NSArray *SDLVehicleDataEventStatus_values = nil; +NSArray<SDLVehicleDataEventStatus *> *SDLVehicleDataEventStatus_values = nil; @implementation SDLVehicleDataEventStatus @@ -23,7 +23,7 @@ NSArray *SDLVehicleDataEventStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLVehicleDataEventStatus *> *)values { if (SDLVehicleDataEventStatus_values == nil) { SDLVehicleDataEventStatus_values = @[ SDLVehicleDataEventStatus.NO_EVENT, diff --git a/SmartDeviceLink/SDLVehicleDataNotificationStatus.h b/SmartDeviceLink/SDLVehicleDataNotificationStatus.h index 24a3fc372..49d829503 100644 --- a/SmartDeviceLink/SDLVehicleDataNotificationStatus.h +++ b/SmartDeviceLink/SDLVehicleDataNotificationStatus.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLVehicleDataNotificationStatus * @return an array that store all possible SDLVehicleDataNotificationStatus */ -+ (NSArray *)values; ++ (NSArray<SDLVehicleDataNotificationStatus *> *)values; /** * @abstract SDLVehicleDataNotificationStatus: *NOT_SUPPORTED* diff --git a/SmartDeviceLink/SDLVehicleDataNotificationStatus.m b/SmartDeviceLink/SDLVehicleDataNotificationStatus.m index 40d66d163..9cbb0f459 100644 --- a/SmartDeviceLink/SDLVehicleDataNotificationStatus.m +++ b/SmartDeviceLink/SDLVehicleDataNotificationStatus.m @@ -9,7 +9,7 @@ SDLVehicleDataNotificationStatus *SDLVehicleDataNotificationStatus_NORMAL = nil; SDLVehicleDataNotificationStatus *SDLVehicleDataNotificationStatus_ACTIVE = nil; SDLVehicleDataNotificationStatus *SDLVehicleDataNotificationStatus_NOT_USED = nil; -NSArray *SDLVehicleDataNotificationStatus_values = nil; +NSArray<SDLVehicleDataNotificationStatus *> *SDLVehicleDataNotificationStatus_values = nil; @implementation SDLVehicleDataNotificationStatus @@ -22,7 +22,7 @@ NSArray *SDLVehicleDataNotificationStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLVehicleDataNotificationStatus *> *)values { if (SDLVehicleDataNotificationStatus_values == nil) { SDLVehicleDataNotificationStatus_values = @[ SDLVehicleDataNotificationStatus.NOT_SUPPORTED, diff --git a/SmartDeviceLink/SDLVehicleDataResultCode.h b/SmartDeviceLink/SDLVehicleDataResultCode.h index 162ecff59..01f966f36 100644 --- a/SmartDeviceLink/SDLVehicleDataResultCode.h +++ b/SmartDeviceLink/SDLVehicleDataResultCode.h @@ -21,7 +21,7 @@ @abstract Store the enumeration of all possible SDLVehicleDataResultCode @return an array that store all possible SDLVehicleDataResultCode */ -+ (NSArray *)values; ++ (NSArray<SDLVehicleDataResultCode *> *)values; /** * Individual vehicle data item / DTC / DID request or subscription successful diff --git a/SmartDeviceLink/SDLVehicleDataResultCode.m b/SmartDeviceLink/SDLVehicleDataResultCode.m index 8aa912568..139325637 100644 --- a/SmartDeviceLink/SDLVehicleDataResultCode.m +++ b/SmartDeviceLink/SDLVehicleDataResultCode.m @@ -14,7 +14,7 @@ SDLVehicleDataResultCode *SDLVehicleDataResultCode_DATA_ALREADY_SUBSCRIBED = nil SDLVehicleDataResultCode *SDLVehicleDataResultCode_DATA_NOT_SUBSCRIBED = nil; SDLVehicleDataResultCode *SDLVehicleDataResultCode_IGNORED = nil; -NSArray *SDLVehicleDataResultCode_values = nil; +NSArray<SDLVehicleDataResultCode *> *SDLVehicleDataResultCode_values = nil; @implementation SDLVehicleDataResultCode @@ -27,7 +27,7 @@ NSArray *SDLVehicleDataResultCode_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLVehicleDataResultCode *> *)values { if (SDLVehicleDataResultCode_values == nil) { SDLVehicleDataResultCode_values = @[ SDLVehicleDataResultCode.SUCCESS, diff --git a/SmartDeviceLink/SDLVehicleDataStatus.h b/SmartDeviceLink/SDLVehicleDataStatus.h index e7720c924..58d3bca26 100644 --- a/SmartDeviceLink/SDLVehicleDataStatus.h +++ b/SmartDeviceLink/SDLVehicleDataStatus.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLVehicleDataStatus * @return an array that store all possible SDLVehicleDataStatus */ -+ (NSArray *)values; ++ (NSArray<SDLVehicleDataStatus *> *)values; /** * @abstract No data avaliable diff --git a/SmartDeviceLink/SDLVehicleDataStatus.m b/SmartDeviceLink/SDLVehicleDataStatus.m index 0fe108a1e..abee87668 100644 --- a/SmartDeviceLink/SDLVehicleDataStatus.m +++ b/SmartDeviceLink/SDLVehicleDataStatus.m @@ -8,7 +8,7 @@ SDLVehicleDataStatus *SDLVehicleDataStatus_NO_DATA_EXISTS = nil; SDLVehicleDataStatus *SDLVehicleDataStatus_OFF = nil; SDLVehicleDataStatus *SDLVehicleDataStatus_ON = nil; -NSArray *SDLVehicleDataStatus_values = nil; +NSArray<SDLVehicleDataStatus *> *SDLVehicleDataStatus_values = nil; @implementation SDLVehicleDataStatus @@ -21,7 +21,7 @@ NSArray *SDLVehicleDataStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLVehicleDataStatus *> *)values { if (SDLVehicleDataStatus_values == nil) { SDLVehicleDataStatus_values = @[ SDLVehicleDataStatus.NO_DATA_EXISTS, diff --git a/SmartDeviceLink/SDLVehicleDataType.h b/SmartDeviceLink/SDLVehicleDataType.h index 71ec1f4fe..63f7b3fde 100644 --- a/SmartDeviceLink/SDLVehicleDataType.h +++ b/SmartDeviceLink/SDLVehicleDataType.h @@ -24,7 +24,7 @@ * * @return an array that store all possible SDLVehicleDataType */ -+ (NSArray *)values; ++ (NSArray<SDLVehicleDataType *> *)values; /** * @abstract SDLVehicleDataType: *VEHICLEDATA_GPS* diff --git a/SmartDeviceLink/SDLVehicleDataType.m b/SmartDeviceLink/SDLVehicleDataType.m index fa5573745..c592e0dd1 100644 --- a/SmartDeviceLink/SDLVehicleDataType.m +++ b/SmartDeviceLink/SDLVehicleDataType.m @@ -31,7 +31,7 @@ SDLVehicleDataType *SDLVehicleDataType_VEHICLEDATA_ENGINETORQUE = nil; SDLVehicleDataType *SDLVehicleDataType_VEHICLEDATA_ACCPEDAL = nil; SDLVehicleDataType *SDLVehicleDataType_VEHICLEDATA_STEERINGWHEEL = nil; -NSArray *SDLVehicleDataType_values = nil; +NSArray<SDLVehicleDataType *> *SDLVehicleDataType_values = nil; @implementation SDLVehicleDataType @@ -44,7 +44,7 @@ NSArray *SDLVehicleDataType_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLVehicleDataType *> *)values { if (SDLVehicleDataType_values == nil) { SDLVehicleDataType_values = @[ SDLVehicleDataType.VEHICLEDATA_GPS, diff --git a/SmartDeviceLink/SDLVrCapabilities.h b/SmartDeviceLink/SDLVrCapabilities.h index 0698d272f..8f9d2862f 100644 --- a/SmartDeviceLink/SDLVrCapabilities.h +++ b/SmartDeviceLink/SDLVrCapabilities.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLVRCapabilities * @return an array that store all possible SDLVRCapabilities */ -+ (NSArray *)values; ++ (NSArray<SDLVRCapabilities *> *)values; /** * @abstract The SDL platform is capable of recognizing spoken text in the current language. diff --git a/SmartDeviceLink/SDLVrCapabilities.m b/SmartDeviceLink/SDLVrCapabilities.m index 72c8c39d2..ec795d8ec 100644 --- a/SmartDeviceLink/SDLVrCapabilities.m +++ b/SmartDeviceLink/SDLVrCapabilities.m @@ -6,7 +6,7 @@ SDLVRCapabilities *SDLVRCapabilities_TEXT = nil; -NSArray *SDLVRCapabilities_values = nil; +NSArray<SDLVRCapabilities *> *SDLVRCapabilities_values = nil; @implementation SDLVRCapabilities @@ -23,7 +23,7 @@ NSArray *SDLVRCapabilities_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLVRCapabilities *> *)values { if (SDLVRCapabilities_values == nil) { SDLVRCapabilities_values = @[ SDLVRCapabilities.TEXT, diff --git a/SmartDeviceLink/SDLWarningLightStatus.h b/SmartDeviceLink/SDLWarningLightStatus.h index 1176d5371..396aae62b 100644 --- a/SmartDeviceLink/SDLWarningLightStatus.h +++ b/SmartDeviceLink/SDLWarningLightStatus.h @@ -23,7 +23,7 @@ * @abstract Store the enumeration of all possible SDLWarningLightStatus * @return an array that store all possible SDLWarningLightStatus */ -+ (NSArray *)values; ++ (NSArray<SDLWarningLightStatus *> *)values; /** * @abstract Warninglight Off diff --git a/SmartDeviceLink/SDLWarningLightStatus.m b/SmartDeviceLink/SDLWarningLightStatus.m index c9d47a407..62fac3879 100644 --- a/SmartDeviceLink/SDLWarningLightStatus.m +++ b/SmartDeviceLink/SDLWarningLightStatus.m @@ -9,7 +9,7 @@ SDLWarningLightStatus *SDLWarningLightStatus_ON = nil; SDLWarningLightStatus *SDLWarningLightStatus_FLASH = nil; SDLWarningLightStatus *SDLWarningLightStatus_NOT_USED = nil; -NSArray *SDLWarningLightStatus_values = nil; +NSArray<SDLWarningLightStatus *> *SDLWarningLightStatus_values = nil; @implementation SDLWarningLightStatus @@ -22,7 +22,7 @@ NSArray *SDLWarningLightStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLWarningLightStatus *> *)values { if (SDLWarningLightStatus_values == nil) { SDLWarningLightStatus_values = @[ SDLWarningLightStatus.OFF, diff --git a/SmartDeviceLink/SDLWiperStatus.h b/SmartDeviceLink/SDLWiperStatus.h index 51a7a1f5d..e6fd88685 100644 --- a/SmartDeviceLink/SDLWiperStatus.h +++ b/SmartDeviceLink/SDLWiperStatus.h @@ -21,7 +21,7 @@ * @abstract Store the enumeration of all possible SDLWiperStatus * @return An array that store all possible SDLWiperStatus */ -+ (NSArray *)values; ++ (NSArray<SDLWiperStatus *> *)values; /** * @abstract SDLWiperStatus: *OFF* diff --git a/SmartDeviceLink/SDLWiperStatus.m b/SmartDeviceLink/SDLWiperStatus.m index d56749a9f..5c5fcd9be 100644 --- a/SmartDeviceLink/SDLWiperStatus.m +++ b/SmartDeviceLink/SDLWiperStatus.m @@ -20,7 +20,7 @@ SDLWiperStatus *SDLWiperStatus_AUTO_ADJUST = nil; SDLWiperStatus *SDLWiperStatus_STALLED = nil; SDLWiperStatus *SDLWiperStatus_NO_DATA_EXISTS = nil; -NSArray *SDLWiperStatus_values = nil; +NSArray<SDLWiperStatus *> *SDLWiperStatus_values = nil; @implementation SDLWiperStatus @@ -33,7 +33,7 @@ NSArray *SDLWiperStatus_values = nil; return nil; } -+ (NSArray *)values { ++ (NSArray<SDLWiperStatus *> *)values { if (SDLWiperStatus_values == nil) { SDLWiperStatus_values = @[ SDLWiperStatus.OFF, diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleConfigurationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleConfigurationSpec.m index e398e429a..46f81feeb 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleConfigurationSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleConfigurationSpec.m @@ -43,8 +43,8 @@ describe(@"a lifecycle configuration", ^{ describe(@"after setting properties manually", ^{ __block NSString *someShortAppName = nil; __block SDLTTSChunk *someTTSChunk = nil; - __block NSArray *someTTSName = nil; - __block NSArray *someSynonyms = nil; + __block NSArray<SDLTTSChunk *> *someTTSName = nil; + __block NSArray<NSString *> *someSynonyms = nil; __block NSString *someResumeHashString = nil; beforeEach(^{ @@ -120,8 +120,8 @@ describe(@"a lifecycle configuration", ^{ describe(@"after setting properties manually", ^{ __block NSString *someShortAppName = nil; __block SDLTTSChunk *someTTSChunk = nil; - __block NSArray *someTTSName = nil; - __block NSArray *someSynonyms = nil; + __block NSArray<SDLTTSChunk *> *someTTSName = nil; + __block NSArray<NSString *> *someSynonyms = nil; __block NSString *someResumeHashString = nil; beforeEach(^{ diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLListFilesOperationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLListFilesOperationSpec.m index 472a590e0..5047d54ce 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLListFilesOperationSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLListFilesOperationSpec.m @@ -45,7 +45,7 @@ describe(@"List Files Operation", ^{ context(@"when a good response comes back", ^{ __block SDLListFilesResponse *goodResponse = nil; __block NSNumber *responseSpaceAvailable = nil; - __block NSMutableArray *responseFileNames = nil; + __block NSMutableArray<NSString *> *responseFileNames = nil; beforeEach(^{ responseSpaceAvailable = @(11212512); @@ -76,7 +76,7 @@ describe(@"List Files Operation", ^{ context(@"when a bad response comes back", ^{ __block SDLListFilesResponse *badResponse = nil; __block NSNumber *responseSpaceAvailable = nil; - __block NSMutableArray *responseFileNames = nil; + __block NSMutableArray<NSString *> *responseFileNames = nil; __block NSString *responseErrorDescription = nil; __block NSString *responseErrorReason = nil; diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m index d0a20b03c..13ee3245d 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m @@ -66,7 +66,7 @@ describe(@"Upload File Operation", ^{ context(@"when a good response comes back", ^{ __block SDLPutFileResponse *goodResponse = nil; __block NSNumber *responseSpaceAvailable = nil; - __block NSMutableArray *responseFileNames = nil; + __block NSMutableArray<NSString *> *responseFileNames = nil; beforeEach(^{ responseSpaceAvailable = @(11212512); diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m index 04fb30c5e..63abbdc8e 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m @@ -43,7 +43,7 @@ describe(@"Disassemble Tests", ^ { testMessage.header = testHeader; testMessage.payload = payloadData; - NSArray* messageList = [SDLProtocolMessageDisassembler disassemble:testMessage withLimit:globals.maxMTUSize]; + NSArray<SDLProtocolMessage *> *messageList = [SDLProtocolMessageDisassembler disassemble:testMessage withLimit:globals.maxMTUSize]; //Payload length per message UInt32 payloadLength = 1012; // v1/2 MTU(1024) - header length(12) @@ -92,4 +92,4 @@ describe(@"Disassemble Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAmbientLightStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAmbientLightStatusSpec.m index c5259da1d..4ace52c71 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAmbientLightStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAmbientLightStatusSpec.m @@ -42,8 +42,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLAmbientLightStatus values]; - __block NSArray* definedValues; + NSArray<SDLAmbientLightStatus *> *storedValues = [SDLAmbientLightStatus values]; + __block NSArray<SDLAmbientLightStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLAmbientLightStatus NIGHT], [SDLAmbientLightStatus TWILIGHT_1], @@ -68,4 +68,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppHMITypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppHMITypeSpec.m index 4e55a1543..5b633943e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppHMITypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppHMITypeSpec.m @@ -46,8 +46,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLAppHMIType values]; - __block NSArray* definedValues; + NSArray<SDLAppHMIType *> *storedValues = [SDLAppHMIType values]; + __block NSArray<SDLAppHMIType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLAppHMIType DEFAULT], [SDLAppHMIType COMMUNICATION], @@ -74,4 +74,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m index a8927c447..ef94c1f84 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m @@ -52,8 +52,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLAppInterfaceUnregisteredReason values]; - __block NSArray* definedValues; + NSArray<SDLAppInterfaceUnregisteredReason *> *storedValues = [SDLAppInterfaceUnregisteredReason values]; + __block NSArray<SDLAppInterfaceUnregisteredReason *> *definedValues; beforeSuite(^ { definedValues = [@[//[SDLAppInterfaceUnregisteredReason USER_EXIT], [SDLAppInterfaceUnregisteredReason IGNITION_OFF], @@ -82,4 +82,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioStreamingStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioStreamingStateSpec.m index 0787d7321..f1e9769d3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioStreamingStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioStreamingStateSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLAudioStreamingState values]; - __block NSArray* definedValues; + NSArray<SDLAudioStreamingState *> *storedValues = [SDLAudioStreamingState values]; + __block NSArray<SDLAudioStreamingState *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLAudioStreamingState AUDIBLE], [SDLAudioStreamingState ATTENUATED], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m index 8587b7ee1..c8932c942 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m @@ -28,8 +28,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLAudioType values]; - __block NSArray* definedValues; + NSArray<SDLAudioType *> *storedValues = [SDLAudioType values]; + __block NSArray<SDLAudioType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLAudioType PCM]] copy]; }); @@ -47,4 +47,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLBitsPerSampleSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLBitsPerSampleSpec.m index bcc5dd01c..092104358 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLBitsPerSampleSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLBitsPerSampleSpec.m @@ -30,8 +30,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLBitsPerSample values]; - __block NSArray* definedValues; + NSArray<SDLBitsPerSample *> *storedValues = [SDLBitsPerSample values]; + __block NSArray<SDLBitsPerSample *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLBitsPerSample _8_BIT], [SDLBitsPerSample _16_BIT]] copy]; diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonEventModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonEventModeSpec.m index 4f6e6d054..e03759e1a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonEventModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonEventModeSpec.m @@ -30,8 +30,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLButtonEventMode values]; - __block NSArray* definedValues; + NSArray<SDLButtonEventMode *> *storedValues = [SDLButtonEventMode values]; + __block NSArray<SDLButtonEventMode *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLButtonEventMode BUTTONUP], [SDLButtonEventMode BUTTONDOWN]] copy]; @@ -50,4 +50,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonNameSpec.m index 6b9c64900..a57901c96 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonNameSpec.m @@ -60,8 +60,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLButtonName values]; - __block NSArray* definedValues; + NSArray<SDLButtonName *> *storedValues = [SDLButtonName values]; + __block NSArray<SDLButtonName *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLButtonName OK], [SDLButtonName SEEKLEFT], @@ -95,4 +95,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonPressModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonPressModeSpec.m index eb6b2fa35..653ff9f54 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonPressModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLButtonPressModeSpec.m @@ -30,8 +30,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLButtonPressMode values]; - __block NSArray* definedValues; + NSArray<SDLButtonPressMode *> *storedValues = [SDLButtonPressMode values]; + __block NSArray<SDLButtonPressMode *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLButtonPressMode LONG], [SDLButtonPressMode SHORT]] copy]; diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCarModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCarModeStatusSpec.m index 78f04e837..812a79b75 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCarModeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCarModeStatusSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLCarModeStatus values]; - __block NSArray* definedValues; + NSArray<SDLCarModeStatus *> *storedValues = [SDLCarModeStatus values]; + __block NSArray<SDLCarModeStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLCarModeStatus NORMAL], [SDLCarModeStatus FACTORY], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m index df29296a5..cdd08a57e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLCharacterSet values]; - __block NSArray* definedValues; + NSArray<SDLCharacterSet *> *storedValues = [SDLCharacterSet values]; + __block NSArray<SDLCharacterSet *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLCharacterSet TYPE2SET], [SDLCharacterSet TYPE5SET], @@ -56,4 +56,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCompassDirectionSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCompassDirectionSpec.m index 49a10e02d..fc4c01766 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCompassDirectionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCompassDirectionSpec.m @@ -42,8 +42,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLCompassDirection values]; - __block NSArray* definedValues; + NSArray<SDLCompassDirection *> *storedValues = [SDLCompassDirection values]; + __block NSArray<SDLCompassDirection *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLCompassDirection NORTH], [SDLCompassDirection NORTHWEST], @@ -68,4 +68,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLComponentVolumeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLComponentVolumeStatusSpec.m index 491e802aa..a9c676977 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLComponentVolumeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLComponentVolumeStatusSpec.m @@ -38,8 +38,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLComponentVolumeStatus values]; - __block NSArray* definedValues; + NSArray<SDLComponentVolumeStatus *> *storedValues = [SDLComponentVolumeStatus values]; + __block NSArray<SDLComponentVolumeStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLComponentVolumeStatus UNKNOWN], [SDLComponentVolumeStatus NORMAL], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m index 70f1bfb61..cf40ba2e1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m @@ -38,8 +38,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLDeviceLevelStatus values]; - __block NSArray* definedValues; + NSArray<SDLDeviceLevelStatus *> *storedValues = [SDLDeviceLevelStatus values]; + __block NSArray<SDLDeviceLevelStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLDeviceLevelStatus ZERO_LEVEL_BARS], [SDLDeviceLevelStatus ONE_LEVEL_BARS], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m index e65ee8201..bd85d54aa 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLDimension values]; - __block NSArray* definedValues; + NSArray<SDLDimension *> *storedValues = [SDLDimension values]; + __block NSArray<SDLDimension *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLDimension NO_FIX], [SDLDimension _2D], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m index 964736fbc..a4f6958d9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m @@ -48,8 +48,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLDisplayType values]; - __block NSArray* definedValues; + NSArray<SDLDisplayType *> *storedValues = [SDLDisplayType values]; + __block NSArray<SDLDisplayType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLDisplayType CID], [SDLDisplayType TYPE2], @@ -77,4 +77,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDriverDistractionStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDriverDistractionStateSpec.m index 8280259bc..f79bc039f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDriverDistractionStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDriverDistractionStateSpec.m @@ -30,8 +30,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLDriverDistractionState values]; - __block NSArray* definedValues; + NSArray<SDLDriverDistractionState *> *storedValues = [SDLDriverDistractionState values]; + __block NSArray<SDLDriverDistractionState *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLDriverDistractionState DD_OFF], [SDLDriverDistractionState DD_ON]] copy]; diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m index aa5398c94..d0bd6fc99 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m @@ -40,8 +40,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLECallConfirmationStatus values]; - __block NSArray* definedValues; + NSArray<SDLECallConfirmationStatus *>* storedValues = [SDLECallConfirmationStatus values]; + __block NSArray<SDLECallConfirmationStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLECallConfirmationStatus NORMAL], [SDLECallConfirmationStatus CALL_IN_PROGRESS], @@ -65,4 +65,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLEmergencyEventTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLEmergencyEventTypeSpec.m index ff0126233..48fe72fff 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLEmergencyEventTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLEmergencyEventTypeSpec.m @@ -40,8 +40,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLEmergencyEventType values]; - __block NSArray* definedValues; + NSArray<SDLEmergencyEventType *> *storedValues = [SDLEmergencyEventType values]; + __block NSArray<SDLEmergencyEventType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLEmergencyEventType NO_EVENT], [SDLEmergencyEventType FRONTAL], @@ -65,4 +65,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m index 77eab74dc..a28dfca65 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m @@ -42,8 +42,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLFileType values]; - __block NSArray* definedValues; + NSArray<SDLFileType *> *storedValues = [SDLFileType values]; + __block NSArray<SDLFileType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLFileType GRAPHIC_BMP], [SDLFileType GRAPHIC_JPEG], @@ -68,4 +68,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFuelCutoffStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFuelCutoffStatusSpec.m index d4833ff40..d00581fb3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFuelCutoffStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFuelCutoffStatusSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLFuelCutoffStatus values]; - __block NSArray* definedValues; + NSArray<SDLFuelCutoffStatus *> *storedValues = [SDLFuelCutoffStatus values]; + __block NSArray<SDLFuelCutoffStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLFuelCutoffStatus TERMINATE_FUEL], [SDLFuelCutoffStatus NORMAL_OPERATION], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m index 2844dcf41..b7dd89cd4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m @@ -40,8 +40,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLGlobalProperty values]; - __block NSArray* definedValues; + NSArray<SDLGlobalProperty *> *storedValues = [SDLGlobalProperty values]; + __block NSArray<SDLGlobalProperty *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLGlobalProperty HELPPROMPT], [SDLGlobalProperty TIMEOUTPROMPT], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMILevelSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMILevelSpec.m index 8b9d9f9b7..4fb83bc8c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMILevelSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMILevelSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLHMILevel values]; - __block NSArray* definedValues; + NSArray<SDLHMILevel *> *storedValues = [SDLHMILevel values]; + __block NSArray<SDLHMILevel *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLHMILevel FULL], [SDLHMILevel LIMITED], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m index 97b047770..51e7c4437 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m @@ -30,8 +30,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLHMIZoneCapabilities values]; - __block NSArray* definedValues; + NSArray<SDLHMIZoneCapabilities *> *storedValues = [SDLHMIZoneCapabilities values]; + __block NSArray<SDLHMIZoneCapabilities *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLHMIZoneCapabilities FRONT], [SDLHMIZoneCapabilities BACK]] copy]; diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStableStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStableStatusSpec.m index bbe507499..31230d019 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStableStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStableStatusSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLIgnitionStableStatus values]; - __block NSArray* definedValues; + NSArray<SDLIgnitionStableStatus *> *storedValues = [SDLIgnitionStableStatus values]; + __block NSArray<SDLIgnitionStableStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLIgnitionStableStatus IGNITION_SWITCH_NOT_STABLE], [SDLIgnitionStableStatus IGNITION_SWITCH_STABLE], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStatusSpec.m index c36c30c23..0ba221b1a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLIgnitionStatusSpec.m @@ -38,8 +38,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLIgnitionStatus values]; - __block NSArray* definedValues; + NSArray<SDLIgnitionStatus *> *storedValues = [SDLIgnitionStatus values]; + __block NSArray<SDLIgnitionStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLIgnitionStatus UNKNOWN], [SDLIgnitionStatus OFF], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m index 5b19dc384..7a4ec1898 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m @@ -52,8 +52,8 @@ describe(@"ValueOf Tests", ^ { }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLImageFieldName values]; - __block NSArray* definedValues; + NSArray<SDLImageFieldName *> *storedValues = [SDLImageFieldName values]; + __block NSArray<SDLImageFieldName *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLImageFieldName softButtonImage], [SDLImageFieldName choiceImage], @@ -83,4 +83,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageTypeSpec.m index 1a63bf7f8..db6ffd39f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageTypeSpec.m @@ -30,8 +30,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLImageType values]; - __block NSArray* definedValues; + NSArray<SDLImageType *> *storedValues = [SDLImageType values]; + __block NSArray<SDLImageType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLImageType STATIC], [SDLImageType DYNAMIC]] copy]; @@ -50,4 +50,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m index 95341e347..b8f2f901f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLInteractionMode values]; - __block NSArray* definedValues; + NSArray<SDLInteractionMode *> *storedValues = [SDLInteractionMode values]; + __block NSArray<SDLInteractionMode *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLInteractionMode MANUAL_ONLY], [SDLInteractionMode VR_ONLY], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardEventSpec.m index 560876185..2bb6a2b9a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardEventSpec.m @@ -38,8 +38,8 @@ describe(@"ValueOf Tests", ^ { }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLKeyboardEvent values]; - __block NSArray* definedValues; + NSArray<SDLKeyboardEvent *> *storedValues = [SDLKeyboardEvent values]; + __block NSArray<SDLKeyboardEvent *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLKeyboardEvent KEYPRESS], [SDLKeyboardEvent ENTRY_SUBMITTED], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m index c55d8cd28..2c670e389 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLKeyboardLayout values]; - __block NSArray* definedValues; + NSArray<SDLKeyboardLayout *> *storedValues = [SDLKeyboardLayout values]; + __block NSArray<SDLKeyboardLayout *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLKeyboardLayout QWERTY], [SDLKeyboardLayout QWERTZ], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeypressModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeypressModeSpec.m index d7304fe5e..c572cb479 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeypressModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeypressModeSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLKeypressMode values]; - __block NSArray* definedValues; + NSArray<SDLKeypressMode *> *storedValues = [SDLKeypressMode values]; + __block NSArray<SDLKeypressMode *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLKeypressMode SINGLE_KEYPRESS], [SDLKeypressMode QUEUE_KEYPRESSES], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLanguageSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLanguageSpec.m index 1c3ec06e0..d78c09cac 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLanguageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLanguageSpec.m @@ -74,8 +74,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLLanguage values]; - __block NSArray* definedValues; + NSArray<SDLLanguage *> *storedValues = [SDLLanguage values]; + __block NSArray<SDLLanguage *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLLanguage EN_US], [SDLLanguage ES_MX], @@ -116,4 +116,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLayoutModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLayoutModeSpec.m index 6aea31374..ab454b2b7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLayoutModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLayoutModeSpec.m @@ -36,8 +36,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLLayoutMode values]; - __block NSArray* definedValues; + NSArray<SDLLayoutMode *> *storedValues = [SDLLayoutMode values]; + __block NSArray<SDLLayoutMode *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLLayoutMode ICON_ONLY], [SDLLayoutMode ICON_WITH_SEARCH], @@ -59,4 +59,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLockScreenStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLockScreenStatusSpec.m index a6d7ecdac..11e22141a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLockScreenStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLLockScreenStatusSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLLockScreenStatus values]; - __block NSArray* definedValues; + NSArray<SDLLockScreenStatus *> *storedValues = [SDLLockScreenStatus values]; + __block NSArray<SDLLockScreenStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLLockScreenStatus OFF], [SDLLockScreenStatus OPTIONAL], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMaintenanceModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMaintenanceModeStatusSpec.m index 349a073eb..26f58a29c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMaintenanceModeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMaintenanceModeStatusSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLMaintenanceModeStatus values]; - __block NSArray* definedValues; + NSArray<SDLMaintenanceModeStatus *> *storedValues = [SDLMaintenanceModeStatus values]; + __block NSArray<SDLMaintenanceModeStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLMaintenanceModeStatus NORMAL], [SDLMaintenanceModeStatus NEAR], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMediaClockFormatSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMediaClockFormatSpec.m index 80603a2b0..42aa61b93 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMediaClockFormatSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMediaClockFormatSpec.m @@ -40,8 +40,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLMediaClockFormat values]; - __block NSArray* definedValues; + NSArray<SDLMediaClockFormat *> *storedValues = [SDLMediaClockFormat values]; + __block NSArray<SDLMediaClockFormat *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLMediaClockFormat CLOCK1], [SDLMediaClockFormat CLOCK2], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPRNDLSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPRNDLSpec.m index 5310f3488..5bc7e9f0f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPRNDLSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPRNDLSpec.m @@ -58,8 +58,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLPRNDL values]; - __block NSArray* definedValues; + NSArray<SDLPRNDL *> *storedValues = [SDLPRNDL values]; + __block NSArray<SDLPRNDL *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLPRNDL PARK], [SDLPRNDL REVERSE], @@ -92,4 +92,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPermissionStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPermissionStatusSpec.m index 3ca864595..51022d2d4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPermissionStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPermissionStatusSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLPermissionStatus values]; - __block NSArray* definedValues; + NSArray<SDLPermissionStatus *> *storedValues = [SDLPermissionStatus values]; + __block NSArray<SDLPermissionStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLPermissionStatus ALLOWED], [SDLPermissionStatus DISALLOWED], @@ -56,4 +56,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m index 1a8c2dd55..25ad07e5a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLPowerModeQualificationStatus values]; - __block NSArray* definedValues; + NSArray<SDLPowerModeQualificationStatus *> *storedValues = [SDLPowerModeQualificationStatus values]; + __block NSArray<SDLPowerModeQualificationStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLPowerModeQualificationStatus POWER_MODE_UNDEFINED], [SDLPowerModeQualificationStatus POWER_MODE_EVALUATION_IN_PROGRESS], @@ -56,4 +56,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeStatusSpec.m index 4ffc91aba..b2ed50c1f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeStatusSpec.m @@ -44,8 +44,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLPowerModeStatus values]; - __block NSArray* definedValues; + NSArray<SDLPowerModeStatus *> *storedValues = [SDLPowerModeStatus values]; + __block NSArray<SDLPowerModeStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLPowerModeStatus KEY_OUT], [SDLPowerModeStatus KEY_RECENTLY_OUT], @@ -71,4 +71,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m index 0f110d08c..9e89bf5d5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m @@ -66,8 +66,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLPredefinedLayout values]; - __block NSArray* definedValues; + NSArray<SDLPredefinedLayout *> *storedValues = [SDLPredefinedLayout values]; + __block NSArray<SDLPredefinedLayout *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLPredefinedLayout DEFAULT], [SDLPredefinedLayout MEDIA], @@ -104,4 +104,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m index 89c0bd218..7c9ea0063 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m @@ -36,8 +36,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLPrerecordedSpeech values]; - __block NSArray* definedValues; + NSArray<SDLPrerecordedSpeech *> *storedValues = [SDLPrerecordedSpeech values]; + __block NSArray<SDLPrerecordedSpeech *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLPrerecordedSpeech HELP_JINGLE], [SDLPrerecordedSpeech INITIAL_JINGLE], @@ -59,4 +59,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m index 0b273e0df..918e5c149 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m @@ -40,8 +40,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLPrimaryAudioSource values]; - __block NSArray* definedValues; + NSArray<SDLPrimaryAudioSource *> *storedValues = [SDLPrimaryAudioSource values]; + __block NSArray<SDLPrimaryAudioSource *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLPrimaryAudioSource NO_SOURCE_SELECTED], [SDLPrimaryAudioSource USB], @@ -65,4 +65,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m index 7a314e1a6..5c9ee071c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m @@ -67,8 +67,8 @@ describe(@"ValueOf Tests", ^ { }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLRequestType values]; - __block NSArray* definedValues; + NSArray<SDLRequestType *> *storedValues = [SDLRequestType values]; + __block NSArray<SDLRequestType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLRequestType HTTP], [SDLRequestType FILE_RESUME], @@ -105,4 +105,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m index 916cb6155..063942361 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m @@ -91,8 +91,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLResult values]; - __block NSArray* definedValues; + NSArray<SDLResult *> *storedValues = [SDLResult values]; + __block NSArray<SDLResult *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLResult SUCCESS], [SDLResult UNSUPPORTED_REQUEST], @@ -142,4 +142,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m index 1d4e56611..8fa2479c3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLSamplingRate values]; - __block NSArray* definedValues; + NSArray<SDLSamplingRate *> *storedValues = [SDLSamplingRate values]; + __block NSArray<SDLSamplingRate *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLSamplingRate _8KHZ], [SDLSamplingRate _16KHZ], diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSoftButtonTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSoftButtonTypeSpec.m index 6960fa1b1..5e13d5d6c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSoftButtonTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSoftButtonTypeSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLSoftButtonType values]; - __block NSArray* definedValues; + NSArray<SDLSoftButtonType *> *storedValues = [SDLSoftButtonType values]; + __block NSArray<SDLSoftButtonType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLSoftButtonType TEXT], [SDLSoftButtonType IMAGE], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m index c33de9c8c..055869b9e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m @@ -36,8 +36,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLSpeechCapabilities values]; - __block NSArray* definedValues; + NSArray<SDLSpeechCapabilities *> *storedValues = [SDLSpeechCapabilities values]; + __block NSArray<SDLSpeechCapabilities *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLSpeechCapabilities TEXT], [SDLSpeechCapabilities SAPI_PHONEMES], @@ -59,4 +59,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemAction.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemAction.m index 917e1acb6..7afe38413 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemAction.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemAction.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLSystemAction values]; - __block NSArray* definedValues; + NSArray<SDLSystemAction *> *storedValues = [SDLSystemAction values]; + __block NSArray<SDLSystemAction *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLSystemAction DEFAULT_ACTION], [SDLSystemAction STEAL_FOCUS], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m index 694247a1d..d964599ed 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m @@ -36,8 +36,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLSystemContext values]; - __block NSArray* definedValues; + NSArray<SDLSystemContext *> *storedValues = [SDLSystemContext values]; + __block NSArray<SDLSystemContext *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLSystemContext MAIN], [SDLSystemContext VRSESSION], @@ -59,4 +59,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m index 070986389..f167f7dff 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m @@ -46,8 +46,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLTBTState values]; - __block NSArray* definedValues; + NSArray<SDLTBTState *> *storedValues = [SDLTBTState values]; + __block NSArray<SDLTBTState *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLTBTState ROUTE_UPDATE_REQUEST], [SDLTBTState ROUTE_ACCEPTED], @@ -74,4 +74,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextAlignmentSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextAlignmentSpec.m index 06082c576..f88e0b994 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextAlignmentSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextAlignmentSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLTextAlignment values]; - __block NSArray* definedValues; + NSArray<SDLTextAlignment *> *storedValues = [SDLTextAlignment values]; + __block NSArray<SDLTextAlignment *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLTextAlignment LEFT_ALIGNED], [SDLTextAlignment RIGHT_ALIGNED], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m index 40be02374..ce0ed676e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m @@ -84,8 +84,8 @@ describe(@"ValueOf Tests", ^ { }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLTextFieldName values]; - __block NSArray* definedValues; + NSArray<SDLTextFieldName *> *storedValues = [SDLTextFieldName values]; + __block NSArray<SDLTextFieldName *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLTextFieldName mainField1], [SDLTextFieldName mainField2], @@ -130,4 +130,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTimerModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTimerModeSpec.m index 0bb0a7448..7197bd000 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTimerModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTimerModeSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLTimerMode values]; - __block NSArray* definedValues; + NSArray<SDLTimerMode *> *storedValues = [SDLTimerMode values]; + __block NSArray<SDLTimerMode *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLTimerMode UP], [SDLTimerMode DOWN], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTouchTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTouchTypeSpec.m index dc72c74b2..f658b5e6e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTouchTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTouchTypeSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLTouchType values]; - __block NSArray* definedValues; + NSArray<SDLTouchType *> *storedValues = [SDLTouchType values]; + __block NSArray<SDLTouchType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLTouchType BEGIN], [SDLTouchType MOVE], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m index 1a1413f54..67a0162de 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLTriggerSource values]; - __block NSArray* definedValues; + NSArray<SDLTriggerSource *> *storedValues = [SDLTriggerSource values]; + __block NSArray<SDLTriggerSource *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLTriggerSource MENU], [SDLTriggerSource VR], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLUpdateModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLUpdateModeSpec.m index 23c8bb5a5..6f8ea0985 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLUpdateModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLUpdateModeSpec.m @@ -36,8 +36,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLUpdateMode values]; - __block NSArray* definedValues; + NSArray<SDLUpdateMode *> *storedValues = [SDLUpdateMode values]; + __block NSArray<SDLUpdateMode *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLUpdateMode COUNTUP], [SDLUpdateMode COUNTDOWN], @@ -59,4 +59,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataActiveStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataActiveStatusSpec.m index 46c2cd927..0d31e0fd4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataActiveStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataActiveStatusSpec.m @@ -36,8 +36,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLVehicleDataActiveStatus values]; - __block NSArray* definedValues; + NSArray<SDLVehicleDataActiveStatus *> *storedValues = [SDLVehicleDataActiveStatus values]; + __block NSArray<SDLVehicleDataActiveStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLVehicleDataActiveStatus INACTIVE_NOT_CONFIRMED], [SDLVehicleDataActiveStatus INACTIVE_CONFIRMED], @@ -59,4 +59,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataEventStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataEventStatusSpec.m index 452404231..bf08a0810 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataEventStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataEventStatusSpec.m @@ -36,8 +36,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLVehicleDataEventStatus values]; - __block NSArray* definedValues; + NSArray<SDLVehicleDataEventStatus *> *storedValues = [SDLVehicleDataEventStatus values]; + __block NSArray<SDLVehicleDataEventStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLVehicleDataEventStatus NO_EVENT], [SDLVehicleDataEventStatus _NO], @@ -59,4 +59,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataNotificationStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataNotificationStatusSpec.m index 6edf13783..fb623cb5f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataNotificationStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataNotificationStatusSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLVehicleDataNotificationStatus values]; - __block NSArray* definedValues; + NSArray<SDLVehicleDataNotificationStatus *> *storedValues = [SDLVehicleDataNotificationStatus values]; + __block NSArray<SDLVehicleDataNotificationStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLVehicleDataNotificationStatus NOT_SUPPORTED], [SDLVehicleDataNotificationStatus NORMAL], @@ -57,4 +57,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataResultCodeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataResultCodeSpec.m index be09e2495..b0ec4d623 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataResultCodeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataResultCodeSpec.m @@ -44,8 +44,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLVehicleDataResultCode values]; - __block NSArray* definedValues; + NSArray<SDLVehicleDataResultCode *> *storedValues = [SDLVehicleDataResultCode values]; + __block NSArray<SDLVehicleDataResultCode *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLVehicleDataResultCode SUCCESS], [SDLVehicleDataResultCode TRUNCATED_DATA], @@ -71,4 +71,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataStatusSpec.m index 997837562..34e2b5c43 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataStatusSpec.m @@ -32,8 +32,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLVehicleDataStatus values]; - __block NSArray* definedValues; + NSArray<SDLVehicleDataStatus *> *storedValues = [SDLVehicleDataStatus values]; + __block NSArray<SDLVehicleDataStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLVehicleDataStatus NO_DATA_EXISTS], [SDLVehicleDataStatus OFF], @@ -53,4 +53,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m index c11e93a7f..03f506929 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m @@ -78,8 +78,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLVehicleDataType values]; - __block NSArray* definedValues; + NSArray<SDLVehicleDataType *> *storedValues = [SDLVehicleDataType values]; + __block NSArray<SDLVehicleDataType *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLVehicleDataType VEHICLEDATA_GPS], [SDLVehicleDataType VEHICLEDATA_SPEED], @@ -122,4 +122,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVrCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVrCapabilitiesSpec.m index be62ee96a..1f71b49fc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVrCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVrCapabilitiesSpec.m @@ -28,8 +28,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLVRCapabilities values]; - __block NSArray* definedValues; + NSArray<SDLVRCapabilities *> *storedValues = [SDLVRCapabilities values]; + __block NSArray<SDLVRCapabilities *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLVRCapabilities TEXT]] copy]; }); @@ -47,4 +47,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWarningLightStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWarningLightStatusSpec.m index 698116e50..3efeebf77 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWarningLightStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWarningLightStatusSpec.m @@ -34,8 +34,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLWarningLightStatus values]; - __block NSArray* definedValues; + NSArray<SDLWarningLightStatus *> *storedValues = [SDLWarningLightStatus values]; + __block NSArray<SDLWarningLightStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLWarningLightStatus OFF], [SDLWarningLightStatus ON], @@ -57,4 +57,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m index 18fbce66c..194ca20a3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m @@ -56,8 +56,8 @@ describe(@"ValueOf Tests", ^ { }); }); describe(@"Value List Tests", ^ { - NSArray* storedValues = [SDLWiperStatus values]; - __block NSArray* definedValues; + NSArray<SDLWiperStatus *> *storedValues = [SDLWiperStatus values]; + __block NSArray<SDLWiperStatus *> *definedValues; beforeSuite(^ { definedValues = [@[[SDLWiperStatus OFF], [SDLWiperStatus AUTO_OFF], @@ -89,4 +89,4 @@ describe(@"Value List Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m index d02cfbd2c..2658e5e95 100644 --- a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m @@ -31,7 +31,7 @@ describe(@"BuildAddCommand Tests", ^ { expect(message.cmdID).to(equal(@33)); expect(message.correlationID).to(equal(@94)); - NSArray* aliases = @[@"Joe1", @"Joe2", @"Joe3", + NSArray<NSString *> *aliases = @[@"Joe1", @"Joe2", @"Joe3", @"--------------------------------ASLONGOFASTRINGASICANPOSSIBLYMAKEINASINGLELINE---------------------------------"]; #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" @@ -83,7 +83,7 @@ describe(@"BuildAddSubMenu Tests", ^ { describe(@"BuildAlert Tests", ^ { context(@"With Text", ^ { it(@"Should build correctly", ^ { - NSArray* softButtons = @[[[SDLSoftButton alloc] init]]; + NSArray<SDLSoftButton *> *softButtons = @[[[SDLSoftButton alloc] init]]; SDLAlert* message = [SDLRPCRequestFactory buildAlertWithAlertText1:@"String1" alertText2:@"String2" alertText3:@"String3" duration:@9999 softButtons:softButtons correlationID:@41]; @@ -168,8 +168,8 @@ describe(@"BuildAlert Tests", ^ { context(@"With TTSChunks", ^ { it(@"Should build correctly", ^ { - NSArray* softButtons = @[[[SDLSoftButton alloc] init]]; - NSArray* ttsChunks = @[[[SDLTTSChunk alloc] init]]; + NSArray<SDLSoftButton *> *softButtons = @[[[SDLSoftButton alloc] init]]; + NSArray<SDLTTSChunk *> *ttsChunks = @[[[SDLTTSChunk alloc] init]]; SDLAlert* message = [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:@"Astonish" alertText2:@"Hi" alertText3:@"Alert" playTone:@NO duration:@4145 softButtons:softButtons correlationID:@19]; @@ -200,8 +200,8 @@ describe(@"BuildAlert Tests", ^ { describe(@"SDLAlertManeuver Tests", ^ { - __block NSMutableArray *softButtons = nil; - __block NSMutableArray *ttsChunks = nil; + __block NSMutableArray<SDLSoftButton *> *softButtons = nil; + __block NSMutableArray<SDLTTSChunk *> *ttsChunks = nil; __block SDLAlertManeuver *message = nil; describe(@"Should build correctly", ^ { @@ -238,7 +238,7 @@ describe(@"BuildChangeRegistration Tests", ^ { describe(@"BuildCreateInteractionChoiceSet Tests", ^ { it(@"Should build correctly", ^ { - NSArray* choices = @[[[SDLChoice alloc] init]]; + NSArray<SDLChoice *> *choices = @[[[SDLChoice alloc] init]]; SDLCreateInteractionChoiceSet* message = [SDLRPCRequestFactory buildCreateInteractionChoiceSetWithID:@4567654 choiceSet:choices correlationID:@0]; expect(message.interactionChoiceSetID).to(equal(@4567654)); @@ -389,10 +389,10 @@ describe(@"BuildPerformAudioPassThru Tests", ^ { describe(@"BuildPerformInteraction Tests", ^ { context(@"With Initial Chunks", ^ { it(@"Should build correctly", ^ { - NSArray* initialChunks = @[[[SDLTTSChunk alloc] init]]; - NSArray* helpChunks = @[[[SDLTTSChunk alloc] init]]; - NSArray* timeoutChunks = @[[[SDLTTSChunk alloc] init]]; - NSArray* vrHelp = @[[[SDLVRHelpItem alloc] init]]; + NSArray<SDLTTSChunk *> *initialChunks = @[[[SDLTTSChunk alloc] init]]; + NSArray<SDLTTSChunk *> *helpChunks = @[[[SDLTTSChunk alloc] init]]; + NSArray<SDLTTSChunk *> *timeoutChunks = @[[[SDLTTSChunk alloc] init]]; + NSArray<SDLVRHelpItem *> *vrHelp = @[[[SDLVRHelpItem alloc] init]]; SDLPerformInteraction* message = [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:@"Start" interactionChoiceSetIDList:@[@878] helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:[SDLInteractionMode MANUAL_ONLY] timeout:@7500 vrHelp:vrHelp correlationID:@272727]; @@ -412,7 +412,7 @@ describe(@"BuildPerformInteraction Tests", ^ { context(@"With Initial Prompt", ^ { it(@"Should build correctly", ^ { - NSArray* vrHelp = @[[[SDLVRHelpItem alloc] init]]; + NSArray<SDLVRHelpItem *> *vrHelp = @[[[SDLVRHelpItem alloc] init]]; SDLPerformInteraction* message = [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:@"Nothing" initialText:@"Still Nothing" interactionChoiceSetIDList:@[@4223, @1337] helpPrompt:@"A Whole Lot of Nothing" timeoutPrompt:@"Time Remaining" interactionMode:[SDLInteractionMode VR_ONLY] timeout:@5600 vrHelp:vrHelp correlationID:@31564]; @@ -500,8 +500,8 @@ describe(@"BuildRegisterAppInterface Tests", ^ { OCMStub([bundleMock infoDictionary]).andReturn(@{@"CFBundleShortVersionString" : @"1.2.3.4"}); OCMStub([bundleMock bundleIdentifier]).andReturn(@"com.register.test"); - NSMutableArray *ttsName = [NSMutableArray arrayWithArray:@[[[SDLTTSChunk alloc] init]]]; - NSMutableArray *synonyms = [NSMutableArray arrayWithArray:@[@"Q", @"W", @"E", @"R"]]; + NSMutableArray<SDLTTSChunk *> *ttsName = [NSMutableArray arrayWithArray:@[[[SDLTTSChunk alloc] init]]]; + NSMutableArray<NSString *> *synonyms = [NSMutableArray arrayWithArray:@[@"Q", @"W", @"E", @"R"]]; SDLRegisterAppInterface* message = [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:@"Interface" ttsName:ttsName vrSynonyms:synonyms isMediaApp:@YES languageDesired:[SDLLanguage EN_US] hmiDisplayLanguageDesired:[SDLLanguage ES_MX] appID:@"6h43g"]; @@ -591,7 +591,7 @@ describe(@"BuildSendLocation", ^{ __block NSNumber *someLatitude = nil; __block NSString *someLocation = nil; __block NSString *someLocationDescription = nil; - __block NSArray *someAddressLines = nil; + __block NSArray<NSString *> *someAddressLines = nil; __block NSString *somePhoneNumber = nil; __block SDLImage *someImage = nil; @@ -644,7 +644,7 @@ describe(@"BuildSendLocation", ^{ describe(@"BuildScrollableMessage Tests", ^ { it(@"Should build correctly", ^ { - NSArray* softButtons = @[[[SDLSoftButton alloc] init]]; + NSArray<SDLSoftButton *> *softButtons = @[[[SDLSoftButton alloc] init]]; SDLScrollableMessage* message = [SDLRPCRequestFactory buildScrollableMessage:@"Message Box" timeout:@37821 softButtons:softButtons correlationID:@9783356]; expect(message.scrollableMessageBody).to(equal(@"Message Box")); @@ -674,7 +674,7 @@ describe(@"BuildSetDisplayLayout Tests", ^ { describe(@"BuildSetGlobalProperties Tests", ^ { it(@"Should build correctly", ^ { - NSArray* help = @[[[SDLVRHelpItem alloc] init]]; + NSArray<SDLVRHelpItem *> *help = @[[[SDLVRHelpItem alloc] init]]; SDLSetGlobalProperties* message = [SDLRPCRequestFactory buildSetGlobalPropertiesWithHelpText:@"Beyond Help" timeoutText:@"You took too long" vrHelpTitle:@"Voice" vrHelp:help correlationID:@5666666]; @@ -723,7 +723,7 @@ describe(@"BuildSetMediaClockTimer Tests", ^ { describe(@"BuildShow Tests", ^ { it(@"Should build correctly", ^ { SDLImage* image = [[SDLImage alloc] init]; - NSArray* softButtons = @[[[SDLSoftButton alloc] init]]; + NSArray<SDLSoftButton *> *softButtons = @[[[SDLSoftButton alloc] init]]; SDLShow* message = [SDLRPCRequestFactory buildShowWithMainField1:@"11" mainField2:@"22" mainField3:@"33" mainField4:@"44" statusBar:@"Bar" mediaClock:@"Time" mediaTrack:@"Crucial Line" alignment:[SDLTextAlignment CENTERED] graphic:image softButtons:softButtons customPresets:@[@"w", @"x", @"y", @"z"] correlationID:@3432343]; @@ -776,7 +776,7 @@ describe(@"BuildShow Tests", ^ { }); describe(@"SDLShowConstantTBT Tests", ^ { - __block NSMutableArray *softButtons = nil; + __block NSMutableArray<SDLSoftButton *> *softButtons = nil; __block SDLImage *image1 = nil; __block SDLImage *image2 = nil; __block SDLShowConstantTBT *message = nil; @@ -864,7 +864,7 @@ describe(@"BuildSlider Tests", ^ { describe(@"BuildSpeak Tests", ^ { it(@"Should build correctly", ^ { - NSArray* ttsChunks = @[[[SDLTTSChunk alloc] init]]; + NSArray<SDLTTSChunk *> *ttsChunks = @[[[SDLTTSChunk alloc] init]]; SDLSpeak* message = [SDLRPCRequestFactory buildSpeakWithTTS:@"GREETINGS HUMAN" correlationID:@65]; expect(((SDLTTSChunk*)[message ttsChunks][0]).text).to(equal(@"GREETINGS HUMAN")); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m index 4bb54276a..778c08308 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameReason:[SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]}, - SDLNameOperationName:SDLNameOnAppInterfaceUnregistered}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameReason:[SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED]}, + SDLNameOperationName:SDLNameOnAppInterfaceUnregistered}} mutableCopy]; SDLOnAppInterfaceUnregistered* testNotification = [[SDLOnAppInterfaceUnregistered alloc] initWithDictionary:dict]; expect(testNotification.reason).to(equal([SDLAppInterfaceUnregisteredReason APP_UNAUTHORIZED])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m index fe1b168aa..503e5a5e0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameButtonName:[SDLButtonName CUSTOM_BUTTON], - SDLNameButtonEventMode:[SDLButtonEventMode BUTTONDOWN], - SDLNameCustomButtonId:@4252}, - SDLNameOperationName:SDLNameOnButtonEvent}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameButtonName:[SDLButtonName CUSTOM_BUTTON], + SDLNameButtonEventMode:[SDLButtonEventMode BUTTONDOWN], + SDLNameCustomButtonId:@4252}, + SDLNameOperationName:SDLNameOnButtonEvent}} mutableCopy]; SDLOnButtonEvent* testNotification = [[SDLOnButtonEvent alloc] initWithDictionary:dict]; expect(testNotification.buttonName).to(equal([SDLButtonName CUSTOM_BUTTON])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m index 6d369a4bb..617e143f1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameButtonName:[SDLButtonName CUSTOM_BUTTON], - SDLNameButtonPressMode:[SDLButtonPressMode LONG], - SDLNameCustomButtonId:@5642}, - SDLNameOperationName:SDLNameOnButtonPress}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameButtonName:[SDLButtonName CUSTOM_BUTTON], + SDLNameButtonPressMode:[SDLButtonPressMode LONG], + SDLNameCustomButtonId:@5642}, + SDLNameOperationName:SDLNameOnButtonPress}} mutableCopy]; SDLOnButtonPress* testNotification = [[SDLOnButtonPress alloc] initWithDictionary:dict]; expect(testNotification.buttonName).to(equal([SDLButtonName CUSTOM_BUTTON])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m index 424405876..6c80341b1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameCommandId:@5676544, - SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]}, - SDLNameOperationName:SDLNameOnCommand}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameCommandId:@5676544, + SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]}, + SDLNameOperationName:SDLNameOnCommand}} mutableCopy]; SDLOnCommand* testNotification = [[SDLOnCommand alloc] initWithDictionary:dict]; expect(testNotification.cmdID).to(equal(@5676544)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m index b97df7e8d..7b9fb23f4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameState:[SDLDriverDistractionState DD_ON]}, - SDLNameOperationName:SDLNameOnDriverDistraction}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameState:[SDLDriverDistractionState DD_ON]}, + SDLNameOperationName:SDLNameOnDriverDistraction}} mutableCopy]; SDLOnDriverDistraction* testNotification = [[SDLOnDriverDistraction alloc] initWithDictionary:dict]; expect(testNotification.state).to(equal([SDLDriverDistractionState DD_ON])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m index 3e4b8878f..b3fd3447e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameData:[@[@0] mutableCopy], - SDLNameURLUppercase:@"www.zombo.com", - SDLNameTimeoutCapitalized:@564}, - SDLNameOperationName:SDLNameOnEncodedSyncPData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameData:[@[@0] mutableCopy], + SDLNameURLUppercase:@"www.zombo.com", + SDLNameTimeoutCapitalized:@564}, + SDLNameOperationName:SDLNameOnEncodedSyncPData}} mutableCopy]; SDLOnEncodedSyncPData* testNotification = [[SDLOnEncodedSyncPData alloc] initWithDictionary:dict]; expect(testNotification.data).to(equal([@[@0] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m index 016a5e449..b2c645870 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m @@ -31,12 +31,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameHMILevel:[SDLHMILevel LIMITED], - SDLNameAudioStreamingState:[SDLAudioStreamingState ATTENUATED], - SDLNameSystemContext:[SDLSystemContext HMI_OBSCURED]}, - SDLNameOperationName:SDLNameOnHMIStatus}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameHMILevel:[SDLHMILevel LIMITED], + SDLNameAudioStreamingState:[SDLAudioStreamingState ATTENUATED], + SDLNameSystemContext:[SDLSystemContext HMI_OBSCURED]}, + SDLNameOperationName:SDLNameOnHMIStatus}} mutableCopy]; SDLOnHMIStatus* testNotification = [[SDLOnHMIStatus alloc] initWithDictionary:dict]; expect(testNotification.hmiLevel).to(equal([SDLHMILevel LIMITED])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m index ea87449c6..14148d4ad 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameHashId:@"hash"}, - SDLNameOperationName:SDLNameOnHashChange}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameHashId:@"hash"}, + SDLNameOperationName:SDLNameOnHashChange}} mutableCopy]; SDLOnHashChange* testNotification = [[SDLOnHashChange alloc] initWithDictionary:dict]; expect(testNotification.hashID).to(equal(@"hash")); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m index 96b867dad..d14827556 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameEvent:[SDLKeyboardEvent ENTRY_SUBMITTED], - SDLNameData:@"qwertyg"}, - SDLNameOperationName:SDLNameOnKeyboardInput}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameEvent:[SDLKeyboardEvent ENTRY_SUBMITTED], + SDLNameData:@"qwertyg"}, + SDLNameOperationName:SDLNameOnKeyboardInput}} mutableCopy]; SDLOnKeyboardInput* testNotification = [[SDLOnKeyboardInput alloc] initWithDictionary:dict]; expect(testNotification.event).to(equal([SDLKeyboardEvent ENTRY_SUBMITTED])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m index b1b2a0ed3..5342604f7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m @@ -27,11 +27,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameLanguage:[SDLLanguage ES_ES], - SDLNameHMIDisplayLanguage:[SDLLanguage DE_DE]}, - SDLNameOperationName:SDLNameOnLanguageChange}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameLanguage:[SDLLanguage ES_ES], + SDLNameHMIDisplayLanguage:[SDLLanguage DE_DE]}, + SDLNameOperationName:SDLNameOnLanguageChange}} mutableCopy]; SDLOnLanguageChange* testNotification = [[SDLOnLanguageChange alloc] initWithDictionary:dict]; expect(testNotification.language).to(equal([SDLLanguage ES_ES])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m index e8da95d84..350a98a15 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m @@ -31,13 +31,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{@"driverdistractionstatus":@NO, - @"userselected":@3, - @"OnLockScreenStatus":[SDLLockScreenStatus REQUIRED], - @"hmilevel":[SDLHMILevel NONE]}, - SDLNameOperationName:@"OnLockScreenStatus"}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{@"driverdistractionstatus":@NO, + @"userselected":@3, + @"OnLockScreenStatus":[SDLLockScreenStatus REQUIRED], + @"hmilevel":[SDLHMILevel NONE]}, + SDLNameOperationName:@"OnLockScreenStatus"}} mutableCopy]; SDLOnLockScreenStatus* testNotification = [[SDLOnLockScreenStatus alloc] initWithDictionary:dict]; expect(testNotification.driverDistractionStatus).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m index 9ad2026de..a66e22654 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNamePermissionItem:[@[item] mutableCopy]}, - SDLNameOperationName:SDLNameOnPermissionsChange}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNamePermissionItem:[@[item] mutableCopy]}, + SDLNameOperationName:SDLNameOnPermissionsChange}} mutableCopy]; SDLOnPermissionsChange* testNotification = [[SDLOnPermissionsChange alloc] initWithDictionary:dict]; expect(testNotification.permissionItem).to(equal([@[item] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m index ff7f95509..c14fe1d52 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameURLUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4", - SDLNameTimeoutCapitalized:@8357}, - SDLNameOperationName:SDLNameOnSyncPData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameURLUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4", + SDLNameTimeoutCapitalized:@8357}, + SDLNameOperationName:SDLNameOnSyncPData}} mutableCopy]; SDLOnSyncPData* testNotification = [[SDLOnSyncPData alloc] initWithDictionary:dict]; expect(testNotification.URL).to(equal(@"https://www.youtube.com/watch?v=ygr5AHufBN4")); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m index 786e38d6c..a32260c96 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m @@ -36,15 +36,15 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameRequestType:[SDLRequestType FILE_RESUME], - SDLNameURL:[@[@"www.google.com"] mutableCopy], - SDLNameTimeout:@52345, - SDLNameFileType:[SDLFileType GRAPHIC_PNG], - SDLNameOffset:@2532678684, - SDLNameLength:@50000000000}, - SDLNameOperationName:SDLNameOnSystemRequest}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameRequestType:[SDLRequestType FILE_RESUME], + SDLNameURL:[@[@"www.google.com"] mutableCopy], + SDLNameTimeout:@52345, + SDLNameFileType:[SDLFileType GRAPHIC_PNG], + SDLNameOffset:@2532678684, + SDLNameLength:@50000000000}, + SDLNameOperationName:SDLNameOnSystemRequest}} mutableCopy]; SDLOnSystemRequest* testNotification = [[SDLOnSystemRequest alloc] initWithDictionary:dict]; expect(testNotification.requestType).to(equal([SDLRequestType FILE_RESUME])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m index 102364f1d..eb507f0b5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameState:[SDLTBTState ETA_REQUEST]}, - SDLNameOperationName:SDLNameOnTBTClientState}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameState:[SDLTBTState ETA_REQUEST]}, + SDLNameOperationName:SDLNameOnTBTClientState}} mutableCopy]; SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] initWithDictionary:dict]; expect(testNotification.state).to(equal([SDLTBTState ETA_REQUEST])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m index c32f40d5f..a8adcd263 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameType:[SDLTouchType BEGIN], - SDLNameEvent:[@[event] mutableCopy]}, - SDLNameOperationName:SDLNameOnTouchEvent}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameType:[SDLTouchType BEGIN], + SDLNameEvent:[@[event] mutableCopy]}, + SDLNameOperationName:SDLNameOnTouchEvent}} mutableCopy]; SDLOnTouchEvent* testNotification = [[SDLOnTouchEvent alloc] initWithDictionary:dict]; expect(testNotification.type).to(equal([SDLTouchType BEGIN])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index 201ff580e..bdec1dbe3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameGPS:gps, - SDLNameSpeed:@70.1, - SDLNameRPM:@4242, - SDLNameFuelLevel:@10.3, - SDLNameFuelLevelState:[SDLComponentVolumeStatus ALERT], - SDLNameInstantFuelConsumption:@4000.63, - SDLNameExternalTemperature:@-10, - SDLNameVIN:@"222222222722", - SDLNamePRNDL:[SDLPRNDL DRIVE], - SDLNameTirePressure:tires, - SDLNameOdometer:@100050, - SDLNameBeltStatus:belt, - SDLNameBodyInformation:body, - SDLNameDeviceStatus:device, - SDLNameDriverBraking:[SDLVehicleDataEventStatus _YES], - SDLNameWiperStatus:[SDLWiperStatus STALLED], - SDLNameHeadLampStatus:headLamp, - SDLNameEngineTorque:@-200.124, - SDLNameAccelerationPedalPosition:@99.99999999, - SDLNameSteeringWheelAngle:@0.000000001, - SDLNameECallInfo:eCall, - SDLNameAirbagStatus:airbag, - SDLNameEmergencyEvent:event, - SDLNameClusterModeStatus:clusterMode, - SDLNameMyKey:myKey}, - SDLNameOperationName:SDLNameOnVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameGPS:gps, + SDLNameSpeed:@70.1, + SDLNameRPM:@4242, + SDLNameFuelLevel:@10.3, + SDLNameFuelLevelState:[SDLComponentVolumeStatus ALERT], + SDLNameInstantFuelConsumption:@4000.63, + SDLNameExternalTemperature:@-10, + SDLNameVIN:@"222222222722", + SDLNamePRNDL:[SDLPRNDL DRIVE], + SDLNameTirePressure:tires, + SDLNameOdometer:@100050, + SDLNameBeltStatus:belt, + SDLNameBodyInformation:body, + SDLNameDeviceStatus:device, + SDLNameDriverBraking:[SDLVehicleDataEventStatus _YES], + SDLNameWiperStatus:[SDLWiperStatus STALLED], + SDLNameHeadLampStatus:headLamp, + SDLNameEngineTorque:@-200.124, + SDLNameAccelerationPedalPosition:@99.99999999, + SDLNameSteeringWheelAngle:@0.000000001, + SDLNameECallInfo:eCall, + SDLNameAirbagStatus:airbag, + SDLNameEmergencyEvent:event, + SDLNameClusterModeStatus:clusterMode, + SDLNameMyKey:myKey}, + SDLNameOperationName:SDLNameOnVehicleData}} mutableCopy]; SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] initWithDictionary:dict]; expect(testNotification.gps).to(equal(gps)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m index 5e6385cee..0119291d9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m @@ -34,13 +34,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameCommandId:@434577, - SDLNameMenuParams:menu, - SDLNameVRCommands:[@[@"name", @"anotherName"] mutableCopy], - SDLNameCommandIcon:image}, - SDLNameOperationName:SDLNameAddCommand}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameCommandId:@434577, + SDLNameMenuParams:menu, + SDLNameVRCommands:[@[@"name", @"anotherName"] mutableCopy], + SDLNameCommandIcon:image}, + SDLNameOperationName:SDLNameAddCommand}} mutableCopy]; + SDLAddCommand* testRequest = [[SDLAddCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@434577)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m index 890049e5f..8dd5742cb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameMenuId:@4345645, - SDLNamePosition:@27, - SDLNameMenuName:@"Welcome to the menu"}, - SDLNameOperationName:SDLNameAddSubMenu}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMenuId:@4345645, + SDLNamePosition:@27, + SDLNameMenuName:@"Welcome to the menu"}, + SDLNameOperationName:SDLNameAddSubMenu}} mutableCopy]; SDLAddSubMenu* testRequest = [[SDLAddSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@4345645)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m index 48091794e..4d42280db 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameTTSChunks:[@[tts] mutableCopy], - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameAlertManeuver}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTTSChunks:[@[tts] mutableCopy], + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameAlertManeuver}} mutableCopy]; SDLAlertManeuver* testRequest = [[SDLAlertManeuver alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[tts] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m index 158557002..a6092684a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m @@ -42,17 +42,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameAlertText1:@"alert#1", - SDLNameAlertText2:@"alert#2", - SDLNameAlertText3:@"alert#3", - SDLNameTTSChunks:[@[tts] mutableCopy], - SDLNameDuration:@4357, - SDLNamePlayTone:@YES, - SDLNameProgressIndicator:@NO, - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameAlert}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameAlertText1:@"alert#1", + SDLNameAlertText2:@"alert#2", + SDLNameAlertText3:@"alert#3", + SDLNameTTSChunks:[@[tts] mutableCopy], + SDLNameDuration:@4357, + SDLNamePlayTone:@YES, + SDLNameProgressIndicator:@NO, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameAlert}} mutableCopy]; SDLAlert* testRequest = [[SDLAlert alloc] initWithDictionary:dict]; expect(testRequest.alertText1).to(equal(@"alert#1")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m index 43fd5326f..8642fe63d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m @@ -21,9 +21,9 @@ describe(@"change registration", ^ { __block SDLLanguage *someLanguage = nil; __block SDLLanguage *someOtherLanguage = nil; __block NSString *someAppName = nil; - __block NSArray *someTTSChunks = nil; + __block NSArray<SDLTTSChunk *> *someTTSChunks = nil; __block NSString *someNGNMediaAppName = nil; - __block NSArray *someVRSynonyms = nil; + __block NSArray<NSString *> *someVRSynonyms = nil; describe(@"when initializing with properites", ^{ context(@"when parameters are set", ^{ @@ -112,15 +112,15 @@ describe(@"change registration", ^ { someNGNMediaAppName = @"some media app name"; someVRSynonyms = @[@"some1", @"some2"]; - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameLanguage:someLanguage, - SDLNameHMIDisplayLanguage:someOtherLanguage, - SDLNameAppName:someAppName, - SDLNameTTSName:someTTSChunks, - SDLNameNGNMediaScreenAppName:someNGNMediaAppName, - SDLNameVRSynonyms:someVRSynonyms}, - SDLNameOperationName:SDLNameChangeRegistration}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameLanguage:someLanguage, + SDLNameHMIDisplayLanguage:someOtherLanguage, + SDLNameAppName:someAppName, + SDLNameTTSName:someTTSChunks, + SDLNameNGNMediaScreenAppName:someNGNMediaAppName, + SDLNameVRSynonyms:someVRSynonyms}, + SDLNameOperationName:SDLNameChangeRegistration}} mutableCopy]; testRequest = [[SDLChangeRegistration alloc] initWithDictionary:dict]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m index 017b123f5..52c496f8b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m @@ -28,11 +28,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameInteractionChoiceSetId:@141414, - SDLNameChoiceSet:[@[choice] mutableCopy]}, - SDLNameOperationName:SDLNameCreateInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInteractionChoiceSetId:@141414, + SDLNameChoiceSet:[@[choice] mutableCopy]}, + SDLNameOperationName:SDLNameCreateInteractionChoiceSet}} mutableCopy]; SDLCreateInteractionChoiceSet* testRequest = [[SDLCreateInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@141414)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m index 89ed13257..b71e48028 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameCommandId:@11223344}, - SDLNameOperationName:SDLNameDeleteCommand}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameCommandId:@11223344}, + SDLNameOperationName:SDLNameDeleteCommand}} mutableCopy]; SDLDeleteCommand* testRequest = [[SDLDeleteCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@11223344)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m index 5946c7ec0..18ce7d1d7 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncFileName:@"synchro"}, - SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"synchro"}, + SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; SDLDeleteFile* testRequest = [[SDLDeleteFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"synchro")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m index 540c08cb4..bcc2c3756 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameInteractionChoiceSetId:@20314}, - SDLNameOperationName:SDLNameDeleteInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInteractionChoiceSetId:@20314}, + SDLNameOperationName:SDLNameDeleteInteractionChoiceSet}} mutableCopy]; SDLDeleteInteractionChoiceSet* testRequest = [[SDLDeleteInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@20314)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m index 3185391ec..888d94f59 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameMenuId:@25614}, - SDLNameOperationName:SDLNameDeleteSubMenu}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMenuId:@25614}, + SDLNameOperationName:SDLNameDeleteSubMenu}} mutableCopy]; SDLDeleteSubMenu* testRequest = [[SDLDeleteSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@25614)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m index fd25fd099..c07a8b5fc 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameTargetId:@3562, - SDLNameMessageLength:@55555, - SDLNameMessageData:[@[@1, @4, @16, @64] mutableCopy]}, - SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTargetId:@3562, + SDLNameMessageLength:@55555, + SDLNameMessageData:[@[@1, @4, @16, @64] mutableCopy]}, + SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessage* testRequest = [[SDLDiagnosticMessage alloc] initWithDictionary:dict]; expect(testRequest.targetID).to(equal(@3562)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m index accdd94a6..739db2b66 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameData:[@[@2, @2, @2] mutableCopy]}, - SDLNameOperationName:SDLNameEncodedSyncPData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameData:[@[@2, @2, @2] mutableCopy]}, + SDLNameOperationName:SDLNameEncodedSyncPData}} mutableCopy]; SDLEncodedSyncPData* testRequest = [[SDLEncodedSyncPData alloc] initWithDictionary:dict]; expect(testRequest.data).to(equal([@[@2, @2, @2] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m index 0c4ca3af7..fcdec90f8 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameECUName:@4321, - SDLNameDTCMask:@22}, - SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameECUName:@4321, + SDLNameDTCMask:@22}, + SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; SDLGetDTCs* testRequest = [[SDLGetDTCs alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@4321)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 7e45c4bd6..053f90503 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -71,34 +71,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameGPS:@NO, - SDLNameSpeed:@YES, - SDLNameRPM:@NO, - SDLNameFuelLevel:@YES, - SDLNameFuelLevelState:@NO, - SDLNameInstantFuelConsumption:@YES, - SDLNameExternalTemperature:@NO, - SDLNameVIN:@YES, - SDLNamePRNDL:@NO, - SDLNameTirePressure:@YES, - SDLNameOdometer:@NO, - SDLNameBeltStatus:@YES, - SDLNameBodyInformation:@NO, - SDLNameDeviceStatus:@YES, - SDLNameDriverBraking:@NO, - SDLNameWiperStatus:@YES, - SDLNameHeadLampStatus:@NO, - SDLNameEngineTorque:@YES, - SDLNameAccelerationPedalPosition:@NO, - SDLNameSteeringWheelAngle:@YES, - SDLNameECallInfo:@NO, - SDLNameAirbagStatus:@YES, - SDLNameEmergencyEvent:@NO, - SDLNameClusterModeStatus:@YES, - SDLNameMyKey:@NO}, - SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@NO, + SDLNameSpeed:@YES, + SDLNameRPM:@NO, + SDLNameFuelLevel:@YES, + SDLNameFuelLevelState:@NO, + SDLNameInstantFuelConsumption:@YES, + SDLNameExternalTemperature:@NO, + SDLNameVIN:@YES, + SDLNamePRNDL:@NO, + SDLNameTirePressure:@YES, + SDLNameOdometer:@NO, + SDLNameBeltStatus:@YES, + SDLNameBodyInformation:@NO, + SDLNameDeviceStatus:@YES, + SDLNameDriverBraking:@NO, + SDLNameWiperStatus:@YES, + SDLNameHeadLampStatus:@NO, + SDLNameEngineTorque:@YES, + SDLNameAccelerationPedalPosition:@NO, + SDLNameSteeringWheelAngle:@YES, + SDLNameECallInfo:@NO, + SDLNameAirbagStatus:@YES, + SDLNameEmergencyEvent:@NO, + SDLNameClusterModeStatus:@YES, + SDLNameMyKey:@NO}, + SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m index f843ede18..78f8346c5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m @@ -39,16 +39,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameAudioPassThruDisplayText1:@"passthru#1", - SDLNameAudioPassThruDisplayText2:@"passthru#2", - SDLNameSamplingRate:[SDLSamplingRate _22KHZ], - SDLNameMaxDuration:@34563, - SDLNameBitsPerSample:[SDLBitsPerSample _16_BIT], - SDLNameAudioType:[SDLAudioType PCM], - SDLNameMuteAudio:@NO}, - SDLNameOperationName:SDLNamePerformAudioPassThru}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameAudioPassThruDisplayText1:@"passthru#1", + SDLNameAudioPassThruDisplayText2:@"passthru#2", + SDLNameSamplingRate:[SDLSamplingRate _22KHZ], + SDLNameMaxDuration:@34563, + SDLNameBitsPerSample:[SDLBitsPerSample _16_BIT], + SDLNameAudioType:[SDLAudioType PCM], + SDLNameMuteAudio:@NO}, + SDLNameOperationName:SDLNamePerformAudioPassThru}} mutableCopy]; SDLPerformAudioPassThru* testRequest = [[SDLPerformAudioPassThru alloc] initWithDictionary:dict]; expect(testRequest.audioPassThruDisplayText1).to(equal(@"passthru#1")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m index 7782b50dd..6dd8f7b07 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m @@ -48,18 +48,18 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameInitialText:@"a", - SDLNameInitialPrompt:[@[chunk1] mutableCopy], - SDLNameInteractionMode:[SDLInteractionMode VR_ONLY], - SDLNameInteractionChoiceSetIdList:[@[@1, @2, @3] mutableCopy], - SDLNameHelpPrompt:[@[chunk2] mutableCopy], - SDLNameTimeoutPrompt:[@[chunk3] mutableCopy], - SDLNameTimeout:@42000, - SDLNameVRHelp:[@[helpItem] mutableCopy], - SDLNameInteractionLayout:[SDLLayoutMode ICON_WITH_SEARCH]}, - SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInitialText:@"a", + SDLNameInitialPrompt:[@[chunk1] mutableCopy], + SDLNameInteractionMode:[SDLInteractionMode VR_ONLY], + SDLNameInteractionChoiceSetIdList:[@[@1, @2, @3] mutableCopy], + SDLNameHelpPrompt:[@[chunk2] mutableCopy], + SDLNameTimeoutPrompt:[@[chunk3] mutableCopy], + SDLNameTimeout:@42000, + SDLNameVRHelp:[@[helpItem] mutableCopy], + SDLNameInteractionLayout:[SDLLayoutMode ICON_WITH_SEARCH]}, + SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; SDLPerformInteraction* testRequest = [[SDLPerformInteraction alloc] initWithDictionary:dict]; expect(testRequest.initialText).to(equal(@"a")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m index c58e5a9f8..3b8af9d9c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m @@ -35,15 +35,15 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncFileName:@"fileName", - SDLNameFileType:[SDLFileType GRAPHIC_JPEG], - SDLNamePersistentFile:@YES, - SDLNameSystemFile:@NO, - SDLNameOffset:@987654321, - SDLNameLength:@123456789}, - SDLNameOperationName:SDLNamePutFile}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"fileName", + SDLNameFileType:[SDLFileType GRAPHIC_JPEG], + SDLNamePersistentFile:@YES, + SDLNameSystemFile:@NO, + SDLNameOffset:@987654321, + SDLNameLength:@123456789}, + SDLNameOperationName:SDLNamePutFile}} mutableCopy]; SDLPutFile* testRequest = [[SDLPutFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"fileName")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m index 31b65061f..f0290c3b6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameECUName:@33112, - SDLNameDIDLocation:[@[@200, @201, @205] mutableCopy]}, - SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameECUName:@33112, + SDLNameDIDLocation:[@[@200, @201, @205] mutableCopy]}, + SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; SDLReadDID* testRequest = [[SDLReadDID alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@33112)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m index 46a57203c..cb44868a6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m @@ -59,22 +59,22 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncMessageVersion:version, - SDLNameAppName:@"app56", - SDLNameTTSName:[@[chunk] mutableCopy], - SDLNameNGNMediaScreenAppName:@"whatisanngn", - SDLNameVRSynonyms:[@[@"paraphrase of the original name"] mutableCopy], - SDLNameIsMediaApplication:@NO, - SDLNameLanguageDesired:[SDLLanguage NO_NO], - SDLNameHMIDisplayLanguageDesired:[SDLLanguage PT_PT], - SDLNameAppHMIType:[@[[SDLAppHMIType MESSAGING], [SDLAppHMIType INFORMATION]] copy], - SDLNameHashId:@"gercd35grw2", - SDLNameDeviceInfo:info, - SDLNameAppId:@"123456789", - SDLNameAppInfo:appInfo}, - SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncMessageVersion:version, + SDLNameAppName:@"app56", + SDLNameTTSName:[@[chunk] mutableCopy], + SDLNameNGNMediaScreenAppName:@"whatisanngn", + SDLNameVRSynonyms:[@[@"paraphrase of the original name"] mutableCopy], + SDLNameIsMediaApplication:@NO, + SDLNameLanguageDesired:[SDLLanguage NO_NO], + SDLNameHMIDisplayLanguageDesired:[SDLLanguage PT_PT], + SDLNameAppHMIType:[@[[SDLAppHMIType MESSAGING], [SDLAppHMIType INFORMATION]] copy], + SDLNameHashId:@"gercd35grw2", + SDLNameDeviceInfo:info, + SDLNameAppId:@"123456789", + SDLNameAppInfo:appInfo}, + SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; SDLRegisterAppInterface* testRequest = [[SDLRegisterAppInterface alloc] initWithDictionary:dict]; expect(testRequest.syncMsgVersion).to(equal(version)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m index 064f6faaf..eb0eca22e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameProperties:[@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy]}, - SDLNameOperationName:SDLNameResetGlobalProperties}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameProperties:[@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy]}, + SDLNameOperationName:SDLNameResetGlobalProperties}} mutableCopy]; SDLResetGlobalProperties* testRequest = [[SDLResetGlobalProperties alloc] initWithDictionary:dict]; expect(testRequest.properties).to(equal([@[[SDLGlobalProperty MENUNAME], [SDLGlobalProperty VRHELPTITLE]] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m index 0787d4e34..f4b50c3f9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameScrollableMessageBody:@"thatmessagebody", - SDLNameTimeout:@9182, - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameScrollableMessage}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameScrollableMessageBody:@"thatmessagebody", + SDLNameTimeout:@9182, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameScrollableMessage}} mutableCopy]; SDLScrollableMessage* testRequest = [[SDLScrollableMessage alloc] initWithDictionary:dict]; expect(testRequest.scrollableMessageBody).to(equal(@"thatmessagebody")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m index c1532a4ec..869602aad 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m @@ -17,7 +17,7 @@ describe(@"Send Location RPC", ^{ __block NSNumber *someLatitude = nil; __block NSString *someLocation = nil; __block NSString *someLocationDescription = nil; - __block NSArray *someAddressLines = nil; + __block NSArray<NSString *> *someAddressLines = nil; __block NSString *somePhoneNumber = nil; __block SDLImage *someImage = nil; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m index af6e55771..29c0f14f5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncFileName:@"A/File/Name"}, - SDLNameOperationName:SDLNameSetAppIcon}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"A/File/Name"}, + SDLNameOperationName:SDLNameSetAppIcon}} mutableCopy]; SDLSetAppIcon* testRequest = [[SDLSetAppIcon alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"A/File/Name")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m index 74684e7a7..ed712dede 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameDisplayLayout:@"wat"}, - SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameDisplayLayout:@"wat"}, + SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayout* testRequest = [[SDLSetDisplayLayout alloc] initWithDictionary:dict]; expect(testRequest.displayLayout).to(equal(@"wat")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m index b5228cc0a..15062d29b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m @@ -46,16 +46,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameHelpPrompt:[@[chunk1] mutableCopy], - SDLNameTimeoutPrompt:[@[chunk2] mutableCopy], - SDLNameVRHelpTitle:@"vr", - SDLNameVRHelp:[@[help] mutableCopy], - SDLNameMenuTitle:@"TheNewMenu", - SDLNameMenuIcon:image, - SDLNameKeyboardProperties:keyboard}, - SDLNameOperationName:SDLNameSetGlobalProperties}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameHelpPrompt:[@[chunk1] mutableCopy], + SDLNameTimeoutPrompt:[@[chunk2] mutableCopy], + SDLNameVRHelpTitle:@"vr", + SDLNameVRHelp:[@[help] mutableCopy], + SDLNameMenuTitle:@"TheNewMenu", + SDLNameMenuIcon:image, + SDLNameKeyboardProperties:keyboard}, + SDLNameOperationName:SDLNameSetGlobalProperties}} mutableCopy]; SDLSetGlobalProperties* testRequest = [[SDLSetGlobalProperties alloc] initWithDictionary:dict]; expect(testRequest.helpPrompt).to(equal([@[chunk1] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m index 968c64402..edbf7a246 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameStartTime:time1, - SDLNameEndTime:time2, - SDLNameUpdateMode:[SDLUpdateMode COUNTUP]}, - SDLNameOperationName:SDLNameSetMediaClockTimer}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameStartTime:time1, + SDLNameEndTime:time2, + SDLNameUpdateMode:[SDLUpdateMode COUNTUP]}, + SDLNameOperationName:SDLNameSetMediaClockTimer}} mutableCopy]; SDLSetMediaClockTimer* testRequest = [[SDLSetMediaClockTimer alloc] initWithDictionary:dict]; expect(testRequest.startTime).to(equal(time1)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m index 8b8c0928b..491096b84 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m @@ -50,20 +50,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameNavigationText1:@"nav1", - SDLNameNavigationText2:@"nav2", - SDLNameETA:@"4/1/7015", - SDLNameTimeToDestination:@"5000 Years", - SDLNameTotalDistance:@"1 parsec", - SDLNameTurnIcon:image1, - SDLNameNextTurnIcon:image2, - SDLNameDistanceToManeuver:@2, - SDLNameDistanceToManeuverScale:@4, - SDLNameManeuverComplete:@NO, - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameShowConstantTBT}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameNavigationText1:@"nav1", + SDLNameNavigationText2:@"nav2", + SDLNameETA:@"4/1/7015", + SDLNameTimeToDestination:@"5000 Years", + SDLNameTotalDistance:@"1 parsec", + SDLNameTurnIcon:image1, + SDLNameNextTurnIcon:image2, + SDLNameDistanceToManeuver:@2, + SDLNameDistanceToManeuverScale:@4, + SDLNameManeuverComplete:@NO, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameShowConstantTBT}} mutableCopy]; SDLShowConstantTBT* testRequest = [[SDLShowConstantTBT alloc] initWithDictionary:dict]; expect(testRequest.navigationText1).to(equal(@"nav1")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m index 71e1300fe..6cc5b4974 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameMainField1:@"field1", - SDLNameMainField2:@"field2", - SDLNameMainField3:@"field3", - SDLNameMainField4:@"field4", - SDLNameAlignment:[SDLTextAlignment LEFT_ALIGNED], - SDLNameStatusBar:@"status", - SDLNameMediaClock:@"TheTime", - SDLNameMediaTrack:@"In The Clear", - SDLNameGraphic:image1, - SDLNameSecondaryGraphic:image2, - SDLNameSoftButtons:[@[button] mutableCopy], - SDLNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy]}, - SDLNameOperationName:SDLNameShow}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMainField1:@"field1", + SDLNameMainField2:@"field2", + SDLNameMainField3:@"field3", + SDLNameMainField4:@"field4", + SDLNameAlignment:[SDLTextAlignment LEFT_ALIGNED], + SDLNameStatusBar:@"status", + SDLNameMediaClock:@"TheTime", + SDLNameMediaTrack:@"In The Clear", + SDLNameGraphic:image1, + SDLNameSecondaryGraphic:image2, + SDLNameSoftButtons:[@[button] mutableCopy], + SDLNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy]}, + SDLNameOperationName:SDLNameShow}} mutableCopy]; SDLShow* testRequest = [[SDLShow alloc] initWithDictionary:dict]; expect(testRequest.mainField1).to(equal(@"field1")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m index e0e49ca3c..294e0ce50 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m @@ -31,14 +31,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameNumberTicks:@2, - SDLNamePosition:@1, - SDLNameSliderHeader:@"Head", - SDLNameSliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy], - SDLNameTimeout:@2000}, - SDLNameOperationName:SDLNameSlider}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameNumberTicks:@2, + SDLNamePosition:@1, + SDLNameSliderHeader:@"Head", + SDLNameSliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy], + SDLNameTimeout:@2000}, + SDLNameOperationName:SDLNameSlider}} mutableCopy]; SDLSlider* testRequest = [[SDLSlider alloc] initWithDictionary:dict]; expect(testRequest.numTicks).to(equal(@2)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m index 7781f4458..e336b0067 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameTTSChunks:[@[chunk] mutableCopy]}, - SDLNameOperationName:SDLNameSpeak}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTTSChunks:[@[chunk] mutableCopy]}, + SDLNameOperationName:SDLNameSpeak}} mutableCopy]; SDLSpeak* testRequest = [[SDLSpeak alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[chunk] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m index 6759f5fbf..fa562c3a3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameButtonName:[SDLButtonName PRESET_5]}, - SDLNameOperationName:SDLNameSubscribeButton}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameButtonName:[SDLButtonName PRESET_5]}, + SDLNameOperationName:SDLNameSubscribeButton}} mutableCopy]; SDLSubscribeButton* testRequest = [[SDLSubscribeButton alloc] initWithDictionary:dict]; expect(testRequest.buttonName).to(equal([SDLButtonName PRESET_5])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index 25af6ca52..b85671aa4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameGPS:@YES, - SDLNameSpeed:@NO, - SDLNameRPM:@YES, - SDLNameFuelLevel:@NO, - SDLNameFuelLevelState:@YES, - SDLNameInstantFuelConsumption:@NO, - SDLNameExternalTemperature:@YES, - SDLNamePRNDL:@YES, - SDLNameTirePressure:@NO, - SDLNameOdometer:@YES, - SDLNameBeltStatus:@NO, - SDLNameBodyInformation:@YES, - SDLNameDeviceStatus:@NO, - SDLNameDriverBraking:@YES, - SDLNameWiperStatus:@NO, - SDLNameHeadLampStatus:@YES, - SDLNameEngineTorque:@NO, - SDLNameAccelerationPedalPosition:@YES, - SDLNameSteeringWheelAngle:@NO, - SDLNameECallInfo:@YES, - SDLNameAirbagStatus:@NO, - SDLNameEmergencyEvent:@YES, - SDLNameClusterModeStatus:@NO, - SDLNameMyKey:@YES}, - SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@YES, + SDLNameSpeed:@NO, + SDLNameRPM:@YES, + SDLNameFuelLevel:@NO, + SDLNameFuelLevelState:@YES, + SDLNameInstantFuelConsumption:@NO, + SDLNameExternalTemperature:@YES, + SDLNamePRNDL:@YES, + SDLNameTirePressure:@NO, + SDLNameOdometer:@YES, + SDLNameBeltStatus:@NO, + SDLNameBodyInformation:@YES, + SDLNameDeviceStatus:@NO, + SDLNameDriverBraking:@YES, + SDLNameWiperStatus:@NO, + SDLNameHeadLampStatus:@YES, + SDLNameEngineTorque:@NO, + SDLNameAccelerationPedalPosition:@YES, + SDLNameSteeringWheelAngle:@NO, + SDLNameECallInfo:@YES, + SDLNameAirbagStatus:@NO, + SDLNameEmergencyEvent:@YES, + SDLNameClusterModeStatus:@NO, + SDLNameMyKey:@YES}, + SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m index 7341787e2..884804c24 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameRequestType:[SDLRequestType AUTH_REQUEST], - SDLNameFilename:@"AnotherFile"}, - SDLNameOperationName:SDLNameSystemRequest}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameRequestType:[SDLRequestType AUTH_REQUEST], + SDLNameFilename:@"AnotherFile"}, + SDLNameOperationName:SDLNameSystemRequest}} mutableCopy]; SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] initWithDictionary:dict]; expect(testRequest.requestType).to(equal([SDLRequestType AUTH_REQUEST])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m index 481243a73..9fa39ab96 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameButtonName:[SDLButtonName PRESET_0]}, - SDLNameOperationName:SDLNameUnsubscribeButton}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameButtonName:[SDLButtonName PRESET_0]}, + SDLNameOperationName:SDLNameUnsubscribeButton}} mutableCopy]; SDLUnsubscribeButton* testRequest = [[SDLUnsubscribeButton alloc] initWithDictionary:dict]; expect(testRequest.buttonName).to(equal([SDLButtonName PRESET_0])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index f4efec0fc..40ec363f8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameGPS:@YES, - SDLNameSpeed:@YES, - SDLNameRPM:@YES, - SDLNameFuelLevel:@YES, - SDLNameFuelLevelState:@YES, - SDLNameInstantFuelConsumption:@YES, - SDLNameExternalTemperature:@YES, - SDLNamePRNDL:@YES, - SDLNameTirePressure:@YES, - SDLNameOdometer:@YES, - SDLNameBeltStatus:@YES, - SDLNameBodyInformation:@YES, - SDLNameDeviceStatus:@YES, - SDLNameDriverBraking:@YES, - SDLNameWiperStatus:@YES, - SDLNameHeadLampStatus:@YES, - SDLNameEngineTorque:@YES, - SDLNameAccelerationPedalPosition:@YES, - SDLNameSteeringWheelAngle:@YES, - SDLNameECallInfo:@YES, - SDLNameAirbagStatus:@YES, - SDLNameEmergencyEvent:@YES, - SDLNameClusterModeStatus:@YES, - SDLNameMyKey:@YES}, - SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@YES, + SDLNameSpeed:@YES, + SDLNameRPM:@YES, + SDLNameFuelLevel:@YES, + SDLNameFuelLevelState:@YES, + SDLNameInstantFuelConsumption:@YES, + SDLNameExternalTemperature:@YES, + SDLNamePRNDL:@YES, + SDLNameTirePressure:@YES, + SDLNameOdometer:@YES, + SDLNameBeltStatus:@YES, + SDLNameBodyInformation:@YES, + SDLNameDeviceStatus:@YES, + SDLNameDriverBraking:@YES, + SDLNameWiperStatus:@YES, + SDLNameHeadLampStatus:@YES, + SDLNameEngineTorque:@YES, + SDLNameAccelerationPedalPosition:@YES, + SDLNameSteeringWheelAngle:@YES, + SDLNameECallInfo:@YES, + SDLNameAirbagStatus:@YES, + SDLNameEmergencyEvent:@YES, + SDLNameClusterModeStatus:@YES, + SDLNameMyKey:@YES}, + SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleData* testRequest = [[SDLUnsubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m index 4806ef21f..24bd699d2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameTurnList:[@[turn] mutableCopy], - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameUpdateTurnList}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTurnList:[@[turn] mutableCopy], + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameUpdateTurnList}} mutableCopy]; SDLUpdateTurnList* testRequest = [[SDLUpdateTurnList alloc] initWithDictionary:dict]; expect(testRequest.turnList).to(equal([@[turn] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m index a78d757c8..13f68a2ea 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameSpaceAvailable:@0}, - SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSpaceAvailable:@0}, + SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; SDLDeleteFileResponse* testResponse = [[SDLDeleteFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m index b322f961d..c36b3cbec 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameMessageDataResult:[@[@3, @9, @27, @81] mutableCopy]}, - SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameMessageDataResult:[@[@3, @9, @27, @81] mutableCopy]}, + SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessageResponse* testResponse = [[SDLDiagnosticMessageResponse alloc] initWithDictionary:dict]; expect(testResponse.messageDataResult).to(equal([@[@3, @9, @27, @81] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m index deb787b9a..d22e8fd1b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameECUHeader:@404, - SDLNameDTC:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, - SDLNameOperationName:SDLNameGetDTCs}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameECUHeader:@404, + SDLNameDTC:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, + SDLNameOperationName:SDLNameGetDTCs}} mutableCopy]; SDLGetDTCsResponse* testResponse = [[SDLGetDTCsResponse alloc] initWithDictionary:dict]; expect(testResponse.ecuHeader).to(equal(@404)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index ece7d087c..c4ee631f7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameGPS:gps, - SDLNameSpeed:@100, - SDLNameRPM:@3, - SDLNameFuelLevel:@99.9999, - SDLNameFuelLevelState:[SDLComponentVolumeStatus FAULT], - SDLNameInstantFuelConsumption:@40.7, - SDLNameExternalTemperature:@0, - SDLNameVIN:@"6574839201", - SDLNamePRNDL:[SDLPRNDL PARK], - SDLNameTirePressure:tires, - SDLNameOdometer:@70000, - SDLNameBeltStatus:belt, - SDLNameBodyInformation:body, - SDLNameDeviceStatus:device, - SDLNameDriverBraking:[SDLVehicleDataEventStatus NO_EVENT], - SDLNameWiperStatus:[SDLWiperStatus AUTO_HIGH], - SDLNameHeadLampStatus:headLamp, - SDLNameEngineTorque:@630.4, - SDLNameAccelerationPedalPosition:@0, - SDLNameSteeringWheelAngle:@-1500, - SDLNameECallInfo:eCall, - SDLNameAirbagStatus:airbag, - SDLNameEmergencyEvent:event, - SDLNameClusterModeStatus:clusterMode, - SDLNameMyKey:myKey}, - SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameGPS:gps, + SDLNameSpeed:@100, + SDLNameRPM:@3, + SDLNameFuelLevel:@99.9999, + SDLNameFuelLevelState:[SDLComponentVolumeStatus FAULT], + SDLNameInstantFuelConsumption:@40.7, + SDLNameExternalTemperature:@0, + SDLNameVIN:@"6574839201", + SDLNamePRNDL:[SDLPRNDL PARK], + SDLNameTirePressure:tires, + SDLNameOdometer:@70000, + SDLNameBeltStatus:belt, + SDLNameBodyInformation:body, + SDLNameDeviceStatus:device, + SDLNameDriverBraking:[SDLVehicleDataEventStatus NO_EVENT], + SDLNameWiperStatus:[SDLWiperStatus AUTO_HIGH], + SDLNameHeadLampStatus:headLamp, + SDLNameEngineTorque:@630.4, + SDLNameAccelerationPedalPosition:@0, + SDLNameSteeringWheelAngle:@-1500, + SDLNameECallInfo:eCall, + SDLNameAirbagStatus:airbag, + SDLNameEmergencyEvent:event, + SDLNameClusterModeStatus:clusterMode, + SDLNameMyKey:myKey}, + SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(gps)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m index 8934562eb..9cc6571a5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameFilenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], - SDLNameSpaceAvailable:@500000000}, - SDLNameOperationName:SDLNameListFiles}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameFilenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], + SDLNameSpaceAvailable:@500000000}, + SDLNameOperationName:SDLNameListFiles}} mutableCopy]; SDLListFilesResponse* testResponse = [[SDLListFilesResponse alloc] initWithDictionary:dict]; expect(testResponse.filenames).to(equal([@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m index 15e75cd48..af42eb3dd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m @@ -29,12 +29,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameChoiceId:@25, - SDLNameManualTextEntry:@"entry", - SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]}, - SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameChoiceId:@25, + SDLNameManualTextEntry:@"entry", + SDLNameTriggerSource:[SDLTriggerSource KEYBOARD]}, + SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; SDLPerformInteractionResponse* testResponse = [[SDLPerformInteractionResponse alloc] initWithDictionary:dict]; expect(testResponse.choiceID).to(equal(@25)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m index 52ed9bf7b..09ae52453 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameSpaceAvailable:@1248}, - SDLNameOperationName:SDLNamePutFile}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSpaceAvailable:@1248}, + SDLNameOperationName:SDLNamePutFile}} mutableCopy]; SDLPutFileResponse* testResponse = [[SDLPutFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@1248)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m index d5f080aba..e8432243a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameDIDResult:[@[result] mutableCopy]}, - SDLNameOperationName:SDLNameReadDID}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameDIDResult:[@[result] mutableCopy]}, + SDLNameOperationName:SDLNameReadDID}} mutableCopy]; SDLReadDIDResponse* testResponse = [[SDLReadDIDResponse alloc] initWithDictionary:dict]; expect(testResponse.didResult).to(equal([@[result] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m index 0f1f9376f..a0af019db 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m @@ -65,27 +65,27 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncMessageVersion:version, - SDLNameLanguage:[SDLLanguage ES_MX], - SDLNameHMIDisplayLanguage:[SDLLanguage RU_RU], - SDLNameDisplayCapabilities:info, - SDLNameButtonCapabilities:[@[button] mutableCopy], - SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], - SDLNamePresetBankCapabilities:presetBank, - SDLNameHMIZoneCapabilities:[@[[SDLHMIZoneCapabilities BACK], [SDLHMIZoneCapabilities FRONT]] copy], - SDLNameSpeechCapabilities:[@[[SDLSpeechCapabilities SAPI_PHONEMES], [SDLSpeechCapabilities SILENCE]] copy], - SDLNameVRCapabilities:[@[[SDLVRCapabilities TEXT]] copy], - SDLNameAudioPassThruCapabilities:[@[audioPassThru] mutableCopy], - SDLNameVehicleType:vehicle, - SDLNamePrerecordedSpeech:[@[[SDLPrerecordedSpeech LISTEN_JINGLE], [SDLPrerecordedSpeech HELP_JINGLE]] mutableCopy], - SDLNameSupportedDiagnosticModes:[@[@67, @99, @111] mutableCopy], - SDLNameHMICapabilities: hmiCapabilities, - SDLNameSDLVersion: @"sdlVersion", - SDLNameSystemSoftwareVersion: @"systemSoftwareVersion" - }, - SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncMessageVersion:version, + SDLNameLanguage:[SDLLanguage ES_MX], + SDLNameHMIDisplayLanguage:[SDLLanguage RU_RU], + SDLNameDisplayCapabilities:info, + SDLNameButtonCapabilities:[@[button] mutableCopy], + SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLNamePresetBankCapabilities:presetBank, + SDLNameHMIZoneCapabilities:[@[[SDLHMIZoneCapabilities BACK], [SDLHMIZoneCapabilities FRONT]] copy], + SDLNameSpeechCapabilities:[@[[SDLSpeechCapabilities SAPI_PHONEMES], [SDLSpeechCapabilities SILENCE]] copy], + SDLNameVRCapabilities:[@[[SDLVRCapabilities TEXT]] copy], + SDLNameAudioPassThruCapabilities:[@[audioPassThru] mutableCopy], + SDLNameVehicleType:vehicle, + SDLNamePrerecordedSpeech:[@[[SDLPrerecordedSpeech LISTEN_JINGLE], [SDLPrerecordedSpeech HELP_JINGLE]] mutableCopy], + SDLNameSupportedDiagnosticModes:[@[@67, @99, @111] mutableCopy], + SDLNameHMICapabilities: hmiCapabilities, + SDLNameSDLVersion: @"sdlVersion", + SDLNameSystemSoftwareVersion: @"systemSoftwareVersion" + }, + SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] initWithDictionary:dict]; expect(testResponse.syncMsgVersion).to(equal(version)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m index a589bfeea..29b589eef 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m @@ -39,13 +39,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameDisplayCapabilities:info, - SDLNameButtonCapabilities:[@[button] mutableCopy], - SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], - SDLNamePresetBankCapabilities:presetBank}, - SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameDisplayCapabilities:info, + SDLNameButtonCapabilities:[@[button] mutableCopy], + SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLNamePresetBankCapabilities:presetBank}, + SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayoutResponse* testResponse = [[SDLSetDisplayLayoutResponse alloc] initWithDictionary:dict]; expect(testResponse.displayCapabilities).to(equal(info)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m index 61666d57b..b7dce33cb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameSliderPosition:@13}, - SDLNameOperationName:SDLNameSlider}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSliderPosition:@13}, + SDLNameOperationName:SDLNameSlider}} mutableCopy]; SDLSliderResponse* testResponse = [[SDLSliderResponse alloc] initWithDictionary:dict]; expect(testResponse.sliderPosition).to(equal(@13)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index 6b6b93ddc..a8b890a8d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameGPS:vehicleDataResult, - SDLNameSpeed:vehicleDataResult, - SDLNameRPM:vehicleDataResult, - SDLNameFuelLevel:vehicleDataResult, - SDLNameFuelLevelState:vehicleDataResult, - SDLNameInstantFuelConsumption:vehicleDataResult, - SDLNameExternalTemperature:vehicleDataResult, - SDLNamePRNDL:vehicleDataResult, - SDLNameTirePressure:vehicleDataResult, - SDLNameOdometer:vehicleDataResult, - SDLNameBeltStatus:vehicleDataResult, - SDLNameBodyInformation:vehicleDataResult, - SDLNameDeviceStatus:vehicleDataResult, - SDLNameDriverBraking:vehicleDataResult, - SDLNameWiperStatus:vehicleDataResult, - SDLNameHeadLampStatus:vehicleDataResult, - SDLNameEngineTorque:vehicleDataResult, - SDLNameAccelerationPedalPosition:vehicleDataResult, - SDLNameSteeringWheelAngle:vehicleDataResult, - SDLNameECallInfo:vehicleDataResult, - SDLNameAirbagStatus:vehicleDataResult, - SDLNameEmergencyEvent:vehicleDataResult, - SDLNameClusterModes:vehicleDataResult, - SDLNameMyKey:vehicleDataResult}, - SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameGPS:vehicleDataResult, + SDLNameSpeed:vehicleDataResult, + SDLNameRPM:vehicleDataResult, + SDLNameFuelLevel:vehicleDataResult, + SDLNameFuelLevelState:vehicleDataResult, + SDLNameInstantFuelConsumption:vehicleDataResult, + SDLNameExternalTemperature:vehicleDataResult, + SDLNamePRNDL:vehicleDataResult, + SDLNameTirePressure:vehicleDataResult, + SDLNameOdometer:vehicleDataResult, + SDLNameBeltStatus:vehicleDataResult, + SDLNameBodyInformation:vehicleDataResult, + SDLNameDeviceStatus:vehicleDataResult, + SDLNameDriverBraking:vehicleDataResult, + SDLNameWiperStatus:vehicleDataResult, + SDLNameHeadLampStatus:vehicleDataResult, + SDLNameEngineTorque:vehicleDataResult, + SDLNameAccelerationPedalPosition:vehicleDataResult, + SDLNameSteeringWheelAngle:vehicleDataResult, + SDLNameECallInfo:vehicleDataResult, + SDLNameAirbagStatus:vehicleDataResult, + SDLNameEmergencyEvent:vehicleDataResult, + SDLNameClusterModes:vehicleDataResult, + SDLNameMyKey:vehicleDataResult}, + SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 022dd306f..129d9cbd2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameGPS:vehicleDataResult, - SDLNameSpeed:vehicleDataResult, - SDLNameRPM:vehicleDataResult, - SDLNameFuelLevel:vehicleDataResult, - SDLNameFuelLevelState:vehicleDataResult, - SDLNameInstantFuelConsumption:vehicleDataResult, - SDLNameExternalTemperature:vehicleDataResult, - SDLNamePRNDL:vehicleDataResult, - SDLNameTirePressure:vehicleDataResult, - SDLNameOdometer:vehicleDataResult, - SDLNameBeltStatus:vehicleDataResult, - SDLNameBodyInformation:vehicleDataResult, - SDLNameDeviceStatus:vehicleDataResult, - SDLNameDriverBraking:vehicleDataResult, - SDLNameWiperStatus:vehicleDataResult, - SDLNameHeadLampStatus:vehicleDataResult, - SDLNameEngineTorque:vehicleDataResult, - SDLNameAccelerationPedalPosition:vehicleDataResult, - SDLNameSteeringWheelAngle:vehicleDataResult, - SDLNameECallInfo:vehicleDataResult, - SDLNameAirbagStatus:vehicleDataResult, - SDLNameEmergencyEvent:vehicleDataResult, - SDLNameClusterModes:vehicleDataResult, - SDLNameMyKey:vehicleDataResult}, - SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameGPS:vehicleDataResult, + SDLNameSpeed:vehicleDataResult, + SDLNameRPM:vehicleDataResult, + SDLNameFuelLevel:vehicleDataResult, + SDLNameFuelLevelState:vehicleDataResult, + SDLNameInstantFuelConsumption:vehicleDataResult, + SDLNameExternalTemperature:vehicleDataResult, + SDLNamePRNDL:vehicleDataResult, + SDLNameTirePressure:vehicleDataResult, + SDLNameOdometer:vehicleDataResult, + SDLNameBeltStatus:vehicleDataResult, + SDLNameBodyInformation:vehicleDataResult, + SDLNameDeviceStatus:vehicleDataResult, + SDLNameDriverBraking:vehicleDataResult, + SDLNameWiperStatus:vehicleDataResult, + SDLNameHeadLampStatus:vehicleDataResult, + SDLNameEngineTorque:vehicleDataResult, + SDLNameAccelerationPedalPosition:vehicleDataResult, + SDLNameSteeringWheelAngle:vehicleDataResult, + SDLNameECallInfo:vehicleDataResult, + SDLNameAirbagStatus:vehicleDataResult, + SDLNameEmergencyEvent:vehicleDataResult, + SDLNameClusterModes:vehicleDataResult, + SDLNameMyKey:vehicleDataResult}, + SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m index 6ce077a0c..74ed37ea3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m @@ -39,14 +39,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDriverAirbagDeployed:[SDLVehicleDataEventStatus _YES], - SDLNameDriverSideAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT], - SDLNameDriverCurtainAirbagDeployed:[SDLVehicleDataEventStatus _NO], - SDLNamePassengerAirbagDeployed:[SDLVehicleDataEventStatus NOT_SUPPORTED], - SDLNamePassengerCurtainAirbagDeployed:[SDLVehicleDataEventStatus FAULT], - SDLNameDriverKneeAirbagDeployed:[SDLVehicleDataEventStatus _NO], - SDLNamePassengerSideAirbagDeployed:[SDLVehicleDataEventStatus _YES], - SDLNamePassengerKneeAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameDriverAirbagDeployed:[SDLVehicleDataEventStatus _YES], + SDLNameDriverSideAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT], + SDLNameDriverCurtainAirbagDeployed:[SDLVehicleDataEventStatus _NO], + SDLNamePassengerAirbagDeployed:[SDLVehicleDataEventStatus NOT_SUPPORTED], + SDLNamePassengerCurtainAirbagDeployed:[SDLVehicleDataEventStatus FAULT], + SDLNameDriverKneeAirbagDeployed:[SDLVehicleDataEventStatus _NO], + SDLNamePassengerSideAirbagDeployed:[SDLVehicleDataEventStatus _YES], + SDLNamePassengerKneeAirbagDeployed:[SDLVehicleDataEventStatus NO_EVENT]} mutableCopy]; SDLAirbagStatus* testStruct = [[SDLAirbagStatus alloc] initWithDictionary:dict]; expect(testStruct.driverAirbagDeployed).to(equal([SDLVehicleDataEventStatus _YES])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m index 73e2fc1bd..b8495dc74 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m @@ -28,9 +28,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameAppDisplayName:@"display name", - SDLNameAppVersion:@"1.2.3.4", - SDLNameAppBundleId:@"com.app.bundle"} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameAppDisplayName:@"display name", + SDLNameAppVersion:@"1.2.3.4", + SDLNameAppBundleId:@"com.app.bundle"} mutableCopy]; SDLAppInfo* testStruct = [[SDLAppInfo alloc] initWithDictionary:dict]; expect(testStruct.appDisplayName).to(equal(@"display name")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m index e4b62e1ff..9bdcb8666 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m @@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameSamplingRate:[SDLSamplingRate _22KHZ], - SDLNameBitsPerSample:[SDLBitsPerSample _8_BIT], - SDLNameAudioType:[SDLAudioType PCM]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameSamplingRate:[SDLSamplingRate _22KHZ], + SDLNameBitsPerSample:[SDLBitsPerSample _8_BIT], + SDLNameAudioType:[SDLAudioType PCM]} mutableCopy]; SDLAudioPassThruCapabilities* testStruct = [[SDLAudioPassThruCapabilities alloc] initWithDictionary:dict]; expect(testStruct.samplingRate).to(equal([SDLSamplingRate _22KHZ])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m index 761ff193b..4a3d4155e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDriverBeltDeployed:[SDLVehicleDataEventStatus NO_EVENT], - SDLNamePassengerBeltDeployed:[SDLVehicleDataEventStatus _YES], - SDLNamePassengerBuckleBelted:[SDLVehicleDataEventStatus _NO], - SDLNameDriverBuckleBelted:[SDLVehicleDataEventStatus FAULT], - SDLNameLeftRow2BuckleBelted:[SDLVehicleDataEventStatus _YES], - SDLNamePassengerChildDetected:[SDLVehicleDataEventStatus _NO], - SDLNameRightRow2BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED], - SDLNameMiddleRow2BuckleBelted:[SDLVehicleDataEventStatus NO_EVENT], - SDLNameMiddleRow3BuckleBelted:[SDLVehicleDataEventStatus _YES], - SDLNameLeftRow3BuckleBelted:[SDLVehicleDataEventStatus FAULT], - SDLNameRightRow3BuckleBelted:[SDLVehicleDataEventStatus _NO], - SDLNameLeftRearInflatableBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED], - SDLNameRightRearInflatableBelted:[SDLVehicleDataEventStatus FAULT], - SDLNameMiddleRow1BeltDeployed:[SDLVehicleDataEventStatus NO_EVENT], - SDLNameMiddleRow1BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameDriverBeltDeployed:[SDLVehicleDataEventStatus NO_EVENT], + SDLNamePassengerBeltDeployed:[SDLVehicleDataEventStatus _YES], + SDLNamePassengerBuckleBelted:[SDLVehicleDataEventStatus _NO], + SDLNameDriverBuckleBelted:[SDLVehicleDataEventStatus FAULT], + SDLNameLeftRow2BuckleBelted:[SDLVehicleDataEventStatus _YES], + SDLNamePassengerChildDetected:[SDLVehicleDataEventStatus _NO], + SDLNameRightRow2BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED], + SDLNameMiddleRow2BuckleBelted:[SDLVehicleDataEventStatus NO_EVENT], + SDLNameMiddleRow3BuckleBelted:[SDLVehicleDataEventStatus _YES], + SDLNameLeftRow3BuckleBelted:[SDLVehicleDataEventStatus FAULT], + SDLNameRightRow3BuckleBelted:[SDLVehicleDataEventStatus _NO], + SDLNameLeftRearInflatableBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED], + SDLNameRightRearInflatableBelted:[SDLVehicleDataEventStatus FAULT], + SDLNameMiddleRow1BeltDeployed:[SDLVehicleDataEventStatus NO_EVENT], + SDLNameMiddleRow1BuckleBelted:[SDLVehicleDataEventStatus NOT_SUPPORTED]} mutableCopy]; SDLBeltStatus* testStruct = [[SDLBeltStatus alloc] initWithDictionary:dict]; expect(testStruct.driverBeltDeployed).to(equal([SDLVehicleDataEventStatus NO_EVENT])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m index 70688afed..24dc90d42 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m @@ -37,13 +37,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameParkBrakeActive:@YES, - SDLNameIgnitionStableStatus:[SDLIgnitionStableStatus IGNITION_SWITCH_NOT_STABLE], - SDLNameIgnitionStatus:[SDLIgnitionStatus START], - SDLNameDriverDoorAjar:@NO, - SDLNamePassengerDoorAjar:@NO, - SDLNameRearLeftDoorAjar:@NO, - SDLNameRearRightDoorAjar:@YES} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameParkBrakeActive:@YES, + SDLNameIgnitionStableStatus:[SDLIgnitionStableStatus IGNITION_SWITCH_NOT_STABLE], + SDLNameIgnitionStatus:[SDLIgnitionStatus START], + SDLNameDriverDoorAjar:@NO, + SDLNamePassengerDoorAjar:@NO, + SDLNameRearLeftDoorAjar:@NO, + SDLNameRearRightDoorAjar:@YES} mutableCopy]; SDLBodyInformation* testStruct = [[SDLBodyInformation alloc] initWithDictionary:dict]; expect(testStruct.parkBrakeActive).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m index 5cce60c0a..1413db447 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m @@ -31,10 +31,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameName:[SDLButtonName CUSTOM_BUTTON], - SDLNameShortPressAvailable:@YES, - SDLNameLongPressAvailable:@YES, - SDLNameUpDownAvailable:@NO} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameName:[SDLButtonName CUSTOM_BUTTON], + SDLNameShortPressAvailable:@YES, + SDLNameLongPressAvailable:@YES, + SDLNameUpDownAvailable:@NO} mutableCopy]; SDLButtonCapabilities* testStruct = [[SDLButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal([SDLButtonName CUSTOM_BUTTON])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m index 51405d639..3fa486a98 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m @@ -40,7 +40,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameChoiceId:@3, + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameChoiceId:@3, SDLNameMenuName:@"Hello", SDLNameVRCommands:[@[@"1", @"2"] mutableCopy], SDLNameImage:image, diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m index 459937f42..2a35e6ec6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m @@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNamePowerModeActive:@NO, - SDLNamePowerModeQualificationStatus:[SDLPowerModeQualificationStatus POWER_MODE_OK], - SDLNameCarModeStatus:[SDLCarModeStatus CRASH], - SDLNamePowerModeStatus:[SDLPowerModeStatus KEY_OUT]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNamePowerModeActive:@NO, + SDLNamePowerModeQualificationStatus:[SDLPowerModeQualificationStatus POWER_MODE_OK], + SDLNameCarModeStatus:[SDLCarModeStatus CRASH], + SDLNamePowerModeStatus:[SDLPowerModeStatus KEY_OUT]} mutableCopy]; SDLClusterModeStatus* testStruct = [[SDLClusterModeStatus alloc] initWithDictionary:dict]; expect(testStruct.powerModeActive).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m index e89ce6ab3..cffcd7851 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResultCode:[SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED], - SDLNameDIDLocation:@300, - SDLNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResultCode:[SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED], + SDLNameDIDLocation:@300, + SDLNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy]; SDLDIDResult* testStruct = [[SDLDIDResult alloc] initWithDictionary:dict]; expect(testStruct.resultCode).to(equal([SDLVehicleDataResultCode DATA_NOT_SUBSCRIBED])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m index 785a53877..3108257f4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameHardware:@"GDFR34F", - SDLNameFirmwareRevision:@"4.2a", - SDLNameOS:@"Robot", - SDLNameOSVersion:@"9.9", - SDLNameCarrier:@"ThatOneWirelessCompany", - SDLNameMaxNumberRFCOMMPorts:@20} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameHardware:@"GDFR34F", + SDLNameFirmwareRevision:@"4.2a", + SDLNameOS:@"Robot", + SDLNameOSVersion:@"9.9", + SDLNameCarrier:@"ThatOneWirelessCompany", + SDLNameMaxNumberRFCOMMPorts:@20} mutableCopy]; SDLDeviceInfo* testStruct = [[SDLDeviceInfo alloc] initWithDictionary:dict]; expect(testStruct.hardware).to(equal(@"GDFR34F")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m index 01c25fe61..ce16e349f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m @@ -46,17 +46,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameVoiceRecognitionOn:@NO, - SDLNameBluetoothIconOn:@NO, - SDLNameCallActive:@YES, - SDLNamePhoneRoaming:@NO, - SDLNameTextMessageAvailable:@YES, - SDLNameBatteryLevelStatus:[SDLDeviceLevelStatus FOUR_LEVEL_BARS], - SDLNameStereoAudioOutputMuted:@YES, - SDLNameMonoAudioOutputMuted:@YES, - SDLNameSignalLevelStatus:[SDLDeviceLevelStatus TWO_LEVEL_BARS], - SDLNamePrimaryAudioSource:[SDLPrimaryAudioSource BLUETOOTH_STEREO_BTST], - SDLNameECallEventActive:@NO} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameVoiceRecognitionOn:@NO, + SDLNameBluetoothIconOn:@NO, + SDLNameCallActive:@YES, + SDLNamePhoneRoaming:@NO, + SDLNameTextMessageAvailable:@YES, + SDLNameBatteryLevelStatus:[SDLDeviceLevelStatus FOUR_LEVEL_BARS], + SDLNameStereoAudioOutputMuted:@YES, + SDLNameMonoAudioOutputMuted:@YES, + SDLNameSignalLevelStatus:[SDLDeviceLevelStatus TWO_LEVEL_BARS], + SDLNamePrimaryAudioSource:[SDLPrimaryAudioSource BLUETOOTH_STEREO_BTST], + SDLNameECallEventActive:@NO} mutableCopy]; SDLDeviceStatus* testStruct = [[SDLDeviceStatus alloc] initWithDictionary:dict]; expect(testStruct.voiceRecOn).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m index c17c1fc69..477685b5f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m @@ -47,14 +47,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDisplayType:[SDLDisplayType GEN2_6_DMA], - SDLNameTextFields:[@[textField] mutableCopy], - SDLNameImageFields:[@[imageField] mutableCopy], - SDLNameMediaClockFormats:[@[[SDLMediaClockFormat CLOCKTEXT1], [SDLMediaClockFormat CLOCK3], [SDLMediaClockFormat CLOCKTEXT3]] copy], - SDLNameGraphicSupported:@YES, - SDLNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], - SDLNameScreenParams:screenParams, - SDLNameNumberCustomPresetsAvailable:@43} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameDisplayType:[SDLDisplayType GEN2_6_DMA], + SDLNameTextFields:[@[textField] mutableCopy], + SDLNameImageFields:[@[imageField] mutableCopy], + SDLNameMediaClockFormats:[@[[SDLMediaClockFormat CLOCKTEXT1], [SDLMediaClockFormat CLOCK3], [SDLMediaClockFormat CLOCKTEXT3]] copy], + SDLNameGraphicSupported:@YES, + SDLNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], + SDLNameScreenParams:screenParams, + SDLNameNumberCustomPresetsAvailable:@43} mutableCopy]; SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] initWithDictionary:dict]; expect(testStruct.displayType).to(equal([SDLDisplayType GEN2_6_DMA])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m index 2e553a218..af3164b29 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameECallNotificationStatus:[SDLVehicleDataNotificationStatus NORMAL], - SDLNameAuxECallNotificationStatus:[SDLVehicleDataNotificationStatus ACTIVE], - SDLNameECallConfirmationStatus:[SDLECallConfirmationStatus CALL_IN_PROGRESS]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameECallNotificationStatus:[SDLVehicleDataNotificationStatus NORMAL], + SDLNameAuxECallNotificationStatus:[SDLVehicleDataNotificationStatus ACTIVE], + SDLNameECallConfirmationStatus:[SDLECallConfirmationStatus CALL_IN_PROGRESS]} mutableCopy]; SDLECallInfo* testStruct = [[SDLECallInfo alloc] initWithDictionary:dict]; expect(testStruct.eCallNotificationStatus).to(equal([SDLVehicleDataNotificationStatus NORMAL])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m index 2706297c2..53d78e721 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameEmergencyEventType:[SDLEmergencyEventType FRONTAL], - SDLNameFuelCutoffStatus:[SDLFuelCutoffStatus NORMAL_OPERATION], - SDLNameRolloverEvent:[SDLVehicleDataEventStatus _YES], - SDLNameMaximumChangeVelocity:@33, - SDLNameMultipleEvents:[SDLVehicleDataEventStatus _NO]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameEmergencyEventType:[SDLEmergencyEventType FRONTAL], + SDLNameFuelCutoffStatus:[SDLFuelCutoffStatus NORMAL_OPERATION], + SDLNameRolloverEvent:[SDLVehicleDataEventStatus _YES], + SDLNameMaximumChangeVelocity:@33, + SDLNameMultipleEvents:[SDLVehicleDataEventStatus _NO]} mutableCopy]; SDLEmergencyEvent* testStruct = [[SDLEmergencyEvent alloc] initWithDictionary:dict]; expect(testStruct.emergencyEventType).to(equal([SDLEmergencyEventType FRONTAL])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m index e856c26e2..2ff593834 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m @@ -60,24 +60,24 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameLongitudeDegrees:@31.41592653589793, - SDLNameLatitudeDegrees:@45, - SDLNameUTCYear:@2015, - SDLNameUTCMonth:@1, - SDLNameUTCDay:@26, - SDLNameUTCHours:@23, - SDLNameUTCMinutes:@59, - SDLNameUTCSeconds:@59, - SDLNameCompassDirection:[SDLCompassDirection SOUTHEAST], - SDLNamePDOP:@3.4, - SDLNameHDOP:@9.9, - SDLNameVDOP:@0, - SDLNameActual:@NO, - SDLNameSatellites:@12, - SDLNameDimension:[SDLDimension _3D], - SDLNameAltitude:@3000, - SDLNameHeading:@96, - SDLNameSpeed:@64} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameLongitudeDegrees:@31.41592653589793, + SDLNameLatitudeDegrees:@45, + SDLNameUTCYear:@2015, + SDLNameUTCMonth:@1, + SDLNameUTCDay:@26, + SDLNameUTCHours:@23, + SDLNameUTCMinutes:@59, + SDLNameUTCSeconds:@59, + SDLNameCompassDirection:[SDLCompassDirection SOUTHEAST], + SDLNamePDOP:@3.4, + SDLNameHDOP:@9.9, + SDLNameVDOP:@0, + SDLNameActual:@NO, + SDLNameSatellites:@12, + SDLNameDimension:[SDLDimension _3D], + SDLNameAltitude:@3000, + SDLNameHeading:@96, + SDLNameSpeed:@64} mutableCopy]; SDLGPSData* testStruct = [[SDLGPSData alloc] initWithDictionary:dict]; expect(testStruct.longitudeDegrees).to(equal(@31.41592653589793)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m index b02c79c2a..f9932c1ef 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameAllowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy], - SDLNameUserDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameAllowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy], + SDLNameUserDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy]; SDLHMIPermissions* testStruct = [[SDLHMIPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m index a84c2f98b..d0fce442e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameLowBeamsOn:@YES, - SDLNameHighBeamsOn:@NO, - SDLNameAmbientLightSensorStatus:[SDLAmbientLightStatus TWILIGHT_3]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameLowBeamsOn:@YES, + SDLNameHighBeamsOn:@NO, + SDLNameAmbientLightSensorStatus:[SDLAmbientLightStatus TWILIGHT_3]} mutableCopy]; SDLHeadLampStatus* testStruct = [[SDLHeadLampStatus alloc] initWithDictionary:dict]; expect(testStruct.lowBeamsOn).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m index 0e7556b12..671210566 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m @@ -33,9 +33,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameName:[SDLImageFieldName turnIcon], - SDLNameImageTypeSupported:[@[[SDLFileType GRAPHIC_PNG], [SDLFileType GRAPHIC_JPEG]] copy], - SDLNameImageResolution:resolution} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameName:[SDLImageFieldName turnIcon], + SDLNameImageTypeSupported:[@[[SDLFileType GRAPHIC_PNG], [SDLFileType GRAPHIC_JPEG]] copy], + SDLNameImageResolution:resolution} mutableCopy]; SDLImageField* testStruct = [[SDLImageField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal([SDLImageFieldName turnIcon])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m index ff33f04f2..c1e2923c8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameValue:@"value", - SDLNameImageType:[SDLImageType STATIC]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameValue:@"value", + SDLNameImageType:[SDLImageType STATIC]} mutableCopy]; SDLImage* testStruct = [[SDLImage alloc] initWithDictionary:dict]; expect(testStruct.value).to(equal(@"value")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m index c1c9410fe..536afe200 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameLanguage:[SDLLanguage DA_DK], - SDLNameKeyboardLayout:[SDLKeyboardLayout QWERTZ], - SDLNameKeypressMode:[SDLKeypressMode RESEND_CURRENT_ENTRY], - SDLNameLimitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], - SDLNameAutoCompleteText:@"Auto Carrot"} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameLanguage:[SDLLanguage DA_DK], + SDLNameKeyboardLayout:[SDLKeyboardLayout QWERTZ], + SDLNameKeypressMode:[SDLKeypressMode RESEND_CURRENT_ENTRY], + SDLNameLimitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], + SDLNameAutoCompleteText:@"Auto Carrot"} mutableCopy]; SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] initWithDictionary:dict]; expect(testStruct.language).to(equal([SDLLanguage DA_DK])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m index 72b8029d4..d823d414a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameParentId:@504320489, - SDLNamePosition:@256, - SDLNameMenuName:@"Menu"} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameParentId:@504320489, + SDLNamePosition:@256, + SDLNameMenuName:@"Menu"} mutableCopy]; SDLMenuParams* testStruct = [[SDLMenuParams alloc] initWithDictionary:dict]; expect(testStruct.parentID).to(equal(@504320489)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m index 1b546613c..e04575796 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m @@ -25,7 +25,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameE911Override:[SDLVehicleDataStatus ON]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameE911Override:[SDLVehicleDataStatus ON]} mutableCopy]; SDLMyKey* testStruct = [[SDLMyKey alloc] initWithDictionary:dict]; expect(testStruct.e911Override).to(equal([SDLVehicleDataStatus ON])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m index 80558faf3..f59a7c46a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameAllowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy], - SDLNameUserDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameAllowed:[@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy], + SDLNameUserDisallowed:[@[[SDLHMILevel NONE], [SDLHMILevel LIMITED]] copy]} mutableCopy]; SDLParameterPermissions* testStruct = [[SDLParameterPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[[SDLHMILevel BACKGROUND], [SDLHMILevel FULL]] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m index ee502ebf8..4ff0ce5e5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m @@ -32,9 +32,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRPCName:@"RPCNameThing", - SDLNameHMIPermissions:hmiPermissions, - SDLNameParameterPermissions:parameterPermissions} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRPCName:@"RPCNameThing", + SDLNameHMIPermissions:hmiPermissions, + SDLNameParameterPermissions:parameterPermissions} mutableCopy]; SDLPermissionItem* testStruct = [[SDLPermissionItem alloc] initWithDictionary:dict]; expect(testStruct.rpcName).to(equal(@"RPCNameThing")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m index 16330022f..8bab3c147 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m @@ -23,7 +23,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameOnScreenPresetsAvailable:@YES} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameOnScreenPresetsAvailable:@YES} mutableCopy]; SDLPresetBankCapabilities* testStruct = [[SDLPresetBankCapabilities alloc] initWithDictionary:dict]; expect(testStruct.onScreenPresetsAvailable).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m index e24ee7ee8..6c574d040 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m @@ -31,8 +31,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResolution:resolution, - SDLNameTouchEventAvailable:capabilities} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResolution:resolution, + SDLNameTouchEventAvailable:capabilities} mutableCopy]; SDLScreenParams* testStruct = [[SDLScreenParams alloc] initWithDictionary:dict]; expect(testStruct.resolution).to(equal(resolution)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m index 5f65785fe..616396a49 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m @@ -24,7 +24,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameStatus:[SDLComponentVolumeStatus LOW]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameStatus:[SDLComponentVolumeStatus LOW]} mutableCopy]; SDLSingleTireStatus* testStruct = [[SDLSingleTireStatus alloc] initWithDictionary:dict]; expect(testStruct.status).to(equal([SDLComponentVolumeStatus LOW])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m index 6301272d6..4000f2764 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameShortPressAvailable:@NO, - SDLNameLongPressAvailable:@YES, - SDLNameUpDownAvailable:@NO, - SDLNameImageSupported:@NO} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameShortPressAvailable:@NO, + SDLNameLongPressAvailable:@YES, + SDLNameUpDownAvailable:@NO, + SDLNameImageSupported:@NO} mutableCopy]; SDLSoftButtonCapabilities* testStruct = [[SDLSoftButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.shortPressAvailable).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m index 1451cd94d..14f21500a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m @@ -39,12 +39,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameType:[SDLSoftButtonType IMAGE], - SDLNameText:@"Button", - SDLNameImage:image, - SDLNameIsHighlighted:@YES, - SDLNameSoftButtonId:@5423, - SDLNameSystemAction:[SDLSystemAction KEEP_CONTEXT]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameType:[SDLSoftButtonType IMAGE], + SDLNameText:@"Button", + SDLNameImage:image, + SDLNameIsHighlighted:@YES, + SDLNameSoftButtonId:@5423, + SDLNameSystemAction:[SDLSystemAction KEEP_CONTEXT]} mutableCopy]; SDLSoftButton* testStruct = [[SDLSoftButton alloc] initWithDictionary:dict]; expect(testStruct.type).to(equal([SDLSoftButtonType IMAGE])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m index 201863048..4de9c43f4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameHours:@22, - SDLNameMinutes:@39, - SDLNameSeconds:@11} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameHours:@22, + SDLNameMinutes:@39, + SDLNameSeconds:@11} mutableCopy]; SDLStartTime* testStruct = [[SDLStartTime alloc] initWithDictionary:dict]; expect(testStruct.hours).to(equal(@22)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m index 75e06f8de..feebead39 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameMajorVersion:@4, - SDLNameMinorVersion:@532} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameMajorVersion:@4, + SDLNameMinorVersion:@532} mutableCopy]; SDLSyncMsgVersion* testStruct = [[SDLSyncMsgVersion alloc] initWithDictionary:dict]; expect(testStruct.majorVersion).to(equal(@4)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m index 2a8650d70..09ff6440f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameText:@"TEXT", - SDLNameType:[SDLSpeechCapabilities PRE_RECORDED]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameText:@"TEXT", + SDLNameType:[SDLSpeechCapabilities PRE_RECORDED]} mutableCopy]; SDLTTSChunk* testStruct = [[SDLTTSChunk alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"TEXT")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m index 226d6269b..ffd3c9dca 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m @@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameName:[SDLTextFieldName tertiaryText], - SDLNameCharacterSet:[SDLCharacterSet TYPE5SET], - SDLNameWidth:@111, - SDLNameRows:@4} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameName:[SDLTextFieldName tertiaryText], + SDLNameCharacterSet:[SDLCharacterSet TYPE5SET], + SDLNameWidth:@111, + SDLNameRows:@4} mutableCopy]; SDLTextField* testStruct = [[SDLTextField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal([SDLTextFieldName tertiaryText])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m index d1b220fb3..0cea03ae3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m @@ -44,13 +44,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNamePressureTelltale:[SDLWarningLightStatus OFF], - SDLNameLeftFront:tire1, - SDLNameRightFront:tire2, - SDLNameLeftRear:tire3, - SDLNameRightRear:tire4, - SDLNameInnerLeftRear:tire5, - SDLNameInnerRightRear:tire6} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNamePressureTelltale:[SDLWarningLightStatus OFF], + SDLNameLeftFront:tire1, + SDLNameRightFront:tire2, + SDLNameLeftRear:tire3, + SDLNameRightRear:tire4, + SDLNameInnerLeftRear:tire5, + SDLNameInnerRightRear:tire6} mutableCopy]; SDLTireStatus* testStruct = [[SDLTireStatus alloc] initWithDictionary:dict]; expect(testStruct.pressureTelltale).to(equal([SDLWarningLightStatus OFF])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m index 0431fe455..bc9ab9495 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameX:@67, - SDLNameY:@362} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameX:@67, + SDLNameY:@362} mutableCopy]; SDLTouchCoord* testStruct = [[SDLTouchCoord alloc] initWithDictionary:dict]; expect(testStruct.x).to(equal(@67)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m index cdda41afc..6df769068 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNamePressAvailable:@YES, - SDLNameMultiTouchAvailable:@NO, - SDLNameDoublePressAvailable:@NO} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNamePressAvailable:@YES, + SDLNameMultiTouchAvailable:@NO, + SDLNameDoublePressAvailable:@NO} mutableCopy]; SDLTouchEventCapabilities* testStruct = [[SDLTouchEventCapabilities alloc] initWithDictionary:dict]; expect(testStruct.pressAvailable).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m index d21dedb97..0419916e5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameId:@3, - SDLNameTimestamp:[@[@23, @52, @41345234] mutableCopy], - SDLNameCoordinate:[@[coord] mutableCopy]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameId:@3, + SDLNameTimestamp:[@[@23, @52, @41345234] mutableCopy], + SDLNameCoordinate:[@[coord] mutableCopy]} mutableCopy]; SDLTouchEvent* testStruct = [[SDLTouchEvent alloc] initWithDictionary:dict]; expect(testStruct.touchEventId).to(equal(@3)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m index 7b44c251e..c445da76e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m @@ -28,8 +28,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNavigationText:@"NAVTEXT", - SDLNameTurnIcon:image} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNavigationText:@"NAVTEXT", + SDLNameTurnIcon:image} mutableCopy]; SDLTurn* testStruct = [[SDLTurn alloc] initWithDictionary:dict]; expect(testStruct.navigationText).to(equal(@"NAVTEXT")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index 4515c938b..9a81f70c6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDataType:[SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS], - SDLNameResultCode:[SDLVehicleDataResultCode DISALLOWED]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameDataType:[SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS], + SDLNameResultCode:[SDLVehicleDataResultCode DISALLOWED]} mutableCopy]; SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDictionary:dict]; expect(testStruct.dataType).to(equal([SDLVehicleDataType VEHICLEDATA_AIRBAGSTATUS])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m index 0eaa6e698..eefc4618b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameMake:@"Make", - SDLNameModel:@"Model", - SDLNameModelYear:@"3.141*10^36", - SDLNameTrim:@"AE"} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameMake:@"Make", + SDLNameModel:@"Model", + SDLNameModelYear:@"3.141*10^36", + SDLNameTrim:@"AE"} mutableCopy]; SDLVehicleType* testStruct = [[SDLVehicleType alloc] initWithDictionary:dict]; expect(testStruct.make).to(equal(@"Make")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m index 6afde1d0a..307d92621 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m @@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameText:@"DON'T PANIC", - SDLNameImage:image, - SDLNamePosition:@42} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLNameText:@"DON'T PANIC", + SDLNameImage:image, + SDLNamePosition:@42} mutableCopy]; SDLVRHelpItem* testStruct = [[SDLVRHelpItem alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"DON'T PANIC")); diff --git a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCStructSpec.m b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCStructSpec.m index 9352569ed..1b2c4d348 100644 --- a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCStructSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCStructSpec.m @@ -14,11 +14,11 @@ QuickSpecBegin(SDLRPCStructSpec) describe(@"SerializeAsDictionary Tests", ^ { it(@"Should serialize correctly", ^ { - NSMutableDictionary* dict = [@{@"Key":@"Value", @"Answer":@42, @"Struct":[[SDLRPCStruct alloc] initWithDictionary:[@{@"Array":@[@1, @1, @1, @1]} mutableCopy]]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{@"Key":@"Value", @"Answer":@42, @"Struct":[[SDLRPCStruct alloc] initWithDictionary:[@{@"Array":@[@1, @1, @1, @1]} mutableCopy]]} mutableCopy]; SDLRPCStruct* testStruct = [[SDLRPCStruct alloc] initWithDictionary:dict]; expect([testStruct serializeAsDictionary:2]).to(equal([@{@"Key":@"Value", @"Answer":@42, @"Struct":@{@"Array":@[@1, @1, @1, @1]}} mutableCopy])); }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/UtilitiesSpecs/HTTP Connection/SDLURLSessionSpec.m b/SmartDeviceLinkTests/UtilitiesSpecs/HTTP Connection/SDLURLSessionSpec.m index ed613c8fb..73d12e6aa 100644 --- a/SmartDeviceLinkTests/UtilitiesSpecs/HTTP Connection/SDLURLSessionSpec.m +++ b/SmartDeviceLinkTests/UtilitiesSpecs/HTTP Connection/SDLURLSessionSpec.m @@ -13,13 +13,13 @@ describe(@"the url session", ^{ context(@"from an https address", ^{ context(@"uploading data", ^{ NSData *testData = [@"testData" dataUsingEncoding:NSUTF8StringEncoding]; - NSArray *someJSONObject = @[@"one", @"two"]; + NSArray<NSString *> *someJSONObject = @[@"one", @"two"]; NSData *testJSONData = [NSJSONSerialization dataWithJSONObject:someJSONObject options:0 error:nil]; __block NSData *testReturnData = nil; __block NSURLResponse *testReturnResponse = nil; __block NSError *testReturnError = nil; - __block NSArray *testReturnJSONObject = nil; + __block NSArray<id> *testReturnJSONObject = nil; beforeEach(^{ [OHHTTPStubs stubRequestsPassingTest:^BOOL(NSURLRequest *request) { @@ -93,7 +93,7 @@ describe(@"the url session", ^{ context(@"from an http address", ^{ NSData *testData = [@"testData" dataUsingEncoding:NSUTF8StringEncoding]; - NSArray *someJSONObject = @[@"one", @"two"]; + NSArray<NSString *> *someJSONObject = @[@"one", @"two"]; NSData *testJSONData = [NSJSONSerialization dataWithJSONObject:someJSONObject options:0 error:nil]; __block NSString *testURLRequestComponent = nil; diff --git a/SmartDeviceLink_Example/Classes/ConnectionContainerViewController.m b/SmartDeviceLink_Example/Classes/ConnectionContainerViewController.m index b3fe8abc0..544a9f3c9 100644 --- a/SmartDeviceLink_Example/Classes/ConnectionContainerViewController.m +++ b/SmartDeviceLink_Example/Classes/ConnectionContainerViewController.m @@ -14,7 +14,7 @@ @interface ConnectionContainerViewController () @property (weak, nonatomic) IBOutlet UISegmentedControl *connectionTypeSegmentedControl; -@property (strong, nonatomic) NSArray *viewControllers; +@property (strong, nonatomic) NSArray<UIViewController *> *viewControllers; @property (strong, nonatomic) UIViewController *currentViewController; @property (strong, nonatomic) UIPanGestureRecognizer *panGestureRecognizer; |