1. moveTessdataToCachesDirectoryIfNecessary tests.

2. moveTessdataToCachesDirectoryIfNecessary logic has been changed to allow it to be tested. No checking for error anymore. Instead check the function results.
3. Some tests of tests are change to NSAsserts

Author: Kirill Makankov

TesseractOCR/G8Tesseract.mm

@@ -113,7 +113,10 @@ - (id)initWithLanguage:(NSString *)language
 
             _absoluteDataPath = [cachesPath stringByAppendingPathComponent:_absoluteDataPath].copy;
 
-            [self moveTessdataToCachesDirectoryIfNecessary];
+            BOOL succes = [self moveTessdataToCachesDirectoryIfNecessary];
+            if (succes == NO) {
+                return nil;
+            }
         }
         else {
             // config Tesseract to search trainedData in tessdata folder of the application bundle];
@@ -207,8 +210,8 @@ - (BOOL)moveTessdataToCachesDirectoryIfNecessary
 
     if ([fileManager fileExistsAtPath:destinationPath] == NO) {
         NSError *error = nil;
-        [fileManager createDirectoryAtPath:destinationPath withIntermediateDirectories:YES attributes:nil error:&error];
-        if (error != nil) {
+        BOOL res = [fileManager createDirectoryAtPath:destinationPath withIntermediateDirectories:YES attributes:nil error:&error];
+        if (res == NO) {
             NSLog(@"Error creating folder %@: %@", destinationPath, error);
             return NO;
         }
@@ -217,30 +220,31 @@ - (BOOL)moveTessdataToCachesDirectoryIfNecessary
     BOOL result = YES;
     NSError *error = nil;
     NSArray *files = [fileManager contentsOfDirectoryAtPath:tessdataPath error:&error];
-    if (error != nil) {
+    if (files == nil) {
         NSLog(@"ERROR! %@", error.description);
         result = NO;
-    }
-    for (NSString *filename in files) {
-        
-        NSString *destinationFileName = [destinationPath stringByAppendingPathComponent:filename];
-        if (![fileManager fileExistsAtPath:destinationFileName]) {
+    } else {
+        for (NSString *filename in files) {
 
-            NSString *filePath = [tessdataPath stringByAppendingPathComponent:filename];
-            //NSLog(@"found %@", filePath);
-            //NSLog(@"symlink in %@", destinationFileName);
-            
-            // delete broken symlinks first
-            [fileManager removeItemAtPath:destinationFileName error:&error];
-            
-            // than recreate it
-            error = nil;    // don't care about previous error, that can happens if we tried to remove an symlink, which doesn't exist
-            [fileManager createSymbolicLinkAtPath:destinationFileName
-                              withDestinationPath:filePath
-                                            error:&error];
-            if (error != nil) {
-                NSLog(@"Error creating symlink %@: %@", destinationPath, error);
-                result = NO;
+            NSString *destinationFileName = [destinationPath stringByAppendingPathComponent:filename];
+            if (![fileManager fileExistsAtPath:destinationFileName]) {
+                
+                NSString *filePath = [tessdataPath stringByAppendingPathComponent:filename];
+                //NSLog(@"found %@", filePath);
+                //NSLog(@"symlink in %@", destinationFileName);
+                
+                // delete broken symlinks first
+                [fileManager removeItemAtPath:destinationFileName error:&error];
+                
+                // than recreate it
+                error = nil;    // don't care about previous error, that can happens if we tried to remove a symlink, which doesn't exist
+                BOOL res = [fileManager createSymbolicLinkAtPath:destinationFileName
+                                             withDestinationPath:filePath
+                                                           error:&error];
+                if (res == NO) {
+                    NSLog(@"Error creating symlink %@: %@", destinationPath, error);
+                    result = NO;
+                }
             }
         }
     }

TestsProject/TestsProjectTests/InitializationTests.m

@@ -147,22 +147,66 @@ - (BOOL)resetEngine;
             checkVariablesAreSetForTesseract(tesseract);
         });
     });
-
+    
     NSArray *cachesPaths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
     NSString *cachesPath = cachesPaths.firstObject;
     NSString *tessdataPath = @"foo/bar";
     NSString *cachesTessDataPath = [cachesPath stringByAppendingPathComponent:tessdataPath];
+    
+    void(^cleanTessdataFolder)() = ^{
+        //NSLog(@"Removing previous tessdata folder from Caches folder");
+        NSError *error = nil;
+        BOOL fileIsRemoved = [fileManager removeItemAtPath:cachesTessDataPath error:&error];
+        if (error != nil) {
+            NSLog(@"Error deleting tessdata folder from the Caches folder: %@", error);
+        }
+        NSAssert(fileIsRemoved == YES, @"Error cleaning tessdata from the Caches folder");
+        
+        // check tessdata folder was deleted
+        NSArray *cachesContent = [fileManager contentsOfDirectoryAtPath:cachesPath error:&error];
+        if (error != nil) {
+            NSLog(@"Error getting the contents of the Caches folder: %@", error);
+        }
+        NSAssert([cachesContent containsObject:tessdataPath] == NO, @"Assert! Tessdata path was not removed from the Caches folder");
+    };
+    
+    context(@"moveTessdataToCachesDirectoryIfNecessary", ^{
+        
+        void (^checkInitializationWithFailedSelectorReturnValueAndCount)(SEL selector, id returnValue, int count) = ^(SEL selector, id returnValue, int count){
+            G8Tesseract *wrongTesseract = [G8Tesseract alloc];
+            [[wrongTesseract shouldNot] beNil];
+            [[[NSFileManager defaultManager] should] receive:selector andReturn:returnValue withCount:count];
+            wrongTesseract = [wrongTesseract initWithLanguage:kG8Languages configDictionary:nil configFileNames:nil cachesRelatedDataPath:tessdataPath engineMode:G8OCREngineModeTesseractOnly];
+            [[wrongTesseract should] beNil];
+        };
+        
+        it(@"Should return nil if createDirectoryAtPath fails", ^{
+            checkInitializationWithFailedSelectorReturnValueAndCount(@selector(createDirectoryAtPath:withIntermediateDirectories:attributes:error:), theValue(NO), 1);
+        });
+        
+        it(@"Should return nil if createSymbolicLinkAtPath fails", ^{
+            NSError *error = nil;
+            NSArray *contentsOfTessdataFromTheBundle = [fileManager contentsOfDirectoryAtPath:tessdataFolderPathFromTheBundle error:&error];
+            NSAssert (error == nil, @"Error getting the content of the Tessdata folder from the app bundle: %@", error);
 
+            checkInitializationWithFailedSelectorReturnValueAndCount(@selector(createSymbolicLinkAtPath:withDestinationPath:error:), theValue(NO), contentsOfTessdataFromTheBundle.count);
+            cleanTessdataFolder();
+        });
+        
+        it(@"Should return nil if contentsOfDirectoryAtPath fails", ^{
+            checkInitializationWithFailedSelectorReturnValueAndCount(@selector(contentsOfDirectoryAtPath:error:), nil, 2);
+            cleanTessdataFolder();
+        });
+    });
+    
     context(@"not nil cachesRelatedDataPath", ^{
 
         // helper
         BOOL (^doFoldersContainTheSameElements)(void) = ^(void){
             NSError *error = nil;
             NSArray *contentsOfTessdataFromTheBundle = [fileManager contentsOfDirectoryAtPath:tessdataFolderPathFromTheBundle error:&error];
-            [[contentsOfTessdataFromTheBundle should] haveCountOfAtLeast:1];
-            if (error != nil) {
-                NSLog(@"Error getting the content of the Tessdata folder from the app bundle: %@", error);
-            }
+            NSAssert(contentsOfTessdataFromTheBundle.count >= 1, @"Error! Tessdata folder is empty");
+            NSAssert(error == nil, @"Error getting the content of the Tessdata folder from the app bundle: %@", error);
 
             NSArray *contentsOfTheTessdataPathFolder = [fileManager contentsOfDirectoryAtPath:[cachesTessDataPath stringByAppendingPathComponent:tessdataFolderName] error:&error];
             [[contentsOfTheTessdataPathFolder should] haveCountOfAtLeast:1];
@@ -181,7 +225,7 @@ - (BOOL)resetEngine;
             it(@"Should simple init, download rus language files and reinitialize tess with them", ^{
                 // proof Caches folder is empty
                 BOOL folderExists = [fileManager fileExistsAtPath:cachesTessDataPath];
-                [[theValue(folderExists) should] beNo];
+                NSAssert(folderExists == NO, @"Error! Tessdata folder is already here: %@", cachesTessDataPath);
 
                 G8Tesseract *tesseract = [[G8Tesseract alloc] initWithLanguage:kG8Languages
                                                               configDictionary:nil
@@ -229,7 +273,7 @@ - (BOOL)resetEngine;
             });
 
             it(@"Should initialize with config dictionary", ^{
-                
+
                 G8Tesseract *tesseract = [[G8Tesseract alloc] initWithLanguage:kG8Languages
                                                               configDictionary:@{
                                                                                  kG8ParamTessdataManagerDebugLevel  : @"1",
@@ -268,8 +312,8 @@ - (BOOL)resetEngine;
 
             it(@"Should initialize with 2 config files", ^{
 
-                [[[fileManager attributesOfItemAtPath:debugConfigsFilePathFromTheCaches error:nil] should] beNil];
-                [[[fileManager attributesOfItemAtPath:recognitionConfigsFilePathFromTheCaches error:nil] should] beNil];
+                NSAssert([fileManager attributesOfItemAtPath:debugConfigsFilePathFromTheCaches error:nil] == nil, @"Error! %@ is already here!", debugConfigsFilePathFromTheCaches);
+                NSAssert([fileManager attributesOfItemAtPath:recognitionConfigsFilePathFromTheCaches error:nil] == nil, @"Error! %@ cannot is already here!", recognitionConfigsFilePathFromTheCaches);
 
                 G8Tesseract *tesseract = [[G8Tesseract alloc] initWithLanguage:kG8Languages
                                                               configDictionary:nil
@@ -413,20 +457,7 @@ - (BOOL)resetEngine;
         });
 
         afterEach(^{
-            //NSLog(@"Removing previous tessdata folder from Caches folder");
-            NSError *error = nil;
-            BOOL fileIsRemoved = [fileManager removeItemAtPath:cachesTessDataPath error:&error];
-            if (error != nil) {
-                NSLog(@"Error deleting tessdata folder from the Caches folder: %@", error);
-            }
-            NSAssert(fileIsRemoved == YES, @"Error cleaning tessdata from the Caches folder");
-            
-            // check tessdata folder was deleted
-            NSArray *cachesContent = [fileManager contentsOfDirectoryAtPath:cachesPath error:&error];
-            if (error != nil) {
-                NSLog(@"Error getting the contents of the Caches folder: %@", error);
-            }
-            NSAssert([cachesContent containsObject:tessdataPath] == NO, @"Assert! Tessdata path was not removed from the Caches folder");
+            cleanTessdataFolder();
         });
     });
 });