Restore on-device testing in iOS 7

.gitmodules

@@ -10,9 +10,9 @@
 [submodule "lib/cocoahttpserver"]
 	path = lib/cocoahttpserver
 	url = https://github.com/robbiehanson/CocoaHTTPServer.git
-[submodule "lib/PublicAutomation"]
-	path = lib/PublicAutomation
-	url = https://github.com/TestingWithFrank/PublicAutomation.git
 [submodule "lib/AnyJSON"]
 	path = lib/AnyJSON
 	url = https://github.com/mattt/AnyJSON.git
+[submodule "lib/KIF"]
+	path = lib/KIF
+	url = https://github.com/kif-framework/KIF.git

Frank.xcodeproj/xcshareddata/xcschemes/CocoaHTTPServer.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frank.xcodeproj/xcshareddata/xcschemes/Frank.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Frank.xcodeproj/xcshareddata/xcschemes/FrankMac.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

src/FrankLoader.m

@@ -86,6 +86,26 @@ + (void)load{
                                              selector:@selector(applicationDidBecomeActive:)
                                                  name:notificationName
                                                object:nil];
+
+#if TARGET_OS_IPHONE
+    NSArray *iOSVersionComponents = [[UIDevice currentDevice].systemVersion componentsSeparatedByString:@"."];
+    int majorVersion = [[iOSVersionComponents objectAtIndex:0] intValue];
+
+    if (majorVersion >= 9) 
+    { 
+        // iOS9 is installed. The UIApplicationDidBecomeActiveNotification may have been fired *before* 
+        // this code is called.
+        // See also:
+        // http://stackoverflow.com/questions/31785878/ios-9-uiapplicationdidbecomeactivenotification-callback-not-called
+
+        // Call applicationDidBecomeActive: after 0.5 second. 
+        // Delay execution of my block for 10 seconds.
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 500 * USEC_PER_SEC), dispatch_get_main_queue(), ^{
+            NSLog(@"Forcefully invoking applicationDidBecomeActive");
+            [FrankLoader applicationDidBecomeActive:nil];
+        });
+    }
+#endif
 }
 
 @end

src/IOSKeyboardCommand.m

@@ -4,12 +4,11 @@
 // To change the template use AppCode | Preferences | File Templates.
 //
 
-
+#import "FranklyProtocolHelper.h"
 #import "IOSKeyboardCommand.h"
 #import "JSON.h"
-#import <PublicAutomation/UIAutomationBridge.h>
-
-#import "FranklyProtocolHelper.h"
+#import "KIFTypist.h"
+#import "UIApplication-KIFAdditions.h"
 
 @implementation IOSKeyboardCommand {
 
@@ -25,11 +24,14 @@ - (NSString *)handleCommandWithRequestBody:(NSString *)requestBody {
     NSDictionary *requestCommand = FROM_JSON(requestBody);
 	NSString *textToType = [requestCommand objectForKey:@"text_to_type"];
 
-    if( ![UIAutomationBridge checkForKeyboard] ){
+    if( ![[UIApplication sharedApplication] keyboardWindow]){
         return [self generateKeyboardNotPresentErrorResponse];
     }
 
-    [UIAutomationBridge typeIntoKeyboard:textToType];
+    for (NSUInteger characterIndex = 0; characterIndex < [textToType length]; characterIndex++) {
+        NSString *characterString = [textToType substringWithRange:NSMakeRange(characterIndex, 1)];
+        [KIFTypist enterCharacter: characterString];
+    }
 
 	return [FranklyProtocolHelper generateSuccessResponseWithoutResults];
 }

src/LocationCommand.m

@@ -6,15 +6,39 @@
 //
 //
 
+#import <objc/runtime.h>
+
 #import "LocationCommand.h"
 
-#import <PublicAutomation/UIAutomationBridge.h>
 #import "FranklyProtocolHelper.h"
 #import "JSON.h"
 
+@interface NSObject ()
+- (id)initWithLatitude: (double) latitude longitude: (double) longitude;
+
+- (id) location;
+
+- (void) locationManager: (id) locationManager didUpdateLocations: (NSArray*) locations;
+- (void) locationManager: (id) locationManager didUpdateToLocation: (id) newLocation fromLocation: (id) oldLocation;
+@end
+
+static LocationCommand*     FEX_staticLocationCommand = nil;
+static id                   FEX_overridenLocation     = nil;
+static NSMutableDictionary* FEX_locationDelegates     = nil;
+static NSMutableDictionary* FEX_updatingManagers      = nil;
 
 @implementation LocationCommand
 
+- (id) init
+{
+    if (self = [super init])
+    {
+        FEX_staticLocationCommand = self;
+    }
+
+    return self;
+}
+
 - (NSString *)handlePost:(NSString *)requestBody{
     NSDictionary *requestCommand = FROM_JSON(requestBody);
 
@@ -27,7 +51,29 @@ - (NSString *)handlePost:(NSString *)requestBody{
 
     NSLog(@"simulating location of %f,%f",locationAsPoint.x, locationAsPoint.y);
 
-    [UIAutomationBridge setLocation:locationAsPoint];
+    FEX_overridenLocation = [[NSClassFromString(@"CLLocation") alloc] initWithLatitude: locationAsPoint.x
+                                                                             longitude: locationAsPoint.y];
+
+    for (id locationManagerDescription in FEX_locationDelegates)
+    {
+        id locationManager =[FEX_updatingManagers objectForKey: locationManagerDescription];
+        if (locationManager != nil)
+        {
+            id delegate = [FEX_locationDelegates objectForKey: [locationManager description]];
+            if ([delegate respondsToSelector: @selector(locationManager:didUpdateLocations:)])
+            {
+                [delegate locationManager: locationManager
+                       didUpdateLocations: [NSArray arrayWithObject: [((NSObject*) locationManager) location]]];
+            }
+
+            if ([delegate respondsToSelector: @selector(locationManager:didUpdateToLocation:fromLocation:)])
+            {
+                [delegate locationManager: locationManager
+                      didUpdateToLocation: [((NSObject*) locationManager) location]
+                             fromLocation: [((NSObject*) locationManager) location]];
+            }
+        }
+    }
 
     return [FranklyProtocolHelper generateSuccessResponseWithoutResults];
 }
@@ -40,4 +86,124 @@ - (NSString *)handleCommandWithRequestBody:(NSString *)requestBody {
         return [self handlePost:requestBody];
 }
 
+- (id) FEX_location
+{
+    id returnValue = nil;
+
+    if (FEX_overridenLocation != nil)
+    {
+        returnValue = FEX_overridenLocation;
+    }
+    else
+    {
+        returnValue = [self FEX_location];
+    }
+
+    return returnValue;
+}
+
+- (void) FEX_setDelegate: (id) delegate
+{
+    [FEX_locationDelegates setObject: delegate forKey: [self description]];
+    [self FEX_setDelegate: FEX_staticLocationCommand];
+}
+
+- (void) FEX_startUpdatingLocation
+{
+    [FEX_updatingManagers setObject: self forKey: [self description]];
+    [self FEX_startUpdatingLocation];
+}
+
+- (void) FEX_stopUpdatingLocation
+{
+    [FEX_updatingManagers removeObjectForKey: [self description]];
+    [self FEX_stopUpdatingLocation];
+}
+
+- (void) FEX_dealloc
+{
+    [FEX_locationDelegates removeObjectForKey: [self description]];
+    [FEX_updatingManagers  removeObjectForKey: [self description]];
+
+    [self FEX_dealloc];
+}
+
++ (void) insertMethod: (SEL) newSelector andSwapWithMethod: (SEL) origSelector
+{
+    Class locationManagerClass = NSClassFromString(@"CLLocationManager");
+
+    if (locationManagerClass != nil)
+    {
+        Method origMethod = class_getInstanceMethod(locationManagerClass, origSelector);
+        Method newMethod  = class_getInstanceMethod(self, newSelector);
+        IMP    newIMP     = method_getImplementation(newMethod);
+
+        if (class_addMethod(locationManagerClass, newSelector, newIMP, method_getTypeEncoding(newMethod)))
+        {
+            newMethod = class_getInstanceMethod(locationManagerClass, newSelector);
+
+            if (origMethod != NULL && newMethod != NULL)
+            {
+                method_exchangeImplementations(origMethod, newMethod);
+            }
+        }
+    }
+}
+
++ (void) load
+{
+    FEX_locationDelegates = [NSMutableDictionary new];
+    FEX_updatingManagers  = [NSMutableDictionary new];
+
+    [self insertMethod: @selector(FEX_setDelegate:)          andSwapWithMethod: @selector(setDelegate:)];
+    [self insertMethod: @selector(FEX_dealloc)               andSwapWithMethod: @selector(dealloc)];
+    [self insertMethod: @selector(FEX_startUpdatingLocation) andSwapWithMethod: @selector(startUpdatingLocation)];
+    [self insertMethod: @selector(FEX_stopUpdatingLocation)  andSwapWithMethod: @selector(stopUpdatingLocation)];
+    [self insertMethod: @selector(FEX_location)              andSwapWithMethod: @selector(location)];
+}
+
+- (void) locationManager: (id) locationManager didUpdateLocations: (NSArray*) locations
+{
+    if (locationManager != nil && [FEX_updatingManagers objectForKey: [locationManager description]] != nil)
+    {
+        id delegate = [FEX_locationDelegates objectForKey: [locationManager description]];
+        if ([delegate respondsToSelector: @selector(locationManager:didUpdateLocations:)])
+        {
+            if (FEX_overridenLocation == nil)
+            {
+                [delegate locationManager: locationManager
+                       didUpdateLocations: locations];
+            }
+            else
+            {
+                [delegate locationManager: locationManager
+                       didUpdateLocations: [NSArray arrayWithObject: FEX_overridenLocation]];
+            }
+        }
+    }
+}
+
+- (void) locationManager: (id) locationManager didUpdateToLocation: (id) newLocation fromLocation: (id) oldLocation
+{
+    if (locationManager != nil && [FEX_updatingManagers objectForKey: [locationManager description]] != nil)
+    {
+        id delegate = [FEX_locationDelegates objectForKey: [locationManager description]];
+        if ([delegate respondsToSelector: @selector(locationManager:didUpdateToLocation:fromLocation:)])
+        {
+            if (FEX_overridenLocation == nil)
+            {
+                [delegate locationManager: locationManager
+                      didUpdateToLocation: newLocation
+                             fromLocation: oldLocation];
+            }
+            else
+            {
+                [delegate locationManager: locationManager
+                      didUpdateToLocation: FEX_overridenLocation
+                             fromLocation: FEX_overridenLocation];
+            }
+        }
+    }
+}
+
 @end

src/MapOperationCommand.m

@@ -58,7 +58,15 @@ - (NSString *)handleCommandWithRequestBody:(NSString *)requestBody {
 	for (FrankMapViewType *view in viewsToMap) {
 		@try {
 			id result = [self performOperation:operation onView:view];
-			[results addObject:[ViewJSONSerializer jsonify:result]];
+			NSString *resultValue = [ViewJSONSerializer jsonify:result];
+
+			// Can't add nil objects to an array.
+			if(resultValue == nil)
+			{
+				resultValue = @"";
+			}
+
+			[results addObject:resultValue];
 		}
 		@catch (NSException * e) {
 			NSLog( @"Exception while performing operation %@\n%@", operation, e );

src/OrientationCommand.m

@@ -7,11 +7,12 @@
 //
 
 #import "OrientationCommand.h"
-
-#import <PublicAutomation/UIAutomationBridge.h>
 #import "FranklyProtocolHelper.h"
 #import "JSON.h"
 
+@interface UIApplication (Private)
+- (BOOL)rotateIfNeeded:(UIDeviceOrientation)orientation;
+@end
 
 @implementation OrientationCommand
 
@@ -106,7 +107,7 @@ - (NSString *)handlePost:(NSString *)requestBody{
                                                            andDetails:[NSString stringWithFormat:@"orientation '%@' is invalid. Use 'landscape_right','landscape_left','portrait', or 'portrait_upside_down'", requestBody]];
     }
 
-    [UIAutomationBridge setOrientation:requestedOrientation];
+    [[UIApplication sharedApplication] rotateIfNeeded:requestedOrientation];
 
     return [FranklyProtocolHelper generateSuccessResponseWithoutResults];
 }

src/UISlider+PublicAutomation.m

@@ -3,17 +3,42 @@
 //
 // Created by Alvaro Barbeira on 27/3/13
 //
-#import <PublicAutomation/UIAutomationBridge.h>
 #import "LoadableCategory.h"
+#import "CGGeometry-KIFAdditions.h"
+#import "UIApplication-KIFAdditions.h"
+
+@interface UIView ()
+
+- (BOOL) FEX_dragFromPoint: (CGPoint) startPoint
+                   toPoint: (CGPoint) destPoint
+                  duration: (CGFloat) duration
+                     delay: (BOOL)    delay;
+
+@end
+
 MAKE_CATEGORIES_LOADABLE(UISlider_PublicAutomation)
 
+#define UI_SLIDER_TIME_STEP 0.1
+
 @implementation UISlider(PublicAutomation)
 
-- (BOOL) FEX_dragThumbToValue:(double)value withDuration:(NSTimeInterval)interval {
-    return [UIAutomationBridge dragThumbInSlider:self toValue:value withDuration:interval];
+- (BOOL) FEX_dragThumbToValue: (double) value withDuration: (NSTimeInterval) duration
+{
+    CGRect  bounds    = [self bounds];
+    CGRect  trackRect = [self trackRectForBounds: bounds];
+    CGRect  startRect = [self thumbRectForBounds: bounds trackRect: trackRect value: [self value]];
+
+    CGPoint startPoint = CGPointCenteredInRect(startRect);
+    CGPoint destPoint  = CGPointMake(bounds.size.width * value / [self maximumValue], 1.0);
+
+    startPoint = [self convertPoint: startPoint toView: nil];
+    destPoint  = [self convertPoint: destPoint  toView: nil];
+
+    return [self FEX_dragFromPoint: startPoint toPoint: destPoint duration: duration delay: NO];
 }
 
 - (BOOL) FEX_dragThumbToValue:(double) value {
-    return [UIAutomationBridge dragThumbInSlider:self toValue:value];
+    return [self FEX_dragThumbToValue: value withDuration: UI_SLIDER_TIME_STEP];
 }
+
 @end