Implmenet EarlGrey 2.0: google#1

axi0mX · axi0mX · commit eea3e916ca86 · 2016-08-18T03:33:41.000-07:00
diff --git a/EarlGrey/Action/GREYActionBlock.m b/EarlGrey/Action/GREYActionBlock.m
@@ -18,10 +18,12 @@
 
 #import "Assertion/GREYAssertionDefines.h"
 #import "Common/GREYDefines.h"
+#import "Common/GREYTestHelper.h"
 #import "Matcher/GREYMatcher.h"
 
 @implementation GREYActionBlock {
   GREYPerformBlock _performBlock;
+  id<GREYMatcher> _constraints;
 }
 
 + (instancetype)actionWithName:(NSString *)name performBlock:(GREYPerformBlock)block {
@@ -41,10 +43,23 @@ - (instancetype)initWithName:(NSString *)name
   self = [super initWithName:name constraints:constraints];
   if (self) {
     _performBlock = block;
+    _constraints = constraints;
   }
   return self;
 }
 
+- (id)initWithCoder:(NSCoder *)coder {
+  return [self initWithName:[coder decodeObjectForKey:@"name"]
+                constraints:[coder decodeObjectForKey:@"constraints"]
+               performBlock:[GREYTestHelper decodeBlock:[coder decodeObjectForKey:@"performBlock"]]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeObject:[self name] forKey:@"name"];
+  [coder encodeObject:_constraints forKey:@"constraints"];
+  [coder encodeObject:[GREYTestHelper encodeBlock:_performBlock] forKey:@"performBlock"];
+}
+
 #pragma mark - GREYAction
 
 - (BOOL)perform:(id)element error:(__strong NSError **)errorOrNil {
diff --git a/EarlGrey/Action/GREYChangeStepperAction.m b/EarlGrey/Action/GREYChangeStepperAction.m
@@ -44,6 +44,14 @@ - (instancetype)initWithValue:(double)value {
   return self;
 }
 
+- (id)initWithCoder:(NSCoder *)coder {
+  return [self initWithValue:[coder decodeDoubleForKey:@"value"]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeDouble:_value forKey:@"value"];
+}
+
 #pragma mark - GREYAction
 
 - (BOOL)perform:(UIStepper *)stepper error:(__strong NSError **)errorOrNil {
diff --git a/EarlGrey/Action/GREYPickerAction.m b/EarlGrey/Action/GREYPickerAction.m
@@ -49,6 +49,16 @@ - (instancetype)initWithColumn:(NSInteger)column value:(NSString *)value {
   return self;
 }
 
+- (id)initWithCoder:(NSCoder *)coder {
+  return [self initWithColumn:[coder decodeIntegerForKey:@"column"]
+                        value:[coder decodeObjectForKey:@"value"]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeInteger:_column forKey:@"column"];
+  [coder encodeObject:_value forKey:@"value"];
+}
+
 #pragma mark - GREYAction
 
 - (BOOL)perform:(UIPickerView *)pickerView error:(__strong NSError **)errorOrNil {
diff --git a/EarlGrey/Action/GREYScrollAction.m b/EarlGrey/Action/GREYScrollAction.m
@@ -24,6 +24,7 @@
 #import "Additions/NSString+GREYAdditions.h"
 #import "Additions/UIScrollView+GREYAdditions.h"
 #import "Assertion/GREYAssertionDefines.h"
+#import "Common/GREYTestHelper.h"
 #import "Event/GREYSyntheticEvents.h"
 #import "Matcher/GREYAllOf.h"
 #import "Matcher/GREYAnyOf.h"
@@ -82,6 +83,18 @@ - (instancetype)initWithDirection:(GREYDirection)direction amount:(CGFloat)amoun
   return [self initWithDirection:direction amount:amount startPointPercents:GREYCGPointNull];
 }
 
+- (id)initWithCoder:(NSCoder *)coder {
+  return [self initWithDirection:[coder decodeIntegerForKey:@"direction"]
+                          amount:[GREYTestHelper decodeCGFloat:[coder decodeObjectForKey:@"amount"]]
+              startPointPercents:[GREYTestHelper decodeCGPoint:[coder decodeObjectForKey:@"startPointPercents"]]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeInteger:_direction forKey:@"direction"];
+  [coder encodeObject:[GREYTestHelper encodeCGFloat:_amount] forKey:@"amount"];
+  [coder encodeObject:[GREYTestHelper encodeCGPoint:_startPointPercents] forKey:@"startPointPercents"];
+}
+
 #pragma mark - GREYAction
 
 - (BOOL)perform:(id)element error:(__strong NSError **)errorOrNil {
diff --git a/EarlGrey/Action/GREYScrollToContentEdgeAction.m b/EarlGrey/Action/GREYScrollToContentEdgeAction.m
@@ -24,6 +24,7 @@
 #import "Additions/NSString+GREYAdditions.h"
 #import "Additions/UIScrollView+GREYAdditions.h"
 #import "Assertion/GREYAssertionDefines.h"
+#import "Common/GREYTestHelper.h"
 #import "Common/GREYVisibilityChecker.h"
 #import "Event/GREYSyntheticEvents.h"
 #import "Matcher/GREYAllOf.h"
@@ -66,6 +67,16 @@ - (instancetype)initWithEdge:(GREYContentEdge)edge {
   return [self initWithEdge:edge startPointPercents:GREYCGPointNull];
 }
 
+- (id)initWithCoder:(NSCoder *)coder {
+  return [self initWithEdge:[coder decodeIntegerForKey:@"edge"]
+         startPointPercents:[GREYTestHelper decodeCGPoint:[coder decodeObjectForKey:@"startPointPercents"]]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeInteger:_edge forKey:@"edge"];
+  [coder encodeObject:[GREYTestHelper encodeCGPoint:_startPointPercents] forKey:@"startPointPercents"];
+}
+
 #pragma mark - GREYAction
 
 - (BOOL)perform:(UIScrollView *)element error:(__strong NSError **)errorOrNil {
diff --git a/EarlGrey/Action/GREYSlideAction.m b/EarlGrey/Action/GREYSlideAction.m
@@ -47,6 +47,14 @@ - (instancetype)initWithSliderValue:(float)value {
   return self;
 }
 
+- (id)initWithCoder:(NSCoder *)coder {
+  return [self initWithSliderValue:[coder decodeFloatForKey:@"finalValue"]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeFloat:_finalValue forKey:@"finalValue"];
+}
+
 #pragma mark - GREYAction
 
 - (BOOL)perform:(UISlider *)slider error:(__strong NSError **)errorOrNil {
diff --git a/EarlGrey/Action/GREYSwipeAction.m b/EarlGrey/Action/GREYSwipeAction.m
@@ -19,6 +19,7 @@
 #import "Action/GREYPathGestureUtils.h"
 #import "Additions/NSString+GREYAdditions.h"
 #import "Assertion/GREYAssertionDefines.h"
+#import "Common/GREYTestHelper.h"
 #import "Event/GREYSyntheticEvents.h"
 #import "Matcher/GREYAllOf.h"
 #import "Matcher/GREYMatcher.h"
@@ -80,6 +81,18 @@ - (instancetype)initWithDirection:(GREYDirection)direction
                     percentPoint:startPercents];
 }
 
+- (id)initWithCoder:(NSCoder *)coder {
+  return [self initWithDirection:[coder decodeIntegerForKey:@"direction"]
+                        duration:[coder decodeDoubleForKey:@"duration"]
+                    percentPoint:[GREYTestHelper decodeCGPoint:[coder decodeObjectForKey:@"startPercents"]]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeInteger:_direction forKey:@"direction"];
+  [coder encodeDouble:_duration forKey:@"duration"];
+  [coder encodeObject:[GREYTestHelper encodeCGPoint:_startPercents] forKey:@"startPercents"];
+}
+
 #pragma mark - GREYAction
 
 - (BOOL)perform:(id)element error:(__strong NSError **)errorOrNil {
diff --git a/EarlGrey/Action/GREYTapAction.m b/EarlGrey/Action/GREYTapAction.m
@@ -21,6 +21,7 @@
 #import "Additions/NSError+GREYAdditions.h"
 #import "Additions/NSObject+GREYAdditions.h"
 #import "Common/GREYDefines.h"
+#import "Common/GREYTestHelper.h"
 #import "Common/GREYVisibilityChecker.h"
 #import "Core/GREYInteraction.h"
 #import "Matcher/GREYAllOf.h"
@@ -103,6 +104,20 @@ - (instancetype)initWithType:(GREYTapType)tapType
   return self;
 }
 
+- (instancetype)initWithCoder:(NSCoder *)coder {
+  return [self initWithType:[coder decodeIntegerForKey:@"type"]
+               numberOfTaps:[GREYTestHelper decodeNSUInteger:[coder decodeObjectForKey:@"numberOfTaps"]]
+                   duration:[coder decodeDoubleForKey:@"duration"]
+                   location:[GREYTestHelper decodeCGPoint:[coder decodeObjectForKey:@"tapLocation"]]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeInteger:_type forKey:@"type"];
+  [coder encodeObject:[GREYTestHelper encodeNSUInteger:_numberOfTaps] forKey:@"numberOfTaps"];
+  [coder encodeDouble:_duration forKey:@"duration"];
+  [coder encodeObject:[GREYTestHelper encodeCGPoint:_tapLocation] forKey:@"tapLocation"];
+}
+
 #pragma mark - GREYAction protocol
 
 - (BOOL)perform:(id)element error:(__strong NSError **)errorOrNil {
diff --git a/EarlGrey/Assertion/GREYAssertionBlock.m b/EarlGrey/Assertion/GREYAssertionBlock.m
@@ -18,6 +18,7 @@
 
 #import "Assertion/GREYAssertionDefines.h"
 #import "Common/GREYDefines.h"
+#import "Common/GREYTestHelper.h"
 
 @implementation GREYAssertionBlock {
   NSString *_name;
@@ -42,6 +43,16 @@ - (instancetype)initWithName:(NSString *)name
   return self;
 }
 
+- (id)initWithCoder:(NSCoder *)coder {
+  return [self initWithName:[coder decodeObjectForKey:@"name"]
+    assertionBlockWithError:[GREYTestHelper decodeBlock:[coder decodeObjectForKey:@"checkBlockWithError"]]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+  [coder encodeObject:_name forKey:@"name"];
+  [coder encodeObject:[GREYTestHelper encodeBlock:_checkBlockWithError] forKey:@"checkBlockWithError"];
+}
+
 #pragma mark - GREYAssertion
 
 - (NSString *)name {
diff --git a/EarlGrey/Assertion/GREYAssertionDefines.h b/EarlGrey/Assertion/GREYAssertionDefines.h
@@ -25,6 +25,7 @@
 #import <EarlGrey/GREYDefines.h>
 #import <EarlGrey/GREYFailureHandler.h>
 #import <EarlGrey/GREYFrameworkException.h>
+#import <EarlGrey/GREYTestHelper.h>
 
 GREY_EXTERN id<GREYFailureHandler> greyFailureHandler;
 
@@ -328,7 +329,17 @@ GREY_EXTERN id<GREYFailureHandler> greyFailureHandler;
                         ##__VA_ARGS__)
 
 #define I_CHECK_MAIN_THREAD() \
-  I_GREYAssertTrue([NSThread isMainThread], @"Must be on the main thread.")
+  I_GREYAssertTrue([NSThread isMainThread], @"Must be on the main thread.\n")
+
+#define I_CHECK_APPLICATION_PROCESS() \
+  I_GREYAssertTrue([GREYTestHelper isInApplicationProcess], @"Must be in an application process.\n")
+
+#define I_CHECK_REMOTE_APPLICATION_PROCESS() \
+  I_GREYAssertTrue([GREYTestHelper isInRemoteApplicationProcess], \
+                   @"Must be in a remote application process.\n")
+
+#define I_CHECK_XCTEST_PROCESS() \
+  I_GREYAssertTrue([GREYTestHelper isInXCTestProcess], @"Must be in the process running XCTest.\n")
 
 /// @endcond
 
diff --git a/EarlGrey/Common/GREYDefines.h b/EarlGrey/Common/GREYDefines.h
@@ -33,6 +33,11 @@
 #define iOS8_2_OR_ABOVE() ([UIDevice currentDevice].systemVersion.doubleValue >= 8.2)
 #define iOS9_OR_ABOVE() ([UIDevice currentDevice].systemVersion.intValue >= 9)
 
+// Used for Objective-C block syntax.
+typedef void(^GREYExecBlock)(void);
+// Used for Swift block syntax.
+typedef void(*GREYExecFunction)(void);
+
 #pragma mark - Math
 
 /**
diff --git a/EarlGrey/Common/GREYExposed.h b/EarlGrey/Common/GREYExposed.h
@@ -21,6 +21,35 @@
 
 #import <UIKit/UIKit.h>
 
+// Source: https://opensource.apple.com/source/libclosure/libclosure-65/Block_private.h
+struct Block_descriptor {
+  unsigned long int reserved;
+  unsigned long int size;
+  void (*copy)(void *dst, void *src);
+  void (*dispose)(void *);
+};
+
+struct Block_layout {
+  void *isa;
+  int flags;
+  int reserved;
+  void (*invoke)(void);
+  struct Block_descriptor *descriptor;
+  /* imported variables */
+};
+
+enum {
+  BLOCK_REFCOUNT_MASK = (0xffff),
+  BLOCK_NEEDS_FREE = (1 << 24),
+  BLOCK_HAS_COPY_DISPOSE = (1 << 25),
+  BLOCK_HAS_CTOR = (1 << 26), /* Helpers have C++ code. */
+  BLOCK_IS_GC = (1 << 27),
+  BLOCK_IS_GLOBAL = (1 << 28),
+  BLOCK_HAS_DESCRIPTOR = (1 << 29)
+};
+
+CFNotificationCenterRef CFNotificationCenterGetDistributedCenter(void);
+
 @interface UIWindow (GREYExposed)
 - (id)firstResponder;
 @end
@@ -359,3 +388,10 @@ IOHIDEventRef IOHIDEventCreateDigitizerFingerEvent(CFAllocatorRef allocator,
  */
 - (void)setPredictionPreferenceValue:(NSNumber *)enabled forSpecifier:(id)specifier;
 @end
+
+@interface XCTestConfiguration : NSObject
+
++ (instancetype)activeTestConfiguration;
+- (NSString *)targetApplicationBundleID;
+
+@end
diff --git a/EarlGrey/Common/GREYTestHelper.h b/EarlGrey/Common/GREYTestHelper.h
@@ -16,6 +16,8 @@
 
 #import <UIKit/UIKit.h>
 
+#import <EarlGrey/GREYDefines.h>
+
 /**
  *  Provides interface for test helper methods.
  */
@@ -32,4 +34,26 @@
  */
 + (void)disableFastAnimation;
 
++ (BOOL)isSystemAlertShown;
++ (BOOL)isInApplicationProcess;
++ (BOOL)isInRemoteApplicationProcess;
++ (BOOL)isInXCTestProcess;
+
++ (NSString *)absoluteXCTestPluginPath;
++ (NSString *)relativeXCTestPluginPath;
++ (NSString *)absoluteEarlGreyPath;
++ (NSString *)relativeEarlGreyPath;
++ (NSString *)targetApplicationBundleID;
+
++ (NSDictionary *)encodeBlock:(id)block;
++ (id)decodeBlock:(NSDictionary *)blockDictionary;
++ (NSDictionary *)encodeFunction:(GREYExecFunction)function;
++ (GREYExecFunction)decodeFunction:(NSDictionary *)dictionary;
++ (NSDictionary *)encodeCGPoint:(CGPoint)value;
++ (CGPoint)decodeCGPoint:(NSDictionary *)dictionary;
++ (NSDictionary *)encodeNSUInteger:(NSUInteger)value;
++ (NSUInteger)decodeNSUInteger:(NSDictionary *)dictionary;
++ (NSDictionary *)encodeCGFloat:(CGFloat)value;
++ (CGFloat)decodeCGFloat:(NSDictionary *)dictionary;
+
 @end
diff --git a/EarlGrey/Common/GREYTestHelper.m b/EarlGrey/Common/GREYTestHelper.m
diff --git a/EarlGrey/Matcher/GREYAllOf.m b/EarlGrey/Matcher/GREYAllOf.m
diff --git a/EarlGrey/Matcher/GREYAnyOf.m b/EarlGrey/Matcher/GREYAnyOf.m
diff --git a/EarlGrey/Matcher/GREYElementMatcherBlock.m b/EarlGrey/Matcher/GREYElementMatcherBlock.m
diff --git a/EarlGrey/Matcher/GREYNot.m b/EarlGrey/Matcher/GREYNot.m
