Fix upload file operation not returning in failure cases

* Fix upload file operation spec

7 files changed, 210 insertions, 126 deletions

diff --git a/SmartDeviceLink/SDLUploadFileOperation.m b/SmartDeviceLink/SDLUploadFileOperation.m
index ea80aa5e9..f9edfe2f5 100644
--- a/SmartDeviceLink/SDLUploadFileOperation.m
+++ b/SmartDeviceLink/SDLUploadFileOperation.m
@@ -72,11 +72,13 @@ NS_ASSUME_NONNULL_BEGIN
     if (self.isCancelled) {
         completion(NO, bytesAvailable, [NSError sdl_fileManager_fileUploadCanceled]);
         [self finishOperation];
+        return;
     }
 
     if (file == nil) {
         completion(NO, bytesAvailable, [NSError sdl_fileManager_fileDoesNotExistError]);
         [self finishOperation];
+        return;
     }
 
     self.inputStream = [self sdl_openInputStreamWithFile:file];
@@ -86,6 +88,7 @@ NS_ASSUME_NONNULL_BEGIN
 
         completion(NO, bytesAvailable, [NSError sdl_fileManager_fileDoesNotExistError]);
         [self finishOperation];
+        return;
     }
 
     dispatch_group_t putFileGroup = dispatch_group_create();
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
index 8bb793a77..93254ca78 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
@@ -12,6 +12,45 @@
 #import "TestConnectionManager.h"
 #import <zlib.h>
 
+@interface UploadFileOperationSpecHelpers : NSObject
+
++ (void)testPutFiles:(NSArray<SDLPutFile *> *)putFiles data:(NSData *)testFileData file:(SDLFile *)testFile;
+
+@end
+
+@implementation UploadFileOperationSpecHelpers
+
++ (void)testPutFiles:(NSArray<SDLPutFile *> *)putFiles data:(NSData *)testFileData file:(SDLFile *)testFile {
+    // Test all packets for offset, length, and data
+    for (NSUInteger index = 0; index < putFiles.count; index++) {
+        SDLPutFile *putFile = putFiles[index];
+
+        NSUInteger mtuSize = [[SDLGlobals sharedGlobals] mtuSizeForServiceType:SDLServiceTypeBulkData];
+        NSData *testBulkFileData = [testFileData subdataWithRange:NSMakeRange((index * mtuSize), MIN(putFile.length.unsignedIntegerValue, mtuSize))];
+        unsigned long testBulkFileDataCrc = crc32(0, testBulkFileData.bytes, (uInt)testBulkFileData.length);
+
+        expect(putFile.offset).to(equal(@(index * mtuSize)));
+        expect(putFile.persistentFile).to(equal(@NO));
+        expect(putFile.syncFileName).to(equal(testFile.name));
+        expect(putFile.bulkData).to(equal(testBulkFileData));
+        expect(putFile.crc).to(equal([NSNumber numberWithUnsignedLong:testBulkFileDataCrc]));
+
+        // Length is used to inform the SDL Core of the total incoming packet size
+        if (index == 0) {
+            // The first putfile sent should have the full file size
+            expect(putFile.length).to(equal(@([testFile fileSize])));
+        } else if (index == putFiles.count - 1) {
+            // The last pufile contains the remaining data size
+            expect(putFile.length).to(equal(@([testFile fileSize] - (index * mtuSize))));
+        } else {
+            // All other putfiles contain the max data size for a putfile packet
+            expect(putFile.length).to(equal(@(mtuSize)));
+        }
+    }
+}
+
+@end
+
 QuickSpecBegin(SDLUploadFileOperationSpec)
 
 describe(@"Streaming upload of data", ^{
@@ -38,121 +77,171 @@ describe(@"Streaming upload of data", ^{
         numberOfPutFiles = 0;
 
         testOperation = nil;
-        testConnectionManager = nil;
+        testConnectionManager = [[TestConnectionManager alloc] init];
 
         successResult = NO;
         bytesAvailableResult = NO;
         errorResult = nil;
     });
 
-    context(@"When uploading data", ^{
+    describe(@"When uploading data", ^{
         context(@"data should be split into smaller packets if too large to send all at once", ^{
-            context(@"both data in memory and on disk can be uploaded", ^{
-                it(@"should split the data from a short chunk of text in memory correctly", ^{
-                    testFileName = @"TestSmallMemory";
-                    testFileData = [@"test1234" dataUsingEncoding:NSUTF8StringEncoding];
-                    testFile = [SDLFile fileWithData:testFileData name:testFileName fileExtension:@"bin"];
-                });
-
-                it(@"should split the data from a large image in memory correctly", ^{
-                    testFileName = @"TestLargeMemory";
-                    UIImage *testImage = [UIImage imageNamed:@"testImagePNG" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];
-                    testFileData = UIImageJPEGRepresentation(testImage, 1.0);
-                    testFile = [SDLFile fileWithData:testFileData name:testFileName fileExtension:@"bin"];
-                });
-
-                it(@"should split the data from a small text file correctly", ^{
-                    NSString *fileName = @"testFileJSON";
-                    testFileName = fileName;
-                    NSString *textFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:fileName ofType:@"json"];
-                    NSURL *textFileURL = [[NSURL alloc] initFileURLWithPath:textFilePath];
-                    testFile = [SDLFile fileAtFileURL:textFileURL name:fileName];
-                    testFileData = [[NSData alloc] initWithContentsOfURL:textFileURL];
-                });
-
-                it(@"should split the data from a large image file correctly", ^{
-                    NSString *fileName = @"testImagePNG";
-                    testFileName = fileName;
-                    NSString *imageFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:fileName ofType:@"png"];
-                    NSURL *imageFileURL = [[NSURL alloc] initFileURLWithPath:imageFilePath];
-                    testFile = [SDLFile fileAtFileURL:imageFileURL name:fileName];
-
-                    // For testing: get data to check if data chunks are being created correctly
-                    testFileData = [[NSData alloc] initWithContentsOfURL:imageFileURL];
-                });
-
-                afterEach(^{
-                    testFileWrapper = [SDLFileWrapper wrapperWithFile:testFile completionHandler:^(BOOL success, NSUInteger bytesAvailable, NSError * _Nullable error) {
-                        successResult = success;
-                        bytesAvailableResult = bytesAvailable;
-                        errorResult = error;
-                    }];
-
-                    numberOfPutFiles = ((([testFile fileSize] - 1) / [[SDLGlobals sharedGlobals] mtuSizeForServiceType:SDLServiceTypeBulkData]) + 1);
-
-                    testConnectionManager = [[TestConnectionManager alloc] init];
-                    testOperation = [[SDLUploadFileOperation alloc] initWithFile:testFileWrapper connectionManager:testConnectionManager];
-                    [testOperation start];
-                });
+            it(@"should split the data from a short chunk of text in memory correctly", ^{
+                testFileName = @"TestSmallMemory";
+                testFileData = [@"test1234" dataUsingEncoding:NSUTF8StringEncoding];
+                testFile = [SDLFile fileWithData:testFileData name:testFileName fileExtension:@"bin"];
+                __block NSInteger spaceLeft = 11212512;
+
+                testFileWrapper = [SDLFileWrapper wrapperWithFile:testFile completionHandler:^(BOOL success, NSUInteger bytesAvailable, NSError * _Nullable error) {
+                    expect(success).to(beTrue());
+                    expect(bytesAvailable).to(equal(spaceLeft));
+                    expect(error).to(beNil());
+                }];
+
+                numberOfPutFiles = ((([testFile fileSize] - 1) / [[SDLGlobals sharedGlobals] mtuSizeForServiceType:SDLServiceTypeBulkData]) + 1);
+
+                testOperation = [[SDLUploadFileOperation alloc] initWithFile:testFileWrapper connectionManager:testConnectionManager];
+                [testOperation start];
+
+                NSArray<SDLPutFile *> *putFiles = testConnectionManager.receivedRequests;
+                expect(@(putFiles.count)).to(equal(@(numberOfPutFiles)));
+                [UploadFileOperationSpecHelpers testPutFiles:putFiles data:testFileData file:testFile];
+
+                __block SDLPutFileResponse *goodResponse = nil;
+
+                // We must do some cleanup here otherwise the unit test cases will crash
+                for (int i = 0; i < numberOfPutFiles; i++) {
+                    spaceLeft -= 1024;
+                    goodResponse = [[SDLPutFileResponse alloc] init];
+                    goodResponse.success = @YES;
+                    goodResponse.spaceAvailable = @(spaceLeft);
+                    [testConnectionManager respondToRequestWithResponse:goodResponse requestNumber:i error:nil];
+                }
+
+                expect(testOperation.finished).toEventually(beTrue());
+                expect(testOperation.executing).toEventually(beFalse());
             });
 
-            afterEach(^{
-                expect(@(testOperation.queuePriority)).to(equal(@(NSOperationQueuePriorityNormal)));
+            it(@"should split the data from a large image in memory correctly", ^{
+                testFileName = @"TestLargeMemory";
+                UIImage *testImage = [UIImage imageNamed:@"testImagePNG" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];
+                testFileData = UIImageJPEGRepresentation(testImage, 1.0);
+                testFile = [SDLFile fileWithData:testFileData name:testFileName fileExtension:@"bin"];
+                __block NSInteger spaceLeft = 11212512;
+
+                testFileWrapper = [SDLFileWrapper wrapperWithFile:testFile completionHandler:^(BOOL success, NSUInteger bytesAvailable, NSError * _Nullable error) {
+                    expect(success).to(beTrue());
+                    expect(bytesAvailable).to(equal(spaceLeft));
+                    expect(error).to(beNil());
+                }];
+
+                numberOfPutFiles = ((([testFile fileSize] - 1) / [[SDLGlobals sharedGlobals] mtuSizeForServiceType:SDLServiceTypeBulkData]) + 1);
+
+                testOperation = [[SDLUploadFileOperation alloc] initWithFile:testFileWrapper connectionManager:testConnectionManager];
+                [testOperation start];
 
                 NSArray<SDLPutFile *> *putFiles = testConnectionManager.receivedRequests;
                 expect(@(putFiles.count)).to(equal(@(numberOfPutFiles)));
+                [UploadFileOperationSpecHelpers testPutFiles:putFiles data:testFileData file:testFile];
 
-                // Test all packets for offset, length, and data
-                for (NSUInteger index = 0; index < numberOfPutFiles; index++) {
-                    SDLPutFile *putFile = putFiles[index];
-
-                    NSUInteger mtuSize = [[SDLGlobals sharedGlobals] mtuSizeForServiceType:SDLServiceTypeBulkData];
-                    NSData *testBulkFileData = [testFileData subdataWithRange:NSMakeRange((index * mtuSize), MIN(putFile.length.unsignedIntegerValue, mtuSize))];
-                    unsigned long testBulkFileDataCrc = crc32(0, testBulkFileData.bytes, (uInt)testBulkFileData.length);
-
-                    expect(putFile.offset).to(equal(@(index * mtuSize)));
-                    expect(putFile.persistentFile).to(equal(@NO));
-                    expect(putFile.syncFileName).to(equal(testFileName));
-                    expect(putFile.bulkData).to(equal(testBulkFileData));
-                    expect(putFile.crc).to(equal([NSNumber numberWithUnsignedLong:testBulkFileDataCrc]));
-
-                    // Length is used to inform the SDL Core of the total incoming packet size
-                    if (index == 0) {
-                        // The first putfile sent should have the full file size
-                        expect(putFile.length).to(equal(@([testFile fileSize])));
-                    } else if (index == numberOfPutFiles - 1) {
-                        // The last pufile contains the remaining data size
-                        expect(putFile.length).to(equal(@([testFile fileSize] - (index * mtuSize))));
-                    } else {
-                        // All other putfiles contain the max data size for a putfile packet
-                        expect(putFile.length).to(equal(@(mtuSize)));
-                    }
+                __block SDLPutFileResponse *goodResponse = nil;
+
+                // We must do some cleanup here otherwise the unit test cases will crash
+                for (int i = 0; i < numberOfPutFiles; i++) {
+                    spaceLeft -= 1024;
+                    goodResponse = [[SDLPutFileResponse alloc] init];
+                    goodResponse.success = @YES;
+                    goodResponse.spaceAvailable = @(spaceLeft);
+                    [testConnectionManager respondToRequestWithResponse:goodResponse requestNumber:i error:nil];
                 }
+
+                expect(testOperation.finished).toEventually(beTrue());
+                expect(testOperation.executing).toEventually(beFalse());
             });
-        });
 
-        afterEach(^{
-            __block SDLPutFileResponse *goodResponse = nil;
+            it(@"should split the data from a small text file correctly", ^{
+                NSString *fileName = @"testFileJSON";
+                testFileName = fileName;
+                NSString *textFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:fileName ofType:@"json"];
+                NSURL *textFileURL = [[NSURL alloc] initFileURLWithPath:textFilePath];
+                testFile = [SDLFile fileAtFileURL:textFileURL name:fileName];
+                testFileData = [[NSData alloc] initWithContentsOfURL:textFileURL];
+                __block NSInteger spaceLeft = 11212512;
+
+                testFileWrapper = [SDLFileWrapper wrapperWithFile:testFile completionHandler:^(BOOL success, NSUInteger bytesAvailable, NSError * _Nullable error) {
+                    expect(success).to(beTrue());
+                    expect(bytesAvailable).to(equal(spaceLeft));
+                    expect(error).to(beNil());
+                }];
+
+                numberOfPutFiles = ((([testFile fileSize] - 1) / [[SDLGlobals sharedGlobals] mtuSizeForServiceType:SDLServiceTypeBulkData]) + 1);
+
+                testOperation = [[SDLUploadFileOperation alloc] initWithFile:testFileWrapper connectionManager:testConnectionManager];
+                [testOperation start];
+
+                NSArray<SDLPutFile *> *putFiles = testConnectionManager.receivedRequests;
+                expect(@(putFiles.count)).to(equal(@(numberOfPutFiles)));
+                [UploadFileOperationSpecHelpers testPutFiles:putFiles data:testFileData file:testFile];
+
+                __block SDLPutFileResponse *goodResponse = nil;
+
+                // We must do some cleanup here otherwise the unit test cases will crash
+                for (int i = 0; i < numberOfPutFiles; i++) {
+                    spaceLeft -= 1024;
+                    goodResponse = [[SDLPutFileResponse alloc] init];
+                    goodResponse.success = @YES;
+                    goodResponse.spaceAvailable = @(spaceLeft);
+                    [testConnectionManager respondToRequestWithResponse:goodResponse requestNumber:i error:nil];
+                }
+
+                expect(testOperation.finished).toEventually(beTrue());
+                expect(testOperation.executing).toEventually(beFalse());
+            });
+
+            it(@"should split the data from a large image file correctly", ^{
+                NSString *fileName = @"testImagePNG";
+                testFileName = fileName;
+                NSString *imageFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:fileName ofType:@"png"];
+                NSURL *imageFileURL = [[NSURL alloc] initFileURLWithPath:imageFilePath];
+                testFile = [SDLFile fileAtFileURL:imageFileURL name:fileName];
+                __block NSInteger spaceLeft = 11212512;
 
-            // We must do some cleanup here otherwise the unit test cases will crash
-            NSInteger spaceLeft = 11212512;
-            for (int i = 0; i < numberOfPutFiles; i++) {
-                spaceLeft -= 1024;
-                goodResponse = [[SDLPutFileResponse alloc] init];
-                goodResponse.success = @YES;
-                goodResponse.spaceAvailable = @(spaceLeft);
-                [testConnectionManager respondToRequestWithResponse:goodResponse requestNumber:i error:nil];
-            }
-
-            expect(@(successResult)).toEventually(equal(@YES));
-            expect(@(bytesAvailableResult)).toEventually(equal(spaceLeft));
-            expect(errorResult).toEventually(beNil());
-            expect(@(testOperation.finished)).toEventually(equal(@YES));
-            expect(@(testOperation.executing)).toEventually(equal(@NO));
+                // For testing: get data to check if data chunks are being created correctly
+                testFileData = [[NSData alloc] initWithContentsOfURL:imageFileURL];
+
+                testFileWrapper = [SDLFileWrapper wrapperWithFile:testFile completionHandler:^(BOOL success, NSUInteger bytesAvailable, NSError * _Nullable error) {
+                    expect(success).to(beTrue());
+                    expect(bytesAvailable).to(equal(spaceLeft));
+                    expect(error).to(beNil());
+                }];
+
+                numberOfPutFiles = ((([testFile fileSize] - 1) / [[SDLGlobals sharedGlobals] mtuSizeForServiceType:SDLServiceTypeBulkData]) + 1);
+
+                testOperation = [[SDLUploadFileOperation alloc] initWithFile:testFileWrapper connectionManager:testConnectionManager];
+                [testOperation start];
+
+                NSArray<SDLPutFile *> *putFiles = testConnectionManager.receivedRequests;
+                expect(@(putFiles.count)).to(equal(@(numberOfPutFiles)));
+                [UploadFileOperationSpecHelpers testPutFiles:putFiles data:testFileData file:testFile];
+
+                __block SDLPutFileResponse *goodResponse = nil;
+
+                // We must do some cleanup here otherwise the unit test cases will crash
+                for (int i = 0; i < numberOfPutFiles; i++) {
+                    spaceLeft -= 1024;
+                    goodResponse = [[SDLPutFileResponse alloc] init];
+                    goodResponse.success = @YES;
+                    goodResponse.spaceAvailable = @(spaceLeft);
+                    [testConnectionManager respondToRequestWithResponse:goodResponse requestNumber:i error:nil];
+                }
+
+                expect(testOperation.finished).toEventually(beTrue());
+                expect(testOperation.executing).toEventually(beFalse());
+            });
         });
     });
 
-    context(@"When a response to the data upload comes back", ^{
+    describe(@"When a response to the data upload comes back", ^{
         beforeEach(^{
             testFileName = @"TestLargeMemory";
             UIImage *testImage = [UIImage imageNamed:@"testImagePNG" inBundle:[NSBundle bundleForClass:[self class]] compatibleWithTraitCollection:nil];
@@ -174,8 +263,8 @@ describe(@"Streaming upload of data", ^{
         });
 
         context(@"If data was sent successfully", ^{
-             __block SDLPutFileResponse *goodResponse = nil;
-             __block NSInteger spaceLeft = 0;
+            __block SDLPutFileResponse *goodResponse = nil;
+            __block NSInteger spaceLeft = 0;
 
             beforeEach(^{
                 goodResponse = nil;
@@ -190,15 +279,13 @@ describe(@"Streaming upload of data", ^{
                     goodResponse.spaceAvailable = @(spaceLeft);
                     [testConnectionManager respondToRequestWithResponse:goodResponse requestNumber:i error:nil];
                 }
-            });
 
-            afterEach(^{
-                expect(@(successResult)).toEventually(equal(@YES));
-                expect(@(bytesAvailableResult)).toEventually(equal(spaceLeft));
+                expect(successResult).toEventually(beTrue());
+                expect(bytesAvailableResult).toEventually(equal(spaceLeft));
                 expect(errorResult).toEventually(beNil());
 
-                expect(@(testOperation.finished)).toEventually(equal(@YES));
-                expect(@(testOperation.executing)).toEventually(equal(@NO));
+                expect(testOperation.finished).toEventually(beTrue());
+                expect(testOperation.executing).toEventually(beFalse());
             });
         });
 
@@ -234,6 +321,10 @@ describe(@"Streaming upload of data", ^{
 
                     [testConnectionManager respondToRequestWithResponse:response requestNumber:i error:error];
                 }
+
+                expect(errorResult.localizedDescription).toEventually(match(responseErrorDescription));
+                expect(errorResult.localizedFailureReason).toEventually(match(responseErrorReason));
+                expect(successResult).toEventually(beFalse());
             });
 
             it(@"should have called the completion handler with error if the last packet was not sent successfully", ^{
@@ -255,6 +346,10 @@ describe(@"Streaming upload of data", ^{
 
                     [testConnectionManager respondToRequestWithResponse:response requestNumber:i error:error];
                 }
+
+                expect(errorResult.localizedDescription).toEventually(match(responseErrorDescription));
+                expect(errorResult.localizedFailureReason).toEventually(match(responseErrorReason));
+                expect(successResult).toEventually(beFalse());
             });
 
             it(@"should have called the completion handler with error if all packets were not sent successfully", ^{
@@ -269,18 +364,16 @@ describe(@"Streaming upload of data", ^{
 
                     [testConnectionManager respondToRequestWithResponse:response requestNumber:i error:[NSError sdl_lifecycle_unknownRemoteErrorWithDescription:responseErrorDescription andReason:responseErrorReason]];
                 }
-            });
 
-            afterEach(^{
                 expect(errorResult.localizedDescription).toEventually(match(responseErrorDescription));
                 expect(errorResult.localizedFailureReason).toEventually(match(responseErrorReason));
-                expect(@(successResult)).toEventually(equal(@NO));
+                expect(successResult).toEventually(beFalse());
             });
         });
     });
 
-    context(@"When an incorrect file url is passed", ^{
-        beforeEach(^{
+    describe(@"when an incorrect file url is passed", ^{
+        it(@"should have called the completion handler with an error", ^{
             NSString *fileName = @"testImagePNG";
             testFileName = fileName;
             NSString *imageFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:fileName ofType:@"png"];
@@ -288,43 +381,31 @@ describe(@"Streaming upload of data", ^{
             testFile = [SDLFile fileAtFileURL:imageFileURL name:fileName];
 
             testFileWrapper = [SDLFileWrapper wrapperWithFile:testFile completionHandler:^(BOOL success, NSUInteger bytesAvailable, NSError * _Nullable error) {
-                successResult = success;
-                bytesAvailableResult = bytesAvailable;
-                errorResult = error;
+                expect(success).to(beFalse());
+                expect(error).to(equal([NSError sdl_fileManager_fileDoesNotExistError]));
             }];
 
             testConnectionManager = [[TestConnectionManager alloc] init];
             testOperation = [[SDLUploadFileOperation alloc] initWithFile:testFileWrapper connectionManager:testConnectionManager];
             [testOperation start];
         });
-
-        it(@"should have called the completion handler with an error", ^{
-            expect(errorResult).toEventually(equal([NSError sdl_fileManager_fileDoesNotExistError]));
-            expect(@(successResult)).toEventually(equal(@NO));
-        });
     });
 
-    context(@"When empty data is passed", ^{
-        beforeEach(^{
+    describe(@"when empty data is passed", ^{
+        it(@"should have called the completion handler with an error", ^{
             testFileName = @"TestEmptyMemory";
             testFileData = [@"" dataUsingEncoding:NSUTF8StringEncoding];
             testFile = [SDLFile fileWithData:testFileData name:testFileName fileExtension:@"bin"];
 
             testFileWrapper = [SDLFileWrapper wrapperWithFile:testFile completionHandler:^(BOOL success, NSUInteger bytesAvailable, NSError * _Nullable error) {
-                successResult = success;
-                bytesAvailableResult = bytesAvailable;
-                errorResult = error;
+                expect(error).to(equal([NSError sdl_fileManager_fileDoesNotExistError]));
+                expect(success).to(beFalse());
             }];
 
             testConnectionManager = [[TestConnectionManager alloc] init];
             testOperation = [[SDLUploadFileOperation alloc] initWithFile:testFileWrapper connectionManager:testConnectionManager];
             [testOperation start];
         });
-
-        it(@"should have called the completion handler with an error", ^{
-            expect(errorResult).toEventually(equal([NSError sdl_fileManager_fileDoesNotExistError]));
-            expect(@(successResult)).toEventually(equal(@NO));
-        });
     });
 });
 
diff --git a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testAppAndVehicleIcons@3x.png b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testAppAndVehicleIcons@3x.png
index 3b7684a62..f1b99e2c5 100644
--- a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testAppAndVehicleIcons@3x.png
+++ b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testAppAndVehicleIcons@3x.png
diff --git a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testLightBackgroundNoAppNoVehicleIcons@3x.png b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testLightBackgroundNoAppNoVehicleIcons@3x.png
index 3b7684a62..f1b99e2c5 100644
--- a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testLightBackgroundNoAppNoVehicleIcons@3x.png
+++ b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testLightBackgroundNoAppNoVehicleIcons@3x.png
diff --git a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testNoAppNoVehicleIcons@3x.png b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testNoAppNoVehicleIcons@3x.png
index 3b7684a62..f1b99e2c5 100644
--- a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testNoAppNoVehicleIcons@3x.png
+++ b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testNoAppNoVehicleIcons@3x.png
diff --git a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testOnlyAppIcon@3x.png b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testOnlyAppIcon@3x.png
index 3b7684a62..f1b99e2c5 100644
--- a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testOnlyAppIcon@3x.png
+++ b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testOnlyAppIcon@3x.png
diff --git a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testOnlyVehicleIcon@3x.png b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testOnlyVehicleIcon@3x.png
index 3b7684a62..f1b99e2c5 100644
--- a/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testOnlyVehicleIcon@3x.png
+++ b/SmartDeviceLinkTests/ReferenceImages_64/SDLLockScreenViewControllerSnapshotTests/testOnlyVehicleIcon@3x.png