Changes to support moved class methods from 1583f7b

smileyborg · smileyborg · commit 353ce7e21265 · 2015-08-16T16:36:25.000-07:00
- Fix usage of moved APIs in unit tests and demo apps
- Add a new set of unit tests for the constraint identifier APIs
diff --git a/PureLayout/Example-Mac/ALMacViewController.m b/PureLayout/Example-Mac/ALMacViewController.m
@@ -164,7 +164,7 @@ - (void)setupDemo4
             [view autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:previousView withOffset:10.0];
             // The orange view will be allowed to change its size if it conflicts with a required constraint
             NSLayoutPriority priority = (view == self.orangeView) ? NSLayoutPriorityDefaultHigh + 1 : NSLayoutPriorityRequired;
-            [NSView autoSetPriority:priority forConstraints:^{
+            [NSLayoutConstraint autoSetPriority:priority forConstraints:^{
                 [view autoMatchDimension:ALDimensionWidth toDimension:ALDimensionWidth ofView:previousView withMultiplier:1.5];
                 [view autoMatchDimension:ALDimensionHeight toDimension:ALDimensionHeight ofView:previousView withMultiplier:2.0];
             }];
diff --git a/PureLayout/Example-iOS/Demos/ALiOSDemo10ViewController.m b/PureLayout/Example-iOS/Demos/ALiOSDemo10ViewController.m
@@ -53,7 +53,7 @@ - (void)updateViewConstraints
         
         // Create and install the constraints that define the horizontal layout, because this is the one we're starting in.
         // Note that we use autoCreateAndInstallConstraints() here in order to easily collect all the constraints into a single array.
-        self.horizontalLayoutConstraints = [UIView autoCreateAndInstallConstraints:^{
+        self.horizontalLayoutConstraints = [NSLayoutConstraint autoCreateAndInstallConstraints:^{
             [views autoSetViewsDimension:ALDimensionHeight toSize:40.0];
             [views autoDistributeViewsAlongAxis:ALAxisHorizontal alignedTo:ALAttributeHorizontal withFixedSpacing:10.0 insetSpacing:YES matchedSizes:YES];
             [self.redView autoAlignAxisToSuperviewAxis:ALAxisHorizontal];
@@ -62,7 +62,7 @@ - (void)updateViewConstraints
         // Create the constraints that define the vertical layout, but don't install any of them - just store them for now.
         // Note that we use autoCreateConstraintsWithoutInstalling() here in order to both prevent the constraints from being installed automatically,
         // and to easily collect all the constraints into a single array.
-        self.verticalLayoutConstraints = [UIView autoCreateConstraintsWithoutInstalling:^{
+        self.verticalLayoutConstraints = [NSLayoutConstraint autoCreateConstraintsWithoutInstalling:^{
             [views autoSetViewsDimension:ALDimensionWidth toSize:60.0];
             [views autoDistributeViewsAlongAxis:ALAxisVertical alignedTo:ALAttributeVertical withFixedSpacing:70.0 insetSpacing:YES matchedSizes:YES];
             [self.redView autoAlignAxisToSuperviewAxis:ALAxisVertical];
diff --git a/PureLayout/Example-iOS/Demos/ALiOSDemo6ViewController.m b/PureLayout/Example-iOS/Demos/ALiOSDemo6ViewController.m
@@ -45,7 +45,7 @@ - (void)updateViewConstraints
         // Add constraints that set the size of the blueView to a ridiculously large size, but set the priority of these constraints
         // to a lower value than Required. This allows the Auto Layout solver to let these constraints be broken if one or both of
         // them conflict with higher-priority constraint(s), such as the above 4 edge constraints.
-        [UIView autoSetPriority:UILayoutPriorityDefaultHigh forConstraints:^{
+        [NSLayoutConstraint autoSetPriority:UILayoutPriorityDefaultHigh forConstraints:^{
             [self.blueView autoSetDimensionsToSize:CGSizeMake(10000.0, 10000.0)];
         }];
         
diff --git a/PureLayout/Example-iOS/Demos/ALiOSDemo8ViewController.m b/PureLayout/Example-iOS/Demos/ALiOSDemo8ViewController.m
@@ -47,7 +47,7 @@ - (void)updateViewConstraints
          it will raise an exception, and you will see these identifiers show up next to the constraint in the console.
          */
         
-        [UIView autoSetIdentifier:@"Pin Container View Edges" forConstraints:^{
+        [NSLayoutConstraint autoSetIdentifier:@"Pin Container View Edges" forConstraints:^{
             [self.containerView autoPinToTopLayoutGuideOfViewController:self withInset:10.0];
             [self.containerView autoPinEdgesToSuperviewEdgesWithInsets:UIEdgeInsetsMake(0.0, 10.0, 10.0, 10.0) excludingEdge:ALEdgeTop];
         }];
@@ -74,7 +74,7 @@ This lets you chain the identifier call right after creating the constraint(s),
          But because we have provided human-readable identifiers, notice how easy it is to figure out which constraints are
          conflicting, and which constraint shouldn't be there!
          */
-        [UIView autoSetIdentifier:@"Bad Constraints That Break Things" forConstraints:^{
+        [NSLayoutConstraint autoSetIdentifier:@"Bad Constraints That Break Things" forConstraints:^{
 //            [self.redView autoAlignAxis:ALAxisVertical toSameAxisOfView:self.view withOffset:5.0]; // uncomment me and watch things blow up!
             
 //            [self.redView autoPinEdgeToSuperviewEdge:ALEdgeLeft]; // uncomment me and watch things blow up!
diff --git a/PureLayout/Example-iOS/Demos/iOSDemo10ViewController.swift b/PureLayout/Example-iOS/Demos/iOSDemo10ViewController.swift
@@ -69,7 +69,7 @@ class iOSDemo10ViewController: UIViewController {
             
             // Create and install the constraints that define the horizontal layout, because this is the one we're starting in.
             // Note that we use autoCreateAndInstallConstraints() here in order to easily collect all the constraints into a single array.
-            horizontalLayoutConstraints = UIView.autoCreateAndInstallConstraints {
+            horizontalLayoutConstraints = NSLayoutConstraint.autoCreateAndInstallConstraints {
                 views.autoSetViewsDimension(.Height, toSize: 40.0)
                 views.autoDistributeViewsAlongAxis(.Horizontal, alignedTo: .Horizontal, withFixedSpacing: 10.0, insetSpacing: true, matchedSizes: true)
                 self.redView.autoAlignAxisToSuperviewAxis(.Horizontal)
@@ -78,7 +78,7 @@ class iOSDemo10ViewController: UIViewController {
             // Create the constraints that define the vertical layout, but don't install any of them - just store them for now.
             // Note that we use autoCreateConstraintsWithoutInstalling() here in order to both prevent the constraints from being installed automatically,
             // and to easily collect all the constraints into a single array.
-            verticalLayoutConstraints = UIView.autoCreateConstraintsWithoutInstalling {
+            verticalLayoutConstraints = NSLayoutConstraint.autoCreateConstraintsWithoutInstalling {
                 views.autoSetViewsDimension(.Width, toSize: 60.0)
                 views.autoDistributeViewsAlongAxis(.Vertical, alignedTo: .Vertical, withFixedSpacing: 70.0, insetSpacing: true, matchedSizes: true)
                 self.redView.autoAlignAxisToSuperviewAxis(.Vertical)
diff --git a/PureLayout/Example-iOS/Demos/iOSDemo6ViewController.swift b/PureLayout/Example-iOS/Demos/iOSDemo6ViewController.swift
@@ -43,7 +43,7 @@ class iOSDemo6ViewController: UIViewController {
             // Add constraints that set the size of the blueView to a ridiculously large size, but set the priority of these constraints
             // to a lower value than Required. This allows the Auto Layout solver to let these constraints be broken if one or both of
             // them conflict with higher-priority constraint(s), such as the above 4 edge constraints.
-            UIView.autoSetPriority(UILayoutPriorityDefaultHigh) {
+            NSLayoutConstraint.autoSetPriority(UILayoutPriorityDefaultHigh) {
                 blueView.autoSetDimensionsToSize(CGSize(width: 10000.0, height: 10000.0))
             }
             
diff --git a/PureLayout/Example-iOS/Demos/iOSDemo8ViewController.swift b/PureLayout/Example-iOS/Demos/iOSDemo8ViewController.swift
@@ -62,7 +62,7 @@ class iOSDemo8ViewController: UIViewController {
             it will raise an exception, and you will see these identifiers show up next to the constraint in the console.
             */
             
-            UIView.autoSetIdentifier("Pin Container View Edges") {
+            NSLayoutConstraint.autoSetIdentifier("Pin Container View Edges") {
                 self.containerView.autoPinToTopLayoutGuideOfViewController(self, withInset: 10.0)
                 self.containerView.autoPinEdgesToSuperviewEdgesWithInsets(UIEdgeInsets(top: 0.0, left: 10.0, bottom: 10.0, right: 10.0), excludingEdge: .Top)
             }
@@ -88,7 +88,7 @@ class iOSDemo8ViewController: UIViewController {
             But because we have provided human-readable identifiers, notice how easy it is to figure out which constraints are
             conflicting, and which constraint shouldn't be there!
             */
-            UIView.autoSetIdentifier("Bad Constraints That Break Things") {
+            NSLayoutConstraint.autoSetIdentifier("Bad Constraints That Break Things") {
 //                self.redView.autoAlignAxis(.Vertical, toSameAxisOfView: self.view, withOffset: 5.0) // uncomment me and watch things blow up!
                 
 //                self.redView.autoPinEdgeToSuperviewEdge(.Left) // uncomment me and watch things blow up!
diff --git a/PureLayout/PureLayout.xcodeproj/project.pbxproj b/PureLayout/PureLayout.xcodeproj/project.pbxproj
@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		A7371DC31B68792800DB94B6 /* PureLayoutBatchTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A7371DC21B68792800DB94B6 /* PureLayoutBatchTests.m */; };
 		A7371DC41B68792800DB94B6 /* PureLayoutBatchTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A7371DC21B68792800DB94B6 /* PureLayoutBatchTests.m */; };
+		A7D0FF361B8146370025AF37 /* PureLayoutIdentifierTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D0FF351B8146370025AF37 /* PureLayoutIdentifierTests.m */; };
+		A7D0FF371B8146370025AF37 /* PureLayoutIdentifierTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A7D0FF351B8146370025AF37 /* PureLayoutIdentifierTests.m */; };
 		A7D496591B7B084800A74818 /* ALiOSDemo2ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B13DFF2319E773D100B26152 /* ALiOSDemo2ViewController.m */; };
 		A7D4965A1B7B084800A74818 /* iOSDemo8ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DB5C951B7AEC83000ED37F /* iOSDemo8ViewController.swift */; };
 		A7D4965B1B7B084800A74818 /* ALiOSDemo5ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B162DF6B19E9F6A800D56FEA /* ALiOSDemo5ViewController.m */; };
@@ -195,6 +197,7 @@
 
 /* Begin PBXFileReference section */
 		A7371DC21B68792800DB94B6 /* PureLayoutBatchTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PureLayoutBatchTests.m; path = PureLayoutTests/PureLayoutBatchTests.m; sourceTree = "<group>"; };
+		A7D0FF351B8146370025AF37 /* PureLayoutIdentifierTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PureLayoutIdentifierTests.m; path = PureLayoutTests/PureLayoutIdentifierTests.m; sourceTree = "<group>"; };
 		A7D4964F1B7AF1D100A74818 /* iOSDemo9ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iOSDemo9ViewController.swift; path = "Example-iOS/Demos/iOSDemo9ViewController.swift"; sourceTree = SOURCE_ROOT; };
 		A7D496511B7AF44D00A74818 /* iOSDemo10ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iOSDemo10ViewController.swift; path = "Example-iOS/Demos/iOSDemo10ViewController.swift"; sourceTree = SOURCE_ROOT; };
 		A7D4967E1B7B084800A74818 /* Example-iOS-Xcode7.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Example-iOS-Xcode7.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -564,6 +567,7 @@
 				B17D24C91956648700F2FD4B /* PureLayoutTestBase.m */,
 				A7371DC21B68792800DB94B6 /* PureLayoutBatchTests.m */,
 				B1089C1A195787C900339027 /* PureLayoutCenteringTests.m */,
+				A7D0FF351B8146370025AF37 /* PureLayoutIdentifierTests.m */,
 				B1089C1B195787C900339027 /* PureLayoutInstallationTests.m */,
 				B1089C1C195787C900339027 /* PureLayoutInstantiationTests.m */,
 				B1089C1D195787C900339027 /* PureLayoutInternalTests.m */,
@@ -978,6 +982,7 @@
 			files = (
 				B1089C29195787C900339027 /* PureLayoutPinEdgesTests.m in Sources */,
 				B1089C23195787C900339027 /* PureLayoutInstallationTests.m in Sources */,
+				A7D0FF361B8146370025AF37 /* PureLayoutIdentifierTests.m in Sources */,
 				B1046B0B1A7F38930017187F /* NSLayoutConstraint+PureLayout.m in Sources */,
 				B1089C27195787C900339027 /* PureLayoutInternalTests.m in Sources */,
 				B1046A811A7F29F80017187F /* PureLayoutDistributeTests.m in Sources */,
@@ -1004,6 +1009,7 @@
 				B1089C22195787C900339027 /* PureLayoutCenteringTests.m in Sources */,
 				B1046B0D1A7F38930017187F /* NSArray+PureLayout.m in Sources */,
 				B1089C26195787C900339027 /* PureLayoutInstantiationTests.m in Sources */,
+				A7D0FF371B8146370025AF37 /* PureLayoutIdentifierTests.m in Sources */,
 				B1089C2E195787C900339027 /* PureLayoutRemovalTests.m in Sources */,
 				B1046A821A7F29F80017187F /* PureLayoutDistributeTests.m in Sources */,
 				B1089C2C195787C900339027 /* PureLayoutPriorityTests.m in Sources */,
diff --git a/PureLayout/PureLayoutTests/PureLayoutBatchTests.m b/PureLayout/PureLayoutTests/PureLayoutBatchTests.m
@@ -79,7 +79,7 @@ - (BOOL)noConstraintsAreActivated:(__NSArray_of(NSLayoutConstraint *) *)constrai
 - (void)testCreateAndInstallConstraints
 {
     __NSMutableArray_of(NSLayoutConstraint *) *createdConstraints = [NSMutableArray array];
-    __NSArray_of(NSLayoutConstraint *) *returnedConstraints = [ALView autoCreateAndInstallConstraints:^{
+    __NSArray_of(NSLayoutConstraint *) *returnedConstraints = [NSLayoutConstraint autoCreateAndInstallConstraints:^{
         [createdConstraints addObjectsFromArray:[self.viewA autoPinEdgesToSuperviewEdges]];
         [createdConstraints addObject:[self.viewA_A autoAlignAxis:ALAxisHorizontal toSameAxisOfView:self.viewA_A.superview]];
         [createdConstraints addObject:[self.viewA_A autoAlignAxis:ALAxisVertical toSameAxisOfView:self.viewA_A.superview withOffset:10.0]];
@@ -104,14 +104,14 @@ - (void)testCreateAndInstallConstraintsNested
     __block __NSArray_of(NSLayoutConstraint *) *returnedConstraints1_1_1 = nil;
     __block __NSArray_of(NSLayoutConstraint *) *returnedConstraints1_2 = nil;
     
-    __NSArray_of(NSLayoutConstraint *) *returnedConstraints1 = [ALView autoCreateAndInstallConstraints:^{
+    __NSArray_of(NSLayoutConstraint *) *returnedConstraints1 = [NSLayoutConstraint autoCreateAndInstallConstraints:^{
         [self.viewA autoPinEdgeToSuperviewEdge:ALEdgeTop];
         
-        returnedConstraints1_1 = [ALView autoCreateAndInstallConstraints:^{
+        returnedConstraints1_1 = [NSLayoutConstraint autoCreateAndInstallConstraints:^{
             [self.viewB autoSetDimension:ALDimensionWidth toSize:100.0];
             [self.viewC autoSetDimension:ALDimensionHeight toSize:100.0];
             
-            returnedConstraints1_1_1 = [ALView autoCreateAndInstallConstraints:^{
+            returnedConstraints1_1_1 = [NSLayoutConstraint autoCreateAndInstallConstraints:^{
                 [self.viewD autoConstrainAttribute:ALAttributeHeight toAttribute:ALAttributeWidth ofView:self.viewC withMultiplier:2.0];
             }];
             XCTAssertEqual(returnedConstraints1_1_1.count, 1);
@@ -125,7 +125,7 @@ - (void)testCreateAndInstallConstraintsNested
 
         [self.viewA autoPinEdgeToSuperviewEdge:ALEdgeLeading];
         
-        returnedConstraints1_2 = [ALView autoCreateAndInstallConstraints:^{
+        returnedConstraints1_2 = [NSLayoutConstraint autoCreateAndInstallConstraints:^{
             [self.viewA autoPinEdgeToSuperviewEdge:ALEdgeBottom];
             [self.viewA autoAlignAxisToSuperviewAxis:ALAxisVertical];
         }];
@@ -150,7 +150,7 @@ - (void)testCreateAndInstallConstraintsNested
 - (void)testCreateConstraintsWithoutInstalling
 {
     __NSMutableArray_of(NSLayoutConstraint *) *createdConstraints = [NSMutableArray array];
-    __NSArray_of(NSLayoutConstraint *) *returnedConstraints = [ALView autoCreateConstraintsWithoutInstalling:^{
+    __NSArray_of(NSLayoutConstraint *) *returnedConstraints = [NSLayoutConstraint autoCreateConstraintsWithoutInstalling:^{
         [createdConstraints addObjectsFromArray:[self.viewA autoPinEdgesToSuperviewEdgesWithInsets:ALEdgeInsetsMake(10.0, 10.0, 10.0, 10.0) excludingEdge:ALEdgeBottom]];
         [createdConstraints addObject:[self.viewA_A autoAlignAxis:ALAxisVertical toSameAxisOfView:self.viewA_A.superview]];
         [createdConstraints addObject:[self.viewA_A autoAlignAxis:ALAxisBaseline toSameAxisOfView:self.viewA_A.superview withOffset:-10.0]];
@@ -175,14 +175,14 @@ - (void)testCreateConstraintsWithoutInstallingNested
     __block __NSArray_of(NSLayoutConstraint *) *returnedConstraints1_1_1 = nil;
     __block __NSArray_of(NSLayoutConstraint *) *returnedConstraints1_2 = nil;
     
-    __NSArray_of(NSLayoutConstraint *) *returnedConstraints1 = [ALView autoCreateConstraintsWithoutInstalling:^{
+    __NSArray_of(NSLayoutConstraint *) *returnedConstraints1 = [NSLayoutConstraint autoCreateConstraintsWithoutInstalling:^{
         [self.viewA autoPinEdgeToSuperviewEdge:ALEdgeTop];
         
-        returnedConstraints1_1 = [ALView autoCreateConstraintsWithoutInstalling:^{
+        returnedConstraints1_1 = [NSLayoutConstraint autoCreateConstraintsWithoutInstalling:^{
             [self.viewB autoSetDimension:ALDimensionWidth toSize:100.0];
             [self.viewC autoSetDimension:ALDimensionHeight toSize:100.0];
             
-            returnedConstraints1_1_1 = [ALView autoCreateConstraintsWithoutInstalling:^{
+            returnedConstraints1_1_1 = [NSLayoutConstraint autoCreateConstraintsWithoutInstalling:^{
                 [self.viewD autoConstrainAttribute:ALAttributeHeight toAttribute:ALAttributeWidth ofView:self.viewC withMultiplier:2.0];
             }];
             XCTAssertEqual(returnedConstraints1_1_1.count, 1);
@@ -196,7 +196,7 @@ - (void)testCreateConstraintsWithoutInstallingNested
         
         [self.viewA autoPinEdgeToSuperviewEdge:ALEdgeLeading];
         
-        returnedConstraints1_2 = [ALView autoCreateConstraintsWithoutInstalling:^{
+        returnedConstraints1_2 = [NSLayoutConstraint autoCreateConstraintsWithoutInstalling:^{
             [self.viewA autoPinEdgeToSuperviewEdge:ALEdgeBottom];
             [self.viewA autoAlignAxisToSuperviewAxis:ALAxisVertical];
         }];
diff --git a/PureLayout/PureLayoutTests/PureLayoutIdentifierTests.m b/PureLayout/PureLayoutTests/PureLayoutIdentifierTests.m
diff --git a/PureLayout/PureLayoutTests/PureLayoutPriorityTests.m b/PureLayout/PureLayoutTests/PureLayoutPriorityTests.m
diff --git a/PureLayout/PureLayoutTests/PureLayoutRemovalTests.m b/PureLayout/PureLayoutTests/PureLayoutRemovalTests.m
diff --git a/PureLayout/PureLayoutTests/PureLayoutTests-iOS/PureLayoutPriorityTests-iOS.m b/PureLayout/PureLayoutTests/PureLayoutTests-iOS/PureLayoutPriorityTests-iOS.m

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class iOSDemo6ViewController: UIViewController {`
`43`	`43`	`// Add constraints that set the size of the blueView to a ridiculously large size, but set the priority of these constraints`
`44`	`44`	`// to a lower value than Required. This allows the Auto Layout solver to let these constraints be broken if one or both of`
`45`	`45`	`// them conflict with higher-priority constraint(s), such as the above 4 edge constraints.`
`46`		`- UIView.autoSetPriority(UILayoutPriorityDefaultHigh) {`
	`46`	`+ NSLayoutConstraint.autoSetPriority(UILayoutPriorityDefaultHigh) {`
`47`	`47`	`blueView.autoSetDimensionsToSize(CGSize(width: 10000.0, height: 10000.0))`
`48`	`48`	`}`
`49`	`49`