From c18b70e7d702a42339dee8849bfa36dbf6c56651 Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Sat, 15 Dec 2018 21:51:22 +0100 Subject: [PATCH] Use XCTAssert instead of XCTAssertTrue --- passKitTests/Models/PasswordTest.swift | 6 +++--- passKitTests/Parser/AdditionFieldTest.swift | 6 +++--- passKitTests/Parser/ConstantsTest.swift | 12 ++++++------ passKitTests/Parser/ParserTest.swift | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/passKitTests/Models/PasswordTest.swift b/passKitTests/Models/PasswordTest.swift index eb1dbd6..38088ad 100644 --- a/passKitTests/Models/PasswordTest.swift +++ b/passKitTests/Models/PasswordTest.swift @@ -35,7 +35,7 @@ class PasswordTest: XCTestCase { XCTAssertEqual(password.password, "") XCTAssertEqual(password.plainData, fileContent.data(using: .utf8)) XCTAssertEqual(password.additionsPlainText, "") - XCTAssertTrue(password.getFilteredAdditions().isEmpty) + XCTAssert(password.getFilteredAdditions().isEmpty) XCTAssertEqual(password.numberOfUnknowns, 0) XCTAssertNil(password.username) @@ -224,7 +224,7 @@ class PasswordTest: XCTestCase { XCTAssertEqual(password.password, fileContent) XCTAssertEqual(password.plainData, fileContent.data(using: .utf8)) - XCTAssertTrue(password.additionsPlainText.isEmpty) + XCTAssert(password.additionsPlainText.isEmpty) XCTAssertEqual(password.numberOfUnknowns, 0) XCTAssertEqual(password.numberOfOtpRelated, 0) @@ -306,7 +306,7 @@ class PasswordTest: XCTestCase { let otpStrings = password.getOtpStrings() XCTAssertNotNil(otpStrings) - XCTAssertTrue(otpStrings!.description.hasPrefix("time-based (expires in")) + XCTAssert(otpStrings!.description.hasPrefix("time-based (expires in")) } func testOtpStringsHotpToken() { diff --git a/passKitTests/Parser/AdditionFieldTest.swift b/passKitTests/Parser/AdditionFieldTest.swift index 93c83d7..4bceaef 100644 --- a/passKitTests/Parser/AdditionFieldTest.swift +++ b/passKitTests/Parser/AdditionFieldTest.swift @@ -21,9 +21,9 @@ class AdditionFieldTest: XCTestCase { XCTAssertEqual(field2.asString, "no content: ") XCTAssertEqual(field3.asString, "no title") - XCTAssertTrue(field1.asTuple == ("key", "value")) - XCTAssertTrue(field2.asTuple == ("no content", "")) - XCTAssertTrue(field3.asTuple == ("", "no title")) + XCTAssert(field1.asTuple == ("key", "value")) + XCTAssert(field2.asTuple == ("no content", "")) + XCTAssert(field3.asTuple == ("", "no title")) } func testAdditionFieldEquals() { diff --git a/passKitTests/Parser/ConstantsTest.swift b/passKitTests/Parser/ConstantsTest.swift index 9c9208d..711ee80 100644 --- a/passKitTests/Parser/ConstantsTest.swift +++ b/passKitTests/Parser/ConstantsTest.swift @@ -13,22 +13,22 @@ import XCTest class ConstantsTest: XCTestCase { func testIsOtpRelated() { - XCTAssertTrue(Constants.isOtpRelated(line: "otpauth://something")) - XCTAssertTrue(Constants.isOtpRelated(line: "otp_algorithm: algorithm")) + XCTAssert(Constants.isOtpRelated(line: "otpauth://something")) + XCTAssert(Constants.isOtpRelated(line: "otp_algorithm: algorithm")) XCTAssertFalse(Constants.isOtpRelated(line: "otp: something")) XCTAssertFalse(Constants.isOtpRelated(line: "otp")) } func testIsOtpKeyword() { - XCTAssertTrue(Constants.isOtpKeyword("otpauth")) - XCTAssertTrue(Constants.isOtpKeyword("oTP_DigITS")) + XCTAssert(Constants.isOtpKeyword("otpauth")) + XCTAssert(Constants.isOtpKeyword("oTP_DigITS")) XCTAssertFalse(Constants.isOtpKeyword("otp")) XCTAssertFalse(Constants.isOtpKeyword("no keyword")) } func testIsUnknown() { - XCTAssertTrue(Constants.isUnknown("unknown")) - XCTAssertTrue(Constants.isUnknown("unknown string")) + XCTAssert(Constants.isUnknown("unknown")) + XCTAssert(Constants.isUnknown("unknown string")) XCTAssertFalse(Constants.isUnknown("otp")) XCTAssertFalse(Constants.isUnknown("Unknown")) } diff --git a/passKitTests/Parser/ParserTest.swift b/passKitTests/Parser/ParserTest.swift index a2b53d3..ee0ba5a 100644 --- a/passKitTests/Parser/ParserTest.swift +++ b/passKitTests/Parser/ParserTest.swift @@ -28,12 +28,12 @@ class ParserTest: XCTestCase { } func testGetKeyValuePair() { - XCTAssertTrue(Parser.getKeyValuePair(from: "key: value") == ("key", "value")) - XCTAssertTrue(Parser.getKeyValuePair(from: "a key: a value") == ("a key", "a value")) - XCTAssertTrue(Parser.getKeyValuePair(from: "key:value") == (nil, "key:value")) - XCTAssertTrue(Parser.getKeyValuePair(from: ": value") == (nil, "value")) - XCTAssertTrue(Parser.getKeyValuePair(from: "key: ") == ("key", "")) - XCTAssertTrue(Parser.getKeyValuePair(from: "otpauth://value") == ("otpauth", "otpauth://value")) + XCTAssert(Parser.getKeyValuePair(from: "key: value") == ("key", "value")) + XCTAssert(Parser.getKeyValuePair(from: "a key: a value") == ("a key", "a value")) + XCTAssert(Parser.getKeyValuePair(from: "key:value") == (nil, "key:value")) + XCTAssert(Parser.getKeyValuePair(from: ": value") == (nil, "value")) + XCTAssert(Parser.getKeyValuePair(from: "key: ") == ("key", "")) + XCTAssert(Parser.getKeyValuePair(from: "otpauth://value") == ("otpauth", "otpauth://value")) } func testEmptyFiles() {