Accessibility parent

Integration Tests/Tests/SLDeviceTest.m

@@ -90,6 +90,14 @@ - (void)testCanRotateDevice
     }
 }
 
+// Exercises a bug in iOS 5.1 and 7.1. See https://github.com/inkling/Subliminal/pull/180#issuecomment-40891098
+- (void)testThatDeviceOrientationPersistsThroughDeactivation {
+    UIDeviceOrientation currentOrientation = [UIDevice currentDevice].orientation;
+    [[SLDevice currentDevice] deactivateAppForDuration:3.0];
+    SLAssertTrue([UIDevice currentDevice].orientation == currentOrientation,
+                 @"The device orientation should not have changed.");
+}
+
 - (void)rotateToAndCheckOrientation:(UIDeviceOrientation)orientation
 {
     [[SLDevice currentDevice] setOrientation:orientation];

Integration Tests/Tests/SLElementMatchingTest.m

@@ -34,6 +34,16 @@ + (NSString *)testCaseViewControllerClassName {
     return @"SLElementMatchingTestViewController";
 }
 
++ (BOOL)testCaseWithSelectorSupportsCurrentPlatform:(SEL)testCaseSelector {
+    if (![super testCaseWithSelectorSupportsCurrentPlatform:testCaseSelector]) return NO;
+
+    if (testCaseSelector == @selector(testMatchingCollectionViewCellChildElement)) {
+        return kCFCoreFoundationVersionNumber > kCFCoreFoundationVersionNumber_iOS_5_1;
+    }
+
+    return YES;
+}
+
 - (void)setUpTestCaseWithSelector:(SEL)testCaseSelector {
     [super setUpTestCaseWithSelector:testCaseSelector];
 
@@ -263,6 +273,14 @@ - (void)testMatchingTableViewHeaderChildElements {
     SLAssertTrue([rightLabel isValid], @"Could not match UITableView header child element.");
 }
 
+#pragma mark - Collection views
+
+- (void)testMatchingCollectionViewCellChildElement {
+    SLButton *fooButton = [SLButton elementWithAccessibilityLabel:@"fooButton"];
+    SLAssertTrue([[UIAElement(fooButton) label] isEqualToString:@"fooButton"],
+                 @"Could not match `UICollectionViewCell` child element.");
+}
+
 #pragma mark - Web views
 
 // This test case is restricted to the iPhone to guarantee the properties of

Integration Tests/Tests/SLElementMatchingTestViewController.m

@@ -29,15 +29,15 @@ @interface SLElementMatchingTestViewController : SLTestCaseViewController
 @end
 
 
-#pragma mark - SLElementMatchingTestCell
+#pragma mark - SLElementMatchingTestTableViewCell
 
-@interface SLElementMatchingTestCell : UITableViewCell
+@interface SLElementMatchingTestTableViewCell : UITableViewCell
 
 - (void)configureAccessibility;
 
 @end
 
-@implementation SLElementMatchingTestCell {
+@implementation SLElementMatchingTestTableViewCell {
     SEL _testCase;
     UISwitch *_switch;
     UILabel *_weatherCity, *_weatherTemp;
@@ -107,15 +107,15 @@ - (void)layoutSubviews {
 @end
 
 
-#pragma mark - SLElementMatchingTestHeader
+#pragma mark - SLElementMatchingTestTableViewHeader
 
-@interface SLElementMatchingTestHeader : UIView
+@interface SLElementMatchingTestTableViewHeader : UIView
 
 - (instancetype)initWithTestCaseWithSelector:(SEL)testCase;
 
 @end
 
-@implementation SLElementMatchingTestHeader {
+@implementation SLElementMatchingTestTableViewHeader {
     UIView *_leftView, *_rightView;
 }
 
@@ -167,9 +167,50 @@ - (void)removeRightView {
 @end
 
 
+#pragma mark - SLElementMatchingTestCollectionViewCell
+
+@interface SLElementMatchingTestCollectionViewCell : UICollectionViewCell
+
++ (CGSize)defaultSize;
+
+@end
+
+@implementation SLElementMatchingTestCollectionViewCell {
+    UIButton *_button;
+}
+
++ (CGSize)defaultSize {
+    return CGSizeMake(100.0f, 50.0f);
+}
+
+- (id)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor greenColor];
+
+        _button = [UIButton buttonWithType:UIButtonTypeCustom];
+        _button.backgroundColor = [UIColor blueColor];
+        [_button setTitle:@"fooButton" forState:UIControlStateNormal];
+        [self.contentView addSubview:_button];
+    }
+    return self;
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+
+    [_button sizeToFit];
+    _button.center = self.center;
+}
+
+@end
+
+
 #pragma mark - SLElementMatchingTestViewController
 
-@interface SLElementMatchingTestViewController () <UITableViewDataSource, UITableViewDelegate, UIWebViewDelegate>
+@interface SLElementMatchingTestViewController () < UITableViewDataSource, UITableViewDelegate,
+                                                    UICollectionViewDataSource, UICollectionViewDelegate,
+                                                    UIWebViewDelegate >
 
 // fooButton is purposely strong so that we can hold onto it
 // while it's removed from the view hierarchy in testElementsWaitToMatchValidObjects
@@ -185,17 +226,18 @@ @interface SLElementMatchingTestViewController () <UITableViewDataSource, UITabl
 @implementation SLElementMatchingTestViewController {
     UIView *_parentView, *_childView;
 
-    NSString *_testTableViewCellIdentifier;
+    NSString *_testTableViewCellIdentifier, *_testCollectionViewCellIdentifier;
     Class _testTableViewCellClass;
 
+    UICollectionView *_collectionView;
     UIWebView *_webView;
     BOOL _webViewDidFinishLoad;
 
     UIPopoverController *_popoverController;
 
     UIActionSheet *_actionSheet;
 
-    SLElementMatchingTestHeader *_headerView;
+    SLElementMatchingTestTableViewHeader *_headerView;
 }
 
 + (NSString *)nibNameForTestCase:(SEL)testCase {
@@ -270,6 +312,19 @@ - (void)loadViewForTestCase:(SEL)testCase {
 
         [view addSubview:_parentView];
         self.view = view;
+    } else if (testCase == @selector(testMatchingCollectionViewCellChildElement)) {
+        // note: `SLElementMatchingTest` marks this test case as not supporting iOS 5.1
+        // so we don't need to worry about runtime-conditionalizing code here
+        UICollectionViewFlowLayout *collectionViewLayout = [[UICollectionViewFlowLayout alloc] init];
+        collectionViewLayout.itemSize = [SLElementMatchingTestCollectionViewCell defaultSize];
+
+        _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:collectionViewLayout];
+        _collectionView.backgroundColor = [UIColor whiteColor];
+        _collectionView.dataSource = self;
+        _collectionView.delegate = self;
+        _collectionView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+
+        self.view = _collectionView;
     }
 }
 
@@ -301,11 +356,15 @@ - (void)viewDidLoad {
         } else if ((self.testCase == @selector(testMatchingNonLabelTableViewCellChildElement)) ||
                    (self.testCase == @selector(testMatchingTableViewCellWithCombinedLabel)) ||
                    (self.testCase == @selector(testCannotMatchIndividualChildLabelsOfTableViewCell))) {
-            _testTableViewCellClass = [SLElementMatchingTestCell class];
+            _testTableViewCellClass = [SLElementMatchingTestTableViewCell class];
         } else {
             NSAssert(NO, @"Table view loaded for unexpected test case: %@.", NSStringFromSelector(self.testCase));
         }
         _testTableViewCellIdentifier = [NSString stringWithFormat:@"%@_%@", NSStringFromClass(_testTableViewCellClass), NSStringFromSelector(self.testCase)];
+    } else if (_collectionView) {
+        Class testCollectionViewCellClass = [SLElementMatchingTestCollectionViewCell class];
+        _testCollectionViewCellIdentifier = [NSString stringWithFormat:@"%@_%@", NSStringFromClass(testCollectionViewCellClass), NSStringFromSelector(self.testCase)];
+        [_collectionView registerClass:testCollectionViewCellClass forCellWithReuseIdentifier:_testCollectionViewCellIdentifier];
     }
 
     if (_webView) {
@@ -316,7 +375,7 @@ - (void)viewDidLoad {
     }
 }
 
-#pragma mark UITableViewDataSource
+#pragma mark - UITableViewDataSource
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     return 1;
@@ -338,9 +397,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         (self.testCase == @selector(testSubliminalReloadsTheAccessibilityHierarchyAsNecessaryWhenMatching))) {
         cell.textLabel.text = @"fooLabel";
     } else {
-        NSAssert([cell isKindOfClass:[SLElementMatchingTestCell class]],
+        NSAssert([cell isKindOfClass:[SLElementMatchingTestTableViewCell class]],
                  @"Unexpected table view cell class for test case: %@.", NSStringFromSelector(self.testCase));
-        [(SLElementMatchingTestCell *)cell configureAccessibility];
+        [(SLElementMatchingTestTableViewCell *)cell configureAccessibility];
     }
 
     return cell;
@@ -360,14 +419,28 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger
         headerView = label;
     } else if ((self.testCase == @selector(testMatchingTableViewHeaderChildElements)) ||
                (self.testCase == @selector(testSubliminalReloadsTheAccessibilityHierarchyAsNecessaryWhenMatching))) {
-        _headerView = [[SLElementMatchingTestHeader alloc] initWithTestCaseWithSelector:self.testCase];
+        _headerView = [[SLElementMatchingTestTableViewHeader alloc] initWithTestCaseWithSelector:self.testCase];
         NSAssert([self numberOfSectionsInTableView:tableView] == 1, @"We only expect to track one header.");
         headerView = _headerView;
     }
 
     return headerView;
 }
 
+#pragma mark - UICollectionViewDataSource
+
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
+    return 1;
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+    return 1;
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    return [collectionView dequeueReusableCellWithReuseIdentifier:_testCollectionViewCellIdentifier forIndexPath:indexPath];
+}
+
 #pragma mark - UIWebView delegate
 
 - (void)webViewDidFinishLoad:(UIWebView *)webView {

Integration Tests/Tests/SLElementVisibilityTest.m

@@ -80,9 +80,25 @@ - (void)setUpTestCaseWithSelector:(SEL)testSelector {
 
     if (testSelector == @selector(testCanDetermineVisibilityOfWebAccessibilityElements)) {
         SLAssertTrueWithTimeout(SLAskAppYesNo(webViewDidFinishLoad), 5.0, @"Webview did not load test HTML.");
+    } else if ((testSelector == @selector(testViewIsVisibleInPortrait)) ||
+               (testSelector == @selector(testViewIsVisibleInPortraitUpsideDown)) ||
+               (testSelector == @selector(testViewIsVisibleInLandscapeLeft)) ||
+               (testSelector == @selector(testViewIsVisibleInLandscapeRight))) {
+        SLAskApp(showTestView);
     }
 }
 
+- (void)tearDownTestCaseWithSelector:(SEL)testCaseSelector {
+    if ((testCaseSelector == @selector(testViewIsVisibleInPortrait)) ||
+        (testCaseSelector == @selector(testViewIsVisibleInPortraitUpsideDown)) ||
+        (testCaseSelector == @selector(testViewIsVisibleInLandscapeLeft)) ||
+        (testCaseSelector == @selector(testViewIsVisibleInLandscapeRight))) {
+        [[SLDevice currentDevice] setOrientation:UIDeviceOrientationPortrait];
+    }
+
+    [super tearDownTestCaseWithSelector:testCaseSelector];
+}
+
 #pragma mark - Test isVisible for elements that are views
 
 - (void)testViewIsNotVisibleIfItIsHidden {
@@ -225,6 +241,26 @@ - (void)testViewIsVisibleIfItsCenterIsCoveredByClearRegion {
     SLAssertTrue([_testElement isVisible], @"Subliminal should say that the element is visible.");
 }
 
+- (void)testViewIsVisibleInPortrait {
+    [[SLDevice currentDevice] setOrientation:UIDeviceOrientationPortrait];
+    SLAssertTrue([UIAElement(_testElement) isVisible], @"Button should be visible");
+}
+
+- (void)testViewIsVisibleInPortraitUpsideDown {
+    [[SLDevice currentDevice] setOrientation:UIDeviceOrientationPortraitUpsideDown];
+    SLAssertTrue([UIAElement(_testElement) isVisible], @"Button should be visible");
+}
+
+- (void)testViewIsVisibleInLandscapeLeft {
+    [[SLDevice currentDevice] setOrientation:UIDeviceOrientationLandscapeLeft];
+    SLAssertTrue([UIAElement(_testElement) isVisible], @"Button should be visible");
+}
+
+- (void)testViewIsVisibleInLandscapeRight {
+    [[SLDevice currentDevice] setOrientation:UIDeviceOrientationLandscapeRight];
+    SLAssertTrue([UIAElement(_testElement) isVisible], @"Button should be visible");
+}
+
 #pragma mark - Test isVisible for elements that are not views
 
 - (void)testAccessibilityElementIsNotVisibleIfContainerIsHidden {

Integration Tests/Tests/SLElementVisibilityTestViewController.m

@@ -226,6 +226,11 @@ + (NSString *)nibNameForTestCase:(SEL)testCase {
                (testCase == @selector(testIsInvalidOrInvisibleDoesNotThrowIfElementIsInvalid)) ||
                (testCase == @selector(testIsInvalidOrInvisibleReturnsYESIfElementIsInvalidOrInvisible))) {
         nibName = @"SLElementVisibilityTestHidden";
+    } else if ((testCase == @selector(testViewIsVisibleInPortrait)) ||
+               (testCase == @selector(testViewIsVisibleInPortraitUpsideDown)) ||
+               (testCase == @selector(testViewIsVisibleInLandscapeLeft)) ||
+               (testCase == @selector(testViewIsVisibleInLandscapeRight))) {
+        nibName = @"SLElementVisibilityTestHidden";
     }
     return nibName;
 }

Integration Tests/Tests/SLNavigationBarTests.m

@@ -0,0 +1,58 @@
+//
+//  SLNavigationBarTests.m
+//  Subliminal
+//
+//  Created by Jordan Zucker on 4/4/14.
+//  Copyright (c) 2014 Inkling. All rights reserved.
+//
+
+#import "SLIntegrationTest.h"
+
+@interface SLNavigationBarTests : SLIntegrationTest
+
+@end
+
+@implementation SLNavigationBarTests
+
++ (NSString *)testCaseViewControllerClassName {
+    return @"SLNavigationBarTestsViewController";
+}
+
+// If you override set-up methods,
+// you must call super at the beginning of your implementations.
+
+// If you override tear-down methods,
+// you must call super at the *end* of your implementations.
+
+- (void)testRightButtonBroadMatching {
+    SLButton *rightButton = [SLButton elementWithAccessibilityLabel:@"Right"];
+    SLAssertTrue([UIAElement(rightButton) isValidAndVisible], @"Right button didn't appear");
+
+    [UIAElement(rightButton) tap];
+}
+
+- (void)testRightButtonWithNewMethod
+{
+    SLAccessibilityContainer *navBar = [SLAccessibilityContainer containerWithIdentifier:@"NavigationBar" andContainerType:SLAccessibilityContainerTypeNavigationBar];
+    SLLogAsync(@"navBar is %@", navBar);
+    SLAssertTrue([UIAElement(navBar) isValidAndVisible], @"Couldn't find nav bar matching specifications");
+    SLButton *rightButton = [navBar childElementMatching:[SLButton elementWithAccessibilityLabel:@"Right"]];
+    SLAssertTrue([UIAElement(rightButton) isValidAndVisible], @"Couldn't find right button bar");
+
+    [UIAElement(rightButton) tap];
+
+}
+
+- (void)testTitleLabel
+{
+    SLAccessibilityContainer *navBar = [SLAccessibilityContainer containerWithIdentifier:@"NavigationBar" andContainerType:SLAccessibilityContainerTypeNavigationBar];
+    SLLogAsync(@"navBar is %@", navBar);
+    SLAssertTrue([UIAElement(navBar) isValidAndVisible], @"Couldn't find nav bar matching specifications");
+    SLElement *title = [navBar childElementMatching:[SLElement elementWithAccessibilityLabel:@"Testing" value:nil traits:UIAccessibilityTraitStaticText]];
+    SLAssertTrue([UIAElement(title) isValidAndVisible], @"title isn't valid and visible");
+    SLLogAsync(@"title is %@", title.label);
+    SLAssertTrue([UIAElement(title.label) isEqualToString:@"Testing"], @"title doesn't match expected string");
+
+}
+
+@end