Skip to content

Commit f00e8d6

Browse files
carlosypuntokzaher
authored andcommitted
fix NSLayoutConstraintTest on macOS
1 parent 5c0c3d6 commit f00e8d6

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Tests/RxCocoaTests/NSLayoutConstraint+RxTests.swift

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@ import XCTest
1212
#if os(macOS)
1313
import AppKit
1414
typealias View = NSView
15+
let topLayoutAttribute = NSLayoutConstraint.Attribute.top
16+
let equalLayoutRelation = NSLayoutConstraint.Relation.equal
1517
#else
1618
import UIKit
1719
typealias View = UIView
20+
let topLayoutAttribute = NSLayoutAttribute.top
21+
let equalLayoutRelation = NSLayoutRelation.equal
1822
#endif
1923

2024
final class NSLayoutConstraintTest : RxTest {
@@ -25,7 +29,7 @@ extension NSLayoutConstraintTest {
2529
func testConstant_0() {
2630
let subject = View(frame: CGRect.zero)
2731
let subject2 = View(frame: CGRect.zero)
28-
let constraint = NSLayoutConstraint(item: subject, attribute: NSLayoutAttribute.top, relatedBy: NSLayoutRelation.equal, toItem: subject2, attribute: NSLayoutAttribute.top, multiplier: 0.5, constant: 0.5)
32+
let constraint = NSLayoutConstraint(item: subject, attribute: topLayoutAttribute, relatedBy: equalLayoutRelation, toItem: subject2, attribute: topLayoutAttribute, multiplier: 0.5, constant: 0.5)
2933
Observable.just(0).subscribe(constraint.rx.constant).dispose()
3034

3135
XCTAssertTrue(constraint.constant == 0.0)
@@ -34,7 +38,7 @@ extension NSLayoutConstraintTest {
3438
func testConstant_1() {
3539
let subject = View(frame: CGRect.zero)
3640
let subject2 = View(frame: CGRect.zero)
37-
let constraint = NSLayoutConstraint(item: subject, attribute: NSLayoutAttribute.top, relatedBy: NSLayoutRelation.equal, toItem: subject2, attribute: NSLayoutAttribute.top, multiplier: 0.5, constant: 0.5)
41+
let constraint = NSLayoutConstraint(item: subject, attribute: topLayoutAttribute, relatedBy: equalLayoutRelation, toItem: subject2, attribute: topLayoutAttribute, multiplier: 0.5, constant: 0.5)
3842
Observable.just(1.0).subscribe(constraint.rx.constant).dispose()
3943

4044
XCTAssertTrue(constraint.constant == 1.0)
@@ -49,7 +53,7 @@ extension NSLayoutConstraintTest {
4953
let subject2 = View(frame: CGRect.zero)
5054
parent.addSubview(subject)
5155
parent.addSubview(subject2)
52-
let constraint = NSLayoutConstraint(item: subject, attribute: NSLayoutAttribute.top, relatedBy: NSLayoutRelation.equal, toItem: subject2, attribute: NSLayoutAttribute.top, multiplier: 0.5, constant: 0.5)
56+
let constraint = NSLayoutConstraint(item: subject, attribute: topLayoutAttribute, relatedBy: equalLayoutRelation, toItem: subject2, attribute: topLayoutAttribute, multiplier: 0.5, constant: 0.5)
5357
Observable.just(true).subscribe(constraint.rx.active).dispose()
5458

5559
XCTAssertTrue(constraint.isActive == true)
@@ -61,7 +65,7 @@ extension NSLayoutConstraintTest {
6165
let subject2 = View(frame: CGRect.zero)
6266
parent.addSubview(subject)
6367
parent.addSubview(subject2)
64-
let constraint = NSLayoutConstraint(item: subject, attribute: NSLayoutAttribute.top, relatedBy: NSLayoutRelation.equal, toItem: subject2, attribute: NSLayoutAttribute.top, multiplier: 0.5, constant: 0.5)
68+
let constraint = NSLayoutConstraint(item: subject, attribute: topLayoutAttribute, relatedBy: equalLayoutRelation, toItem: subject2, attribute: topLayoutAttribute, multiplier: 0.5, constant: 0.5)
6569
Observable.just(false).subscribe(constraint.rx.active).dispose()
6670

6771
XCTAssertTrue(constraint.isActive == false)

0 commit comments

Comments
 (0)