SDL0238 'Keyboard Enhancements r2': fix a test

2 files changed, 95 insertions, 77 deletions

diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m
index e0ab9ed0f..d254c9d06 100644
--- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m
@@ -12,8 +12,8 @@
 
 QuickSpecBegin(SDLKeyboardLayoutSpec)
 
-describe(@"individual enum value tests", ^ {
-    it(@"should match internal values", ^ {
+describe(@"individual enum value tests", ^{
+    it(@"should match internal values", ^{
         expect(SDLKeyboardLayoutQWERTY).to(equal(@"QWERTY"));
         expect(SDLKeyboardLayoutQWERTZ).to(equal(@"QWERTZ"));
         expect(SDLKeyboardLayoutAZERTY).to(equal(@"AZERTY"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
index e8eda61ea..f76147f31 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
@@ -25,123 +25,141 @@ NSString *testAutoCompleteText = @"Auto Carrot";
 NSArray<NSString *> *testAutoCompleteList = @[@"Hello World", @"How are you"];
 SDLKeyboardInputMask maskInputCharacters = SDLKeyboardInputMaskEnableInputKeyMask;
 NSArray<NSString *> *customKeys = @[@"abc", @"DEF"];
+__block SDLKeyboardProperties* testStruct = nil;
 
 describe(@"getter/setter tests", ^{
-    it(@"should set and get correctly", ^{
-        SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] init];
-
-        testStruct.language = testLanguage;
-        testStruct.keyboardLayout = testLayout;
-        testStruct.keypressMode = testMode;
-        testStruct.limitedCharacterList = testLimitedCharacterList;
-        testStruct.autoCompleteList = testAutoCompleteList;
-        testStruct.maskInputCharacters = maskInputCharacters;
-        testStruct.customKeys = customKeys;
+    afterEach(^{
+        testStruct = nil;
+    });
+
+    context(@"init and assign", ^{
+        beforeEach(^{
+            testStruct = [[SDLKeyboardProperties alloc] init];
+            testStruct.language = testLanguage;
+            testStruct.keyboardLayout = testLayout;
+            testStruct.keypressMode = testMode;
+            testStruct.limitedCharacterList = testLimitedCharacterList;
+            testStruct.autoCompleteList = testAutoCompleteList;
+            testStruct.maskInputCharacters = maskInputCharacters;
+            testStruct.customKeys = customKeys;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        testStruct.autoCompleteText = testAutoCompleteText;
+            testStruct.autoCompleteText = testAutoCompleteText;
 #pragma clang diagnostic pop
-        testStruct.maskInputCharacters = maskInputCharacters;
-
-        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));
-        expect(testStruct.maskInputCharacters).to(equal(maskInputCharacters));
-        expect(testStruct.customKeys).to(equal(customKeys));
+            testStruct.maskInputCharacters = maskInputCharacters;
+        });
+
+        it(@"expect all properties to be set properly", ^{
+            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));
+            expect(testStruct.maskInputCharacters).to(equal(maskInputCharacters));
+            expect(testStruct.customKeys).to(equal(customKeys));
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
             expect(testStruct.autoCompleteText).to(equal(testAutoCompleteText));
 #pragma clang diagnostic pop
-            expect(testStruct.maskInputCharacters).to(equal(maskInputCharacters));
         });
+    });
 
-    it(@"should get correctly when initialized with a dictionary", ^{
-        NSDictionary* dict = @{SDLRPCParameterNameLanguage: testLanguage,
-                               SDLRPCParameterNameKeyboardLayout: testLayout,
-                               SDLRPCParameterNameKeypressMode: testMode,
-                               SDLRPCParameterNameLimitedCharacterList: testLimitedCharacterList,
-                               SDLRPCParameterNameAutoCompleteList: testAutoCompleteList,
-                               SDLRPCParameterNameAutoCompleteText: testAutoCompleteText,
-                               SDLRPCParameterNameMaskInputCharacters: maskInputCharacters,
-                               SDLRPCParameterNameCustomKeys: customKeys,
-                            };
-        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.autoCompleteList).to(equal(testAutoCompleteList));
-        expect(testStruct.maskInputCharacters).to(equal(maskInputCharacters));
-        expect(testStruct.customKeys).to(equal(customKeys));
+    context(@"initWithDictionary:", ^{
+        beforeEach(^{
+            NSDictionary* dict = @{SDLRPCParameterNameLanguage: testLanguage,
+                                   SDLRPCParameterNameKeyboardLayout: testLayout,
+                                   SDLRPCParameterNameKeypressMode: testMode,
+                                   SDLRPCParameterNameLimitedCharacterList: testLimitedCharacterList,
+                                   SDLRPCParameterNameAutoCompleteList: testAutoCompleteList,
+                                   SDLRPCParameterNameAutoCompleteText: testAutoCompleteText,
+                                   SDLRPCParameterNameMaskInputCharacters: maskInputCharacters,
+                                   SDLRPCParameterNameCustomKeys: customKeys,
+            };
+            testStruct = [[SDLKeyboardProperties alloc] initWithDictionary:dict];
+        });
+
+        it(@"expect all properties to be set properly", ^{
+            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));
+            expect(testStruct.maskInputCharacters).to(equal(maskInputCharacters));
+            expect(testStruct.customKeys).to(equal(customKeys));
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
             expect(testStruct.autoCompleteText).to(equal(testAutoCompleteText));
 #pragma clang diagnostic pop
-            expect(testStruct.maskInputCharacters).to(equal(maskInputCharacters));
         });
+    });
 
-    it(@"should get correctly when initialized with initWithLanguage:layout:keypressMode:limitedCharacterList:autoCompleteText:autoCompleteList:", ^{
+    context(@"initWithLanguage:layout:keypressMode:limitedCharacterList:autoCompleteText:autoCompleteList:", ^{
+        beforeEach(^{
 #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];
+            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));
-        expect(testStruct.maskInputCharacters).to(beNil());
-        expect(testStruct.customKeys).to(beNil());
+        });
+
+        it(@"expect all properties to be set properly", ^{
+            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));
+            expect(testStruct.maskInputCharacters).to(beNil());
+            expect(testStruct.customKeys).to(beNil());
 #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));
-            expect(testStruct.maskInputCharacters).to(beNil());
         });
+    });
 
-    it(@"should get correctly when initialized with initWithLanguage:keyboardLayout:keypressMode:limitedCharacterList:autoCompleteList:", ^{
+    context(@"initWithLanguage:keyboardLayout:keypressMode:limitedCharacterList:autoCompleteList:", ^{
+        beforeEach(^{
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        SDLKeyboardProperties *testStruct = [[SDLKeyboardProperties alloc] initWithLanguage:testLanguage keyboardLayout:testLayout keypressMode:testMode limitedCharacterList:testLimitedCharacterList autoCompleteList:testAutoCompleteList];
+            testStruct = [[SDLKeyboardProperties alloc] initWithLanguage:testLanguage keyboardLayout:testLayout keypressMode:testMode limitedCharacterList:testLimitedCharacterList 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));
-        expect(testStruct.autoCompleteList).to(equal(testAutoCompleteList));
-        expect(testStruct.maskInputCharacters).to(beNil());
-        expect(testStruct.customKeys).to(beNil());
+        });
+
+        it(@"expect all properties to be set properly", ^{
+            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));
+            expect(testStruct.maskInputCharacters).to(beNil());
+            expect(testStruct.customKeys).to(beNil());
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
             expect(testStruct.autoCompleteText).to(beNil());
 #pragma clang diagnostic pop
-            expect(testStruct.autoCompleteList).to(equal(testAutoCompleteList));
-            expect(testStruct.maskInputCharacters).to(beNil());
+        });
+    });
+
+    context(@"init", ^{
+        beforeEach(^{
+            testStruct = [[SDLKeyboardProperties alloc] init];
         });
 
-    it(@"should return nil if not set", ^{
-        SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] init];
-        
-        expect(testStruct.language).to(beNil());
-        expect(testStruct.keyboardLayout).to(beNil());
-        expect(testStruct.keypressMode).to(beNil());
-        expect(testStruct.limitedCharacterList).to(beNil());
-        expect(testStruct.autoCompleteList).to(beNil());
-        expect(testStruct.maskInputCharacters).to(beNil());
-        expect(testStruct.customKeys).to(beNil());
+        it(@"expect all properties to be nil", ^{
+            expect(testStruct.language).to(beNil());
+            expect(testStruct.keyboardLayout).to(beNil());
+            expect(testStruct.keypressMode).to(beNil());
+            expect(testStruct.limitedCharacterList).to(beNil());
+            expect(testStruct.autoCompleteList).to(beNil());
+            expect(testStruct.maskInputCharacters).to(beNil());
+            expect(testStruct.customKeys).to(beNil());
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
             expect(testStruct.autoCompleteText).to(beNil());
 #pragma clang diagnostic pop
-            expect(testStruct.maskInputCharacters).to(beNil());
         });
+    });
 
     context(@"initWithLanguage:keyboardLayout:keypressMode:limitedCharacterList:autoCompleteList:maskInputCharacters:customKeys:", ^{
-        __block SDLKeyboardProperties *testStruct = nil;
-
         beforeEach(^{
             testStruct = [[SDLKeyboardProperties alloc] initWithLanguage:testLanguage keyboardLayout:testLayout keypressMode:testMode limitedCharacterList:testLimitedCharacterList autoCompleteList:testAutoCompleteList maskInputCharacters:maskInputCharacters customKeys:customKeys];
         });