diff options
18 files changed, 114 insertions, 44 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 3ea42383f..2426b129c 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "SmartDeviceLink-iOS" -s.version = "7.0.0-rc.3" +s.version = "7.0.0" s.summary = "Connect your app with cars!" s.homepage = "https://github.com/smartdevicelink/SmartDeviceLink-iOS" s.license = { :type => "New BSD", :file => "LICENSE" } diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index 3515205d6..948f32bfb 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -7527,7 +7527,7 @@ attributes = { CLASSPREFIX = SDL; LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 1200; + LastUpgradeCheck = 1210; ORGANIZATIONNAME = smartdevicelink; TargetAttributes = { 5D4019AE1A76EC350006B0C2 = { @@ -8957,7 +8957,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Example Apps/Example ObjC/SmartDeviceLink-Example-ObjC-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = "7.0.0-rc.3"; + MARKETING_VERSION = 7.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.SDLTestApp; PRODUCT_NAME = "SDL Example"; SWIFT_VERSION = 5.0; @@ -8973,7 +8973,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Example Apps/Example ObjC/SmartDeviceLink-Example-ObjC-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = "7.0.0-rc.3"; + MARKETING_VERSION = 7.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.SDLTestApp; PRODUCT_NAME = "SDL Example"; SWIFT_VERSION = 5.0; @@ -9016,7 +9016,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = "7.0.0-rc.3"; + MARKETING_VERSION = 7.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.smartdevicelink; PRODUCT_NAME = "$(TARGET_NAME)"; RUN_CLANG_STATIC_ANALYZER = YES; @@ -9062,7 +9062,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = "7.0.0-rc.3"; + MARKETING_VERSION = 7.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.smartdevicelink; PRODUCT_NAME = "$(TARGET_NAME)"; RUN_CLANG_STATIC_ANALYZER = YES; @@ -9156,7 +9156,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Example Apps/Example Swift/SmartDeviceLink-Example-Swift-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = "7.0.0-rc.3"; + MARKETING_VERSION = 7.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.SDLTestApp; PRODUCT_NAME = "SDL Example Swift"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -9178,7 +9178,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Example Apps/Example Swift/SmartDeviceLink-Example-Swift-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = "7.0.0-rc.3"; + MARKETING_VERSION = 7.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.SDLTestApp; PRODUCT_NAME = "SDL Example Swift"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -9225,7 +9225,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = "7.0.0-rc.3"; + MARKETING_VERSION = 7.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.SmartDeviceLinkSwift; PRODUCT_NAME = "$(TARGET_NAME)"; RUN_CLANG_STATIC_ANALYZER = YES; @@ -9276,7 +9276,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = "7.0.0-rc.3"; + MARKETING_VERSION = 7.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.SmartDeviceLinkSwift; PRODUCT_NAME = "$(TARGET_NAME)"; RUN_CLANG_STATIC_ANALYZER = YES; diff --git a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink-Example-ObjC.xcscheme b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink-Example-ObjC.xcscheme index ace9007ab..144ab0c4b 100644 --- a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink-Example-ObjC.xcscheme +++ b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink-Example-ObjC.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1200" + LastUpgradeVersion = "1210" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme index fd8fd90e9..a9b412148 100644 --- a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme +++ b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1200" + LastUpgradeVersion = "1210" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLinkSwift.xcscheme b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLinkSwift.xcscheme index 3151474db..55446e4f2 100644 --- a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLinkSwift.xcscheme +++ b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLinkSwift.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "1200" + LastUpgradeVersion = "1210" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index d74ed5c9a..87028fab6 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "SmartDeviceLink" -s.version = "7.0.0-rc.3" +s.version = "7.0.0" s.summary = "Connect your app with cars!" s.homepage = "https://github.com/smartdevicelink/SmartDeviceLink-iOS" s.license = { :type => "New BSD", :file => "LICENSE" } diff --git a/SmartDeviceLink/private/SDLChoiceSetManager.m b/SmartDeviceLink/private/SDLChoiceSetManager.m index 80d691b87..a8a0de0e7 100644 --- a/SmartDeviceLink/private/SDLChoiceSetManager.m +++ b/SmartDeviceLink/private/SDLChoiceSetManager.m @@ -502,7 +502,10 @@ UInt16 const ChoiceCellCancelIdMin = 1; _keyboardConfiguration = [self sdl_defaultKeyboardConfiguration]; } else { SDLLogD(@"Updating keyboard configuration to a new configuration: %@", keyboardConfiguration); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" _keyboardConfiguration = [[SDLKeyboardProperties alloc] initWithLanguage:keyboardConfiguration.language layout:keyboardConfiguration.keyboardLayout keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:keyboardConfiguration.limitedCharacterList autoCompleteText:keyboardConfiguration.autoCompleteText autoCompleteList:keyboardConfiguration.autoCompleteList]; +#pragma clang diagnostic pop if (keyboardConfiguration.keypressMode != SDLKeypressModeResendCurrentEntry) { SDLLogW(@"Attempted to set a keyboard configuration with an invalid keypress mode; only .resentCurrentEntry is valid. This value will be ignored, the rest of the properties will be set."); @@ -511,7 +514,7 @@ UInt16 const ChoiceCellCancelIdMin = 1; } - (SDLKeyboardProperties *)sdl_defaultKeyboardConfiguration { - return [[SDLKeyboardProperties alloc] initWithLanguage:SDLLanguageEnUs layout:SDLKeyboardLayoutQWERTY keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:nil autoCompleteText:nil autoCompleteList:nil]; + return [[SDLKeyboardProperties alloc] initWithLanguage:SDLLanguageEnUs keyboardLayout:SDLKeyboardLayoutQWERTY keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:nil autoCompleteList:nil]; } #pragma mark - Getters diff --git a/SmartDeviceLink/private/SDLPresentChoiceSetOperation.m b/SmartDeviceLink/private/SDLPresentChoiceSetOperation.m index 0788b0b97..f0fbbf28a 100644 --- a/SmartDeviceLink/private/SDLPresentChoiceSetOperation.m +++ b/SmartDeviceLink/private/SDLPresentChoiceSetOperation.m @@ -278,7 +278,10 @@ NS_ASSUME_NONNULL_BEGIN } weakself.keyboardProperties.autoCompleteList = (newList.count > 0) ? newList : @[]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" weakself.keyboardProperties.autoCompleteText = (newList.count > 0) ? newList.firstObject : nil; +#pragma clang diagnostic pop [weakself sdl_updateKeyboardPropertiesWithCompletionHandler:nil]; }]; } diff --git a/SmartDeviceLink/private/SDLPresentKeyboardOperation.m b/SmartDeviceLink/private/SDLPresentKeyboardOperation.m index 633ccfba6..798e046af 100644 --- a/SmartDeviceLink/private/SDLPresentKeyboardOperation.m +++ b/SmartDeviceLink/private/SDLPresentKeyboardOperation.m @@ -192,7 +192,10 @@ NS_ASSUME_NONNULL_BEGIN } weakself.keyboardProperties.autoCompleteList = (newList.count > 0) ? newList : @[]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" weakself.keyboardProperties.autoCompleteText = (newList.count > 0) ? newList.firstObject : nil; +#pragma clang diagnostic pop [weakself sdl_updateKeyboardPropertiesWithCompletionHandler:nil]; }]; } diff --git a/SmartDeviceLink/public/SDLKeyboardProperties.h b/SmartDeviceLink/public/SDLKeyboardProperties.h index 5939d398f..a538b52bd 100644 --- a/SmartDeviceLink/public/SDLKeyboardProperties.h +++ b/SmartDeviceLink/public/SDLKeyboardProperties.h @@ -25,7 +25,19 @@ NS_ASSUME_NONNULL_BEGIN @param autoCompleteList A list of strings to show the user to complete what they are typing. @return The RPC object */ -- (instancetype)initWithLanguage:(nullable SDLLanguage)language layout:(nullable SDLKeyboardLayout)layout keypressMode:(nullable SDLKeypressMode)keypressMode limitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList autoCompleteText:(nullable NSString *)autoCompleteText autoCompleteList:(nullable NSArray<NSString *> *)autoCompleteList; +- (instancetype)initWithLanguage:(nullable SDLLanguage)language layout:(nullable SDLKeyboardLayout)layout keypressMode:(nullable SDLKeypressMode)keypressMode limitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList autoCompleteText:(nullable NSString *)autoCompleteText autoCompleteList:(nullable NSArray<NSString *> *)autoCompleteList __deprecated_msg("Use initWithLanguage:keyboardLayout:keypressMode:limitedCharacterList:autoCompleteList: instead"); + +/** + * Convenience init with all properties. + * + * @param language - language + * @param keyboardLayout - keyboardLayout + * @param keypressMode - keypressMode + * @param limitedCharacterList - limitedCharacterList + * @param autoCompleteList - autoCompleteList + * @return A SDLKeyboardProperties object + */ +- (instancetype)initWithLanguage:(nullable SDLLanguage)language keyboardLayout:(nullable SDLKeyboardLayout)keyboardLayout keypressMode:(nullable SDLKeypressMode)keypressMode limitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList autoCompleteList:(nullable NSArray<NSString *> *)autoCompleteList; /** The keyboard language @@ -58,11 +70,13 @@ NS_ASSUME_NONNULL_BEGIN @property (nullable, strong, nonatomic) NSArray<NSString *> *limitedCharacterList; /** - Allows an app to prepopulate the text field with a suggested or completed entry as the user types - - Optional + * Deprecated, use autoCompleteList instead. + * {"string_min_length": 1, "string_max_length": 1000} + * + * @deprecated in SmartDeviceLink 6.0.0 + * @added in SmartDeviceLink 3.0.0 */ -@property (nullable, strong, nonatomic) NSString *autoCompleteText; +@property (nullable, strong, nonatomic) NSString *autoCompleteText __deprecated_msg("Use autoCompleteList instead"); /** Allows an app to show a list of possible autocomplete suggestions as the user types diff --git a/SmartDeviceLink/public/SDLKeyboardProperties.m b/SmartDeviceLink/public/SDLKeyboardProperties.m index 5f6fa82dd..c21c91bc7 100644 --- a/SmartDeviceLink/public/SDLKeyboardProperties.m +++ b/SmartDeviceLink/public/SDLKeyboardProperties.m @@ -11,16 +11,23 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLKeyboardProperties - (instancetype)initWithLanguage:(nullable SDLLanguage)language layout:(nullable SDLKeyboardLayout)layout keypressMode:(nullable SDLKeypressMode)keypressMode limitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList autoCompleteText:(nullable NSString *)autoCompleteText autoCompleteList:(nullable NSArray<NSString *> *)autoCompleteList { + self = [[self init] initWithLanguage:language keyboardLayout:layout keypressMode:keypressMode limitedCharacterList:limitedCharacterList autoCompleteList:autoCompleteList]; + if (!self) { return nil; } + self.autoCompleteText = autoCompleteText; + + return self; +} + +- (instancetype)initWithLanguage:(nullable SDLLanguage)language keyboardLayout:(nullable SDLKeyboardLayout)keyboardLayout keypressMode:(nullable SDLKeypressMode)keypressMode limitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList autoCompleteList:(nullable NSArray<NSString *> *)autoCompleteList { self = [self init]; if (!self) { return nil; } self.language = language; - self.keyboardLayout = layout; + self.keyboardLayout = keyboardLayout; self.keypressMode = keypressMode; - self.limitedCharacterList = [limitedCharacterList mutableCopy]; - self.autoCompleteText = autoCompleteText; + self.limitedCharacterList = limitedCharacterList; self.autoCompleteList = autoCompleteList; return self; diff --git a/SmartDeviceLink/public/SDLTouchManager.m b/SmartDeviceLink/public/SDLTouchManager.m index ad9eb4703..25b88d6fa 100644 --- a/SmartDeviceLink/public/SDLTouchManager.m +++ b/SmartDeviceLink/public/SDLTouchManager.m @@ -434,12 +434,16 @@ static NSUInteger const MaximumNumberOfTouches = 2; [self sdl_cancelSingleTapTimer]; } - __weak typeof(self) weakSelf = self; - self.singleTapTimer = [[SDLTimer alloc] initWithDuration:self.tapTimeThreshold]; - self.singleTapTimer.elapsedBlock = ^{ - [weakSelf sdl_singleTapTimerCallbackWithPoint:point]; - }; - [self.singleTapTimer start]; + if (self.tapTimeThreshold == 0.0) { + [self sdl_singleTapTimerCallbackWithPoint:point]; + } else { + __weak typeof(self) weakSelf = self; + self.singleTapTimer = [[SDLTimer alloc] initWithDuration:self.tapTimeThreshold]; + self.singleTapTimer.elapsedBlock = ^{ + [weakSelf sdl_singleTapTimerCallbackWithPoint:point]; + }; + [self.singleTapTimer start]; + } } /** diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLChoiceSetManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLChoiceSetManagerSpec.m index 47156d1c0..321a2dde6 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLChoiceSetManagerSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLChoiceSetManagerSpec.m @@ -105,7 +105,7 @@ describe(@"choice set manager tests", ^{ it(@"should be in the correct startup state", ^{ expect(testManager.currentState).to(equal(SDLChoiceManagerStateShutdown)); - SDLKeyboardProperties *defaultProperties = [[SDLKeyboardProperties alloc] initWithLanguage:SDLLanguageEnUs layout:SDLKeyboardLayoutQWERTY keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:nil autoCompleteText:nil autoCompleteList:nil]; + SDLKeyboardProperties *defaultProperties = [[SDLKeyboardProperties alloc] initWithLanguage:SDLLanguageEnUs keyboardLayout:SDLKeyboardLayoutQWERTY keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:nil autoCompleteList:nil]; expect(testManager.keyboardConfiguration).to(equal(defaultProperties)); }); diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLPresentChoiceSetOperationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLPresentChoiceSetOperationSpec.m index 7ca891608..883720b82 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLPresentChoiceSetOperationSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLPresentChoiceSetOperationSpec.m @@ -60,7 +60,7 @@ describe(@"present choice operation", ^{ testKeyboardDelegate = OCMProtocolMock(@protocol(SDLKeyboardDelegate)); OCMStub([testKeyboardDelegate customKeyboardConfiguration]).andReturn(nil); - testKeyboardProperties = [[SDLKeyboardProperties alloc] initWithLanguage:SDLLanguageArSa layout:SDLKeyboardLayoutAZERTY keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:nil autoCompleteText:nil autoCompleteList:nil]; + testKeyboardProperties = [[SDLKeyboardProperties alloc] initWithLanguage:SDLLanguageArSa keyboardLayout:SDLKeyboardLayoutAZERTY keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:nil autoCompleteList:nil]; }); it(@"should have a priority of 'normal'", ^{ @@ -460,7 +460,10 @@ describe(@"present choice operation", ^{ expect(testConnectionManager.receivedRequests.lastObject).to(beAnInstanceOf([SDLSetGlobalProperties class])); SDLSetGlobalProperties *setProperties = testConnectionManager.receivedRequests.lastObject; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(setProperties.keyboardProperties.autoCompleteText).to(equal(inputData)); +#pragma clang diagnostic pop }); it(@"should respond to text input notification with character set", ^{ diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLPresentKeyboardOperationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLPresentKeyboardOperationSpec.m index 08424949d..29ed6d0b0 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLPresentKeyboardOperationSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLPresentKeyboardOperationSpec.m @@ -43,7 +43,7 @@ describe(@"present keyboard operation", ^{ testDelegate = OCMProtocolMock(@protocol(SDLKeyboardDelegate)); OCMStub([testDelegate customKeyboardConfiguration]).andReturn(nil); - testInitialProperties = [[SDLKeyboardProperties alloc] initWithLanguage:SDLLanguageArSa layout:SDLKeyboardLayoutAZERTY keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:nil autoCompleteText:nil autoCompleteList:nil]; + testInitialProperties = [[SDLKeyboardProperties alloc] initWithLanguage:SDLLanguageArSa keyboardLayout:SDLKeyboardLayoutAZERTY keypressMode:SDLKeypressModeResendCurrentEntry limitedCharacterList:nil autoCompleteList:nil]; }); it(@"should have a priority of 'normal'", ^{ @@ -194,7 +194,10 @@ describe(@"present keyboard operation", ^{ expect(testConnectionManager.receivedRequests.lastObject).to(beAnInstanceOf([SDLSetGlobalProperties class])); SDLSetGlobalProperties *setProperties = testConnectionManager.receivedRequests.lastObject; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(setProperties.keyboardProperties.autoCompleteText).to(equal(inputData)); +#pragma clang diagnostic pop }); it(@"should respond to text input notification with character set", ^{ diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m index 7b1e28362..b1f15a63f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m @@ -32,45 +32,72 @@ describe(@"Getter/Setter Tests", ^ { testStruct.keyboardLayout = testLayout; testStruct.keypressMode = testMode; testStruct.limitedCharacterList = testLimitedCharacterList; - testStruct.autoCompleteText = testAutoCompleteText; testStruct.autoCompleteList = testAutoCompleteList; - +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + testStruct.autoCompleteText = testAutoCompleteText; +#pragma clang diagnostic pop + expect(testStruct.language).to(equal(testLanguage)); expect(testStruct.keyboardLayout).to(equal(testLayout)); expect(testStruct.keypressMode).to(equal(testMode)); expect(testStruct.limitedCharacterList).to(equal(testLimitedCharacterList)); - expect(testStruct.autoCompleteText).to(equal(testAutoCompleteText)); expect(testStruct.autoCompleteList).to(equal(testAutoCompleteList)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testStruct.autoCompleteText).to(equal(testAutoCompleteText)); +#pragma clang diagnostic pop }); it(@"Should get correctly when initialized with a dictionary", ^ { NSDictionary* dict = @{SDLRPCParameterNameLanguage: testLanguage, - SDLRPCParameterNameKeyboardLayout: testLayout, - SDLRPCParameterNameKeypressMode: testMode, - SDLRPCParameterNameLimitedCharacterList: testLimitedCharacterList, - SDLRPCParameterNameAutoCompleteText: testAutoCompleteText, - SDLRPCParameterNameAutoCompleteList: testAutoCompleteList - }; + SDLRPCParameterNameKeyboardLayout: testLayout, + SDLRPCParameterNameKeypressMode: testMode, + SDLRPCParameterNameLimitedCharacterList: testLimitedCharacterList, + SDLRPCParameterNameAutoCompleteList: testAutoCompleteList, + SDLRPCParameterNameAutoCompleteText: testAutoCompleteText + }; SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] initWithDictionary:dict]; expect(testStruct.language).to(equal(testLanguage)); expect(testStruct.keyboardLayout).to(equal(testLayout)); expect(testStruct.keypressMode).to(equal(testMode)); expect(testStruct.limitedCharacterList).to(equal(testLimitedCharacterList)); - expect(testStruct.autoCompleteText).to(equal(testAutoCompleteText)); expect(testStruct.autoCompleteList).to(equal(testAutoCompleteList)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testStruct.autoCompleteText).to(equal(testAutoCompleteText)); +#pragma clang diagnostic pop }); it(@"Should get correctly when initialized with initWithLanguage:layout:keypressMode:limitedCharacterList:autoCompleteText:autoCompleteList:", ^ { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" SDLKeyboardProperties *testStruct = [[SDLKeyboardProperties alloc] initWithLanguage:testLanguage layout:testLayout keypressMode:testMode limitedCharacterList:testLimitedCharacterList autoCompleteText:testAutoCompleteText autoCompleteList:testAutoCompleteList]; - +#pragma clang diagnostic pop expect(testStruct.language).to(equal(testLanguage)); expect(testStruct.keyboardLayout).to(equal(testLayout)); expect(testStruct.keypressMode).to(equal(testMode)); expect(testStruct.limitedCharacterList).to(equal(testLimitedCharacterList)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" expect(testStruct.autoCompleteText).to(equal(testAutoCompleteText)); +#pragma clang diagnostic pop expect(testStruct.autoCompleteList).to(equal(testAutoCompleteList)); }); + + it(@"Should get correctly when initialized with initWithLanguage:keyboardLayout:keypressMode:limitedCharacterList:autoCompleteList:", ^ { + SDLKeyboardProperties *testStruct = [[SDLKeyboardProperties alloc] initWithLanguage:testLanguage keyboardLayout:testLayout keypressMode:testMode limitedCharacterList:testLimitedCharacterList autoCompleteList:testAutoCompleteList]; + expect(testStruct.language).to(equal(testLanguage)); + expect(testStruct.keyboardLayout).to(equal(testLayout)); + expect(testStruct.keypressMode).to(equal(testMode)); + expect(testStruct.limitedCharacterList).to(equal(testLimitedCharacterList)); + expect(testStruct.autoCompleteList).to(equal(testAutoCompleteList)); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testStruct.autoCompleteText).to(beNil()); +#pragma clang diagnostic pop + }); it(@"Should return nil if not set", ^ { SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] init]; @@ -79,8 +106,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.keyboardLayout).to(beNil()); expect(testStruct.keypressMode).to(beNil()); expect(testStruct.limitedCharacterList).to(beNil()); - expect(testStruct.autoCompleteText).to(beNil()); expect(testStruct.autoCompleteList).to(beNil()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + expect(testStruct.autoCompleteText).to(beNil()); +#pragma clang diagnostic pop }); }); diff --git a/bson_c_lib b/bson_c_lib -Subproject dae065d8cedc85a02ac6cf5b16cbb5d6b92073c +Subproject e82d717ae4a9abc833fba51c75bc9b25a32dd5b diff --git a/generator/rpc_spec b/generator/rpc_spec -Subproject eead323f356be713d2b0f0a253f3f3d36143460 +Subproject 762489ca140f246923e8bb8f54e96364e9d0101 |