cleaned up code and added failure case

1 files changed, 31 insertions, 18 deletions

diff --git a/SmartDeviceLinkTests/SDLCacheFileManagerSpec.m b/SmartDeviceLinkTests/SDLCacheFileManagerSpec.m
index 33e5e2412..4abd84ad0 100644
--- a/SmartDeviceLinkTests/SDLCacheFileManagerSpec.m
+++ b/SmartDeviceLinkTests/SDLCacheFileManagerSpec.m
@@ -19,11 +19,6 @@
 
 + (nullable NSString *)sdl_writeImage:(UIImage *)icon toFileFromURL:(NSString *)urlString atFilePath:(NSString *)filePath;
 - (void)sdl_downloadIconFromRequestURL:(NSString *)requestURL withCompletionHandler:(ImageRetrievalCompletionHandler)completion;
-- (BOOL)updateArchiveFileWithIconURL:(NSString *)iconURL
-                        iconFilePath:(NSString *)iconFilePath
-                         archiveFile:(SDLIconArchiveFile *)archiveFile
-                               error:(NSError **)error;
-+ (NSInteger)numberOfDaysFromDateCreated:(NSDate *)date;
 
 @property (weak, nonatomic, nullable) NSURLSession *urlSession;
 @property (weak, nonatomic, nullable) NSURLSessionDataTask *dataTask;
@@ -143,7 +138,6 @@ describe(@"a cache file manager", ^{
                     beforeEach(^{
                         OCMStub(ClassMethod([mockArchiver archiveRootObject:[OCMArg any] toFile:[OCMArg any]])).andReturn(NO);
                         OCMStub(ClassMethod([testManagerMock sdl_writeImage:[OCMArg any] toFileFromURL:[OCMArg any] atFilePath:[OCMArg any]])).andReturn(testFilePath);
-
                         OCMStub([testManagerMock sdl_downloadIconFromRequestURL:[OCMArg any] withCompletionHandler:([OCMArg invokeBlockWithArgs:testImage, [NSNull null], nil])]);
 
                         [testManager retrieveImageForRequest:expiredTestRequest withCompletionHandler:^(UIImage * _Nullable image, NSError * _Nullable error) {
@@ -180,7 +174,6 @@ describe(@"a cache file manager", ^{
                 context(@"write image to file path fails", ^{
                     beforeEach(^{
                         OCMStub(ClassMethod([testManagerMock sdl_writeImage:[OCMArg any] toFileFromURL:[OCMArg any] atFilePath:[OCMArg any]])).andReturn(nil);
-
                         OCMStub([testManagerMock sdl_downloadIconFromRequestURL:[OCMArg any] withCompletionHandler:([OCMArg invokeBlockWithArgs:testImage, [NSNull null], nil])]);
 
                         [testManager retrieveImageForRequest:expiredTestRequest withCompletionHandler:^(UIImage * _Nullable image, NSError * _Nullable error) {
@@ -286,20 +279,40 @@ describe(@"a cache file manager", ^{
             });
 
             context(@"archive file present", ^{
-                beforeEach(^{
-                    OCMStub([mockFileManager removeItemAtPath:[OCMArg any] error:[OCMArg anyObjectRef]]).andReturn(YES);
-                    OCMStub([mockFileManager contentsOfDirectoryAtPath:[OCMArg any] error:[OCMArg anyObjectRef]]).andReturn(@[@"iconArchiveFile"]);
-                    OCMStub([mockFileManager fileExistsAtPath:[OCMArg any]]).andReturn(YES);
+                context(@"remove item success", ^{
+                    beforeEach(^{
+                        OCMStub([mockFileManager removeItemAtPath:[OCMArg any] error:[OCMArg anyObjectRef]]).andReturn(YES);
+                        OCMStub([mockFileManager contentsOfDirectoryAtPath:[OCMArg any] error:[OCMArg anyObjectRef]]).andReturn(@[@"iconArchiveFile"]);
+                        OCMStub([mockFileManager fileExistsAtPath:[OCMArg any]]).andReturn(YES);
 
-                    [testManager retrieveImageForRequest:newIconRequest withCompletionHandler:^(UIImage * _Nullable image, NSError * _Nullable error) {
-                        resultImage = image;
-                        resultError = error;
-                    }];
+                        [testManager retrieveImageForRequest:newIconRequest withCompletionHandler:^(UIImage * _Nullable image, NSError * _Nullable error) {
+                            resultImage = image;
+                            resultError = error;
+                        }];
+                    });
+
+                    it(@"it should return downloaded image and no error", ^{
+                        expect(resultImage).to(equal(testImage));
+                        expect(resultError).to(beNil());
+                    });
                 });
 
-                it(@"it should return downloaded image and no error", ^{
-                    expect(resultImage).to(equal(testImage));
-                    expect(resultError).to(beNil());
+                context(@"remove item fails", ^{
+                    beforeEach(^{
+                        OCMStub([mockFileManager removeItemAtPath:[OCMArg any] error:[OCMArg anyObjectRef]]).andReturn(NO);
+                        OCMStub([mockFileManager contentsOfDirectoryAtPath:[OCMArg any] error:[OCMArg anyObjectRef]]).andReturn(@[@"iconArchiveFile"]);
+                        OCMStub([mockFileManager fileExistsAtPath:[OCMArg any]]).andReturn(YES);
+
+                        [testManager retrieveImageForRequest:newIconRequest withCompletionHandler:^(UIImage * _Nullable image, NSError * _Nullable error) {
+                            resultImage = image;
+                            resultError = error;
+                        }];
+                    });
+
+                    it(@"it should return downloaded image and no error", ^{
+                        expect(resultImage).to(equal(testImage));
+                        expect(resultError).to(beNil());
+                    });
                 });
             });
         });