Future iOS SDK compatibility.

Makes app work with SDK's that do not contain UITouch->_gestureView.
Work around defect in current betas where accessibilityValue may return
an NSAttributedString.
Address issues where an application's keyWindow may not be a member of
the windows array.
Increase the timeout between scrolling to a cell and looking it up.

Note that the latest simulator release has issues with accessibility
and the tests will need to be run on device or with an earlier
simulator.

Author: bnickel

Additions/UIApplication-KIFAdditions.h

@@ -19,5 +19,6 @@
 
 - (UIWindow *)keyboardWindow;
 - (UIWindow *)pickerViewWindow;
+- (NSArray *)windowsWithKeyWindow;
 
 @end

Additions/UIApplication-KIFAdditions.m

@@ -31,7 +31,7 @@ - (UIAccessibilityElement *)accessibilityElementWithLabel:(NSString *)label acce
 {
     // Go through the array of windows in reverse order to process the frontmost window first.
     // When several elements with the same accessibilitylabel are present the one in front will be picked.
-    for (UIWindow *window in [self.windows reverseObjectEnumerator]) {
+    for (UIWindow *window in [self.windowsWithKeyWindow reverseObjectEnumerator]) {
         UIAccessibilityElement *element = [window accessibilityElementWithLabel:label accessibilityValue:value traits:traits];
         if (element) {
             return element;
@@ -43,7 +43,7 @@ - (UIAccessibilityElement *)accessibilityElementWithLabel:(NSString *)label acce
 
 - (UIAccessibilityElement *)accessibilityElementMatchingBlock:(BOOL(^)(UIAccessibilityElement *))matchBlock;
 {
-    for (UIWindow *window in [self.windows reverseObjectEnumerator]) {
+    for (UIWindow *window in [self.windowsWithKeyWindow reverseObjectEnumerator]) {
         UIAccessibilityElement *element = [window accessibilityElementMatchingBlock:matchBlock];
         if (element) {
             return element;
@@ -55,7 +55,7 @@ - (UIAccessibilityElement *)accessibilityElementMatchingBlock:(BOOL(^)(UIAccessi
 
 - (UIWindow *)keyboardWindow;
 {
-    for (UIWindow *window in self.windows) {
+    for (UIWindow *window in self.windowsWithKeyWindow) {
         if ([NSStringFromClass([window class]) isEqual:@"UITextEffectsWindow"]) {
             return window;
         }
@@ -66,7 +66,7 @@ - (UIWindow *)keyboardWindow;
 
 - (UIWindow *)pickerViewWindow;
 {
-    for (UIWindow *window in [self windows]) {
+    for (UIWindow *window in self.windowsWithKeyWindow) {
         NSArray *pickerViews = [window subviewsWithClassNameOrSuperClassNamePrefix:@"UIPickerView"];
         if (pickerViews.count > 0) {
             return window;
@@ -76,4 +76,14 @@ - (UIWindow *)pickerViewWindow;
     return nil;
 }
 
+- (NSArray *)windowsWithKeyWindow
+{
+    NSMutableArray *windows = self.windows.mutableCopy;
+    UIWindow *keyWindow = self.keyWindow;
+    if (![windows containsObject:keyWindow]) {
+        [windows addObject:keyWindow];
+    }
+    return [windows autorelease];
+}
+
 @end

Additions/UITouch-KIFAdditions.m

@@ -24,7 +24,6 @@ @interface UITouch () {
 
     UIWindow        *_window;
     UIView          *_view;
-    UIView          *_gestureView;
     UIView          *_warpedIntoView;
     NSMutableArray  *_gestureRecognizers;
     NSMutableArray  *_forwardingRecord;
@@ -43,6 +42,7 @@ @interface UITouch () {
     } _touchFlags;
 #endif
 }
+- (void)setGestureView:(UIView *)view;
 @end
 
 @implementation UITouch (KIFAdditions)
@@ -70,7 +70,9 @@ - (id)initAtPoint:(CGPoint)point inWindow:(UIWindow *)window;
 
     _window = [window retain];
     _view = [hitTestView retain];
-    _gestureView = [hitTestView retain];
+    if ([self respondsToSelector:@selector(setGestureView:)]) {
+        [self setGestureView:hitTestView];
+    }
     _phase = UITouchPhaseBegan;
     _touchFlags._firstTouchForView = 1;
     _touchFlags._isTap = 1;

Additions/UIView-KIFAdditions.m

@@ -81,9 +81,16 @@ - (UIAccessibilityElement *)accessibilityElementWithLabel:(NSString *)label trai
 - (UIAccessibilityElement *)accessibilityElementWithLabel:(NSString *)label accessibilityValue:(NSString *)value traits:(UIAccessibilityTraits)traits;
 {
     return [self accessibilityElementMatchingBlock:^(UIAccessibilityElement *element) {
+        
+        // TODO: This is a temporary fix for an SDK defect.
+        NSString *accessibilityValue = element.accessibilityValue;
+        if ([accessibilityValue isKindOfClass:[NSAttributedString class]]) {
+            accessibilityValue = [(NSAttributedString *)accessibilityValue string];
+        }
+        
         BOOL labelsMatch = [element.accessibilityLabel isEqual:label];
         BOOL traitsMatch = ((element.accessibilityTraits) & traits) == traits;
-        BOOL valuesMatch = !value || [value isEqual:element.accessibilityValue];
+        BOOL valuesMatch = !value || [value isEqual:accessibilityValue];
 
         return (BOOL)(labelsMatch && traitsMatch && valuesMatch);
     }];

Classes/KIFTestController.m

@@ -11,11 +11,11 @@
 #import "KIFTestScenario.h"
 #import "KIFTestStep.h"
 #import "NSFileManager-KIFAdditions.h"
+#import "UIApplication-KIFAdditions.h"
 #import <QuartzCore/QuartzCore.h>
 #import <dlfcn.h>
 #import <objc/runtime.h>
 
-
 extern id objc_msgSend(id theReceiver, SEL theSelector, ...);
 
 
@@ -442,7 +442,7 @@ - (void)_writeScreenshotForStep:(KIFTestStep *)step;
         return;
     }
 
-    NSArray *windows = [[UIApplication sharedApplication] windows];
+    NSArray *windows = [[UIApplication sharedApplication] windowsWithKeyWindow];
     if (windows.count == 0) {
         return;
     }

Classes/KIFTestStep.m

@@ -334,7 +334,7 @@ + (id)stepToTapScreenAtPoint:(CGPoint)screenPoint;
 
         // Try all the windows until we get one back that actually has something in it at the given point
         UIView *view = nil;
-        for (UIWindow *window in [[[UIApplication sharedApplication] windows] reverseObjectEnumerator]) {
+        for (UIWindow *window in [[[UIApplication sharedApplication] windowsWithKeyWindow] reverseObjectEnumerator]) {
             CGPoint windowPoint = [window convertPoint:screenPoint fromView:nil];
             view = [window hitTest:windowPoint withEvent:nil];
 
@@ -585,7 +585,7 @@ + (id)stepToDismissPopover;
 {
     return [self stepWithDescription:@"Dismiss the popover" executionBlock:^(KIFTestStep *step, NSError **error) {
         const NSTimeInterval tapDelay = 0.05;
-        NSArray *windows = [[UIApplication sharedApplication] windows];
+        NSArray *windows = [[UIApplication sharedApplication] windowsWithKeyWindow];
         KIFTestCondition(windows.count, error, @"Failed to find any windows in the application");
         UIView *dimmingView = [[[windows objectAtIndex:0] subviewsWithClassNamePrefix:@"UIDimmingView"] lastObject];
         [dimmingView tapAtPoint:CGPointMake(50.0f, 50.0f)];
@@ -619,7 +619,7 @@ + (id)stepToTapRowInTableViewWithAccessibilityLabel:(NSString*)tableViewLabel at
             KIFTestCondition([indexPath section] < [tableView numberOfSections], error, @"Section %d is not found in '%@' table view", [indexPath section], tableViewLabel);
             KIFTestCondition([indexPath row] < [tableView numberOfRowsInSection:[indexPath section]], error, @"Row %d is not found in section %d of '%@' table view", [indexPath row], [indexPath section], tableViewLabel);
             [tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionMiddle animated:YES];
-            [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.25]];
+            [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.5]];
             cell = [tableView cellForRowAtIndexPath:indexPath];
         }
         KIFTestCondition(cell, error, @"Table view cell at index path %@ not found", indexPath);
@@ -915,9 +915,10 @@ + (UIAccessibilityElement *)_accessibilityElementWithLabel:(NSString *)label acc
     UIAccessibilityElement *element = [[UIApplication sharedApplication] accessibilityElementWithLabel:label accessibilityValue:value traits:traits];
     if (!element) {
         if (error) {
+            element = [[UIApplication sharedApplication] accessibilityElementWithLabel:label accessibilityValue:nil traits:traits];
             // For purposes of a better error message, see if we can find the view, just not a view with the specified value.
-            if (value && [[UIApplication sharedApplication] accessibilityElementWithLabel:label accessibilityValue:nil traits:traits]) {
-                *error = [[[NSError alloc] initWithDomain:@"KIFTest" code:KIFTestStepResultFailure userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Found an accessibility element with the label \"%@\", but not with the value \"%@\"", label, value], NSLocalizedDescriptionKey, nil]] autorelease];
+            if (value && element) {
+                *error = [[[NSError alloc] initWithDomain:@"KIFTest" code:KIFTestStepResultFailure userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Found an accessibility element with the label \"%@\", but with the value \"%@\", not \"%@\"", label, element.accessibilityValue, value], NSLocalizedDescriptionKey, nil]] autorelease];
 
             // Check the traits, too.
             } else if (traits != UIAccessibilityTraitNone && [[UIApplication sharedApplication] accessibilityElementWithLabel:label accessibilityValue:nil traits:UIAccessibilityTraitNone]) {