Text and graphic test fixes

2 files changed, 18 insertions, 11 deletions

diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
index 180147ef8..ff9c4e7bb 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
@@ -30,12 +30,11 @@
 @property (assign, nonatomic) BOOL hasQueuedUpdate;
 @property (assign, nonatomic) BOOL waitingOnHMIUpdate;
 @property (copy, nonatomic) NSArray<SDLMenuCell *> *waitingUpdateMenuCells;
+@property (strong, nonatomic, nullable) SDLWindowCapability *windowCapability;
 
 @property (assign, nonatomic) UInt32 lastMenuId;
 @property (copy, nonatomic) NSArray<SDLMenuCell *> *oldMenuCells;
 
-- (void)sdl_displayCapabilityDidUpdate:(SDLSystemCapability *)systemCapability;
-
 @end
 
 QuickSpecBegin(SDLMenuManagerSpec)
@@ -81,13 +80,7 @@ describe(@"menu manager", ^{
         windowCapability.imageFields = @[commandIconField];
         windowCapability.imageTypeSupported = @[SDLImageTypeDynamic, SDLImageTypeStatic];
         windowCapability.menuLayoutsAvailable = @[SDLMenuLayoutList, SDLMenuLayoutTiles];
-
-        SDLDisplayCapability *displayCapability = [[SDLDisplayCapability alloc] initWithDisplayName:SDLDisplayTypeGeneric];
-        displayCapability.windowCapabilities = @[windowCapability];
-
-        OCMStub(mockSystemCapabilityManager.defaultMainWindowCapability).andReturn(windowCapability);
-        OCMStub(mockSystemCapabilityManager.displays).andReturn(@[displayCapability]);
-        [testManager sdl_displayCapabilityDidUpdate:nil];
+        testManager.windowCapability = windowCapability;
     });
 
     it(@"should instantiate correctly", ^{
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicManagerSpec.m
index 5f4944315..2cd87bb3b 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicManagerSpec.m
@@ -6,6 +6,7 @@
 #import "SDLFileManager.h"
 #import "SDLHMILevel.h"
 #import "SDLImage.h"
+#import "SDLImageField.h"
 #import "SDLMetadataTags.h"
 #import "SDLPutFileResponse.h"
 #import "SDLShow.h"
@@ -37,6 +38,8 @@
 
 @property (assign, nonatomic) BOOL isDirty;
 
+- (void)sdl_displayCapabilityDidUpdate:(SDLSystemCapability *)systemCapability;
+
 @end
 
 QuickSpecBegin(SDLTextAndGraphicManagerSpec)
@@ -859,10 +862,21 @@ describe(@"text and graphic manager", ^{
             });
         });
 
-        context(@"updating images", ^{
+        fcontext(@"updating images", ^{
             __block NSString *testTextFieldText = @"mainFieldText";
 
             beforeEach(^{
+                testManager.windowCapability = [[SDLWindowCapability alloc] init];
+                SDLImageField *primaryImageField = [[SDLImageField alloc] init];
+                primaryImageField.name = SDLImageFieldNameGraphic;
+                SDLImageField *secondaryImageField = [[SDLImageField alloc] init];
+                secondaryImageField.name = SDLImageFieldNameSecondaryGraphic;
+                testManager.windowCapability.imageFields = @[primaryImageField, secondaryImageField];
+
+                SDLTextField *lineOneField = [[SDLTextField alloc] init];
+                lineOneField.name = SDLTextFieldNameMainField1;
+                testManager.windowCapability.textFields = @[lineOneField];
+
                 testManager.batchUpdates = YES;
                 testManager.textField1 = testTextFieldText;
             });
@@ -888,7 +902,7 @@ describe(@"text and graphic manager", ^{
                         testManager.windowCapability = [[SDLWindowCapability alloc] init];
                     });
 
-                    it(@"should send everything", ^{
+                    it(@"should send nothing", ^{
                         testManager.primaryGraphic = testArtwork;
                         testManager.secondaryGraphic = testArtwork;
                         testManager.batchUpdates = NO;