Primary graphic now sent on reconnects

SmartDeviceLink/SDLMenuManager.m

@@ -95,7 +95,7 @@ - (void)stop {
     _menuCells = @[];
     _oldMenuCells = @[];
 
-    _currentHMILevel = SDLHMILevelNone;
+    _currentHMILevel = nil;
     _currentSystemContext = SDLSystemContextMain;
     _displayCapabilities = nil;
     _inProgressUpdate = nil;

SmartDeviceLink/SDLSoftButtonManager.m

@@ -64,7 +64,7 @@ - (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connecti
     _fileManager = fileManager;
     _softButtonObjects = @[];
 
-    _currentLevel = SDLHMILevelNone; // Assume NONE until we get something else
+    _currentLevel = nil;
     _waitingOnHMILevelUpdateToSetButtons = NO;
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sdl_registerResponse:) name:SDLDidReceiveRegisterAppInterfaceResponse object:nil];
@@ -82,7 +82,7 @@ - (void)stop {
     _inProgressHandler = nil;
     _hasQueuedUpdate = NO;
     _queuedUpdateHandler = nil;
-    _currentLevel = SDLHMILevelNone;
+    _currentLevel = nil;
     _displayCapabilities = nil;
     _softButtonCapabilities = nil;
     _waitingOnHMILevelUpdateToSetButtons = NO;

SmartDeviceLink/SDLTextAndGraphicManager.m

@@ -93,6 +93,7 @@ - (void)stop {
     _textField3Type = nil;
     _textField4Type = nil;
 
+    _currentScreenData = [[SDLShow alloc] init];
     _inProgressUpdate = nil;
     _inProgressHandler = nil;
     _queuedImageUpdate = nil;

SmartDeviceLink/SDLVoiceCommandManager.m

@@ -77,7 +77,7 @@ - (void)stop {
     _oldVoiceCommands = @[];
 
     _waitingOnHMIUpdate = NO;
-    _currentHMILevel = SDLHMILevelNone;
+    _currentHMILevel = nil;
     _inProgressUpdate = nil;
     _hasQueuedUpdate = NO;
 }

SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m

@@ -75,6 +75,7 @@ @interface SDLMenuManager()
         expect(testManager.waitingOnHMIUpdate).to(beFalse());
         expect(testManager.lastMenuId).to(equal(1));
         expect(testManager.oldMenuCells).to(beEmpty());
+        expect(testManager.waitingUpdateMenuCells).to(beNil());
     });
 
     describe(@"updating menu cells before HMI is ready", ^{
@@ -310,6 +311,27 @@ @interface SDLMenuManager()
         });
     });
 
+    context(@"On disconnects", ^{
+        beforeEach(^{
+            [testManager stop];
+        });
+
+        it(@"should reset correctly", ^{
+            expect(testManager.connectionManager).to(equal(mockConnectionManager));
+            expect(testManager.fileManager).to(equal(mockFileManager));
+
+            expect(testManager.menuCells).to(beEmpty());
+            expect(testManager.currentHMILevel).to(beNil());
+            expect(testManager.displayCapabilities).to(beNil());
+            expect(testManager.inProgressUpdate).to(beNil());
+            expect(testManager.hasQueuedUpdate).to(beFalse());
+            expect(testManager.waitingOnHMIUpdate).to(beFalse());
+            expect(testManager.lastMenuId).to(equal(1));
+            expect(testManager.oldMenuCells).to(beEmpty());
+            expect(testManager.waitingUpdateMenuCells).to(beEmpty());
+        });
+    });
+
     afterEach(^{
         testManager = nil;
     });

SmartDeviceLinkTests/DevAPISpecs/SDLSoftButtonManagerSpec.m

@@ -24,6 +24,9 @@ @interface SDLSoftButtonObject()
 
 @interface SDLSoftButtonManager()
 
+@property (weak, nonatomic) id<SDLConnectionManagerType> connectionManager;
+@property (weak, nonatomic) SDLFileManager *fileManager;
+
 @property (strong, nonatomic) NSArray<SDLSoftButton *> *currentSoftButtons;
 
 @property (strong, nonatomic, nullable) SDLShow *inProgressUpdate;
@@ -74,9 +77,23 @@ @interface SDLSoftButtonManager()
 
         testManager = [[SDLSoftButtonManager alloc] initWithConnectionManager:testConnectionManager fileManager:testFileManager];
 
+        expect(testManager.currentLevel).to(beNil());
         testManager.currentLevel = SDLHMILevelFull;
     });
 
+    it(@"should instantiate correctly", ^{
+        expect(testManager.connectionManager).to(equal(testConnectionManager));
+        expect(testManager.fileManager).to(equal(testFileManager));
+
+        expect(testManager.softButtonObjects).to(beEmpty());
+        expect(testManager.currentMainField1).to(beNil());
+        expect(testManager.inProgressUpdate).to(beNil());
+        expect(testManager.hasQueuedUpdate).to(beFalse());
+        expect(testManager.displayCapabilities).to(beNil());
+        expect(testManager.softButtonCapabilities).to(beNil());
+        expect(testManager.waitingOnHMILevelUpdateToSetButtons).to(beFalse());
+    });
+
     context(@"when in HMI NONE", ^{
         beforeEach(^{
             testManager.currentLevel = SDLHMILevelNone;
@@ -325,6 +342,26 @@ @interface SDLSoftButtonManager()
             expect(testManager.inProgressUpdate.softButtons[1].text).to(equal(object2State1Text));
         });
     });
+
+    context(@"On disconnects", ^{
+        beforeEach(^{
+            [testManager stop];
+        });
+
+        it(@"should reset correctly", ^{
+            expect(testManager.connectionManager).to(equal(testConnectionManager));
+            expect(testManager.fileManager).to(equal(testFileManager));
+
+            expect(testManager.softButtonObjects).to(beEmpty());
+            expect(testManager.currentMainField1).to(beNil());
+            expect(testManager.inProgressUpdate).to(beNil());
+            expect(testManager.hasQueuedUpdate).to(beFalse());
+            expect(testManager.currentLevel).to(beNil());
+            expect(testManager.displayCapabilities).to(beNil());
+            expect(testManager.softButtonCapabilities).to(beNil());
+            expect(testManager.waitingOnHMILevelUpdateToSetButtons).to(beFalse());
+        });
+    });
 });
 
 QuickSpecEnd

SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicManagerSpec.m

@@ -53,17 +53,30 @@ @interface SDLTextAndGraphicManager()
     });
 
     it(@"should instantiate correctly", ^{
+        expect(testManager.connectionManager).to(equal(mockConnectionManager));
+        expect(testManager.fileManager).to(equal(mockFileManager));
+
         expect(testManager.textField1).to(beNil());
         expect(testManager.textField2).to(beNil());
         expect(testManager.textField3).to(beNil());
         expect(testManager.textField4).to(beNil());
+        expect(testManager.mediaTrackTextField).to(beNil());
         expect(testManager.primaryGraphic).to(beNil());
         expect(testManager.secondaryGraphic).to(beNil());
         expect(testManager.alignment).to(equal(SDLTextAlignmentCenter));
         expect(testManager.textField1Type).to(beNil());
         expect(testManager.textField2Type).to(beNil());
         expect(testManager.textField3Type).to(beNil());
         expect(testManager.textField4Type).to(beNil());
+
+        expect(testManager.currentScreenData).to(equal([[SDLShow alloc] init]));
+        expect(testManager.inProgressUpdate).to(beNil());
+        expect(testManager.queuedImageUpdate).to(beNil());
+        expect(testManager.hasQueuedUpdate).to(beFalse());
+        expect(testManager.displayCapabilities).to(beNil());
+        expect(testManager.currentLevel).to(equal(SDLHMILevelNone));
+        expect(testManager.blankArtwork).toNot(beNil());
+        expect(testManager.isDirty).to(beFalse());
     });
 
     describe(@"setting setters", ^{
@@ -706,6 +719,39 @@ @interface SDLTextAndGraphicManager()
             });
         });
     });
+
+    context(@"On disconnects", ^{
+        beforeEach(^{
+            [testManager stop];
+        });
+
+        it(@"should reset correctly", ^{
+            expect(testManager.connectionManager).to(equal(mockConnectionManager));
+            expect(testManager.fileManager).to(equal(mockFileManager));
+
+            expect(testManager.textField1).to(beNil());
+            expect(testManager.textField2).to(beNil());
+            expect(testManager.textField3).to(beNil());
+            expect(testManager.textField4).to(beNil());
+            expect(testManager.mediaTrackTextField).to(beNil());
+            expect(testManager.primaryGraphic).to(beNil());
+            expect(testManager.secondaryGraphic).to(beNil());
+            expect(testManager.alignment).to(equal(SDLTextAlignmentCenter));
+            expect(testManager.textField1Type).to(beNil());
+            expect(testManager.textField2Type).to(beNil());
+            expect(testManager.textField3Type).to(beNil());
+            expect(testManager.textField4Type).to(beNil());
+
+            expect(testManager.currentScreenData).to(equal([[SDLShow alloc] init]));
+            expect(testManager.inProgressUpdate).to(beNil());
+            expect(testManager.queuedImageUpdate).to(beNil());
+            expect(testManager.hasQueuedUpdate).to(beFalse());
+            expect(testManager.displayCapabilities).to(beNil());
+            expect(testManager.currentLevel).to(equal(SDLHMILevelNone));
+            expect(testManager.blankArtwork).toNot(beNil());
+            expect(testManager.isDirty).to(beFalse());
+        });
+    });
 });
 
 QuickSpecEnd

SmartDeviceLinkTests/DevAPISpecs/SDLVoiceCommandManagerSpec.m

@@ -48,6 +48,8 @@ @interface SDLVoiceCommandManager()
     });
 
     it(@"should instantiate correctly", ^{
+        expect(testManager.connectionManager).to(equal(mockConnectionManager));
+
         expect(testManager.voiceCommands).to(beEmpty());
         expect(testManager.connectionManager).to(equal(mockConnectionManager));
         expect(testManager.currentHMILevel).to(beNil());
@@ -118,6 +120,25 @@ @interface SDLVoiceCommandManager()
             });
         });
     });
+
+    context(@"On disconnects", ^{
+        beforeEach(^{
+            [testManager stop];
+        });
+
+        it(@"should reset correctly", ^{
+            expect(testManager.connectionManager).to(equal(mockConnectionManager));
+
+            expect(testManager.voiceCommands).to(beEmpty());
+            expect(testManager.connectionManager).to(equal(mockConnectionManager));
+            expect(testManager.currentHMILevel).to(beNil());
+            expect(testManager.inProgressUpdate).to(beNil());
+            expect(testManager.hasQueuedUpdate).to(beFalse());
+            expect(testManager.waitingOnHMIUpdate).to(beFalse());
+            expect(testManager.lastVoiceCommandId).to(equal(VoiceCommandIdMin));
+            expect(testManager.oldVoiceCommands).to(beEmpty());
+        });
+    });
 });
 
 QuickSpecEnd