diff --git a/Sources/Nimble/Matchers/BeLessThanOrEqual.swift b/Sources/Nimble/Matchers/BeLessThanOrEqual.swift index 098a85283..f9e9f4e73 100644 --- a/Sources/Nimble/Matchers/BeLessThanOrEqual.swift +++ b/Sources/Nimble/Matchers/BeLessThanOrEqual.swift @@ -33,7 +33,7 @@ public func <=(lhs: Expectation, rhs: T) { #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) extension NMBObjCMatcher { @objc public class func beLessThanOrEqualToMatcher(_ expected: NMBComparable?) -> NMBObjCMatcher { - return NMBObjCMatcher(canMatchNil:false) { actualExpression, failureMessage in + return NMBObjCMatcher(canMatchNil: false) { actualExpression, failureMessage in let expr = actualExpression.cast { $0 as? NMBComparable } return try! beLessThanOrEqualTo(expected).matches(expr, failureMessage: failureMessage) } diff --git a/Sources/Nimble/Matchers/MatcherProtocols.swift b/Sources/Nimble/Matchers/MatcherProtocols.swift index fff3c776b..82f3cf036 100644 --- a/Sources/Nimble/Matchers/MatcherProtocols.swift +++ b/Sources/Nimble/Matchers/MatcherProtocols.swift @@ -46,8 +46,8 @@ public protocol NMBContainer { //extension NSHashTable : NMBContainer {} // Corelibs Foundation does not include this class yet #endif -extension NSArray : NMBContainer {} -extension NSSet : NMBContainer {} +extension NSArray: NMBContainer {} +extension NSSet: NMBContainer {} /// Protocol for types that support only beEmpty(), haveCount() matchers public protocol NMBCollection { @@ -55,32 +55,32 @@ public protocol NMBCollection { } #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) -extension NSHashTable : NMBCollection {} // Corelibs Foundation does not include these classes yet -extension NSMapTable : NMBCollection {} +extension NSHashTable: NMBCollection {} // Corelibs Foundation does not include these classes yet +extension NSMapTable: NMBCollection {} #endif -extension NSSet : NMBCollection {} -extension NSIndexSet : NMBCollection {} -extension NSDictionary : NMBCollection {} +extension NSSet: NMBCollection {} +extension NSIndexSet: NMBCollection {} +extension NSDictionary: NMBCollection {} /// Protocol for types that support beginWith(), endWith(), beEmpty() matchers public protocol NMBOrderedCollection: NMBCollection { func object(at index: Int) -> Any } -extension NSArray : NMBOrderedCollection {} +extension NSArray: NMBOrderedCollection {} public protocol NMBDoubleConvertible { var doubleValue: CDouble { get } } -extension Double : NMBDoubleConvertible { +extension Double: NMBDoubleConvertible { public var doubleValue: CDouble { return self } } -extension Float : NMBDoubleConvertible { +extension Float: NMBDoubleConvertible { public var doubleValue: CDouble { return CDouble(self) } @@ -92,7 +92,7 @@ extension CGFloat: NMBDoubleConvertible { } } -extension NSNumber : NMBDoubleConvertible { +extension NSNumber: NMBDoubleConvertible { } private let dateFormatter: DateFormatter = { @@ -142,12 +142,12 @@ public protocol NMBComparable { } #endif -extension NSNumber : NMBComparable { +extension NSNumber: NMBComparable { public func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult { return compare(otherObject as! NSNumber) } } -extension NSString : NMBComparable { +extension NSString: NMBComparable { public func NMB_compare(_ otherObject: NMBComparable!) -> ComparisonResult { return compare(otherObject as! String) } diff --git a/Sources/Nimble/Matchers/PostNotification.swift b/Sources/Nimble/Matchers/PostNotification.swift index ba5572884..ee886f1cb 100644 --- a/Sources/Nimble/Matchers/PostNotification.swift +++ b/Sources/Nimble/Matchers/PostNotification.swift @@ -6,7 +6,6 @@ extension NotificationCenter { #if swift(>=4.0) #if swift(>=4.0.2) #else - // swiftlint:disable:next line_length func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol { return addObserver(forName: name, object: obj, queue: queue, usingBlock: block) } @@ -20,6 +19,7 @@ extension NotificationCenter { } #endif #else + // swiftlint:disable:next line_length func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, using block: @escaping (Notification) -> Void) -> NSObjectProtocol { return addObserver(forName: name, object: obj, queue: queue, usingBlock: block) } diff --git a/Tests/NimbleTests/Helpers/utils.swift b/Tests/NimbleTests/Helpers/utils.swift index 6a5f544c0..a1bbc681b 100644 --- a/Tests/NimbleTests/Helpers/utils.swift +++ b/Tests/NimbleTests/Helpers/utils.swift @@ -88,7 +88,7 @@ extension Date { dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" dateFormatter.locale = Locale(identifier: "en_US_POSIX") let date = dateFormatter.date(from: dateTimeString)! - self.init(timeInterval:0, since:date) + self.init(timeInterval: 0, since: date) } } diff --git a/Tests/NimbleTests/Matchers/BeAKindOfTest.swift b/Tests/NimbleTests/Matchers/BeAKindOfTest.swift index 94137dc64..bb9041ba2 100644 --- a/Tests/NimbleTests/Matchers/BeAKindOfTest.swift +++ b/Tests/NimbleTests/Matchers/BeAKindOfTest.swift @@ -67,7 +67,7 @@ final class BeAKindOfObjCTest: XCTestCase, XCTestCaseProvider { func testPositiveMatch() { expect(TestNull()).to(beAKindOf(NSNull.self)) expect(NSObject()).to(beAKindOf(NSObject.self)) - expect(NSNumber(value:1)).toNot(beAKindOf(NSDate.self)) + expect(NSNumber(value: 1)).toNot(beAKindOf(NSDate.self)) } func testFailureMessages() { @@ -78,10 +78,10 @@ final class BeAKindOfObjCTest: XCTestCase, XCTestCaseProvider { expect(nil as NSString?).to(beAKindOf(NSString.self)) } failsWithErrorMessage("expected to be a kind of NSString, got <__NSCFNumber instance>") { - expect(NSNumber(value:1)).to(beAKindOf(NSString.self)) + expect(NSNumber(value: 1)).to(beAKindOf(NSString.self)) } failsWithErrorMessage("expected to not be a kind of NSNumber, got <__NSCFNumber instance>") { - expect(NSNumber(value:1)).toNot(beAKindOf(NSNumber.self)) + expect(NSNumber(value: 1)).toNot(beAKindOf(NSNumber.self)) } } } diff --git a/Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift b/Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift index fe089dd9f..aeea28af7 100644 --- a/Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift +++ b/Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift @@ -18,7 +18,7 @@ final class BeAnInstanceOfTest: XCTestCase, XCTestCaseProvider { func testPositiveMatch() { expect(NSNull()).to(beAnInstanceOf(NSNull.self)) - expect(NSNumber(value:1)).toNot(beAnInstanceOf(NSDate.self)) + expect(NSNumber(value: 1)).toNot(beAnInstanceOf(NSDate.self)) } enum TestEnum { @@ -55,10 +55,10 @@ final class BeAnInstanceOfTest: XCTestCase, XCTestCaseProvider { let numberTypeName = "NSNumber" #endif failsWithErrorMessage("expected to be an instance of NSString, got <\(numberTypeName) instance>") { - expect(NSNumber(value:1)).to(beAnInstanceOf(NSString.self)) + expect(NSNumber(value: 1)).to(beAnInstanceOf(NSString.self)) } failsWithErrorMessage("expected to not be an instance of \(numberTypeName), got <\(numberTypeName) instance>") { - expect(NSNumber(value:1)).toNot(beAnInstanceOf(type(of: NSNumber(value:1)))) + expect(NSNumber(value: 1)).toNot(beAnInstanceOf(type(of: NSNumber(value: 1)))) } } diff --git a/Tests/NimbleTests/Matchers/BeCloseToTest.swift b/Tests/NimbleTests/Matchers/BeCloseToTest.swift index 81530f322..cb7a3ecdc 100644 --- a/Tests/NimbleTests/Matchers/BeCloseToTest.swift +++ b/Tests/NimbleTests/Matchers/BeCloseToTest.swift @@ -40,12 +40,12 @@ final class BeCloseToTest: XCTestCase, XCTestCaseProvider { } func testBeCloseToWithNSNumber() { - expect(NSNumber(value:1.2)).to(beCloseTo(9.300, within: 10)) - expect(NSNumber(value:1.2)).to(beCloseTo(NSNumber(value:9.300), within: 10)) - expect(1.2).to(beCloseTo(NSNumber(value:9.300), within: 10)) + expect(NSNumber(value: 1.2)).to(beCloseTo(9.300, within: 10)) + expect(NSNumber(value: 1.2)).to(beCloseTo(NSNumber(value: 9.300), within: 10)) + expect(1.2).to(beCloseTo(NSNumber(value: 9.300), within: 10)) failsWithErrorMessage("expected to not be close to <1.2001> (within 1), got <1.2>") { - expect(NSNumber(value:1.2)).toNot(beCloseTo(1.2001, within: 1.0)) + expect(NSNumber(value: 1.2)).toNot(beCloseTo(1.2001, within: 1.0)) } } diff --git a/Tests/NimbleTests/Matchers/BeEmptyTest.swift b/Tests/NimbleTests/Matchers/BeEmptyTest.swift index 9562fe029..067ddebe5 100644 --- a/Tests/NimbleTests/Matchers/BeEmptyTest.swift +++ b/Tests/NimbleTests/Matchers/BeEmptyTest.swift @@ -18,8 +18,8 @@ final class BeEmptyTest: XCTestCase, XCTestCaseProvider { expect([1] as [CInt]).toNot(beEmpty()) #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) - expect(NSDictionary() as? [Int:Int]).to(beEmpty()) - expect(NSDictionary(object: 1, forKey: 1 as NSNumber) as? [Int:Int]).toNot(beEmpty()) + expect(NSDictionary() as? [Int: Int]).to(beEmpty()) + expect(NSDictionary(object: 1, forKey: 1 as NSNumber) as? [Int: Int]).toNot(beEmpty()) #endif expect([Int: Int]()).to(beEmpty()) diff --git a/Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift b/Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift index b9bd64274..bd7336126 100644 --- a/Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift +++ b/Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift @@ -14,10 +14,10 @@ final class BeGreaterThanOrEqualToTest: XCTestCase, XCTestCaseProvider { expect(10).to(beGreaterThanOrEqualTo(10)) expect(10).to(beGreaterThanOrEqualTo(2)) expect(1).toNot(beGreaterThanOrEqualTo(2)) - expect(NSNumber(value:1)).toNot(beGreaterThanOrEqualTo(2)) - expect(NSNumber(value:2)).to(beGreaterThanOrEqualTo(NSNumber(value:2))) + expect(NSNumber(value: 1)).toNot(beGreaterThanOrEqualTo(2)) + expect(NSNumber(value: 2)).to(beGreaterThanOrEqualTo(NSNumber(value: 2))) #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) - expect(1).to(beGreaterThanOrEqualTo(NSNumber(value:0))) + expect(1).to(beGreaterThanOrEqualTo(NSNumber(value: 0))) #endif failsWithErrorMessage("expected to be greater than or equal to <2>, got <0>") { @@ -39,8 +39,8 @@ final class BeGreaterThanOrEqualToTest: XCTestCase, XCTestCaseProvider { func testGreaterThanOrEqualToOperator() { expect(0) >= 0 expect(1) >= 0 - expect(NSNumber(value:1)) >= 1 - expect(NSNumber(value:1)) >= NSNumber(value:1) + expect(NSNumber(value: 1)) >= 1 + expect(NSNumber(value: 1)) >= NSNumber(value: 1) expect(2.5) >= 2.5 expect(2.5) >= 2 expect(Float(2.5)) >= Float(2.5) diff --git a/Tests/NimbleTests/Matchers/BeGreaterThanTest.swift b/Tests/NimbleTests/Matchers/BeGreaterThanTest.swift index ea024a392..9c33e4b81 100644 --- a/Tests/NimbleTests/Matchers/BeGreaterThanTest.swift +++ b/Tests/NimbleTests/Matchers/BeGreaterThanTest.swift @@ -14,11 +14,11 @@ final class BeGreaterThanTest: XCTestCase, XCTestCaseProvider { expect(10).to(beGreaterThan(2)) expect(1).toNot(beGreaterThan(2)) #if SUPPORT_IMPLICIT_BRIDGING_CONVERSION - expect(NSNumber(value:3)).to(beGreaterThan(2)) + expect(NSNumber(value: 3)).to(beGreaterThan(2)) #else - expect(NSNumber(value:3)).to(beGreaterThan(2 as NSNumber)) + expect(NSNumber(value: 3)).to(beGreaterThan(2 as NSNumber)) #endif - expect(NSNumber(value:1)).toNot(beGreaterThan(NSNumber(value:2))) + expect(NSNumber(value: 1)).toNot(beGreaterThan(NSNumber(value: 2))) failsWithErrorMessage("expected to be greater than <2>, got <0>") { expect(0).to(beGreaterThan(2)) @@ -36,11 +36,11 @@ final class BeGreaterThanTest: XCTestCase, XCTestCaseProvider { func testGreaterThanOperator() { expect(1) > 0 - expect(NSNumber(value:1)) > NSNumber(value:0) + expect(NSNumber(value: 1)) > NSNumber(value: 0) #if SUPPORT_IMPLICIT_BRIDGING_CONVERSION - expect(NSNumber(value:1)) > 0 + expect(NSNumber(value: 1)) > 0 #else - expect(NSNumber(value:1)) > 0 as NSNumber + expect(NSNumber(value: 1)) > 0 as NSNumber #endif expect(2.5) > 1.5 expect(Float(2.5)) > Float(1.5) diff --git a/Tests/NimbleTests/Matchers/BeIdenticalToTest.swift b/Tests/NimbleTests/Matchers/BeIdenticalToTest.swift index eb976e689..6b629b0ab 100644 --- a/Tests/NimbleTests/Matchers/BeIdenticalToTest.swift +++ b/Tests/NimbleTests/Matchers/BeIdenticalToTest.swift @@ -20,13 +20,13 @@ final class BeIdenticalToTest: XCTestCase, XCTestCaseProvider { } func testBeIdenticalToNegative() { - expect(NSNumber(value:1)).toNot(beIdenticalTo(NSString(string: "yo"))) + expect(NSNumber(value: 1)).toNot(beIdenticalTo(NSString(string: "yo"))) expect(NSArray(array: [NSNumber(value: 1)])).toNot(beIdenticalTo(NSArray(array: [NSNumber(value: 1)]))) } func testBeIdenticalToPositiveMessage() { - let num1 = NSNumber(value:1) - let num2 = NSNumber(value:2) + let num1 = NSNumber(value: 1) + let num2 = NSNumber(value: 2) let message = "expected to be identical to \(identityAsString(num2)), got \(identityAsString(num1))" failsWithErrorMessage(message) { expect(num1).to(beIdenticalTo(num2)) @@ -45,13 +45,13 @@ final class BeIdenticalToTest: XCTestCase, XCTestCaseProvider { func testOperators() { let value = NSDate() expect(value) === value - expect(NSNumber(value:1)) !== NSNumber(value:2) + expect(NSNumber(value: 1)) !== NSNumber(value: 2) } func testBeAlias() { let value = NSDate() expect(value).to(be(value)) - expect(NSNumber(value:1)).toNot(be(NSString(string: "turtles"))) + expect(NSNumber(value: 1)).toNot(be(NSString(string: "turtles"))) #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) expect([1]).toNot(be([1])) #else diff --git a/Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift b/Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift index 166822332..428ace42a 100644 --- a/Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift +++ b/Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift @@ -15,11 +15,11 @@ final class BeLessThanOrEqualToTest: XCTestCase, XCTestCaseProvider { expect(2).to(beLessThanOrEqualTo(10)) expect(2).toNot(beLessThanOrEqualTo(1)) - expect(NSNumber(value:2)).to(beLessThanOrEqualTo(10)) - expect(NSNumber(value:2)).toNot(beLessThanOrEqualTo(1)) + expect(NSNumber(value: 2)).to(beLessThanOrEqualTo(10)) + expect(NSNumber(value: 2)).toNot(beLessThanOrEqualTo(1)) #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) - expect(2).to(beLessThanOrEqualTo(NSNumber(value:10))) - expect(2).toNot(beLessThanOrEqualTo(NSNumber(value:1))) + expect(2).to(beLessThanOrEqualTo(NSNumber(value: 10))) + expect(2).toNot(beLessThanOrEqualTo(NSNumber(value: 1))) #endif failsWithErrorMessage("expected to be less than or equal to <0>, got <2>") { diff --git a/Tests/NimbleTests/Matchers/BeLessThanTest.swift b/Tests/NimbleTests/Matchers/BeLessThanTest.swift index f1c331784..90ba1b92a 100644 --- a/Tests/NimbleTests/Matchers/BeLessThanTest.swift +++ b/Tests/NimbleTests/Matchers/BeLessThanTest.swift @@ -14,17 +14,17 @@ final class BeLessThanTest: XCTestCase, XCTestCaseProvider { expect(2).to(beLessThan(10)) expect(2).toNot(beLessThan(1)) #if SUPPORT_IMPLICIT_BRIDGING_CONVERSION - expect(NSNumber(value:2)).to(beLessThan(10)) - expect(NSNumber(value:2)).toNot(beLessThan(1)) + expect(NSNumber(value: 2)).to(beLessThan(10)) + expect(NSNumber(value: 2)).toNot(beLessThan(1)) - expect(2).to(beLessThan(NSNumber(value:10))) - expect(2).toNot(beLessThan(NSNumber(value:1))) + expect(2).to(beLessThan(NSNumber(value: 10))) + expect(2).toNot(beLessThan(NSNumber(value: 1))) #else - expect(NSNumber(value:2)).to(beLessThan(10 as NSNumber)) - expect(NSNumber(value:2)).toNot(beLessThan(1 as NSNumber)) + expect(NSNumber(value: 2)).to(beLessThan(10 as NSNumber)) + expect(NSNumber(value: 2)).toNot(beLessThan(1 as NSNumber)) - expect(2 as NSNumber).to(beLessThan(NSNumber(value:10))) - expect(2 as NSNumber).toNot(beLessThan(NSNumber(value:1))) + expect(2 as NSNumber).to(beLessThan(NSNumber(value: 10))) + expect(2 as NSNumber).toNot(beLessThan(NSNumber(value: 1))) #endif failsWithErrorMessage("expected to be less than <0>, got <2>") { @@ -45,9 +45,9 @@ final class BeLessThanTest: XCTestCase, XCTestCaseProvider { func testLessThanOperator() { expect(0) < 1 #if SUPPORT_IMPLICIT_BRIDGING_CONVERSION - expect(NSNumber(value:0)) < 1 + expect(NSNumber(value: 0)) < 1 #else - expect(NSNumber(value:0)) < 1 as NSNumber + expect(NSNumber(value: 0)) < 1 as NSNumber #endif failsWithErrorMessage("expected to be less than <1>, got <2>") { expect(2) < 1 diff --git a/Tests/NimbleTests/Matchers/ContainTest.swift b/Tests/NimbleTests/Matchers/ContainTest.swift index a63c79d73..1d8a1ebeb 100644 --- a/Tests/NimbleTests/Matchers/ContainTest.swift +++ b/Tests/NimbleTests/Matchers/ContainTest.swift @@ -22,7 +22,7 @@ final class ContainTest: XCTestCase, XCTestCaseProvider { expect(["foo", "bar", "baz"]).toNot(contain("ba")) #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) expect(NSArray(array: ["a"])).to(contain(NSString(string: "a"))) - expect(NSArray(array: ["a"])).toNot(contain(NSString(string:"b"))) + expect(NSArray(array: ["a"])).toNot(contain(NSString(string: "b"))) expect(NSArray(object: 1) as NSArray?).to(contain(1)) #endif diff --git a/Tests/NimbleTests/Matchers/EqualTest.swift b/Tests/NimbleTests/Matchers/EqualTest.swift index 48f8c28d6..85be7513f 100644 --- a/Tests/NimbleTests/Matchers/EqualTest.swift +++ b/Tests/NimbleTests/Matchers/EqualTest.swift @@ -139,7 +139,7 @@ final class EqualTest: XCTestCase, XCTestCaseProvider { #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) expect(NSDictionary(object: "bar", forKey: "foo" as NSString)).to(equal(["foo": "bar"])) - expect(NSDictionary(object: "bar", forKey: "foo" as NSString) as? [String:String]).to(equal(expected)) + expect(NSDictionary(object: "bar", forKey: "foo" as NSString) as? [String: String]).to(equal(expected)) #endif } @@ -165,10 +165,10 @@ final class EqualTest: XCTestCase, XCTestCaseProvider { } func testNSObjectEquality() { - expect(NSNumber(value:1)).to(equal(NSNumber(value:1))) - expect(NSNumber(value:1)) == NSNumber(value:1) - expect(NSNumber(value:1)) != NSNumber(value:2) - expect { NSNumber(value:1) }.to(equal(1)) + expect(NSNumber(value: 1)).to(equal(NSNumber(value: 1))) + expect(NSNumber(value: 1)) == NSNumber(value: 1) + expect(NSNumber(value: 1)) != NSNumber(value: 2) + expect { NSNumber(value: 1) }.to(equal(1)) } func testOperatorEquality() { diff --git a/Tests/NimbleTests/Matchers/RaisesExceptionTest.swift b/Tests/NimbleTests/Matchers/RaisesExceptionTest.swift index 9e6a6f5c4..f62f6336b 100644 --- a/Tests/NimbleTests/Matchers/RaisesExceptionTest.swift +++ b/Tests/NimbleTests/Matchers/RaisesExceptionTest.swift @@ -90,7 +90,7 @@ final class RaisesExceptionTest: XCTestCase, XCTestCaseProvider { func testNegativeMatchesDoNotCallClosureWithoutException() { failsWithErrorMessage("expected to raise exception that satisfies block, got no exception") { expect { self.anException }.to(raiseException { (exception: NSException) in - expect(exception.name).to(equal(NSExceptionName(rawValue:"foo"))) + expect(exception.name).to(equal(NSExceptionName(rawValue: "foo"))) }) } diff --git a/Tests/NimbleTests/Matchers/ThrowErrorTest.swift b/Tests/NimbleTests/Matchers/ThrowErrorTest.swift index f0e0f94ba..f11c8c56e 100644 --- a/Tests/NimbleTests/Matchers/ThrowErrorTest.swift +++ b/Tests/NimbleTests/Matchers/ThrowErrorTest.swift @@ -10,7 +10,7 @@ enum EquatableError: Error { case parameterized(x: Int) } -extension EquatableError : Equatable { +extension EquatableError: Equatable { } func == (lhs: EquatableError, rhs: EquatableError) -> Bool { @@ -25,7 +25,7 @@ enum CustomDebugStringConvertibleError: Error { case b } -extension CustomDebugStringConvertibleError : CustomDebugStringConvertible { +extension CustomDebugStringConvertibleError: CustomDebugStringConvertible { var debugDescription: String { return "code=\(_code)" }