1386_manager_update_display_capability : improve (KISS) test SDLMenuManagerSpec

https://github.com/smartdevicelink/sdl_ios/pull/1390/files/ce156b1ace4685978e90941ac3870910f9913242#r324813232

1 files changed, 13 insertions, 39 deletions

diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
index 1b19094e0..ab04ff7b7 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
@@ -67,6 +67,19 @@ describe(@"menu manager", ^{
         mockFileManager = OCMClassMock([SDLFileManager class]);
         mockSystemCapabilityManager = OCMClassMock([SDLSystemCapabilityManager class]);
         testManager = [[SDLMenuManager alloc] initWithConnectionManager:mockConnectionManager fileManager:mockFileManager systemCapabilityManager:mockSystemCapabilityManager];
+
+        SDLImageField *commandIconField = [[SDLImageField alloc] init];
+        commandIconField.name = SDLImageFieldNameCommandIcon;
+        SDLWindowCapability *windowCapability = [[SDLWindowCapability alloc] init];
+        windowCapability.windowID = @(SDLPredefinedWindowsDefaultWindow);
+        windowCapability.imageFields = @[commandIconField];
+        windowCapability.imageTypeSupported = @[SDLImageTypeDynamic, SDLImageTypeStatic];
+
+        SDLDisplayCapability *displayCapability = [[SDLDisplayCapability alloc] initWithDisplayName:SDLDisplayTypeGeneric];
+        displayCapability.windowCapabilities = @[windowCapability];
+
+        OCMStub(mockSystemCapabilityManager.defaultMainWindowCapability).andReturn(windowCapability);
+        OCMStub(mockSystemCapabilityManager.displays).andReturn(@[displayCapability]);
     });
 
     it(@"should instantiate correctly", ^{
@@ -152,19 +165,6 @@ describe(@"menu manager", ^{
         beforeEach(^{
             testManager.currentHMILevel = SDLHMILevelFull;
             testManager.currentSystemContext = SDLSystemContextMain;
-
-            SDLImageField *commandIconField = [[SDLImageField alloc] init];
-            commandIconField.name = SDLImageFieldNameCommandIcon;
-            SDLWindowCapability *windowCapability = [[SDLWindowCapability alloc] init];
-            windowCapability.windowID = @(SDLPredefinedWindowsDefaultWindow);
-            windowCapability.imageFields = @[commandIconField];
-            windowCapability.imageTypeSupported = @[SDLImageTypeDynamic, SDLImageTypeStatic];
-            
-            SDLDisplayCapability *displayCapability = [[SDLDisplayCapability alloc] initWithDisplayName:SDLDisplayTypeGeneric];
-            displayCapability.windowCapabilities = @[windowCapability];
-            
-            OCMStub(mockSystemCapabilityManager.defaultMainWindowCapability).andReturn(windowCapability);
-            OCMStub(mockSystemCapabilityManager.displays).andReturn(@[displayCapability]);
         });
 
         context(@"duplicate titles", ^{
@@ -511,19 +511,6 @@ describe(@"menu manager", ^{
 
             cellCalled = NO;
             testTriggerSource = nil;
-            
-            SDLImageField *commandIconField = [[SDLImageField alloc] init];
-            commandIconField.name = SDLImageFieldNameCommandIcon;
-            SDLWindowCapability *windowCapability = [[SDLWindowCapability alloc] init];
-            windowCapability.windowID = @(SDLPredefinedWindowsDefaultWindow);
-            windowCapability.imageFields = @[commandIconField];
-            windowCapability.imageTypeSupported = @[SDLImageTypeDynamic, SDLImageTypeStatic];
-            
-            SDLDisplayCapability *displayCapability = [[SDLDisplayCapability alloc] initWithDisplayName:SDLDisplayTypeGeneric];
-            displayCapability.windowCapabilities = @[windowCapability];
-
-            OCMStub(mockSystemCapabilityManager.defaultMainWindowCapability).andReturn(windowCapability);
-            OCMStub(mockSystemCapabilityManager.displays).andReturn(@[displayCapability]);
         });
 
         context(@"on a main menu cell", ^{
@@ -599,19 +586,6 @@ describe(@"menu manager", ^{
         beforeEach(^{
             testManager.currentHMILevel = SDLHMILevelFull;
             testManager.currentSystemContext = SDLSystemContextMain;
-            
-            SDLImageField *commandIconField = [[SDLImageField alloc] init];
-            commandIconField.name = SDLImageFieldNameCommandIcon;
-            SDLWindowCapability *windowCapability = [[SDLWindowCapability alloc] init];
-            windowCapability.windowID = @(SDLPredefinedWindowsDefaultWindow);
-            windowCapability.imageFields = @[commandIconField];
-            windowCapability.imageTypeSupported = @[SDLImageTypeDynamic, SDLImageTypeStatic];
-            
-            SDLDisplayCapability *displayCapability = [[SDLDisplayCapability alloc] initWithDisplayName:SDLDisplayTypeGeneric];
-            displayCapability.windowCapabilities = @[windowCapability];
-            
-            OCMStub(mockSystemCapabilityManager.defaultMainWindowCapability).andReturn(windowCapability);
-            OCMStub(mockSystemCapabilityManager.displays).andReturn(@[displayCapability]);
         });
 
         context(@"when open menu RPC can be sent", ^{