From 2befcf36df13d4baff975af120f3545a135ac1b1 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Tue, 17 Feb 2015 22:06:43 +0000 Subject: [PATCH 01/21] Adding a few autolayout tests. --- Tests/RZUtilsTests.xcodeproj/project.pbxproj | 28 ++- Tests/RZUtilsTests/RZAutoLayoutHelpersTest.m | 206 +++++++++++++++++++ 2 files changed, 228 insertions(+), 6 deletions(-) create mode 100644 Tests/RZUtilsTests/RZAutoLayoutHelpersTest.m diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index 6ec8de0..a3b9ce2 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 14E90E001A931CB10085702C /* RZAutoLayoutHelpersTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */; }; 7A175505AE684DAFB8613F72 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BAB0697B95400AAAD3740C /* libPods.a */; }; 9A8D4DF4196335CC00AFAB21 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DF3196335CC00AFAB21 /* XCTest.framework */; }; 9A8D4DF5196335CC00AFAB21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DD1196335CC00AFAB21 /* Foundation.framework */; }; @@ -17,7 +18,11 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZAutoLayoutHelpersTest.m; sourceTree = ""; }; + 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; 22BAB0697B95400AAAD3740C /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 6C14FC1B7EEB65A025DD17AB /* Pods.enterprise-qa.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods.enterprise-qa.xcconfig"; path = "Pods/Target Support Files/Pods/Pods.enterprise-qa.xcconfig"; sourceTree = ""; }; + 7F351ABFC52A252FD16A17B2 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; 9A8D4DD1196335CC00AFAB21 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 9A8D4DD3196335CC00AFAB21 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 9A8D4DD5196335CC00AFAB21 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -28,7 +33,6 @@ 9A8D4DFD196335CC00AFAB21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 9A8D4EB4196336C500AFAB21 /* RZUtilsTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RZUtilsTests-Prefix.pch"; sourceTree = ""; }; 9A8D4EB51963431900AFAB21 /* RZBlockKVOTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZBlockKVOTests.m; sourceTree = ""; }; - CFC331EF976D4DEC8CB9094C /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = ""; }; D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZAutoLayoutTests.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -47,13 +51,23 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 1D20370BBD690B491DE2ED6F /* Pods */ = { + isa = PBXGroup; + children = ( + 7F351ABFC52A252FD16A17B2 /* Pods.debug.xcconfig */, + 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */, + 6C14FC1B7EEB65A025DD17AB /* Pods.enterprise-qa.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; 9A8D4DC5196335CC00AFAB21 = { isa = PBXGroup; children = ( 9A8D4DF9196335CC00AFAB21 /* RZUtilsTests */, 9A8D4DD0196335CC00AFAB21 /* Frameworks */, 9A8D4DCF196335CC00AFAB21 /* Products */, - CFC331EF976D4DEC8CB9094C /* Pods.xcconfig */, + 1D20370BBD690B491DE2ED6F /* Pods */, ); sourceTree = ""; }; @@ -84,6 +98,7 @@ 9A8D4DFA196335CC00AFAB21 /* Supporting Files */, 9A8D4EB51963431900AFAB21 /* RZBlockKVOTests.m */, D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */, + 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */, ); path = RZUtilsTests; sourceTree = ""; @@ -171,7 +186,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; showEnvVarsInLog = 0; }; DFCEA1E42D714A99949F834D /* Check Pods Manifest.lock */ = { @@ -196,6 +211,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 14E90E001A931CB10085702C /* RZAutoLayoutHelpersTest.m in Sources */, D4874DA119918C46003EEC4B /* RZAutoLayoutTests.m in Sources */, 9A8D4EB61963431900AFAB21 /* RZBlockKVOTests.m in Sources */, ); @@ -327,7 +343,7 @@ }; 9A8D4E09196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CFC331EF976D4DEC8CB9094C /* Pods.xcconfig */; + baseConfigurationReference = 7F351ABFC52A252FD16A17B2 /* Pods.debug.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -349,7 +365,7 @@ }; 9A8D4E0A196335CC00AFAB21 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CFC331EF976D4DEC8CB9094C /* Pods.xcconfig */; + baseConfigurationReference = 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -367,7 +383,7 @@ }; 9A8D4E0B196335CC00AFAB21 /* Enterprise-QA */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CFC331EF976D4DEC8CB9094C /* Pods.xcconfig */; + baseConfigurationReference = 6C14FC1B7EEB65A025DD17AB /* Pods.enterprise-qa.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", diff --git a/Tests/RZUtilsTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTests/RZAutoLayoutHelpersTest.m new file mode 100644 index 0000000..7d73d16 --- /dev/null +++ b/Tests/RZUtilsTests/RZAutoLayoutHelpersTest.m @@ -0,0 +1,206 @@ +// +// RZAutoLayoutHelpersTest.m +// +// Created by Sean O'Shea on 2/17/15. + +// Copyright 2014 Raizlabs and other contributors +// http://raizlabs.com/ +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#import +#import + +#import "UIView+RZAutoLayoutHelpers.h" + +@interface RZAutoLayoutHelpersContainerView : UIView + +@end + +@implementation RZAutoLayoutHelpersContainerView + +@end + +@interface RZAutoLayoutHelpersTest : XCTestCase + +@property (nonatomic) RZAutoLayoutHelpersContainerView *containerView; +@property (nonatomic) UIView *testViewOne; +@property (nonatomic) UIView *testViewTwo; + +@end + +static CGFloat RZAutoLayoutHelpersTestContainerWidth = 1000.0f; +static CGFloat RZAutoLayoutHelpersTestContainerHeight = 1000.0f; +static CGFloat RZAutoLayoutHelpersTestCenterOffset = 22.0f; + +static CGFloat RZAutoLayoutHelpersTestAllowableDelta = 1.0f; + +@implementation RZAutoLayoutHelpersTest + +- (void)setUp +{ + [super setUp]; + + self.containerView = [[RZAutoLayoutHelpersContainerView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, RZAutoLayoutHelpersTestContainerWidth, RZAutoLayoutHelpersTestContainerHeight)]; + self.containerView.translatesAutoresizingMaskIntoConstraints = NO; + self.testViewOne = [[UIView alloc] init]; + self.testViewTwo = [[UIView alloc] init]; + self.testViewOne.translatesAutoresizingMaskIntoConstraints = NO; + self.testViewTwo.translatesAutoresizingMaskIntoConstraints = NO; + [self.testViewOne rz_pinSizeTo:CGSizeMake(250.0f, 250.0f)]; + [self.testViewTwo rz_pinSizeTo:CGSizeMake(175.0f, 330.0f)]; + + [self.containerView addSubview:self.testViewOne]; + [self.containerView addSubview:self.testViewTwo]; +} + +- (void)tearDown +{ + [super tearDown]; +} + +- (void)forceConstraintsEvaluation +{ + [self forceConstraintsEvaluationForAllSubviewsOfView:self.containerView]; +} + +- (void)forceConstraintsEvaluationForAllSubviewsOfView:(UIView *)view +{ + for (UIView *subview in view.subviews) { + [self forceConstraintsEvaluationForAllSubviewsOfView:subview]; + } + [view setNeedsLayout]; + [view layoutIfNeeded]; +} + +- (void)testCenteringViews +{ + [self.testViewOne rz_centerHorizontallyInContainer]; + [self.testViewOne rz_centerVerticallyInContainer]; + [self.testViewTwo rz_centerHorizontallyInContainer]; + [self.testViewTwo rz_centerVerticallyInContainer]; + + [self forceConstraintsEvaluation]; + + XCTAssert([self.testViewOne rz_pinnedCenterXConstraint] != nil); + XCTAssert([self.testViewOne rz_pinnedCenterYConstraint] != nil); + XCTAssert([self.testViewTwo rz_pinnedCenterXConstraint] != nil); + XCTAssert([self.testViewTwo rz_pinnedCenterYConstraint] != nil); + + CGRect frameOne = self.testViewOne.frame; + + XCTAssert([self roundedEquals:frameOne.origin.x valueTwo:375.0f]); + XCTAssert([self roundedEquals:frameOne.origin.y valueTwo:375.0f]); + XCTAssert([self roundedEquals:frameOne.size.width valueTwo:250.0f]); + XCTAssert([self roundedEquals:frameOne.size.height valueTwo:250.0f]); + + XCTAssert([self roundedEquals:CGRectGetMidX(frameOne) valueTwo:500.0f]); + XCTAssert([self roundedEquals:CGRectGetMidY(frameOne) valueTwo:500.0f]); + + CGRect frameTwo = self.testViewTwo.frame; + + XCTAssert([self roundedEquals:frameTwo.origin.x valueTwo:412.5f]); + XCTAssert([self roundedEquals:frameTwo.origin.y valueTwo:335.0f]); + XCTAssert([self roundedEquals:frameTwo.size.width valueTwo:175.0f]); + XCTAssert([self roundedEquals:frameTwo.size.height valueTwo:330.0f]); + + XCTAssert([self roundedEquals:CGRectGetMidX(frameTwo) valueTwo:500.0f]); + XCTAssert([self roundedEquals:CGRectGetMidY(frameTwo) valueTwo:500.0f]); +} + +- (void)testCenteringWithOffsetViews +{ + [self.testViewOne rz_centerHorizontallyInContainerWithOffset:RZAutoLayoutHelpersTestCenterOffset]; + [self.testViewOne rz_centerVerticallyInContainerWithOffset:RZAutoLayoutHelpersTestCenterOffset]; + [self.testViewTwo rz_centerHorizontallyInContainerWithOffset:RZAutoLayoutHelpersTestCenterOffset]; + [self.testViewTwo rz_centerVerticallyInContainerWithOffset:RZAutoLayoutHelpersTestCenterOffset]; + + [self forceConstraintsEvaluation]; + + XCTAssert([self.testViewOne rz_pinnedCenterXConstraint] != nil); + XCTAssert([self.testViewOne rz_pinnedCenterYConstraint] != nil); + XCTAssert([self.testViewTwo rz_pinnedCenterXConstraint] != nil); + XCTAssert([self.testViewTwo rz_pinnedCenterYConstraint] != nil); + + CGRect frameOne = self.testViewOne.frame; + + XCTAssert([self roundedEquals:frameOne.origin.x valueTwo:397.0f]); + XCTAssert([self roundedEquals:frameOne.origin.y valueTwo:397.0f]); + XCTAssert([self roundedEquals:frameOne.size.width valueTwo:250.0f]); + XCTAssert([self roundedEquals:frameOne.size.height valueTwo:250.0f]); + + XCTAssert([self roundedEquals:CGRectGetMidX(frameOne) valueTwo:522.0f]); + XCTAssert([self roundedEquals:CGRectGetMidY(frameOne) valueTwo:522.0f]); + + CGRect frameTwo = self.testViewTwo.frame; + + XCTAssert([self roundedEquals:frameTwo.origin.x valueTwo:434.5f]); + XCTAssert([self roundedEquals:frameTwo.origin.y valueTwo:357.0f]); + XCTAssert([self roundedEquals:frameTwo.size.width valueTwo:175.0f]); + XCTAssert([self roundedEquals:frameTwo.size.height valueTwo:330.0f]); + + XCTAssert([self roundedEquals:CGRectGetMidX(frameTwo) valueTwo:522.0f]); + XCTAssert([self roundedEquals:CGRectGetMidY(frameTwo) valueTwo:522.0f]); +} + +- (void)testPinningViews { + + [self.testViewOne rz_pinTopSpaceToSuperviewWithPadding:0.0f]; + [self.testViewOne rz_pinRightSpaceToSuperviewWithPadding:0.0f]; + [self.testViewOne rz_pinBottomSpaceToSuperviewWithPadding:0.0f]; + [self.testViewOne rz_pinLeftSpaceToSuperviewWithPadding:0.0f]; + + [self.testViewTwo rz_pinTopSpaceToSuperviewWithPadding:21.0f]; + [self.testViewTwo rz_pinRightSpaceToSuperviewWithPadding:21.0f]; + [self.testViewTwo rz_pinBottomSpaceToSuperviewWithPadding:17.0f]; + [self.testViewTwo rz_pinLeftSpaceToSuperviewWithPadding:17.0f]; + + [self forceConstraintsEvaluation]; + + XCTAssert([self.testViewOne rz_pinnedTopConstraint] != nil); + XCTAssert([self.testViewOne rz_pinnedRightConstraint] != nil); + XCTAssert([self.testViewOne rz_pinnedBottomConstraint] != nil); + XCTAssert([self.testViewOne rz_pinnedLeftConstraint] != nil); + XCTAssert([self.testViewTwo rz_pinnedTopConstraint] != nil); + XCTAssert([self.testViewTwo rz_pinnedRightConstraint] != nil); + XCTAssert([self.testViewTwo rz_pinnedBottomConstraint] != nil); + XCTAssert([self.testViewTwo rz_pinnedLeftConstraint] != nil); + + CGRect frameOne = self.testViewOne.frame; + + XCTAssert([self roundedEquals:frameOne.origin.x valueTwo:0.0f]); + XCTAssert([self roundedEquals:frameOne.origin.y valueTwo:0.0f]); + XCTAssert([self roundedEquals:frameOne.size.width valueTwo:RZAutoLayoutHelpersTestContainerWidth]); + XCTAssert([self roundedEquals:frameOne.size.height valueTwo:RZAutoLayoutHelpersTestContainerHeight]); + + CGRect frameTwo = self.testViewTwo.frame; + + XCTAssert([self roundedEquals:frameTwo.origin.x valueTwo:17.0f]); + XCTAssert([self roundedEquals:frameTwo.origin.y valueTwo:21.0f]); + XCTAssert([self roundedEquals:frameTwo.size.width valueTwo:962.0f]); + XCTAssert([self roundedEquals:frameTwo.size.height valueTwo:962.0f]); +} + +- (BOOL)roundedEquals:(CGFloat)valueOne valueTwo:(CGFloat)valueTwo { + // accommodates for rounding issues which happen when unit tests are run on an iPhone 6 Plus + return fabs((valueOne) - (valueTwo)) < RZAutoLayoutHelpersTestAllowableDelta; +} + +@end From 5f1f1c7b05fa3a7679f6acad401e69236bdcb28e Mon Sep 17 00:00:00 2001 From: seanoshea Date: Sat, 28 Feb 2015 17:49:27 +0000 Subject: [PATCH 02/21] Trying to add a test app target. --- Tests/RZUtilsTestApp/ViewController.h | 15 + Tests/RZUtilsTests.xcodeproj/project.pbxproj | 382 +++++++++++++++++- .../xcschemes/RZUtilsTests.xcscheme | 2 +- .../RZUtilsTests/RZUtilsTestApp/AppDelegate.h | 16 + .../Base.lproj/LaunchScreen.xib | 47 +++ .../RZUtilsTestApp/Base.lproj/Main.storyboard | 32 ++ .../AppIcon.appiconset/Contents.json | 68 ++++ Tests/RZUtilsTests/RZUtilsTestApp/Info.plist | 47 +++ Tests/RZUtilsTests/RZUtilsTestApp/main.m | 16 + .../RZUtilsTestAppTests/Info.plist | 24 ++ 10 files changed, 639 insertions(+), 10 deletions(-) create mode 100644 Tests/RZUtilsTestApp/ViewController.h create mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/AppDelegate.h create mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib create mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/Main.storyboard create mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json create mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/Info.plist create mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/main.m create mode 100644 Tests/RZUtilsTests/RZUtilsTestAppTests/Info.plist diff --git a/Tests/RZUtilsTestApp/ViewController.h b/Tests/RZUtilsTestApp/ViewController.h new file mode 100644 index 0000000..d996468 --- /dev/null +++ b/Tests/RZUtilsTestApp/ViewController.h @@ -0,0 +1,15 @@ +// +// ViewController.h +// RZUtilsTestApp +// +// Created by Sean O Shea on 2/28/15. +// Copyright (c) 2015 Raizlabs. All rights reserved. +// + +#import + +@interface ViewController : UIViewController + + +@end + diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index a3b9ce2..7047ac8 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -7,17 +7,52 @@ objects = { /* Begin PBXBuildFile section */ - 14E90E001A931CB10085702C /* RZAutoLayoutHelpersTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */; }; + 142C60881AA2338100A89522 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 142C607D1AA2338100A89522 /* AppDelegate.m */; }; + 142C60891AA2338100A89522 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 142C607F1AA2338100A89522 /* LaunchScreen.xib */; }; + 142C608A1AA2338100A89522 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 142C60811AA2338100A89522 /* Main.storyboard */; }; + 142C608B1AA2338100A89522 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 142C60831AA2338100A89522 /* Images.xcassets */; }; + 142C608C1AA2338100A89522 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 142C60841AA2338100A89522 /* Info.plist */; }; + 142C608D1AA2338100A89522 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 142C60851AA2338100A89522 /* main.m */; }; + 142C60911AA2338800A89522 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 142C608F1AA2338800A89522 /* Info.plist */; }; + 142C60931AA233F500A89522 /* RZAutoLayoutHelpersTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */; }; 7A175505AE684DAFB8613F72 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BAB0697B95400AAAD3740C /* libPods.a */; }; 9A8D4DF4196335CC00AFAB21 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DF3196335CC00AFAB21 /* XCTest.framework */; }; 9A8D4DF5196335CC00AFAB21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DD1196335CC00AFAB21 /* Foundation.framework */; }; 9A8D4DF6196335CC00AFAB21 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DD5196335CC00AFAB21 /* UIKit.framework */; }; 9A8D4DFE196335CC00AFAB21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9A8D4DFC196335CC00AFAB21 /* InfoPlist.strings */; }; 9A8D4EB61963431900AFAB21 /* RZBlockKVOTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A8D4EB51963431900AFAB21 /* RZBlockKVOTests.m */; }; + A52E683CC9AFCD909DF352B2 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BAB0697B95400AAAD3740C /* libPods.a */; }; D4874DA119918C46003EEC4B /* RZAutoLayoutTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 142C606B1AA232DE00A89522 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 142C60511AA232DE00A89522; + remoteInfo = RZUtilsTestApp; + }; + 142C60971AA236AA00A89522 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; + remoteInfo = RZUtilsTests; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ + 142C60521AA232DE00A89522 /* RZUtilsTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RZUtilsTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 142C606A1AA232DE00A89522 /* RZUtilsTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RZUtilsTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 142C607C1AA2338100A89522 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 142C607D1AA2338100A89522 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 142C60801AA2338100A89522 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.xib; sourceTree = ""; }; + 142C60821AA2338100A89522 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Main.storyboard; sourceTree = ""; }; + 142C60831AA2338100A89522 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 142C60841AA2338100A89522 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 142C60851AA2338100A89522 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 142C608F1AA2338800A89522 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZAutoLayoutHelpersTest.m; sourceTree = ""; }; 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; 22BAB0697B95400AAAD3740C /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -37,6 +72,21 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 142C604F1AA232DE00A89522 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A52E683CC9AFCD909DF352B2 /* libPods.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 142C60671AA232DE00A89522 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A8D4DEF196335CC00AFAB21 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -51,6 +101,36 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 142C607A1AA2333300A89522 /* RZUtilsTestApp */ = { + isa = PBXGroup; + children = ( + 142C607C1AA2338100A89522 /* AppDelegate.h */, + 142C607D1AA2338100A89522 /* AppDelegate.m */, + 142C607E1AA2338100A89522 /* Base.lproj */, + 142C60831AA2338100A89522 /* Images.xcassets */, + 142C60841AA2338100A89522 /* Info.plist */, + 142C60851AA2338100A89522 /* main.m */, + ); + path = RZUtilsTestApp; + sourceTree = ""; + }; + 142C607B1AA2333C00A89522 /* RZUtilsTestAppTests */ = { + isa = PBXGroup; + children = ( + 142C608F1AA2338800A89522 /* Info.plist */, + ); + path = RZUtilsTestAppTests; + sourceTree = ""; + }; + 142C607E1AA2338100A89522 /* Base.lproj */ = { + isa = PBXGroup; + children = ( + 142C607F1AA2338100A89522 /* LaunchScreen.xib */, + 142C60811AA2338100A89522 /* Main.storyboard */, + ); + path = Base.lproj; + sourceTree = ""; + }; 1D20370BBD690B491DE2ED6F /* Pods */ = { isa = PBXGroup; children = ( @@ -75,6 +155,8 @@ isa = PBXGroup; children = ( 9A8D4DF2196335CC00AFAB21 /* RZUtilsTests.xctest */, + 142C60521AA232DE00A89522 /* RZUtilsTestApp.app */, + 142C606A1AA232DE00A89522 /* RZUtilsTestAppTests.xctest */, ); name = Products; sourceTree = ""; @@ -95,10 +177,12 @@ 9A8D4DF9196335CC00AFAB21 /* RZUtilsTests */ = { isa = PBXGroup; children = ( - 9A8D4DFA196335CC00AFAB21 /* Supporting Files */, - 9A8D4EB51963431900AFAB21 /* RZBlockKVOTests.m */, - D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */, 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */, + D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */, + 9A8D4EB51963431900AFAB21 /* RZBlockKVOTests.m */, + 142C607A1AA2333300A89522 /* RZUtilsTestApp */, + 142C607B1AA2333C00A89522 /* RZUtilsTestAppTests */, + 9A8D4DFA196335CC00AFAB21 /* Supporting Files */, ); path = RZUtilsTests; sourceTree = ""; @@ -116,6 +200,44 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 142C60511AA232DE00A89522 /* RZUtilsTestApp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 142C60781AA232DE00A89522 /* Build configuration list for PBXNativeTarget "RZUtilsTestApp" */; + buildPhases = ( + 2D1E8057A4342000020E647E /* Check Pods Manifest.lock */, + 142C604E1AA232DE00A89522 /* Sources */, + 142C604F1AA232DE00A89522 /* Frameworks */, + 142C60501AA232DE00A89522 /* Resources */, + F955B99AD281C15BA511A2A4 /* Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + 142C60981AA236AA00A89522 /* PBXTargetDependency */, + ); + name = RZUtilsTestApp; + productName = RZUtilsTestApp; + productReference = 142C60521AA232DE00A89522 /* RZUtilsTestApp.app */; + productType = "com.apple.product-type.application"; + }; + 142C60691AA232DE00A89522 /* RZUtilsTestAppTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 142C60791AA232DE00A89522 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */; + buildPhases = ( + 142C60661AA232DE00A89522 /* Sources */, + 142C60671AA232DE00A89522 /* Frameworks */, + 142C60681AA232DE00A89522 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 142C606C1AA232DE00A89522 /* PBXTargetDependency */, + ); + name = RZUtilsTestAppTests; + productName = RZUtilsTestAppTests; + productReference = 142C606A1AA232DE00A89522 /* RZUtilsTestAppTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */ = { isa = PBXNativeTarget; buildConfigurationList = 9A8D4E08196335CC00AFAB21 /* Build configuration list for PBXNativeTarget "RZUtilsTests" */; @@ -142,8 +264,17 @@ isa = PBXProject; attributes = { CLASSPREFIX = RZ; - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0600; ORGANIZATIONNAME = Raizlabs; + TargetAttributes = { + 142C60511AA232DE00A89522 = { + CreatedOnToolsVersion = 6.0.1; + }; + 142C60691AA232DE00A89522 = { + CreatedOnToolsVersion = 6.0.1; + TestTargetID = 142C60511AA232DE00A89522; + }; + }; }; buildConfigurationList = 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */; compatibilityVersion = "Xcode 3.2"; @@ -151,6 +282,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 9A8D4DC5196335CC00AFAB21; productRefGroup = 9A8D4DCF196335CC00AFAB21 /* Products */; @@ -158,15 +290,36 @@ projectRoot = ""; targets = ( 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, + 142C60511AA232DE00A89522 /* RZUtilsTestApp */, + 142C60691AA232DE00A89522 /* RZUtilsTestAppTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 142C60501AA232DE00A89522 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 142C60681AA232DE00A89522 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A8D4DF0196335CC00AFAB21 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 142C608A1AA2338100A89522 /* Main.storyboard in Resources */, + 142C608B1AA2338100A89522 /* Images.xcassets in Resources */, + 142C60911AA2338800A89522 /* Info.plist in Resources */, + 142C60891AA2338100A89522 /* LaunchScreen.xib in Resources */, + 142C608C1AA2338100A89522 /* Info.plist in Resources */, 9A8D4DFE196335CC00AFAB21 /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -174,6 +327,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 2D1E8057A4342000020E647E /* Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; DB328C2D17B7432F9AFBFA98 /* Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -204,14 +372,45 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; + F955B99AD281C15BA511A2A4 /* Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 142C604E1AA232DE00A89522 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 142C60661AA232DE00A89522 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 142C60931AA233F500A89522 /* RZAutoLayoutHelpersTest.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A8D4DEE196335CC00AFAB21 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 14E90E001A931CB10085702C /* RZAutoLayoutHelpersTest.m in Sources */, + 142C608D1AA2338100A89522 /* main.m in Sources */, + 142C60881AA2338100A89522 /* AppDelegate.m in Sources */, D4874DA119918C46003EEC4B /* RZAutoLayoutTests.m in Sources */, 9A8D4EB61963431900AFAB21 /* RZBlockKVOTests.m in Sources */, ); @@ -219,7 +418,36 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 142C606C1AA232DE00A89522 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 142C60511AA232DE00A89522 /* RZUtilsTestApp */; + targetProxy = 142C606B1AA232DE00A89522 /* PBXContainerItemProxy */; + }; + 142C60981AA236AA00A89522 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; + targetProxy = 142C60971AA236AA00A89522 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ + 142C607F1AA2338100A89522 /* LaunchScreen.xib */ = { + isa = PBXVariantGroup; + children = ( + 142C60801AA2338100A89522 /* Base */, + ); + name = LaunchScreen.xib; + sourceTree = ""; + }; + 142C60811AA2338100A89522 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 142C60821AA2338100A89522 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; 9A8D4DFC196335CC00AFAB21 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -231,11 +459,129 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 142C60721AA232DE00A89522 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7F351ABFC52A252FD16A17B2 /* Pods.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 142C60731AA232DE00A89522 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 142C60741AA232DE00A89522 /* Enterprise-QA */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 6C14FC1B7EEB65A025DD17AB /* Pods.enterprise-qa.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = "Enterprise-QA"; + }; + 142C60751AA232DE00A89522 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + }; + name = Debug; + }; + 142C60761AA232DE00A89522 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + }; + name = Release; + }; + 142C60771AA232DE00A89522 /* Enterprise-QA */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + }; + name = "Enterprise-QA"; + }; 9A8D4E01196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -274,7 +620,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -307,7 +652,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -402,6 +746,26 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 142C60781AA232DE00A89522 /* Build configuration list for PBXNativeTarget "RZUtilsTestApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 142C60721AA232DE00A89522 /* Debug */, + 142C60731AA232DE00A89522 /* Release */, + 142C60741AA232DE00A89522 /* Enterprise-QA */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 142C60791AA232DE00A89522 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 142C60751AA232DE00A89522 /* Debug */, + 142C60761AA232DE00A89522 /* Release */, + 142C60771AA232DE00A89522 /* Enterprise-QA */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTests.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTests.xcscheme index b0389c1..8030eab 100644 --- a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTests.xcscheme +++ b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTests.xcscheme @@ -1,6 +1,6 @@ + +@interface AppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + +@end + diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib b/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib new file mode 100644 index 0000000..3c9c851 --- /dev/null +++ b/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/Main.storyboard b/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/Main.storyboard new file mode 100644 index 0000000..dc6fd8b --- /dev/null +++ b/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/Main.storyboard @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json b/Tests/RZUtilsTests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..36d2c80 --- /dev/null +++ b/Tests/RZUtilsTests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/Info.plist b/Tests/RZUtilsTests/RZUtilsTestApp/Info.plist new file mode 100644 index 0000000..8576cff --- /dev/null +++ b/Tests/RZUtilsTests/RZUtilsTestApp/Info.plist @@ -0,0 +1,47 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + RZ.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/main.m b/Tests/RZUtilsTests/RZUtilsTestApp/main.m new file mode 100644 index 0000000..526a753 --- /dev/null +++ b/Tests/RZUtilsTests/RZUtilsTestApp/main.m @@ -0,0 +1,16 @@ +// +// main.m +// RZUtilsTestApp +// +// Created by Sean O Shea on 2/28/15. +// Copyright (c) 2015 Raizlabs. All rights reserved. +// + +#import +#import "AppDelegate.h" + +int main(int argc, char * argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/Tests/RZUtilsTests/RZUtilsTestAppTests/Info.plist b/Tests/RZUtilsTests/RZUtilsTestAppTests/Info.plist new file mode 100644 index 0000000..53449e6 --- /dev/null +++ b/Tests/RZUtilsTests/RZUtilsTestAppTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + RZ.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + From 8235d107ede46b28fabd58dc8693a2a799a238ce Mon Sep 17 00:00:00 2001 From: seanoshea Date: Sun, 1 Mar 2015 09:42:45 +0000 Subject: [PATCH 03/21] Backing out of the TestApp project. --- Tests/RZUtilsTestApp/ViewController.h | 15 - Tests/RZUtilsTests.xcodeproj/project.pbxproj | 368 ------------------ .../RZUtilsTests/RZUtilsTestApp/AppDelegate.h | 16 - .../Base.lproj/LaunchScreen.xib | 47 --- .../RZUtilsTestApp/Base.lproj/Main.storyboard | 32 -- .../AppIcon.appiconset/Contents.json | 68 ---- Tests/RZUtilsTests/RZUtilsTestApp/Info.plist | 47 --- Tests/RZUtilsTests/RZUtilsTestApp/main.m | 16 - .../RZUtilsTestAppTests/Info.plist | 24 -- 9 files changed, 633 deletions(-) delete mode 100644 Tests/RZUtilsTestApp/ViewController.h delete mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/AppDelegate.h delete mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib delete mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/Main.storyboard delete mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/Info.plist delete mode 100644 Tests/RZUtilsTests/RZUtilsTestApp/main.m delete mode 100644 Tests/RZUtilsTests/RZUtilsTestAppTests/Info.plist diff --git a/Tests/RZUtilsTestApp/ViewController.h b/Tests/RZUtilsTestApp/ViewController.h deleted file mode 100644 index d996468..0000000 --- a/Tests/RZUtilsTestApp/ViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// ViewController.h -// RZUtilsTestApp -// -// Created by Sean O Shea on 2/28/15. -// Copyright (c) 2015 Raizlabs. All rights reserved. -// - -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index 7047ac8..f440c08 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -7,52 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - 142C60881AA2338100A89522 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 142C607D1AA2338100A89522 /* AppDelegate.m */; }; - 142C60891AA2338100A89522 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 142C607F1AA2338100A89522 /* LaunchScreen.xib */; }; - 142C608A1AA2338100A89522 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 142C60811AA2338100A89522 /* Main.storyboard */; }; - 142C608B1AA2338100A89522 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 142C60831AA2338100A89522 /* Images.xcassets */; }; - 142C608C1AA2338100A89522 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 142C60841AA2338100A89522 /* Info.plist */; }; - 142C608D1AA2338100A89522 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 142C60851AA2338100A89522 /* main.m */; }; - 142C60911AA2338800A89522 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 142C608F1AA2338800A89522 /* Info.plist */; }; - 142C60931AA233F500A89522 /* RZAutoLayoutHelpersTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */; }; 7A175505AE684DAFB8613F72 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BAB0697B95400AAAD3740C /* libPods.a */; }; 9A8D4DF4196335CC00AFAB21 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DF3196335CC00AFAB21 /* XCTest.framework */; }; 9A8D4DF5196335CC00AFAB21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DD1196335CC00AFAB21 /* Foundation.framework */; }; 9A8D4DF6196335CC00AFAB21 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DD5196335CC00AFAB21 /* UIKit.framework */; }; 9A8D4DFE196335CC00AFAB21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9A8D4DFC196335CC00AFAB21 /* InfoPlist.strings */; }; 9A8D4EB61963431900AFAB21 /* RZBlockKVOTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A8D4EB51963431900AFAB21 /* RZBlockKVOTests.m */; }; - A52E683CC9AFCD909DF352B2 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BAB0697B95400AAAD3740C /* libPods.a */; }; D4874DA119918C46003EEC4B /* RZAutoLayoutTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 142C606B1AA232DE00A89522 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 142C60511AA232DE00A89522; - remoteInfo = RZUtilsTestApp; - }; - 142C60971AA236AA00A89522 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; - remoteInfo = RZUtilsTests; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ - 142C60521AA232DE00A89522 /* RZUtilsTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RZUtilsTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 142C606A1AA232DE00A89522 /* RZUtilsTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RZUtilsTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 142C607C1AA2338100A89522 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 142C607D1AA2338100A89522 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 142C60801AA2338100A89522 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.xib; sourceTree = ""; }; - 142C60821AA2338100A89522 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Main.storyboard; sourceTree = ""; }; - 142C60831AA2338100A89522 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 142C60841AA2338100A89522 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 142C60851AA2338100A89522 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 142C608F1AA2338800A89522 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZAutoLayoutHelpersTest.m; sourceTree = ""; }; 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; 22BAB0697B95400AAAD3740C /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -72,21 +36,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 142C604F1AA232DE00A89522 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A52E683CC9AFCD909DF352B2 /* libPods.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 142C60671AA232DE00A89522 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9A8D4DEF196335CC00AFAB21 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -101,36 +50,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 142C607A1AA2333300A89522 /* RZUtilsTestApp */ = { - isa = PBXGroup; - children = ( - 142C607C1AA2338100A89522 /* AppDelegate.h */, - 142C607D1AA2338100A89522 /* AppDelegate.m */, - 142C607E1AA2338100A89522 /* Base.lproj */, - 142C60831AA2338100A89522 /* Images.xcassets */, - 142C60841AA2338100A89522 /* Info.plist */, - 142C60851AA2338100A89522 /* main.m */, - ); - path = RZUtilsTestApp; - sourceTree = ""; - }; - 142C607B1AA2333C00A89522 /* RZUtilsTestAppTests */ = { - isa = PBXGroup; - children = ( - 142C608F1AA2338800A89522 /* Info.plist */, - ); - path = RZUtilsTestAppTests; - sourceTree = ""; - }; - 142C607E1AA2338100A89522 /* Base.lproj */ = { - isa = PBXGroup; - children = ( - 142C607F1AA2338100A89522 /* LaunchScreen.xib */, - 142C60811AA2338100A89522 /* Main.storyboard */, - ); - path = Base.lproj; - sourceTree = ""; - }; 1D20370BBD690B491DE2ED6F /* Pods */ = { isa = PBXGroup; children = ( @@ -155,8 +74,6 @@ isa = PBXGroup; children = ( 9A8D4DF2196335CC00AFAB21 /* RZUtilsTests.xctest */, - 142C60521AA232DE00A89522 /* RZUtilsTestApp.app */, - 142C606A1AA232DE00A89522 /* RZUtilsTestAppTests.xctest */, ); name = Products; sourceTree = ""; @@ -180,8 +97,6 @@ 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */, D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */, 9A8D4EB51963431900AFAB21 /* RZBlockKVOTests.m */, - 142C607A1AA2333300A89522 /* RZUtilsTestApp */, - 142C607B1AA2333C00A89522 /* RZUtilsTestAppTests */, 9A8D4DFA196335CC00AFAB21 /* Supporting Files */, ); path = RZUtilsTests; @@ -200,44 +115,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 142C60511AA232DE00A89522 /* RZUtilsTestApp */ = { - isa = PBXNativeTarget; - buildConfigurationList = 142C60781AA232DE00A89522 /* Build configuration list for PBXNativeTarget "RZUtilsTestApp" */; - buildPhases = ( - 2D1E8057A4342000020E647E /* Check Pods Manifest.lock */, - 142C604E1AA232DE00A89522 /* Sources */, - 142C604F1AA232DE00A89522 /* Frameworks */, - 142C60501AA232DE00A89522 /* Resources */, - F955B99AD281C15BA511A2A4 /* Copy Pods Resources */, - ); - buildRules = ( - ); - dependencies = ( - 142C60981AA236AA00A89522 /* PBXTargetDependency */, - ); - name = RZUtilsTestApp; - productName = RZUtilsTestApp; - productReference = 142C60521AA232DE00A89522 /* RZUtilsTestApp.app */; - productType = "com.apple.product-type.application"; - }; - 142C60691AA232DE00A89522 /* RZUtilsTestAppTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 142C60791AA232DE00A89522 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */; - buildPhases = ( - 142C60661AA232DE00A89522 /* Sources */, - 142C60671AA232DE00A89522 /* Frameworks */, - 142C60681AA232DE00A89522 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 142C606C1AA232DE00A89522 /* PBXTargetDependency */, - ); - name = RZUtilsTestAppTests; - productName = RZUtilsTestAppTests; - productReference = 142C606A1AA232DE00A89522 /* RZUtilsTestAppTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */ = { isa = PBXNativeTarget; buildConfigurationList = 9A8D4E08196335CC00AFAB21 /* Build configuration list for PBXNativeTarget "RZUtilsTests" */; @@ -266,15 +143,6 @@ CLASSPREFIX = RZ; LastUpgradeCheck = 0600; ORGANIZATIONNAME = Raizlabs; - TargetAttributes = { - 142C60511AA232DE00A89522 = { - CreatedOnToolsVersion = 6.0.1; - }; - 142C60691AA232DE00A89522 = { - CreatedOnToolsVersion = 6.0.1; - TestTargetID = 142C60511AA232DE00A89522; - }; - }; }; buildConfigurationList = 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */; compatibilityVersion = "Xcode 3.2"; @@ -290,36 +158,15 @@ projectRoot = ""; targets = ( 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, - 142C60511AA232DE00A89522 /* RZUtilsTestApp */, - 142C60691AA232DE00A89522 /* RZUtilsTestAppTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 142C60501AA232DE00A89522 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 142C60681AA232DE00A89522 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9A8D4DF0196335CC00AFAB21 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 142C608A1AA2338100A89522 /* Main.storyboard in Resources */, - 142C608B1AA2338100A89522 /* Images.xcassets in Resources */, - 142C60911AA2338800A89522 /* Info.plist in Resources */, - 142C60891AA2338100A89522 /* LaunchScreen.xib in Resources */, - 142C608C1AA2338100A89522 /* Info.plist in Resources */, 9A8D4DFE196335CC00AFAB21 /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -327,21 +174,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2D1E8057A4342000020E647E /* Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; DB328C2D17B7432F9AFBFA98 /* Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -372,45 +204,13 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - F955B99AD281C15BA511A2A4 /* Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 142C604E1AA232DE00A89522 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 142C60661AA232DE00A89522 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 142C60931AA233F500A89522 /* RZAutoLayoutHelpersTest.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9A8D4DEE196335CC00AFAB21 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 142C608D1AA2338100A89522 /* main.m in Sources */, - 142C60881AA2338100A89522 /* AppDelegate.m in Sources */, D4874DA119918C46003EEC4B /* RZAutoLayoutTests.m in Sources */, 9A8D4EB61963431900AFAB21 /* RZBlockKVOTests.m in Sources */, ); @@ -418,36 +218,7 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 142C606C1AA232DE00A89522 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 142C60511AA232DE00A89522 /* RZUtilsTestApp */; - targetProxy = 142C606B1AA232DE00A89522 /* PBXContainerItemProxy */; - }; - 142C60981AA236AA00A89522 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; - targetProxy = 142C60971AA236AA00A89522 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ - 142C607F1AA2338100A89522 /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - 142C60801AA2338100A89522 /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; - 142C60811AA2338100A89522 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 142C60821AA2338100A89522 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; 9A8D4DFC196335CC00AFAB21 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -459,125 +230,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 142C60721AA232DE00A89522 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7F351ABFC52A252FD16A17B2 /* Pods.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_WARN_UNREACHABLE_CODE = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 142C60731AA232DE00A89522 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_WARN_UNREACHABLE_CODE = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 142C60741AA232DE00A89522 /* Enterprise-QA */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 6C14FC1B7EEB65A025DD17AB /* Pods.enterprise-qa.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_WARN_UNREACHABLE_CODE = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = "Enterprise-QA"; - }; - 142C60751AA232DE00A89522 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_WARN_UNREACHABLE_CODE = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; - }; - name = Debug; - }; - 142C60761AA232DE00A89522 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_WARN_UNREACHABLE_CODE = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; - }; - name = Release; - }; - 142C60771AA232DE00A89522 /* Enterprise-QA */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_WARN_UNREACHABLE_CODE = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTests/RZUtilsTestApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; - }; - name = "Enterprise-QA"; - }; 9A8D4E01196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -746,26 +398,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 142C60781AA232DE00A89522 /* Build configuration list for PBXNativeTarget "RZUtilsTestApp" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 142C60721AA232DE00A89522 /* Debug */, - 142C60731AA232DE00A89522 /* Release */, - 142C60741AA232DE00A89522 /* Enterprise-QA */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 142C60791AA232DE00A89522 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 142C60751AA232DE00A89522 /* Debug */, - 142C60761AA232DE00A89522 /* Release */, - 142C60771AA232DE00A89522 /* Enterprise-QA */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/AppDelegate.h b/Tests/RZUtilsTests/RZUtilsTestApp/AppDelegate.h deleted file mode 100644 index 059bfed..0000000 --- a/Tests/RZUtilsTests/RZUtilsTestApp/AppDelegate.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// AppDelegate.h -// RZUtilsTestApp -// -// Created by Sean O Shea on 2/28/15. -// Copyright (c) 2015 Raizlabs. All rights reserved. -// - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end - diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib b/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 3c9c851..0000000 --- a/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/Main.storyboard b/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/Main.storyboard deleted file mode 100644 index dc6fd8b..0000000 --- a/Tests/RZUtilsTests/RZUtilsTestApp/Base.lproj/Main.storyboard +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json b/Tests/RZUtilsTests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 36d2c80..0000000 --- a/Tests/RZUtilsTests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/Info.plist b/Tests/RZUtilsTests/RZUtilsTestApp/Info.plist deleted file mode 100644 index 8576cff..0000000 --- a/Tests/RZUtilsTests/RZUtilsTestApp/Info.plist +++ /dev/null @@ -1,47 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - RZ.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/Tests/RZUtilsTests/RZUtilsTestApp/main.m b/Tests/RZUtilsTests/RZUtilsTestApp/main.m deleted file mode 100644 index 526a753..0000000 --- a/Tests/RZUtilsTests/RZUtilsTestApp/main.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// main.m -// RZUtilsTestApp -// -// Created by Sean O Shea on 2/28/15. -// Copyright (c) 2015 Raizlabs. All rights reserved. -// - -#import -#import "AppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/Tests/RZUtilsTests/RZUtilsTestAppTests/Info.plist b/Tests/RZUtilsTests/RZUtilsTestAppTests/Info.plist deleted file mode 100644 index 53449e6..0000000 --- a/Tests/RZUtilsTests/RZUtilsTestAppTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - RZ.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - From f54f79b72973e126ff1943facc4908b8ce181809 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Sun, 1 Mar 2015 09:47:50 +0000 Subject: [PATCH 04/21] Adding back the test app at a different location. --- Tests/RZUtilsTestApp/AppDelegate.h | 16 + Tests/RZUtilsTestApp/AppDelegate.m | 22 ++ .../Base.lproj/LaunchScreen.xib | 46 +++ .../RZUtilsTestApp/Base.lproj/Main.storyboard | 31 ++ .../AppIcon.appiconset/Contents.json | 68 ++++ Tests/RZUtilsTestApp/Info.plist | 47 +++ Tests/RZUtilsTestApp/main.m | 16 + Tests/RZUtilsTestAppTests/Info.plist | 24 ++ .../RZUtilsTestAppTests/RZUtilsTestAppTests.m | 33 ++ Tests/RZUtilsTests.xcodeproj/project.pbxproj | 322 ++++++++++++++++++ 10 files changed, 625 insertions(+) create mode 100644 Tests/RZUtilsTestApp/AppDelegate.h create mode 100644 Tests/RZUtilsTestApp/AppDelegate.m create mode 100644 Tests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib create mode 100644 Tests/RZUtilsTestApp/Base.lproj/Main.storyboard create mode 100644 Tests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json create mode 100644 Tests/RZUtilsTestApp/Info.plist create mode 100644 Tests/RZUtilsTestApp/main.m create mode 100644 Tests/RZUtilsTestAppTests/Info.plist create mode 100644 Tests/RZUtilsTestAppTests/RZUtilsTestAppTests.m diff --git a/Tests/RZUtilsTestApp/AppDelegate.h b/Tests/RZUtilsTestApp/AppDelegate.h new file mode 100644 index 0000000..16d4b9e --- /dev/null +++ b/Tests/RZUtilsTestApp/AppDelegate.h @@ -0,0 +1,16 @@ +// +// AppDelegate.h +// RZUtilsTestApp +// +// Created by Sean O Shea on 3/1/15. +// Copyright (c) 2015 Raizlabs. All rights reserved. +// + +#import + +@interface AppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + +@end + diff --git a/Tests/RZUtilsTestApp/AppDelegate.m b/Tests/RZUtilsTestApp/AppDelegate.m new file mode 100644 index 0000000..aa56ff6 --- /dev/null +++ b/Tests/RZUtilsTestApp/AppDelegate.m @@ -0,0 +1,22 @@ +// +// AppDelegate.m +// RZUtilsTestApp +// +// Created by Sean O Shea on 3/1/15. +// Copyright (c) 2015 Raizlabs. All rights reserved. +// + +#import "AppDelegate.h" + +@interface AppDelegate () + +@end + +@implementation AppDelegate + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Override point for customization after application launch. + return YES; +} + +@end diff --git a/Tests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib b/Tests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib new file mode 100644 index 0000000..1290aa8 --- /dev/null +++ b/Tests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/RZUtilsTestApp/Base.lproj/Main.storyboard b/Tests/RZUtilsTestApp/Base.lproj/Main.storyboard new file mode 100644 index 0000000..a568465 --- /dev/null +++ b/Tests/RZUtilsTestApp/Base.lproj/Main.storyboard @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json b/Tests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..36d2c80 --- /dev/null +++ b/Tests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Tests/RZUtilsTestApp/Info.plist b/Tests/RZUtilsTestApp/Info.plist new file mode 100644 index 0000000..8576cff --- /dev/null +++ b/Tests/RZUtilsTestApp/Info.plist @@ -0,0 +1,47 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + RZ.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/Tests/RZUtilsTestApp/main.m b/Tests/RZUtilsTestApp/main.m new file mode 100644 index 0000000..fa072aa --- /dev/null +++ b/Tests/RZUtilsTestApp/main.m @@ -0,0 +1,16 @@ +// +// main.m +// RZUtilsTestApp +// +// Created by Sean O Shea on 3/1/15. +// Copyright (c) 2015 Raizlabs. All rights reserved. +// + +#import +#import "AppDelegate.h" + +int main(int argc, char * argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/Tests/RZUtilsTestAppTests/Info.plist b/Tests/RZUtilsTestAppTests/Info.plist new file mode 100644 index 0000000..53449e6 --- /dev/null +++ b/Tests/RZUtilsTestAppTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + RZ.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/Tests/RZUtilsTestAppTests/RZUtilsTestAppTests.m b/Tests/RZUtilsTestAppTests/RZUtilsTestAppTests.m new file mode 100644 index 0000000..838b507 --- /dev/null +++ b/Tests/RZUtilsTestAppTests/RZUtilsTestAppTests.m @@ -0,0 +1,33 @@ +// +// RZUtilsTestAppTests.m +// RZUtilsTestAppTests +// +// Created by Sean O Shea on 3/1/15. +// Copyright (c) 2015 Raizlabs. All rights reserved. +// + +#import +#import + +@interface RZUtilsTestAppTests : XCTestCase + +@end + +@implementation RZUtilsTestAppTests + +- (void)setUp { + [super setUp]; + // Put setup code here. This method is called before the invocation of each test method in the class. +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void)testExample { + // This is an example of a functional test case. + XCTAssert(YES, @"Pass"); +} + +@end diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index f440c08..e8a864c 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -7,6 +7,12 @@ objects = { /* Begin PBXBuildFile section */ + 14D21D6F1AA316CA000765B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D6E1AA316CA000765B6 /* main.m */; }; + 14D21D721AA316CA000765B6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* AppDelegate.m */; }; + 14D21D781AA316CA000765B6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D761AA316CA000765B6 /* Main.storyboard */; }; + 14D21D7A1AA316CA000765B6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D791AA316CA000765B6 /* Images.xcassets */; }; + 14D21D7D1AA316CA000765B6 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D7B1AA316CA000765B6 /* LaunchScreen.xib */; }; + 14D21D891AA316CB000765B6 /* RZUtilsTestAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D881AA316CB000765B6 /* RZUtilsTestAppTests.m */; }; 7A175505AE684DAFB8613F72 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BAB0697B95400AAAD3740C /* libPods.a */; }; 9A8D4DF4196335CC00AFAB21 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DF3196335CC00AFAB21 /* XCTest.framework */; }; 9A8D4DF5196335CC00AFAB21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DD1196335CC00AFAB21 /* Foundation.framework */; }; @@ -16,7 +22,28 @@ D4874DA119918C46003EEC4B /* RZAutoLayoutTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 14D21D831AA316CB000765B6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 14D21D691AA316CA000765B6; + remoteInfo = RZUtilsTestApp; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ + 14D21D6A1AA316CA000765B6 /* RZUtilsTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RZUtilsTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 14D21D6D1AA316CA000765B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 14D21D6E1AA316CA000765B6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 14D21D701AA316CA000765B6 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 14D21D711AA316CA000765B6 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 14D21D771AA316CA000765B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 14D21D791AA316CA000765B6 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 14D21D7C1AA316CA000765B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; + 14D21D821AA316CA000765B6 /* RZUtilsTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RZUtilsTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 14D21D871AA316CB000765B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 14D21D881AA316CB000765B6 /* RZUtilsTestAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RZUtilsTestAppTests.m; sourceTree = ""; }; 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZAutoLayoutHelpersTest.m; sourceTree = ""; }; 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; 22BAB0697B95400AAAD3740C /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -36,6 +63,20 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 14D21D671AA316CA000765B6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 14D21D7F1AA316CA000765B6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A8D4DEF196335CC00AFAB21 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -50,6 +91,45 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 14D21D6B1AA316CA000765B6 /* RZUtilsTestApp */ = { + isa = PBXGroup; + children = ( + 14D21D701AA316CA000765B6 /* AppDelegate.h */, + 14D21D711AA316CA000765B6 /* AppDelegate.m */, + 14D21D761AA316CA000765B6 /* Main.storyboard */, + 14D21D791AA316CA000765B6 /* Images.xcassets */, + 14D21D7B1AA316CA000765B6 /* LaunchScreen.xib */, + 14D21D6C1AA316CA000765B6 /* Supporting Files */, + ); + path = RZUtilsTestApp; + sourceTree = ""; + }; + 14D21D6C1AA316CA000765B6 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 14D21D6D1AA316CA000765B6 /* Info.plist */, + 14D21D6E1AA316CA000765B6 /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 14D21D851AA316CB000765B6 /* RZUtilsTestAppTests */ = { + isa = PBXGroup; + children = ( + 14D21D881AA316CB000765B6 /* RZUtilsTestAppTests.m */, + 14D21D861AA316CB000765B6 /* Supporting Files */, + ); + path = RZUtilsTestAppTests; + sourceTree = ""; + }; + 14D21D861AA316CB000765B6 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 14D21D871AA316CB000765B6 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; 1D20370BBD690B491DE2ED6F /* Pods */ = { isa = PBXGroup; children = ( @@ -64,6 +144,8 @@ isa = PBXGroup; children = ( 9A8D4DF9196335CC00AFAB21 /* RZUtilsTests */, + 14D21D6B1AA316CA000765B6 /* RZUtilsTestApp */, + 14D21D851AA316CB000765B6 /* RZUtilsTestAppTests */, 9A8D4DD0196335CC00AFAB21 /* Frameworks */, 9A8D4DCF196335CC00AFAB21 /* Products */, 1D20370BBD690B491DE2ED6F /* Pods */, @@ -74,6 +156,8 @@ isa = PBXGroup; children = ( 9A8D4DF2196335CC00AFAB21 /* RZUtilsTests.xctest */, + 14D21D6A1AA316CA000765B6 /* RZUtilsTestApp.app */, + 14D21D821AA316CA000765B6 /* RZUtilsTestAppTests.xctest */, ); name = Products; sourceTree = ""; @@ -115,6 +199,41 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 14D21D691AA316CA000765B6 /* RZUtilsTestApp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 14D21D8A1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestApp" */; + buildPhases = ( + 14D21D661AA316CA000765B6 /* Sources */, + 14D21D671AA316CA000765B6 /* Frameworks */, + 14D21D681AA316CA000765B6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = RZUtilsTestApp; + productName = RZUtilsTestApp; + productReference = 14D21D6A1AA316CA000765B6 /* RZUtilsTestApp.app */; + productType = "com.apple.product-type.application"; + }; + 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */; + buildPhases = ( + 14D21D7E1AA316CA000765B6 /* Sources */, + 14D21D7F1AA316CA000765B6 /* Frameworks */, + 14D21D801AA316CA000765B6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 14D21D841AA316CB000765B6 /* PBXTargetDependency */, + ); + name = RZUtilsTestAppTests; + productName = RZUtilsTestAppTests; + productReference = 14D21D821AA316CA000765B6 /* RZUtilsTestAppTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */ = { isa = PBXNativeTarget; buildConfigurationList = 9A8D4E08196335CC00AFAB21 /* Build configuration list for PBXNativeTarget "RZUtilsTests" */; @@ -143,6 +262,15 @@ CLASSPREFIX = RZ; LastUpgradeCheck = 0600; ORGANIZATIONNAME = Raizlabs; + TargetAttributes = { + 14D21D691AA316CA000765B6 = { + CreatedOnToolsVersion = 6.0.1; + }; + 14D21D811AA316CA000765B6 = { + CreatedOnToolsVersion = 6.0.1; + TestTargetID = 14D21D691AA316CA000765B6; + }; + }; }; buildConfigurationList = 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */; compatibilityVersion = "Xcode 3.2"; @@ -158,11 +286,30 @@ projectRoot = ""; targets = ( 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, + 14D21D691AA316CA000765B6 /* RZUtilsTestApp */, + 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 14D21D681AA316CA000765B6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 14D21D781AA316CA000765B6 /* Main.storyboard in Resources */, + 14D21D7D1AA316CA000765B6 /* LaunchScreen.xib in Resources */, + 14D21D7A1AA316CA000765B6 /* Images.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 14D21D801AA316CA000765B6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A8D4DF0196335CC00AFAB21 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -207,6 +354,23 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 14D21D661AA316CA000765B6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 14D21D721AA316CA000765B6 /* AppDelegate.m in Sources */, + 14D21D6F1AA316CA000765B6 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 14D21D7E1AA316CA000765B6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 14D21D891AA316CB000765B6 /* RZUtilsTestAppTests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 9A8D4DEE196335CC00AFAB21 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -218,7 +382,31 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 14D21D841AA316CB000765B6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 14D21D691AA316CA000765B6 /* RZUtilsTestApp */; + targetProxy = 14D21D831AA316CB000765B6 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ + 14D21D761AA316CA000765B6 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 14D21D771AA316CA000765B6 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 14D21D7B1AA316CA000765B6 /* LaunchScreen.xib */ = { + isa = PBXVariantGroup; + children = ( + 14D21D7C1AA316CA000765B6 /* Base */, + ); + name = LaunchScreen.xib; + sourceTree = ""; + }; 9A8D4DFC196335CC00AFAB21 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -230,6 +418,122 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 14D21D8B1AA316CB000765B6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 14D21D8C1AA316CB000765B6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 14D21D8D1AA316CB000765B6 /* Enterprise-QA */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTestApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = "Enterprise-QA"; + }; + 14D21D8F1AA316CB000765B6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTestAppTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + }; + name = Debug; + }; + 14D21D901AA316CB000765B6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTestAppTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + }; + name = Release; + }; + 14D21D911AA316CB000765B6 /* Enterprise-QA */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_WARN_UNREACHABLE_CODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = RZUtilsTestAppTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + }; + name = "Enterprise-QA"; + }; 9A8D4E01196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -398,6 +702,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 14D21D8A1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 14D21D8B1AA316CB000765B6 /* Debug */, + 14D21D8C1AA316CB000765B6 /* Release */, + 14D21D8D1AA316CB000765B6 /* Enterprise-QA */, + ); + defaultConfigurationIsVisible = 0; + }; + 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 14D21D8F1AA316CB000765B6 /* Debug */, + 14D21D901AA316CB000765B6 /* Release */, + 14D21D911AA316CB000765B6 /* Enterprise-QA */, + ); + defaultConfigurationIsVisible = 0; + }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; buildConfigurations = ( From eb401839b708ef780a9e7516fd373d089014967a Mon Sep 17 00:00:00 2001 From: seanoshea Date: Sun, 1 Mar 2015 09:49:10 +0000 Subject: [PATCH 05/21] Sharing the scheme which should make it easier to run for anyone picking up the project. --- .../xcschemes/RZUtilsTestApp.xcscheme | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTestApp.xcscheme diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTestApp.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTestApp.xcscheme new file mode 100644 index 0000000..c76f59a --- /dev/null +++ b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTestApp.xcscheme @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9ca40acf38c9e399a105bed1fe9dd7b26b8a1893 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Sun, 1 Mar 2015 12:17:36 +0000 Subject: [PATCH 06/21] Adding the auto layout tests to the test app project. Allows the tests to be run in iOS7 and iOS8. --- Tests/RZUtilsTestApp/AppDelegate.h | 16 -------- Tests/RZUtilsTestApp/AppDelegate.m | 22 ---------- Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.h | 35 ++++++++++++++++ Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.m | 41 +++++++++++++++++++ Tests/RZUtilsTestApp/main.m | 4 +- .../RZAutoLayoutHelpersTest.m | 14 +++---- .../RZUtilsTestAppTests/RZUtilsTestAppTests.m | 33 --------------- Tests/RZUtilsTests.xcodeproj/project.pbxproj | 41 +++++++++++++------ 8 files changed, 114 insertions(+), 92 deletions(-) delete mode 100644 Tests/RZUtilsTestApp/AppDelegate.h delete mode 100644 Tests/RZUtilsTestApp/AppDelegate.m create mode 100644 Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.h create mode 100644 Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.m rename Tests/{RZUtilsTests => RZUtilsTestAppTests}/RZAutoLayoutHelpersTest.m (98%) delete mode 100644 Tests/RZUtilsTestAppTests/RZUtilsTestAppTests.m diff --git a/Tests/RZUtilsTestApp/AppDelegate.h b/Tests/RZUtilsTestApp/AppDelegate.h deleted file mode 100644 index 16d4b9e..0000000 --- a/Tests/RZUtilsTestApp/AppDelegate.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// AppDelegate.h -// RZUtilsTestApp -// -// Created by Sean O Shea on 3/1/15. -// Copyright (c) 2015 Raizlabs. All rights reserved. -// - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end - diff --git a/Tests/RZUtilsTestApp/AppDelegate.m b/Tests/RZUtilsTestApp/AppDelegate.m deleted file mode 100644 index aa56ff6..0000000 --- a/Tests/RZUtilsTestApp/AppDelegate.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// AppDelegate.m -// RZUtilsTestApp -// -// Created by Sean O Shea on 3/1/15. -// Copyright (c) 2015 Raizlabs. All rights reserved. -// - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -@end diff --git a/Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.h b/Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.h new file mode 100644 index 0000000..c530c98 --- /dev/null +++ b/Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.h @@ -0,0 +1,35 @@ +// +// RZUtilsTestAppDelegate.h +// +// Created by Sean O'Shea on 3/1/15. + +// Copyright 2014 Raizlabs and other contributors +// http://raizlabs.com/ +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#import + +@interface RZUtilsTestAppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + +@end + diff --git a/Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.m b/Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.m new file mode 100644 index 0000000..81e45b2 --- /dev/null +++ b/Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.m @@ -0,0 +1,41 @@ +// +// RZUtilsTestAppDelegate.m +// +// Created by Sean O'Shea on 3/1/15. + +// Copyright 2014 Raizlabs and other contributors +// http://raizlabs.com/ +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#import "RZUtilsTestAppDelegate.h" + +@interface RZUtilsTestAppDelegate () + +@end + +@implementation RZUtilsTestAppDelegate + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Override point for customization after application launch. + return YES; +} + +@end diff --git a/Tests/RZUtilsTestApp/main.m b/Tests/RZUtilsTestApp/main.m index fa072aa..2c78b0e 100644 --- a/Tests/RZUtilsTestApp/main.m +++ b/Tests/RZUtilsTestApp/main.m @@ -7,10 +7,10 @@ // #import -#import "AppDelegate.h" +#import "RZUtilsTestAppDelegate.h" int main(int argc, char * argv[]) { @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + return UIApplicationMain(argc, argv, nil, NSStringFromClass([RZUtilsTestAppDelegate class])); } } diff --git a/Tests/RZUtilsTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m similarity index 98% rename from Tests/RZUtilsTests/RZAutoLayoutHelpersTest.m rename to Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index 7d73d16..1ce0012 100644 --- a/Tests/RZUtilsTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -1,7 +1,7 @@ // // RZAutoLayoutHelpersTest.m // -// Created by Sean O'Shea on 2/17/15. +// Created by Sean O'Shea on 3/1/15. // Copyright 2014 Raizlabs and other contributors // http://raizlabs.com/ @@ -38,7 +38,7 @@ @implementation RZAutoLayoutHelpersContainerView @end -@interface RZAutoLayoutHelpersTest : XCTestCase +@interface RZUtilsTestAppTests : XCTestCase @property (nonatomic) RZAutoLayoutHelpersContainerView *containerView; @property (nonatomic) UIView *testViewOne; @@ -52,7 +52,7 @@ @interface RZAutoLayoutHelpersTest : XCTestCase static CGFloat RZAutoLayoutHelpersTestAllowableDelta = 1.0f; -@implementation RZAutoLayoutHelpersTest +@implementation RZUtilsTestAppTests - (void)setUp { @@ -110,7 +110,7 @@ - (void)testCenteringViews XCTAssert([self roundedEquals:frameOne.origin.y valueTwo:375.0f]); XCTAssert([self roundedEquals:frameOne.size.width valueTwo:250.0f]); XCTAssert([self roundedEquals:frameOne.size.height valueTwo:250.0f]); - + XCTAssert([self roundedEquals:CGRectGetMidX(frameOne) valueTwo:500.0f]); XCTAssert([self roundedEquals:CGRectGetMidY(frameOne) valueTwo:500.0f]); @@ -133,7 +133,7 @@ - (void)testCenteringWithOffsetViews [self.testViewTwo rz_centerVerticallyInContainerWithOffset:RZAutoLayoutHelpersTestCenterOffset]; [self forceConstraintsEvaluation]; - + XCTAssert([self.testViewOne rz_pinnedCenterXConstraint] != nil); XCTAssert([self.testViewOne rz_pinnedCenterYConstraint] != nil); XCTAssert([self.testViewTwo rz_pinnedCenterXConstraint] != nil); @@ -189,9 +189,9 @@ - (void)testPinningViews { XCTAssert([self roundedEquals:frameOne.origin.y valueTwo:0.0f]); XCTAssert([self roundedEquals:frameOne.size.width valueTwo:RZAutoLayoutHelpersTestContainerWidth]); XCTAssert([self roundedEquals:frameOne.size.height valueTwo:RZAutoLayoutHelpersTestContainerHeight]); - + CGRect frameTwo = self.testViewTwo.frame; - + XCTAssert([self roundedEquals:frameTwo.origin.x valueTwo:17.0f]); XCTAssert([self roundedEquals:frameTwo.origin.y valueTwo:21.0f]); XCTAssert([self roundedEquals:frameTwo.size.width valueTwo:962.0f]); diff --git a/Tests/RZUtilsTestAppTests/RZUtilsTestAppTests.m b/Tests/RZUtilsTestAppTests/RZUtilsTestAppTests.m deleted file mode 100644 index 838b507..0000000 --- a/Tests/RZUtilsTestAppTests/RZUtilsTestAppTests.m +++ /dev/null @@ -1,33 +0,0 @@ -// -// RZUtilsTestAppTests.m -// RZUtilsTestAppTests -// -// Created by Sean O Shea on 3/1/15. -// Copyright (c) 2015 Raizlabs. All rights reserved. -// - -#import -#import - -@interface RZUtilsTestAppTests : XCTestCase - -@end - -@implementation RZUtilsTestAppTests - -- (void)setUp { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the class. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testExample { - // This is an example of a functional test case. - XCTAssert(YES, @"Pass"); -} - -@end diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index e8a864c..392ddf8 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -8,11 +8,11 @@ /* Begin PBXBuildFile section */ 14D21D6F1AA316CA000765B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D6E1AA316CA000765B6 /* main.m */; }; - 14D21D721AA316CA000765B6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* AppDelegate.m */; }; + 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */; }; 14D21D781AA316CA000765B6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D761AA316CA000765B6 /* Main.storyboard */; }; 14D21D7A1AA316CA000765B6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D791AA316CA000765B6 /* Images.xcassets */; }; 14D21D7D1AA316CA000765B6 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D7B1AA316CA000765B6 /* LaunchScreen.xib */; }; - 14D21D891AA316CB000765B6 /* RZUtilsTestAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D881AA316CB000765B6 /* RZUtilsTestAppTests.m */; }; + 14D21D891AA316CB000765B6 /* RZAutoLayoutHelpersTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D881AA316CB000765B6 /* RZAutoLayoutHelpersTest.m */; }; 7A175505AE684DAFB8613F72 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BAB0697B95400AAAD3740C /* libPods.a */; }; 9A8D4DF4196335CC00AFAB21 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DF3196335CC00AFAB21 /* XCTest.framework */; }; 9A8D4DF5196335CC00AFAB21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A8D4DD1196335CC00AFAB21 /* Foundation.framework */; }; @@ -30,21 +30,27 @@ remoteGlobalIDString = 14D21D691AA316CA000765B6; remoteInfo = RZUtilsTestApp; }; + 14D21D931AA31A3F000765B6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; + remoteInfo = RZUtilsTests; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 14D21D6A1AA316CA000765B6 /* RZUtilsTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RZUtilsTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 14D21D6D1AA316CA000765B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 14D21D6E1AA316CA000765B6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 14D21D701AA316CA000765B6 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 14D21D711AA316CA000765B6 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 14D21D701AA316CA000765B6 /* RZUtilsTestAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RZUtilsTestAppDelegate.h; sourceTree = ""; }; + 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RZUtilsTestAppDelegate.m; sourceTree = ""; }; 14D21D771AA316CA000765B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 14D21D791AA316CA000765B6 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 14D21D7C1AA316CA000765B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 14D21D821AA316CA000765B6 /* RZUtilsTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RZUtilsTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 14D21D871AA316CB000765B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 14D21D881AA316CB000765B6 /* RZUtilsTestAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RZUtilsTestAppTests.m; sourceTree = ""; }; - 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZAutoLayoutHelpersTest.m; sourceTree = ""; }; + 14D21D881AA316CB000765B6 /* RZAutoLayoutHelpersTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RZAutoLayoutHelpersTest.m; sourceTree = ""; }; 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; 22BAB0697B95400AAAD3740C /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 6C14FC1B7EEB65A025DD17AB /* Pods.enterprise-qa.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods.enterprise-qa.xcconfig"; path = "Pods/Target Support Files/Pods/Pods.enterprise-qa.xcconfig"; sourceTree = ""; }; @@ -94,8 +100,8 @@ 14D21D6B1AA316CA000765B6 /* RZUtilsTestApp */ = { isa = PBXGroup; children = ( - 14D21D701AA316CA000765B6 /* AppDelegate.h */, - 14D21D711AA316CA000765B6 /* AppDelegate.m */, + 14D21D701AA316CA000765B6 /* RZUtilsTestAppDelegate.h */, + 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */, 14D21D761AA316CA000765B6 /* Main.storyboard */, 14D21D791AA316CA000765B6 /* Images.xcassets */, 14D21D7B1AA316CA000765B6 /* LaunchScreen.xib */, @@ -116,7 +122,7 @@ 14D21D851AA316CB000765B6 /* RZUtilsTestAppTests */ = { isa = PBXGroup; children = ( - 14D21D881AA316CB000765B6 /* RZUtilsTestAppTests.m */, + 14D21D881AA316CB000765B6 /* RZAutoLayoutHelpersTest.m */, 14D21D861AA316CB000765B6 /* Supporting Files */, ); path = RZUtilsTestAppTests; @@ -178,7 +184,6 @@ 9A8D4DF9196335CC00AFAB21 /* RZUtilsTests */ = { isa = PBXGroup; children = ( - 14E90DFF1A931CB10085702C /* RZAutoLayoutHelpersTest.m */, D4874DA019918C46003EEC4B /* RZAutoLayoutTests.m */, 9A8D4EB51963431900AFAB21 /* RZBlockKVOTests.m */, 9A8D4DFA196335CC00AFAB21 /* Supporting Files */, @@ -210,6 +215,7 @@ buildRules = ( ); dependencies = ( + 14D21D941AA31A3F000765B6 /* PBXTargetDependency */, ); name = RZUtilsTestApp; productName = RZUtilsTestApp; @@ -358,7 +364,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 14D21D721AA316CA000765B6 /* AppDelegate.m in Sources */, + 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */, 14D21D6F1AA316CA000765B6 /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -367,7 +373,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 14D21D891AA316CB000765B6 /* RZUtilsTestAppTests.m in Sources */, + 14D21D891AA316CB000765B6 /* RZAutoLayoutHelpersTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -388,6 +394,11 @@ target = 14D21D691AA316CA000765B6 /* RZUtilsTestApp */; targetProxy = 14D21D831AA316CB000765B6 /* PBXContainerItemProxy */; }; + 14D21D941AA31A3F000765B6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; + targetProxy = 14D21D931AA31A3F000765B6 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -420,6 +431,7 @@ /* Begin XCBuildConfiguration section */ 14D21D8B1AA316CB000765B6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 7F351ABFC52A252FD16A17B2 /* Pods.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -440,6 +452,7 @@ }; 14D21D8C1AA316CB000765B6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -456,6 +469,7 @@ }; 14D21D8D1AA316CB000765B6 /* Enterprise-QA */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 6C14FC1B7EEB65A025DD17AB /* Pods.enterprise-qa.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -472,6 +486,7 @@ }; 14D21D8F1AA316CB000765B6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 7F351ABFC52A252FD16A17B2 /* Pods.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -496,6 +511,7 @@ }; 14D21D901AA316CB000765B6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -516,6 +532,7 @@ }; 14D21D911AA316CB000765B6 /* Enterprise-QA */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 6C14FC1B7EEB65A025DD17AB /* Pods.enterprise-qa.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_WARN_UNREACHABLE_CODE = YES; From f4c2cc93dec92041946ee3046f53166612a86e0f Mon Sep 17 00:00:00 2001 From: seanoshea Date: Mon, 2 Mar 2015 19:18:26 +0000 Subject: [PATCH 07/21] Per code review comments - should only need to invoke layoutIfNeeded --- Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m | 1 - 1 file changed, 1 deletion(-) diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index 1ce0012..1398904 100644 --- a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -86,7 +86,6 @@ - (void)forceConstraintsEvaluationForAllSubviewsOfView:(UIView *)view for (UIView *subview in view.subviews) { [self forceConstraintsEvaluationForAllSubviewsOfView:subview]; } - [view setNeedsLayout]; [view layoutIfNeeded]; } From 689af6e99b6680376a24b3cc8c4274c42e5a1000 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Mon, 2 Mar 2015 19:30:21 +0000 Subject: [PATCH 08/21] Switching to XCTAssertEqualWithAccuracy --- .../RZAutoLayoutHelpersTest.m | 71 +++++++++---------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index 1398904..74aa84a 100644 --- a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -105,23 +105,23 @@ - (void)testCenteringViews CGRect frameOne = self.testViewOne.frame; - XCTAssert([self roundedEquals:frameOne.origin.x valueTwo:375.0f]); - XCTAssert([self roundedEquals:frameOne.origin.y valueTwo:375.0f]); - XCTAssert([self roundedEquals:frameOne.size.width valueTwo:250.0f]); - XCTAssert([self roundedEquals:frameOne.size.height valueTwo:250.0f]); + XCTAssertEqualWithAccuracy(frameOne.origin.x, 375.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.origin.y, 375.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.size.width, 250.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.size.height, 250.0f, RZAutoLayoutHelpersTestAllowableDelta); - XCTAssert([self roundedEquals:CGRectGetMidX(frameOne) valueTwo:500.0f]); - XCTAssert([self roundedEquals:CGRectGetMidY(frameOne) valueTwo:500.0f]); + XCTAssertEqualWithAccuracy(CGRectGetMidX(frameOne), 500.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(CGRectGetMidY(frameOne), 500.0f, RZAutoLayoutHelpersTestAllowableDelta); CGRect frameTwo = self.testViewTwo.frame; - XCTAssert([self roundedEquals:frameTwo.origin.x valueTwo:412.5f]); - XCTAssert([self roundedEquals:frameTwo.origin.y valueTwo:335.0f]); - XCTAssert([self roundedEquals:frameTwo.size.width valueTwo:175.0f]); - XCTAssert([self roundedEquals:frameTwo.size.height valueTwo:330.0f]); + XCTAssertEqualWithAccuracy(frameTwo.origin.x, 412.5f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.origin.y, 335.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.size.width, 175.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.size.height, 330.0f, RZAutoLayoutHelpersTestAllowableDelta); - XCTAssert([self roundedEquals:CGRectGetMidX(frameTwo) valueTwo:500.0f]); - XCTAssert([self roundedEquals:CGRectGetMidY(frameTwo) valueTwo:500.0f]); + XCTAssertEqualWithAccuracy(CGRectGetMidX(frameTwo), 500.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(CGRectGetMidY(frameTwo), 500.0f, RZAutoLayoutHelpersTestAllowableDelta); } - (void)testCenteringWithOffsetViews @@ -140,23 +140,23 @@ - (void)testCenteringWithOffsetViews CGRect frameOne = self.testViewOne.frame; - XCTAssert([self roundedEquals:frameOne.origin.x valueTwo:397.0f]); - XCTAssert([self roundedEquals:frameOne.origin.y valueTwo:397.0f]); - XCTAssert([self roundedEquals:frameOne.size.width valueTwo:250.0f]); - XCTAssert([self roundedEquals:frameOne.size.height valueTwo:250.0f]); + XCTAssertEqualWithAccuracy(frameOne.origin.x, 397.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.origin.y, 397.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.size.width, 250.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.size.height, 250.0f, RZAutoLayoutHelpersTestAllowableDelta); - XCTAssert([self roundedEquals:CGRectGetMidX(frameOne) valueTwo:522.0f]); - XCTAssert([self roundedEquals:CGRectGetMidY(frameOne) valueTwo:522.0f]); + XCTAssertEqualWithAccuracy(CGRectGetMidX(frameOne), 522.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(CGRectGetMidY(frameOne), 522.0f, RZAutoLayoutHelpersTestAllowableDelta); CGRect frameTwo = self.testViewTwo.frame; - XCTAssert([self roundedEquals:frameTwo.origin.x valueTwo:434.5f]); - XCTAssert([self roundedEquals:frameTwo.origin.y valueTwo:357.0f]); - XCTAssert([self roundedEquals:frameTwo.size.width valueTwo:175.0f]); - XCTAssert([self roundedEquals:frameTwo.size.height valueTwo:330.0f]); + XCTAssertEqualWithAccuracy(frameTwo.origin.x, 434.5f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.origin.y, 357.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.size.width, 175.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.size.height, 330.0f, RZAutoLayoutHelpersTestAllowableDelta); - XCTAssert([self roundedEquals:CGRectGetMidX(frameTwo) valueTwo:522.0f]); - XCTAssert([self roundedEquals:CGRectGetMidY(frameTwo) valueTwo:522.0f]); + XCTAssertEqualWithAccuracy(CGRectGetMidX(frameTwo), 522.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(CGRectGetMidY(frameTwo), 522.0f, RZAutoLayoutHelpersTestAllowableDelta); } - (void)testPinningViews { @@ -184,22 +184,19 @@ - (void)testPinningViews { CGRect frameOne = self.testViewOne.frame; - XCTAssert([self roundedEquals:frameOne.origin.x valueTwo:0.0f]); - XCTAssert([self roundedEquals:frameOne.origin.y valueTwo:0.0f]); - XCTAssert([self roundedEquals:frameOne.size.width valueTwo:RZAutoLayoutHelpersTestContainerWidth]); - XCTAssert([self roundedEquals:frameOne.size.height valueTwo:RZAutoLayoutHelpersTestContainerHeight]); + XCTAssertEqualWithAccuracy(frameOne.origin.x, 0.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.origin.y, 0.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.size.width, RZAutoLayoutHelpersTestContainerWidth, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameOne.size.height, RZAutoLayoutHelpersTestContainerHeight, RZAutoLayoutHelpersTestAllowableDelta); CGRect frameTwo = self.testViewTwo.frame; - XCTAssert([self roundedEquals:frameTwo.origin.x valueTwo:17.0f]); - XCTAssert([self roundedEquals:frameTwo.origin.y valueTwo:21.0f]); - XCTAssert([self roundedEquals:frameTwo.size.width valueTwo:962.0f]); - XCTAssert([self roundedEquals:frameTwo.size.height valueTwo:962.0f]); -} - -- (BOOL)roundedEquals:(CGFloat)valueOne valueTwo:(CGFloat)valueTwo { - // accommodates for rounding issues which happen when unit tests are run on an iPhone 6 Plus - return fabs((valueOne) - (valueTwo)) < RZAutoLayoutHelpersTestAllowableDelta; + XCTAssertEqualWithAccuracy(frameTwo.origin.x, 17.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.origin.y, 21.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.size.width, 962.0f, RZAutoLayoutHelpersTestAllowableDelta); + XCTAssertEqualWithAccuracy(frameTwo.size.height, 962.0f, RZAutoLayoutHelpersTestAllowableDelta); + + XCTAssertEqualWithAccuracy(frameTwo.origin.x, 17.0f, RZAutoLayoutHelpersTestAllowableDelta); } @end From 890e24ec48e672d4e74475a31658bcf054322685 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Mon, 2 Mar 2015 19:37:09 +0000 Subject: [PATCH 09/21] Reducing the allowable delta. --- .../RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index 74aa84a..b29c6b0 100644 --- a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -30,12 +30,21 @@ #import "UIView+RZAutoLayoutHelpers.h" +static CGFloat RZAutoLayoutHelpersTestContainerWidth = 1000.0f; +static CGFloat RZAutoLayoutHelpersTestContainerHeight = 1000.0f; +static CGFloat RZAutoLayoutHelpersTestCenterOffset = 22.0f; +static CGFloat RZAutoLayoutHelpersTestAllowableDelta = 0.5f; + @interface RZAutoLayoutHelpersContainerView : UIView @end @implementation RZAutoLayoutHelpersContainerView +- (CGSize)intrinsicContentSize { + return CGSizeMake(RZAutoLayoutHelpersTestContainerWidth, RZAutoLayoutHelpersTestContainerHeight); +} + @end @interface RZUtilsTestAppTests : XCTestCase @@ -46,12 +55,6 @@ @interface RZUtilsTestAppTests : XCTestCase @end -static CGFloat RZAutoLayoutHelpersTestContainerWidth = 1000.0f; -static CGFloat RZAutoLayoutHelpersTestContainerHeight = 1000.0f; -static CGFloat RZAutoLayoutHelpersTestCenterOffset = 22.0f; - -static CGFloat RZAutoLayoutHelpersTestAllowableDelta = 1.0f; - @implementation RZUtilsTestAppTests - (void)setUp From 5327af89d1f6e29fde32b9cc37832b80afee6c26 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Wed, 4 Mar 2015 23:37:31 +0000 Subject: [PATCH 10/21] Adding an aggregate target to run all the tests. --- Rakefile | 12 +-- Tests/RZUtilsTests.xcodeproj/project.pbxproj | 75 ++++++++++++++++++ .../xcschemes/RZUtilsAllTests.xcscheme | 77 +++++++++++++++++++ 3 files changed, 158 insertions(+), 6 deletions(-) create mode 100644 Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme diff --git a/Rakefile b/Rakefile index 6f9cb4a..40d398a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,14 +1,14 @@ TEST_PROJ_PATH="Tests/RZUtilsTests.xcodeproj" TEST_WORKSPACE_PATH="Tests/RZUtilsTests.xcworkspace" -TEST_SCHEME="RZUtilsTests" +TEST_SCHEME="RZUtilsAllTests" # # Install # namespace :install do - + task :tools do # don't care if this fails on travis sh("brew update") rescue nil @@ -19,7 +19,7 @@ namespace :install do task :pods do sh("cd Tests && pod install") end - + end task :install do @@ -50,17 +50,17 @@ end # namespace :clean do - + task :pods do sh("rm -f Tests/Podfile.lock") sh "rm -rf Tests/Pods" sh("rm -rf Tests/*.xcworkspace") end - + task :tests do sh("xctool -project '#{TEST_PROJ_PATH}' -scheme '#{TEST_SCHEME}' -sdk iphonesimulator clean") rescue nil end - + end task :clean do diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index 392ddf8..118d9bb 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -6,6 +6,21 @@ objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + 14FB17091AA7CD95003FDDB8 /* RZUtilsAllTests */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 14FB170A1AA7CD95003FDDB8 /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */; + buildPhases = ( + ); + dependencies = ( + 14FB170F1AA7CD9E003FDDB8 /* PBXTargetDependency */, + 14FB17111AA7CD9E003FDDB8 /* PBXTargetDependency */, + ); + name = RZUtilsAllTests; + productName = RZUtilsAllTests; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 14D21D6F1AA316CA000765B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D6E1AA316CA000765B6 /* main.m */; }; 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */; }; @@ -37,6 +52,20 @@ remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; remoteInfo = RZUtilsTests; }; + 14FB170E1AA7CD9E003FDDB8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; + remoteInfo = RZUtilsTests; + }; + 14FB17101AA7CD9E003FDDB8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 14D21D811AA316CA000765B6; + remoteInfo = RZUtilsTestAppTests; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -276,6 +305,9 @@ CreatedOnToolsVersion = 6.0.1; TestTargetID = 14D21D691AA316CA000765B6; }; + 14FB17091AA7CD95003FDDB8 = { + CreatedOnToolsVersion = 6.0.1; + }; }; }; buildConfigurationList = 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */; @@ -294,6 +326,7 @@ 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, 14D21D691AA316CA000765B6 /* RZUtilsTestApp */, 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */, + 14FB17091AA7CD95003FDDB8 /* RZUtilsAllTests */, ); }; /* End PBXProject section */ @@ -399,6 +432,16 @@ target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; targetProxy = 14D21D931AA31A3F000765B6 /* PBXContainerItemProxy */; }; + 14FB170F1AA7CD9E003FDDB8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; + targetProxy = 14FB170E1AA7CD9E003FDDB8 /* PBXContainerItemProxy */; + }; + 14FB17111AA7CD9E003FDDB8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */; + targetProxy = 14FB17101AA7CD9E003FDDB8 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -551,6 +594,27 @@ }; name = "Enterprise-QA"; }; + 14FB170B1AA7CD95003FDDB8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 14FB170C1AA7CD95003FDDB8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 14FB170D1AA7CD95003FDDB8 /* Enterprise-QA */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Enterprise-QA"; + }; 9A8D4E01196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -727,6 +791,7 @@ 14D21D8D1AA316CB000765B6 /* Enterprise-QA */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */ = { isa = XCConfigurationList; @@ -736,6 +801,16 @@ 14D21D911AA316CB000765B6 /* Enterprise-QA */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 14FB170A1AA7CD95003FDDB8 /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 14FB170B1AA7CD95003FDDB8 /* Debug */, + 14FB170C1AA7CD95003FDDB8 /* Release */, + 14FB170D1AA7CD95003FDDB8 /* Enterprise-QA */, + ); + defaultConfigurationIsVisible = 0; }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme new file mode 100644 index 0000000..06d0544 --- /dev/null +++ b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 88c4f768214bbba12fee0f4246f7606c4eb5f530 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 19:45:37 +0000 Subject: [PATCH 11/21] Silencing some autolayout error on the command line. --- .../RZAutoLayoutHelpersTest.m | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index b29c6b0..e9dd3c4 100644 --- a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -47,11 +47,35 @@ - (CGSize)intrinsicContentSize { @end +@interface RZTestViewOne : UIView + +@end + +@implementation RZTestViewOne + +- (CGSize)intrinsicContentSize { + return CGSizeMake(250.0f, 250.0f); +} + +@end + +@interface RZTestViewTwo : UIView + +@end + +@implementation RZTestViewTwo + +- (CGSize)intrinsicContentSize { + return CGSizeMake(175.0f, 330.0f); +} + +@end + @interface RZUtilsTestAppTests : XCTestCase @property (nonatomic) RZAutoLayoutHelpersContainerView *containerView; -@property (nonatomic) UIView *testViewOne; -@property (nonatomic) UIView *testViewTwo; +@property (nonatomic) RZTestViewOne *testViewOne; +@property (nonatomic) RZTestViewTwo *testViewTwo; @end @@ -63,12 +87,10 @@ - (void)setUp self.containerView = [[RZAutoLayoutHelpersContainerView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, RZAutoLayoutHelpersTestContainerWidth, RZAutoLayoutHelpersTestContainerHeight)]; self.containerView.translatesAutoresizingMaskIntoConstraints = NO; - self.testViewOne = [[UIView alloc] init]; - self.testViewTwo = [[UIView alloc] init]; + self.testViewOne = [[RZTestViewOne alloc] init]; + self.testViewTwo = [[RZTestViewTwo alloc] init]; self.testViewOne.translatesAutoresizingMaskIntoConstraints = NO; self.testViewTwo.translatesAutoresizingMaskIntoConstraints = NO; - [self.testViewOne rz_pinSizeTo:CGSizeMake(250.0f, 250.0f)]; - [self.testViewTwo rz_pinSizeTo:CGSizeMake(175.0f, 330.0f)]; [self.containerView addSubview:self.testViewOne]; [self.containerView addSubview:self.testViewTwo]; From e5060622904597e8db9e02dde6fa3fdad48f0af3 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 19:54:50 +0000 Subject: [PATCH 12/21] Revert "Silencing some autolayout error on the command line." This reverts commit 88c4f768214bbba12fee0f4246f7606c4eb5f530. --- .../RZAutoLayoutHelpersTest.m | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index e9dd3c4..b29c6b0 100644 --- a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -47,35 +47,11 @@ - (CGSize)intrinsicContentSize { @end -@interface RZTestViewOne : UIView - -@end - -@implementation RZTestViewOne - -- (CGSize)intrinsicContentSize { - return CGSizeMake(250.0f, 250.0f); -} - -@end - -@interface RZTestViewTwo : UIView - -@end - -@implementation RZTestViewTwo - -- (CGSize)intrinsicContentSize { - return CGSizeMake(175.0f, 330.0f); -} - -@end - @interface RZUtilsTestAppTests : XCTestCase @property (nonatomic) RZAutoLayoutHelpersContainerView *containerView; -@property (nonatomic) RZTestViewOne *testViewOne; -@property (nonatomic) RZTestViewTwo *testViewTwo; +@property (nonatomic) UIView *testViewOne; +@property (nonatomic) UIView *testViewTwo; @end @@ -87,10 +63,12 @@ - (void)setUp self.containerView = [[RZAutoLayoutHelpersContainerView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, RZAutoLayoutHelpersTestContainerWidth, RZAutoLayoutHelpersTestContainerHeight)]; self.containerView.translatesAutoresizingMaskIntoConstraints = NO; - self.testViewOne = [[RZTestViewOne alloc] init]; - self.testViewTwo = [[RZTestViewTwo alloc] init]; + self.testViewOne = [[UIView alloc] init]; + self.testViewTwo = [[UIView alloc] init]; self.testViewOne.translatesAutoresizingMaskIntoConstraints = NO; self.testViewTwo.translatesAutoresizingMaskIntoConstraints = NO; + [self.testViewOne rz_pinSizeTo:CGSizeMake(250.0f, 250.0f)]; + [self.testViewTwo rz_pinSizeTo:CGSizeMake(175.0f, 330.0f)]; [self.containerView addSubview:self.testViewOne]; [self.containerView addSubview:self.testViewTwo]; From 36fb1dbb99419e6219f63011832e39fd56597621 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 19:54:57 +0000 Subject: [PATCH 13/21] Revert "Adding an aggregate target to run all the tests." This reverts commit 5327af89d1f6e29fde32b9cc37832b80afee6c26. --- Rakefile | 12 +-- Tests/RZUtilsTests.xcodeproj/project.pbxproj | 75 ------------------ .../xcschemes/RZUtilsAllTests.xcscheme | 77 ------------------- 3 files changed, 6 insertions(+), 158 deletions(-) delete mode 100644 Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme diff --git a/Rakefile b/Rakefile index 40d398a..6f9cb4a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,14 +1,14 @@ TEST_PROJ_PATH="Tests/RZUtilsTests.xcodeproj" TEST_WORKSPACE_PATH="Tests/RZUtilsTests.xcworkspace" -TEST_SCHEME="RZUtilsAllTests" +TEST_SCHEME="RZUtilsTests" # # Install # namespace :install do - + task :tools do # don't care if this fails on travis sh("brew update") rescue nil @@ -19,7 +19,7 @@ namespace :install do task :pods do sh("cd Tests && pod install") end - + end task :install do @@ -50,17 +50,17 @@ end # namespace :clean do - + task :pods do sh("rm -f Tests/Podfile.lock") sh "rm -rf Tests/Pods" sh("rm -rf Tests/*.xcworkspace") end - + task :tests do sh("xctool -project '#{TEST_PROJ_PATH}' -scheme '#{TEST_SCHEME}' -sdk iphonesimulator clean") rescue nil end - + end task :clean do diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index 118d9bb..392ddf8 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -6,21 +6,6 @@ objectVersion = 46; objects = { -/* Begin PBXAggregateTarget section */ - 14FB17091AA7CD95003FDDB8 /* RZUtilsAllTests */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 14FB170A1AA7CD95003FDDB8 /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */; - buildPhases = ( - ); - dependencies = ( - 14FB170F1AA7CD9E003FDDB8 /* PBXTargetDependency */, - 14FB17111AA7CD9E003FDDB8 /* PBXTargetDependency */, - ); - name = RZUtilsAllTests; - productName = RZUtilsAllTests; - }; -/* End PBXAggregateTarget section */ - /* Begin PBXBuildFile section */ 14D21D6F1AA316CA000765B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D6E1AA316CA000765B6 /* main.m */; }; 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */; }; @@ -52,20 +37,6 @@ remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; remoteInfo = RZUtilsTests; }; - 14FB170E1AA7CD9E003FDDB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; - remoteInfo = RZUtilsTests; - }; - 14FB17101AA7CD9E003FDDB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 14D21D811AA316CA000765B6; - remoteInfo = RZUtilsTestAppTests; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -305,9 +276,6 @@ CreatedOnToolsVersion = 6.0.1; TestTargetID = 14D21D691AA316CA000765B6; }; - 14FB17091AA7CD95003FDDB8 = { - CreatedOnToolsVersion = 6.0.1; - }; }; }; buildConfigurationList = 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */; @@ -326,7 +294,6 @@ 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, 14D21D691AA316CA000765B6 /* RZUtilsTestApp */, 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */, - 14FB17091AA7CD95003FDDB8 /* RZUtilsAllTests */, ); }; /* End PBXProject section */ @@ -432,16 +399,6 @@ target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; targetProxy = 14D21D931AA31A3F000765B6 /* PBXContainerItemProxy */; }; - 14FB170F1AA7CD9E003FDDB8 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; - targetProxy = 14FB170E1AA7CD9E003FDDB8 /* PBXContainerItemProxy */; - }; - 14FB17111AA7CD9E003FDDB8 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */; - targetProxy = 14FB17101AA7CD9E003FDDB8 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -594,27 +551,6 @@ }; name = "Enterprise-QA"; }; - 14FB170B1AA7CD95003FDDB8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 14FB170C1AA7CD95003FDDB8 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 14FB170D1AA7CD95003FDDB8 /* Enterprise-QA */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Enterprise-QA"; - }; 9A8D4E01196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -791,7 +727,6 @@ 14D21D8D1AA316CB000765B6 /* Enterprise-QA */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; }; 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */ = { isa = XCConfigurationList; @@ -801,16 +736,6 @@ 14D21D911AA316CB000765B6 /* Enterprise-QA */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 14FB170A1AA7CD95003FDDB8 /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 14FB170B1AA7CD95003FDDB8 /* Debug */, - 14FB170C1AA7CD95003FDDB8 /* Release */, - 14FB170D1AA7CD95003FDDB8 /* Enterprise-QA */, - ); - defaultConfigurationIsVisible = 0; }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme deleted file mode 100644 index 06d0544..0000000 --- a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 45aa9f71d2fc30df2341e0340c8d902d0e1ab691 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 19:55:53 +0000 Subject: [PATCH 14/21] Revert "Revert "Adding an aggregate target to run all the tests."" This reverts commit 36fb1dbb99419e6219f63011832e39fd56597621. --- Rakefile | 12 +-- Tests/RZUtilsTests.xcodeproj/project.pbxproj | 75 ++++++++++++++++++ .../xcschemes/RZUtilsAllTests.xcscheme | 77 +++++++++++++++++++ 3 files changed, 158 insertions(+), 6 deletions(-) create mode 100644 Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme diff --git a/Rakefile b/Rakefile index 6f9cb4a..40d398a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,14 +1,14 @@ TEST_PROJ_PATH="Tests/RZUtilsTests.xcodeproj" TEST_WORKSPACE_PATH="Tests/RZUtilsTests.xcworkspace" -TEST_SCHEME="RZUtilsTests" +TEST_SCHEME="RZUtilsAllTests" # # Install # namespace :install do - + task :tools do # don't care if this fails on travis sh("brew update") rescue nil @@ -19,7 +19,7 @@ namespace :install do task :pods do sh("cd Tests && pod install") end - + end task :install do @@ -50,17 +50,17 @@ end # namespace :clean do - + task :pods do sh("rm -f Tests/Podfile.lock") sh "rm -rf Tests/Pods" sh("rm -rf Tests/*.xcworkspace") end - + task :tests do sh("xctool -project '#{TEST_PROJ_PATH}' -scheme '#{TEST_SCHEME}' -sdk iphonesimulator clean") rescue nil end - + end task :clean do diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index 392ddf8..118d9bb 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -6,6 +6,21 @@ objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + 14FB17091AA7CD95003FDDB8 /* RZUtilsAllTests */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 14FB170A1AA7CD95003FDDB8 /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */; + buildPhases = ( + ); + dependencies = ( + 14FB170F1AA7CD9E003FDDB8 /* PBXTargetDependency */, + 14FB17111AA7CD9E003FDDB8 /* PBXTargetDependency */, + ); + name = RZUtilsAllTests; + productName = RZUtilsAllTests; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 14D21D6F1AA316CA000765B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D6E1AA316CA000765B6 /* main.m */; }; 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */; }; @@ -37,6 +52,20 @@ remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; remoteInfo = RZUtilsTests; }; + 14FB170E1AA7CD9E003FDDB8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; + remoteInfo = RZUtilsTests; + }; + 14FB17101AA7CD9E003FDDB8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 14D21D811AA316CA000765B6; + remoteInfo = RZUtilsTestAppTests; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -276,6 +305,9 @@ CreatedOnToolsVersion = 6.0.1; TestTargetID = 14D21D691AA316CA000765B6; }; + 14FB17091AA7CD95003FDDB8 = { + CreatedOnToolsVersion = 6.0.1; + }; }; }; buildConfigurationList = 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */; @@ -294,6 +326,7 @@ 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, 14D21D691AA316CA000765B6 /* RZUtilsTestApp */, 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */, + 14FB17091AA7CD95003FDDB8 /* RZUtilsAllTests */, ); }; /* End PBXProject section */ @@ -399,6 +432,16 @@ target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; targetProxy = 14D21D931AA31A3F000765B6 /* PBXContainerItemProxy */; }; + 14FB170F1AA7CD9E003FDDB8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; + targetProxy = 14FB170E1AA7CD9E003FDDB8 /* PBXContainerItemProxy */; + }; + 14FB17111AA7CD9E003FDDB8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */; + targetProxy = 14FB17101AA7CD9E003FDDB8 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -551,6 +594,27 @@ }; name = "Enterprise-QA"; }; + 14FB170B1AA7CD95003FDDB8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 14FB170C1AA7CD95003FDDB8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 14FB170D1AA7CD95003FDDB8 /* Enterprise-QA */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Enterprise-QA"; + }; 9A8D4E01196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -727,6 +791,7 @@ 14D21D8D1AA316CB000765B6 /* Enterprise-QA */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */ = { isa = XCConfigurationList; @@ -736,6 +801,16 @@ 14D21D911AA316CB000765B6 /* Enterprise-QA */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 14FB170A1AA7CD95003FDDB8 /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 14FB170B1AA7CD95003FDDB8 /* Debug */, + 14FB170C1AA7CD95003FDDB8 /* Release */, + 14FB170D1AA7CD95003FDDB8 /* Enterprise-QA */, + ); + defaultConfigurationIsVisible = 0; }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme new file mode 100644 index 0000000..06d0544 --- /dev/null +++ b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 67c4d60a5879b2b3b27e33f792742597589f8e6f Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 19:55:56 +0000 Subject: [PATCH 15/21] Revert "Revert "Silencing some autolayout error on the command line."" This reverts commit e5060622904597e8db9e02dde6fa3fdad48f0af3. --- .../RZAutoLayoutHelpersTest.m | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index b29c6b0..e9dd3c4 100644 --- a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -47,11 +47,35 @@ - (CGSize)intrinsicContentSize { @end +@interface RZTestViewOne : UIView + +@end + +@implementation RZTestViewOne + +- (CGSize)intrinsicContentSize { + return CGSizeMake(250.0f, 250.0f); +} + +@end + +@interface RZTestViewTwo : UIView + +@end + +@implementation RZTestViewTwo + +- (CGSize)intrinsicContentSize { + return CGSizeMake(175.0f, 330.0f); +} + +@end + @interface RZUtilsTestAppTests : XCTestCase @property (nonatomic) RZAutoLayoutHelpersContainerView *containerView; -@property (nonatomic) UIView *testViewOne; -@property (nonatomic) UIView *testViewTwo; +@property (nonatomic) RZTestViewOne *testViewOne; +@property (nonatomic) RZTestViewTwo *testViewTwo; @end @@ -63,12 +87,10 @@ - (void)setUp self.containerView = [[RZAutoLayoutHelpersContainerView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, RZAutoLayoutHelpersTestContainerWidth, RZAutoLayoutHelpersTestContainerHeight)]; self.containerView.translatesAutoresizingMaskIntoConstraints = NO; - self.testViewOne = [[UIView alloc] init]; - self.testViewTwo = [[UIView alloc] init]; + self.testViewOne = [[RZTestViewOne alloc] init]; + self.testViewTwo = [[RZTestViewTwo alloc] init]; self.testViewOne.translatesAutoresizingMaskIntoConstraints = NO; self.testViewTwo.translatesAutoresizingMaskIntoConstraints = NO; - [self.testViewOne rz_pinSizeTo:CGSizeMake(250.0f, 250.0f)]; - [self.testViewTwo rz_pinSizeTo:CGSizeMake(175.0f, 330.0f)]; [self.containerView addSubview:self.testViewOne]; [self.containerView addSubview:self.testViewTwo]; From f330e37e15aa367749b17a0ca4902a4ad3dd32d3 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 19:55:57 +0000 Subject: [PATCH 16/21] Revert "Silencing some autolayout error on the command line." This reverts commit 88c4f768214bbba12fee0f4246f7606c4eb5f530. --- .../RZAutoLayoutHelpersTest.m | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index e9dd3c4..b29c6b0 100644 --- a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -47,35 +47,11 @@ - (CGSize)intrinsicContentSize { @end -@interface RZTestViewOne : UIView - -@end - -@implementation RZTestViewOne - -- (CGSize)intrinsicContentSize { - return CGSizeMake(250.0f, 250.0f); -} - -@end - -@interface RZTestViewTwo : UIView - -@end - -@implementation RZTestViewTwo - -- (CGSize)intrinsicContentSize { - return CGSizeMake(175.0f, 330.0f); -} - -@end - @interface RZUtilsTestAppTests : XCTestCase @property (nonatomic) RZAutoLayoutHelpersContainerView *containerView; -@property (nonatomic) RZTestViewOne *testViewOne; -@property (nonatomic) RZTestViewTwo *testViewTwo; +@property (nonatomic) UIView *testViewOne; +@property (nonatomic) UIView *testViewTwo; @end @@ -87,10 +63,12 @@ - (void)setUp self.containerView = [[RZAutoLayoutHelpersContainerView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, RZAutoLayoutHelpersTestContainerWidth, RZAutoLayoutHelpersTestContainerHeight)]; self.containerView.translatesAutoresizingMaskIntoConstraints = NO; - self.testViewOne = [[RZTestViewOne alloc] init]; - self.testViewTwo = [[RZTestViewTwo alloc] init]; + self.testViewOne = [[UIView alloc] init]; + self.testViewTwo = [[UIView alloc] init]; self.testViewOne.translatesAutoresizingMaskIntoConstraints = NO; self.testViewTwo.translatesAutoresizingMaskIntoConstraints = NO; + [self.testViewOne rz_pinSizeTo:CGSizeMake(250.0f, 250.0f)]; + [self.testViewTwo rz_pinSizeTo:CGSizeMake(175.0f, 330.0f)]; [self.containerView addSubview:self.testViewOne]; [self.containerView addSubview:self.testViewTwo]; From 8d7b20c9923ad03733a8f36ea52239baa9c80677 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 20:00:15 +0000 Subject: [PATCH 17/21] Removing an aggregate test target. --- Tests/RZUtilsTests.xcodeproj/project.pbxproj | 73 ------------------ .../xcschemes/RZUtilsAllTests.xcscheme | 77 ------------------- 2 files changed, 150 deletions(-) delete mode 100644 Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index 118d9bb..c6964a9 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -6,21 +6,6 @@ objectVersion = 46; objects = { -/* Begin PBXAggregateTarget section */ - 14FB17091AA7CD95003FDDB8 /* RZUtilsAllTests */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 14FB170A1AA7CD95003FDDB8 /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */; - buildPhases = ( - ); - dependencies = ( - 14FB170F1AA7CD9E003FDDB8 /* PBXTargetDependency */, - 14FB17111AA7CD9E003FDDB8 /* PBXTargetDependency */, - ); - name = RZUtilsAllTests; - productName = RZUtilsAllTests; - }; -/* End PBXAggregateTarget section */ - /* Begin PBXBuildFile section */ 14D21D6F1AA316CA000765B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D6E1AA316CA000765B6 /* main.m */; }; 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */; }; @@ -52,20 +37,6 @@ remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; remoteInfo = RZUtilsTests; }; - 14FB170E1AA7CD9E003FDDB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9A8D4DF1196335CC00AFAB21; - remoteInfo = RZUtilsTests; - }; - 14FB17101AA7CD9E003FDDB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9A8D4DC6196335CC00AFAB21 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 14D21D811AA316CA000765B6; - remoteInfo = RZUtilsTestAppTests; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -305,9 +276,6 @@ CreatedOnToolsVersion = 6.0.1; TestTargetID = 14D21D691AA316CA000765B6; }; - 14FB17091AA7CD95003FDDB8 = { - CreatedOnToolsVersion = 6.0.1; - }; }; }; buildConfigurationList = 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */; @@ -326,7 +294,6 @@ 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, 14D21D691AA316CA000765B6 /* RZUtilsTestApp */, 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */, - 14FB17091AA7CD95003FDDB8 /* RZUtilsAllTests */, ); }; /* End PBXProject section */ @@ -432,16 +399,6 @@ target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; targetProxy = 14D21D931AA31A3F000765B6 /* PBXContainerItemProxy */; }; - 14FB170F1AA7CD9E003FDDB8 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */; - targetProxy = 14FB170E1AA7CD9E003FDDB8 /* PBXContainerItemProxy */; - }; - 14FB17111AA7CD9E003FDDB8 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */; - targetProxy = 14FB17101AA7CD9E003FDDB8 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -594,27 +551,6 @@ }; name = "Enterprise-QA"; }; - 14FB170B1AA7CD95003FDDB8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 14FB170C1AA7CD95003FDDB8 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 14FB170D1AA7CD95003FDDB8 /* Enterprise-QA */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Enterprise-QA"; - }; 9A8D4E01196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -803,15 +739,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 14FB170A1AA7CD95003FDDB8 /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 14FB170B1AA7CD95003FDDB8 /* Debug */, - 14FB170C1AA7CD95003FDDB8 /* Release */, - 14FB170D1AA7CD95003FDDB8 /* Enterprise-QA */, - ); - defaultConfigurationIsVisible = 0; - }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme deleted file mode 100644 index 06d0544..0000000 --- a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 56e2ac89dcf0febcfa0fd24ffe007296eb6d40c6 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 20:07:16 +0000 Subject: [PATCH 18/21] Changing the scheme again. --- Rakefile | 2 +- .../RZAutoLayoutHelpersTest.m | 34 +++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index 40d398a..df8b7e1 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ TEST_PROJ_PATH="Tests/RZUtilsTests.xcodeproj" TEST_WORKSPACE_PATH="Tests/RZUtilsTests.xcworkspace" -TEST_SCHEME="RZUtilsAllTests" +TEST_SCHEME="RZUtilsTestApp" # # Install diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m index b29c6b0..e9dd3c4 100644 --- a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m @@ -47,11 +47,35 @@ - (CGSize)intrinsicContentSize { @end +@interface RZTestViewOne : UIView + +@end + +@implementation RZTestViewOne + +- (CGSize)intrinsicContentSize { + return CGSizeMake(250.0f, 250.0f); +} + +@end + +@interface RZTestViewTwo : UIView + +@end + +@implementation RZTestViewTwo + +- (CGSize)intrinsicContentSize { + return CGSizeMake(175.0f, 330.0f); +} + +@end + @interface RZUtilsTestAppTests : XCTestCase @property (nonatomic) RZAutoLayoutHelpersContainerView *containerView; -@property (nonatomic) UIView *testViewOne; -@property (nonatomic) UIView *testViewTwo; +@property (nonatomic) RZTestViewOne *testViewOne; +@property (nonatomic) RZTestViewTwo *testViewTwo; @end @@ -63,12 +87,10 @@ - (void)setUp self.containerView = [[RZAutoLayoutHelpersContainerView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, RZAutoLayoutHelpersTestContainerWidth, RZAutoLayoutHelpersTestContainerHeight)]; self.containerView.translatesAutoresizingMaskIntoConstraints = NO; - self.testViewOne = [[UIView alloc] init]; - self.testViewTwo = [[UIView alloc] init]; + self.testViewOne = [[RZTestViewOne alloc] init]; + self.testViewTwo = [[RZTestViewTwo alloc] init]; self.testViewOne.translatesAutoresizingMaskIntoConstraints = NO; self.testViewTwo.translatesAutoresizingMaskIntoConstraints = NO; - [self.testViewOne rz_pinSizeTo:CGSizeMake(250.0f, 250.0f)]; - [self.testViewTwo rz_pinSizeTo:CGSizeMake(175.0f, 330.0f)]; [self.containerView addSubview:self.testViewOne]; [self.containerView addSubview:self.testViewTwo]; From 21d71cd3725bbae1cdaa2a80275bdac6f252fc55 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Thu, 19 Mar 2015 20:37:17 +0000 Subject: [PATCH 19/21] Adding in an aggregate target which runs the other two test targets. --- Rakefile | 4 +- Tests/RZUtilsTests.xcodeproj/project.pbxproj | 75 ++++++++++++++++ .../xcschemes/RZUtilsAllTests.xcscheme | 86 +++++++++++++++++++ 3 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme diff --git a/Rakefile b/Rakefile index df8b7e1..9cf7fb1 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ TEST_PROJ_PATH="Tests/RZUtilsTests.xcodeproj" TEST_WORKSPACE_PATH="Tests/RZUtilsTests.xcworkspace" -TEST_SCHEME="RZUtilsTestApp" +TEST_SCHEME="RZUtilsAllTests" # # Install @@ -32,7 +32,7 @@ end # task :test do - sh("xctool -workspace '#{TEST_WORKSPACE_PATH}' -scheme '#{TEST_SCHEME}' -sdk iphonesimulator build test") rescue nil + sh("xctool -workspace '#{TEST_WORKSPACE_PATH}' -scheme '#{TEST_SCHEME}' -sdk iphonesimulator build") rescue nil exit $?.exitstatus end diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index c6964a9..db014ca 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -6,6 +6,21 @@ objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + 14FB87F61ABB662E005ECA1D /* RZUtilsAllTests */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 14FB87FA1ABB662E005ECA1D /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */; + buildPhases = ( + 14FB88011ABB6973005ECA1D /* ShellScript */, + 14FB88021ABB6AAB005ECA1D /* ShellScript */, + ); + dependencies = ( + ); + name = RZUtilsAllTests; + productName = RZUtilsAllTests; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 14D21D6F1AA316CA000765B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D6E1AA316CA000765B6 /* main.m */; }; 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */; }; @@ -276,6 +291,9 @@ CreatedOnToolsVersion = 6.0.1; TestTargetID = 14D21D691AA316CA000765B6; }; + 14FB87F61ABB662E005ECA1D = { + CreatedOnToolsVersion = 6.0.1; + }; }; }; buildConfigurationList = 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */; @@ -294,6 +312,7 @@ 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, 14D21D691AA316CA000765B6 /* RZUtilsTestApp */, 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */, + 14FB87F61ABB662E005ECA1D /* RZUtilsAllTests */, ); }; /* End PBXProject section */ @@ -327,6 +346,32 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 14FB88011ABB6973005ECA1D /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "xctool -workspace RZUtilsTests.xcworkspace -scheme RZUtilsTests -sdk iphonesimulator test"; + }; + 14FB88021ABB6AAB005ECA1D /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "xctool -workspace RZUtilsTests.xcworkspace -scheme RZUtilsTestApp -sdk iphonesimulator test"; + }; DB328C2D17B7432F9AFBFA98 /* Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -551,6 +596,27 @@ }; name = "Enterprise-QA"; }; + 14FB87F71ABB662E005ECA1D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 14FB87F81ABB662E005ECA1D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 14FB87F91ABB662E005ECA1D /* Enterprise-QA */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Enterprise-QA"; + }; 9A8D4E01196335CC00AFAB21 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -739,6 +805,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 14FB87FA1ABB662E005ECA1D /* Build configuration list for PBXAggregateTarget "RZUtilsAllTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 14FB87F71ABB662E005ECA1D /* Debug */, + 14FB87F81ABB662E005ECA1D /* Release */, + 14FB87F91ABB662E005ECA1D /* Enterprise-QA */, + ); + defaultConfigurationIsVisible = 0; + }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme new file mode 100644 index 0000000..60db6e4 --- /dev/null +++ b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsAllTests.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2a736ab65b5487f0b9423d663ba5343f97ba84e6 Mon Sep 17 00:00:00 2001 From: seanoshea Date: Sat, 25 Jul 2015 18:45:47 +0100 Subject: [PATCH 20/21] Trying RZHostApp --- .../Base.lproj/LaunchScreen.xib | 0 .../Base.lproj/Main.storyboard | 0 .../AppIcon.appiconset/Contents.json | 0 .../{RZUtilsTestApp => RZHostApp}/Info.plist | 0 Tests/RZHostApp/RZHostAppDelegate.h | 35 +++++++++ Tests/RZHostApp/RZHostAppDelegate.m | 37 +++++++++ Tests/RZHostApp/main.m | 35 +++++++++ .../Info.plist | 0 .../RZAutoLayoutHelpersTest.m | 0 ...sTestAppDelegate.h => RZHostAppDelegate.h} | 0 ...sTestAppDelegate.m => RZHostAppDelegate.m} | 0 Tests/RZUtilsTestApp/main.m | 16 ---- Tests/RZUtilsTests.xcodeproj/project.pbxproj | 77 ++++++++++--------- .../xcschemes/RZUtilsTestApp.xcscheme | 30 ++++---- .../xcschemes/RZUtilsTests.xcscheme | 6 +- 15 files changed, 166 insertions(+), 70 deletions(-) rename Tests/{RZUtilsTestApp => RZHostApp}/Base.lproj/LaunchScreen.xib (100%) rename Tests/{RZUtilsTestApp => RZHostApp}/Base.lproj/Main.storyboard (100%) rename Tests/{RZUtilsTestApp => RZHostApp}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename Tests/{RZUtilsTestApp => RZHostApp}/Info.plist (100%) create mode 100644 Tests/RZHostApp/RZHostAppDelegate.h create mode 100644 Tests/RZHostApp/RZHostAppDelegate.m create mode 100644 Tests/RZHostApp/main.m rename Tests/{RZUtilsTestAppTests => RZHostAppTests}/Info.plist (100%) rename Tests/{RZUtilsTestAppTests => RZHostAppTests}/RZAutoLayoutHelpersTest.m (100%) rename Tests/RZUtilsTestApp/{RZUtilsTestAppDelegate.h => RZHostAppDelegate.h} (100%) rename Tests/RZUtilsTestApp/{RZUtilsTestAppDelegate.m => RZHostAppDelegate.m} (100%) delete mode 100644 Tests/RZUtilsTestApp/main.m diff --git a/Tests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib b/Tests/RZHostApp/Base.lproj/LaunchScreen.xib similarity index 100% rename from Tests/RZUtilsTestApp/Base.lproj/LaunchScreen.xib rename to Tests/RZHostApp/Base.lproj/LaunchScreen.xib diff --git a/Tests/RZUtilsTestApp/Base.lproj/Main.storyboard b/Tests/RZHostApp/Base.lproj/Main.storyboard similarity index 100% rename from Tests/RZUtilsTestApp/Base.lproj/Main.storyboard rename to Tests/RZHostApp/Base.lproj/Main.storyboard diff --git a/Tests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json b/Tests/RZHostApp/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Tests/RZUtilsTestApp/Images.xcassets/AppIcon.appiconset/Contents.json rename to Tests/RZHostApp/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Tests/RZUtilsTestApp/Info.plist b/Tests/RZHostApp/Info.plist similarity index 100% rename from Tests/RZUtilsTestApp/Info.plist rename to Tests/RZHostApp/Info.plist diff --git a/Tests/RZHostApp/RZHostAppDelegate.h b/Tests/RZHostApp/RZHostAppDelegate.h new file mode 100644 index 0000000..13e8e03 --- /dev/null +++ b/Tests/RZHostApp/RZHostAppDelegate.h @@ -0,0 +1,35 @@ +// +// RZHostAppDelegate.h +// +// Created by Sean O'Shea on 3/1/15. + +// Copyright 2014 Raizlabs and other contributors +// http://raizlabs.com/ +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#import + +@interface RZHostAppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + +@end + diff --git a/Tests/RZHostApp/RZHostAppDelegate.m b/Tests/RZHostApp/RZHostAppDelegate.m new file mode 100644 index 0000000..4d9fcec --- /dev/null +++ b/Tests/RZHostApp/RZHostAppDelegate.m @@ -0,0 +1,37 @@ +// +// RZHostAppDelegate.m +// +// Created by Sean O'Shea on 3/1/15. + +// Copyright 2014 Raizlabs and other contributors +// http://raizlabs.com/ +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#import "RZHostAppDelegate.h" + +@implementation RZHostAppDelegate + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Override point for customization after application launch. + return YES; +} + +@end diff --git a/Tests/RZHostApp/main.m b/Tests/RZHostApp/main.m new file mode 100644 index 0000000..ba9e7d9 --- /dev/null +++ b/Tests/RZHostApp/main.m @@ -0,0 +1,35 @@ +// +// main.m +// +// Created by Sean O'Shea on 3/1/15. + +// Copyright 2014 Raizlabs and other contributors +// http://raizlabs.com/ +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +#import +#import "RZHostAppDelegate.h" + +int main(int argc, char * argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([RZHostAppDelegate class])); + } +} diff --git a/Tests/RZUtilsTestAppTests/Info.plist b/Tests/RZHostAppTests/Info.plist similarity index 100% rename from Tests/RZUtilsTestAppTests/Info.plist rename to Tests/RZHostAppTests/Info.plist diff --git a/Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZHostAppTests/RZAutoLayoutHelpersTest.m similarity index 100% rename from Tests/RZUtilsTestAppTests/RZAutoLayoutHelpersTest.m rename to Tests/RZHostAppTests/RZAutoLayoutHelpersTest.m diff --git a/Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.h b/Tests/RZUtilsTestApp/RZHostAppDelegate.h similarity index 100% rename from Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.h rename to Tests/RZUtilsTestApp/RZHostAppDelegate.h diff --git a/Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.m b/Tests/RZUtilsTestApp/RZHostAppDelegate.m similarity index 100% rename from Tests/RZUtilsTestApp/RZUtilsTestAppDelegate.m rename to Tests/RZUtilsTestApp/RZHostAppDelegate.m diff --git a/Tests/RZUtilsTestApp/main.m b/Tests/RZUtilsTestApp/main.m deleted file mode 100644 index 2c78b0e..0000000 --- a/Tests/RZUtilsTestApp/main.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// main.m -// RZUtilsTestApp -// -// Created by Sean O Shea on 3/1/15. -// Copyright (c) 2015 Raizlabs. All rights reserved. -// - -#import -#import "RZUtilsTestAppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([RZUtilsTestAppDelegate class])); - } -} diff --git a/Tests/RZUtilsTests.xcodeproj/project.pbxproj b/Tests/RZUtilsTests.xcodeproj/project.pbxproj index db014ca..350ebd2 100644 --- a/Tests/RZUtilsTests.xcodeproj/project.pbxproj +++ b/Tests/RZUtilsTests.xcodeproj/project.pbxproj @@ -23,7 +23,7 @@ /* Begin PBXBuildFile section */ 14D21D6F1AA316CA000765B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D6E1AA316CA000765B6 /* main.m */; }; - 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */; }; + 14D21D721AA316CA000765B6 /* RZHostAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14D21D711AA316CA000765B6 /* RZHostAppDelegate.m */; }; 14D21D781AA316CA000765B6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D761AA316CA000765B6 /* Main.storyboard */; }; 14D21D7A1AA316CA000765B6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D791AA316CA000765B6 /* Images.xcassets */; }; 14D21D7D1AA316CA000765B6 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 14D21D7B1AA316CA000765B6 /* LaunchScreen.xib */; }; @@ -55,15 +55,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 14D21D6A1AA316CA000765B6 /* RZUtilsTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RZUtilsTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 14D21D6A1AA316CA000765B6 /* RZHostApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RZHostApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 14D21D6D1AA316CA000765B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 14D21D6E1AA316CA000765B6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 14D21D701AA316CA000765B6 /* RZUtilsTestAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RZUtilsTestAppDelegate.h; sourceTree = ""; }; - 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RZUtilsTestAppDelegate.m; sourceTree = ""; }; + 14D21D701AA316CA000765B6 /* RZHostAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RZHostAppDelegate.h; sourceTree = ""; }; + 14D21D711AA316CA000765B6 /* RZHostAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RZHostAppDelegate.m; sourceTree = ""; }; 14D21D771AA316CA000765B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 14D21D791AA316CA000765B6 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 14D21D7C1AA316CA000765B6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 14D21D821AA316CA000765B6 /* RZUtilsTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RZUtilsTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 14D21D821AA316CA000765B6 /* RZHostAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RZHostAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 14D21D871AA316CB000765B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 14D21D881AA316CB000765B6 /* RZAutoLayoutHelpersTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RZAutoLayoutHelpersTest.m; sourceTree = ""; }; 1CFF0789A9F774D9B6D7E13D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; @@ -112,17 +112,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 14D21D6B1AA316CA000765B6 /* RZUtilsTestApp */ = { + 14D21D6B1AA316CA000765B6 /* RZHostApp */ = { isa = PBXGroup; children = ( - 14D21D701AA316CA000765B6 /* RZUtilsTestAppDelegate.h */, - 14D21D711AA316CA000765B6 /* RZUtilsTestAppDelegate.m */, + 14D21D701AA316CA000765B6 /* RZHostAppDelegate.h */, + 14D21D711AA316CA000765B6 /* RZHostAppDelegate.m */, 14D21D761AA316CA000765B6 /* Main.storyboard */, 14D21D791AA316CA000765B6 /* Images.xcassets */, 14D21D7B1AA316CA000765B6 /* LaunchScreen.xib */, 14D21D6C1AA316CA000765B6 /* Supporting Files */, ); - path = RZUtilsTestApp; + path = RZHostApp; sourceTree = ""; }; 14D21D6C1AA316CA000765B6 /* Supporting Files */ = { @@ -134,13 +134,13 @@ name = "Supporting Files"; sourceTree = ""; }; - 14D21D851AA316CB000765B6 /* RZUtilsTestAppTests */ = { + 14D21D851AA316CB000765B6 /* RZHostAppTests */ = { isa = PBXGroup; children = ( 14D21D881AA316CB000765B6 /* RZAutoLayoutHelpersTest.m */, 14D21D861AA316CB000765B6 /* Supporting Files */, ); - path = RZUtilsTestAppTests; + path = RZHostAppTests; sourceTree = ""; }; 14D21D861AA316CB000765B6 /* Supporting Files */ = { @@ -165,8 +165,8 @@ isa = PBXGroup; children = ( 9A8D4DF9196335CC00AFAB21 /* RZUtilsTests */, - 14D21D6B1AA316CA000765B6 /* RZUtilsTestApp */, - 14D21D851AA316CB000765B6 /* RZUtilsTestAppTests */, + 14D21D6B1AA316CA000765B6 /* RZHostApp */, + 14D21D851AA316CB000765B6 /* RZHostAppTests */, 9A8D4DD0196335CC00AFAB21 /* Frameworks */, 9A8D4DCF196335CC00AFAB21 /* Products */, 1D20370BBD690B491DE2ED6F /* Pods */, @@ -177,8 +177,8 @@ isa = PBXGroup; children = ( 9A8D4DF2196335CC00AFAB21 /* RZUtilsTests.xctest */, - 14D21D6A1AA316CA000765B6 /* RZUtilsTestApp.app */, - 14D21D821AA316CA000765B6 /* RZUtilsTestAppTests.xctest */, + 14D21D6A1AA316CA000765B6 /* RZHostApp.app */, + 14D21D821AA316CA000765B6 /* RZHostAppTests.xctest */, ); name = Products; sourceTree = ""; @@ -219,9 +219,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 14D21D691AA316CA000765B6 /* RZUtilsTestApp */ = { + 14D21D691AA316CA000765B6 /* RZHostApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 14D21D8A1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestApp" */; + buildConfigurationList = 14D21D8A1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZHostApp" */; buildPhases = ( 14D21D661AA316CA000765B6 /* Sources */, 14D21D671AA316CA000765B6 /* Frameworks */, @@ -232,14 +232,14 @@ dependencies = ( 14D21D941AA31A3F000765B6 /* PBXTargetDependency */, ); - name = RZUtilsTestApp; + name = RZHostApp; productName = RZUtilsTestApp; - productReference = 14D21D6A1AA316CA000765B6 /* RZUtilsTestApp.app */; + productReference = 14D21D6A1AA316CA000765B6 /* RZHostApp.app */; productType = "com.apple.product-type.application"; }; - 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */ = { + 14D21D811AA316CA000765B6 /* RZHostAppTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */; + buildConfigurationList = 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZHostAppTests" */; buildPhases = ( 14D21D7E1AA316CA000765B6 /* Sources */, 14D21D7F1AA316CA000765B6 /* Frameworks */, @@ -250,9 +250,9 @@ dependencies = ( 14D21D841AA316CB000765B6 /* PBXTargetDependency */, ); - name = RZUtilsTestAppTests; + name = RZHostAppTests; productName = RZUtilsTestAppTests; - productReference = 14D21D821AA316CA000765B6 /* RZUtilsTestAppTests.xctest */; + productReference = 14D21D821AA316CA000765B6 /* RZHostAppTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */ = { @@ -310,8 +310,8 @@ projectRoot = ""; targets = ( 9A8D4DF1196335CC00AFAB21 /* RZUtilsTests */, - 14D21D691AA316CA000765B6 /* RZUtilsTestApp */, - 14D21D811AA316CA000765B6 /* RZUtilsTestAppTests */, + 14D21D691AA316CA000765B6 /* RZHostApp */, + 14D21D811AA316CA000765B6 /* RZHostAppTests */, 14FB87F61ABB662E005ECA1D /* RZUtilsAllTests */, ); }; @@ -409,7 +409,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 14D21D721AA316CA000765B6 /* RZUtilsTestAppDelegate.m in Sources */, + 14D21D721AA316CA000765B6 /* RZHostAppDelegate.m in Sources */, 14D21D6F1AA316CA000765B6 /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -436,7 +436,7 @@ /* Begin PBXTargetDependency section */ 14D21D841AA316CB000765B6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 14D21D691AA316CA000765B6 /* RZUtilsTestApp */; + target = 14D21D691AA316CA000765B6 /* RZHostApp */; targetProxy = 14D21D831AA316CB000765B6 /* PBXContainerItemProxy */; }; 14D21D941AA31A3F000765B6 /* PBXTargetDependency */ = { @@ -486,7 +486,7 @@ "$(inherited)", ); GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTestApp/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/RZHostApp/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; @@ -503,7 +503,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTestApp/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/RZHostApp/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; @@ -520,7 +520,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTestApp/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/RZHostApp/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; @@ -545,12 +545,12 @@ "$(inherited)", ); GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTestAppTests/Info.plist; + INFOPLIST_FILE = RZHostAppTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZHostApp.app/RZHostApp"; }; name = Debug; }; @@ -566,12 +566,12 @@ "$(inherited)", ); GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTestAppTests/Info.plist; + INFOPLIST_FILE = RZHostAppTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZHostApp.app/RZHostApp"; }; name = Release; }; @@ -587,12 +587,12 @@ "$(inherited)", ); GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = RZUtilsTestAppTests/Info.plist; + INFOPLIST_FILE = RZHostAppTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZUtilsTestApp.app/RZUtilsTestApp"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RZHostApp.app/RZHostApp"; }; name = "Enterprise-QA"; }; @@ -785,7 +785,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 14D21D8A1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestApp" */ = { + 14D21D8A1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZHostApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 14D21D8B1AA316CB000765B6 /* Debug */, @@ -795,7 +795,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZUtilsTestAppTests" */ = { + 14D21D8E1AA316CB000765B6 /* Build configuration list for PBXNativeTarget "RZHostAppTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 14D21D8F1AA316CB000765B6 /* Debug */, @@ -813,6 +813,7 @@ 14FB87F91ABB662E005ECA1D /* Enterprise-QA */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 9A8D4DC9196335CC00AFAB21 /* Build configuration list for PBXProject "RZUtilsTests" */ = { isa = XCConfigurationList; diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTestApp.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTestApp.xcscheme index c76f59a..53504d1 100644 --- a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTestApp.xcscheme +++ b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTestApp.xcscheme @@ -15,8 +15,8 @@ @@ -29,8 +29,8 @@ @@ -47,8 +47,8 @@ @@ -57,8 +57,8 @@ @@ -72,12 +72,13 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> - + @@ -90,12 +91,13 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> - + diff --git a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTests.xcscheme b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTests.xcscheme index 8030eab..320ae80 100644 --- a/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTests.xcscheme +++ b/Tests/RZUtilsTests.xcodeproj/xcshareddata/xcschemes/RZUtilsTests.xcscheme @@ -72,7 +72,8 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> - + - + Date: Mon, 27 Jul 2015 20:27:45 +0100 Subject: [PATCH 21/21] Code review comments. --- .../RZHostAppTests/RZAutoLayoutHelpersTest.m | 32 +++++++-------- Tests/RZUtilsTestApp/RZHostAppDelegate.h | 35 ---------------- Tests/RZUtilsTestApp/RZHostAppDelegate.m | 41 ------------------- 3 files changed, 16 insertions(+), 92 deletions(-) delete mode 100644 Tests/RZUtilsTestApp/RZHostAppDelegate.h delete mode 100644 Tests/RZUtilsTestApp/RZHostAppDelegate.m diff --git a/Tests/RZHostAppTests/RZAutoLayoutHelpersTest.m b/Tests/RZHostAppTests/RZAutoLayoutHelpersTest.m index e9dd3c4..b49b8e5 100644 --- a/Tests/RZHostAppTests/RZAutoLayoutHelpersTest.m +++ b/Tests/RZHostAppTests/RZAutoLayoutHelpersTest.m @@ -123,10 +123,10 @@ - (void)testCenteringViews [self forceConstraintsEvaluation]; - XCTAssert([self.testViewOne rz_pinnedCenterXConstraint] != nil); - XCTAssert([self.testViewOne rz_pinnedCenterYConstraint] != nil); - XCTAssert([self.testViewTwo rz_pinnedCenterXConstraint] != nil); - XCTAssert([self.testViewTwo rz_pinnedCenterYConstraint] != nil); + XCTAssertNotNil([self.testViewOne rz_pinnedCenterXConstraint]); + XCTAssertNotNil([self.testViewOne rz_pinnedCenterYConstraint]); + XCTAssertNotNil([self.testViewTwo rz_pinnedCenterXConstraint]); + XCTAssertNotNil([self.testViewTwo rz_pinnedCenterYConstraint]); CGRect frameOne = self.testViewOne.frame; @@ -158,10 +158,10 @@ - (void)testCenteringWithOffsetViews [self forceConstraintsEvaluation]; - XCTAssert([self.testViewOne rz_pinnedCenterXConstraint] != nil); - XCTAssert([self.testViewOne rz_pinnedCenterYConstraint] != nil); - XCTAssert([self.testViewTwo rz_pinnedCenterXConstraint] != nil); - XCTAssert([self.testViewTwo rz_pinnedCenterYConstraint] != nil); + XCTAssertNotNil([self.testViewOne rz_pinnedCenterXConstraint]); + XCTAssertNotNil([self.testViewOne rz_pinnedCenterYConstraint]); + XCTAssertNotNil([self.testViewTwo rz_pinnedCenterXConstraint]); + XCTAssertNotNil([self.testViewTwo rz_pinnedCenterYConstraint]); CGRect frameOne = self.testViewOne.frame; @@ -198,14 +198,14 @@ - (void)testPinningViews { [self forceConstraintsEvaluation]; - XCTAssert([self.testViewOne rz_pinnedTopConstraint] != nil); - XCTAssert([self.testViewOne rz_pinnedRightConstraint] != nil); - XCTAssert([self.testViewOne rz_pinnedBottomConstraint] != nil); - XCTAssert([self.testViewOne rz_pinnedLeftConstraint] != nil); - XCTAssert([self.testViewTwo rz_pinnedTopConstraint] != nil); - XCTAssert([self.testViewTwo rz_pinnedRightConstraint] != nil); - XCTAssert([self.testViewTwo rz_pinnedBottomConstraint] != nil); - XCTAssert([self.testViewTwo rz_pinnedLeftConstraint] != nil); + XCTAssertNotNil([self.testViewOne rz_pinnedTopConstraint]); + XCTAssertNotNil([self.testViewOne rz_pinnedRightConstraint]); + XCTAssertNotNil([self.testViewOne rz_pinnedBottomConstraint]); + XCTAssertNotNil([self.testViewOne rz_pinnedLeftConstraint]); + XCTAssertNotNil([self.testViewTwo rz_pinnedTopConstraint]); + XCTAssertNotNil([self.testViewTwo rz_pinnedRightConstraint]); + XCTAssertNotNil([self.testViewTwo rz_pinnedBottomConstraint]); + XCTAssertNotNil([self.testViewTwo rz_pinnedLeftConstraint]); CGRect frameOne = self.testViewOne.frame; diff --git a/Tests/RZUtilsTestApp/RZHostAppDelegate.h b/Tests/RZUtilsTestApp/RZHostAppDelegate.h deleted file mode 100644 index c530c98..0000000 --- a/Tests/RZUtilsTestApp/RZHostAppDelegate.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// RZUtilsTestAppDelegate.h -// -// Created by Sean O'Shea on 3/1/15. - -// Copyright 2014 Raizlabs and other contributors -// http://raizlabs.com/ -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -#import - -@interface RZUtilsTestAppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end - diff --git a/Tests/RZUtilsTestApp/RZHostAppDelegate.m b/Tests/RZUtilsTestApp/RZHostAppDelegate.m deleted file mode 100644 index 81e45b2..0000000 --- a/Tests/RZUtilsTestApp/RZHostAppDelegate.m +++ /dev/null @@ -1,41 +0,0 @@ -// -// RZUtilsTestAppDelegate.m -// -// Created by Sean O'Shea on 3/1/15. - -// Copyright 2014 Raizlabs and other contributors -// http://raizlabs.com/ -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -#import "RZUtilsTestAppDelegate.h" - -@interface RZUtilsTestAppDelegate () - -@end - -@implementation RZUtilsTestAppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -@end