commit 9c1242ae96c973faa7039d8b7a019aed959af73b
author sskhandp <sskhandp@gmail.com> Thu Apr 20 22:59:36 2017
committer Aditya Atul Tirodkar <tirodkar@users.noreply.github.com> Fri Apr 21 18:24:50 2017
tree bade6c4260e4673c7debef691372b40c228415c7
parent ad6b49f173ce7800c23de9bef3243ac6e6b06068

timeout was being thrown as assertion failure... changed it back to timeout exception

EarlGrey/Core/GREYElementInteraction.m

diff --git a/EarlGrey/Core/GREYElementInteraction.m b/EarlGrey/Core/GREYElementInteraction.m
index 1711710..7d11281 100644
--- a/EarlGrey/Core/GREYElementInteraction.m
+++ b/EarlGrey/Core/GREYElementInteraction.m
@@ -445,7 +445,8 @@
 }
 
 - (instancetype)assertWithMatcher:(id<GREYMatcher>)matcher error:(__strong NSError **)errorOrNil {
-  return [self assert:[GREYAssertions grey_createAssertionWithMatcher:matcher] error:errorOrNil];
+  id<GREYAssertion> assertion = [GREYAssertions grey_createAssertionWithMatcher:matcher];
+  return [self assert:assertion error:errorOrNil];
 }
 
 - (instancetype)usingSearchAction:(id<GREYAction>)action
@@ -540,11 +541,9 @@
         NSString *reason = [NSString stringWithFormat:@"Matching element timed out.\n"
                                                       @"Exception with Action: %@\n",
                                                       reasonDetail];
-
         I_GREYTimeout(reason,
                       @"Error Trace: %@",
                       [GREYError grey_nestedDescriptionForError:actionError]);
-
         return NO;
       } else if (([errorDomain isEqualToString:kGREYUIThreadExecutorErrorDomain]) &&
                  (errorCode == kGREYUIThreadExecutorTimeoutErrorCode)) {
@@ -566,9 +565,8 @@
           [(GREYError *)actionError setErrorInfo:errorDetails];
         }
 
-        I_GREYAssertionFail(reason, @"Error Trace: %@",
-                            [GREYError grey_nestedDescriptionForError:actionError]);
-
+        I_GREYTimeout(reason, @"Error Trace: %@",
+                      [GREYError grey_nestedDescriptionForError:actionError]);
         return NO;
       }
     }
@@ -736,7 +734,6 @@
         I_GREYTimeout(reason,
                       @"Error Trace: %@",
                       [GREYError grey_nestedDescriptionForError:assertionError]);
-
         return NO;
       } else if (([errorDomain isEqualToString:kGREYUIThreadExecutorErrorDomain]) &&
                  (errorCode == kGREYUIThreadExecutorTimeoutErrorCode)) {
@@ -759,10 +756,9 @@
           [(GREYError *)assertionError setErrorInfo:errorDetails];
         }
 
-        I_GREYAssertionFail(reason,
-                            @"Error Trace: %@",
-                            [GREYError grey_nestedDescriptionForError:assertionError]);
-
+        I_GREYTimeout(reason,
+                      @"Error Trace: %@",
+                      [GREYError grey_nestedDescriptionForError:assertionError]);
         return NO;
       }
     }