lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Introduce some helper methods in TestBase to simplify PasswordTest

Browse source
This commit is contained in:
Danny Moesch 2018-12-08 18:20:00 +01:00 • committed by Bob Sun
parent fa12a6f046
commit e019f6ac9d
2 changed files with 50 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

82
passKitTests/Models/PasswordTest.swift
View file

@ -14,6 +14,7 @@ class PasswordTest: XCTestCase {
func testUrl() { func testUrl() {
let password = getPasswordObjectWith(content: "") let password = getPasswordObjectWith(content: "")
XCTAssertEqual(password.url, PASSWORD_URL) XCTAssertEqual(password.url, PASSWORD_URL)
XCTAssertEqual(password.namePath, PASSWORD_PATH) XCTAssertEqual(password.namePath, PASSWORD_PATH)
} }
@ -27,7 +28,6 @@ class PasswordTest: XCTestCase {
XCTAssertEqual(password.password, "") XCTAssertEqual(password.password, "")
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8)) XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, "") XCTAssertEqual(password.additionsPlainText, "")
XCTAssertTrue(password.getFilteredAdditions().isEmpty) XCTAssertTrue(password.getFilteredAdditions().isEmpty)
@ -41,11 +41,9 @@ class PasswordTest: XCTestCase {
let fileContent = "\n\(LOGIN_FIELD.asString)" let fileContent = "\n\(LOGIN_FIELD.asString)"
let password = getPasswordObjectWith(content: fileContent) let password = getPasswordObjectWith(content: fileContent)
XCTAssertEqual(password.password, "") assertDefaults(in: password, with: "", and: LOGIN_FIELD.asString)
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, LOGIN_FIELD.asString)
XCTAssertFalse(does(password, contain: LOGIN_FIELD)) XCTAssert(LOGIN_FIELD ∉ password)
XCTAssertNil(password.username) XCTAssertNil(password.username)
XCTAssertNil(password.urlString) XCTAssertNil(password.urlString)
@ -57,14 +55,12 @@ class PasswordTest: XCTestCase {
let fileContent = PASSWORD_STRING | additions let fileContent = PASSWORD_STRING | additions
let password = getPasswordObjectWith(content: fileContent) let password = getPasswordObjectWith(content: fileContent)
XCTAssertEqual(password.password, PASSWORD_STRING) assertDefaults(in: password, with: PASSWORD_STRING, and: additions)
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, additions)
XCTAssertTrue(does(password, contain: SECURE_URL_FIELD)) XCTAssert(SECURE_URL_FIELD ∈ password)
XCTAssertFalse(does(password, contain: LOGIN_FIELD)) XCTAssert(LOGIN_FIELD ∉ password)
XCTAssertFalse(does(password, contain: USERNAME_FIELD)) XCTAssert(USERNAME_FIELD ∉ password)
XCTAssertTrue(does(password, contain: NOTE_FIELD)) XCTAssert(NOTE_FIELD ∈ password)
XCTAssertEqual(password.urlString, SECURE_URL_FIELD.content) XCTAssertEqual(password.urlString, SECURE_URL_FIELD.content)
XCTAssertEqual(password.login, LOGIN_FIELD.content) XCTAssertEqual(password.login, LOGIN_FIELD.content)
@ -80,8 +76,8 @@ class PasswordTest: XCTestCase {
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8)) XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, additions) XCTAssertEqual(password.additionsPlainText, additions)
XCTAssertTrue(does(password, contain: INSECURE_URL_FIELD)) XCTAssert(INSECURE_URL_FIELD ∈ password)
XCTAssertTrue(does(password, contain: Constants.unknown(1) => "efgh5678")) XCTAssert(Constants.unknown(1) => "efgh5678" ∈ password)
XCTAssertNil(password.username) XCTAssertNil(password.username)
XCTAssertEqual(password.urlString, INSECURE_URL_FIELD.content) XCTAssertEqual(password.urlString, INSECURE_URL_FIELD.content)
@ -92,11 +88,9 @@ class PasswordTest: XCTestCase {
let fileContent = SECURE_URL_FIELD | NOTE_FIELD let fileContent = SECURE_URL_FIELD | NOTE_FIELD
let password = getPasswordObjectWith(content: fileContent) let password = getPasswordObjectWith(content: fileContent)
XCTAssertEqual(password.password, SECURE_URL_FIELD.asString) assertDefaults(in: password, with: SECURE_URL_FIELD.asString, and: NOTE_FIELD.asString)
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, NOTE_FIELD.asString)
XCTAssertTrue(does(password, contain: NOTE_FIELD)) XCTAssert(NOTE_FIELD ∈ password)
XCTAssertNil(password.username) XCTAssertNil(password.username)
XCTAssertNil(password.urlString) XCTAssertNil(password.urlString)
@ -108,12 +102,10 @@ class PasswordTest: XCTestCase {
let fileContent = PASSWORD_STRING | additions let fileContent = PASSWORD_STRING | additions
let password = getPasswordObjectWith(content: fileContent) let password = getPasswordObjectWith(content: fileContent)
XCTAssertEqual(password.password, PASSWORD_STRING) assertDefaults(in: password, with: PASSWORD_STRING, and: additions)
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, additions)
XCTAssertTrue(does(password, contain: SECURE_URL_FIELD)) XCTAssert(SECURE_URL_FIELD ∈ password)
XCTAssertTrue(does(password, contain: INSECURE_URL_FIELD)) XCTAssert(INSECURE_URL_FIELD ∈ password)
XCTAssertNil(password.username) XCTAssertNil(password.username)
XCTAssertEqual(password.urlString, SECURE_URL_FIELD.content) XCTAssertEqual(password.urlString, SECURE_URL_FIELD.content)
@ -133,12 +125,12 @@ class PasswordTest: XCTestCase {
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8)) XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, additions) XCTAssertEqual(password.additionsPlainText, additions)
XCTAssertTrue(does(password, contain: Constants.unknown(1) => value1)) XCTAssert(Constants.unknown(1) => value1 ∈ password)
XCTAssertTrue(does(password, contain: NOTE_FIELD)) XCTAssert(NOTE_FIELD ∈ password)
XCTAssertTrue(does(password, contain: Constants.unknown(2) => value2)) XCTAssert(Constants.unknown(2) => value2 ∈ password)
XCTAssertTrue(does(password, contain: Constants.unknown(3) => value3)) XCTAssert(Constants.unknown(3) => value3 ∈ password)
XCTAssertTrue(does(password, contain: SECURE_URL_FIELD)) XCTAssert(SECURE_URL_FIELD ∈ password)
XCTAssertTrue(does(password, contain: Constants.unknown(4) => value4)) XCTAssert(Constants.unknown(4) => value4 ∈ password)
XCTAssertNil(password.username) XCTAssertNil(password.username)
XCTAssertEqual(password.urlString, SECURE_URL_FIELD.content) XCTAssertEqual(password.urlString, SECURE_URL_FIELD.content)
@ -220,14 +212,12 @@ class PasswordTest: XCTestCase {
let fileContent = PASSWORD_STRING | additions let fileContent = PASSWORD_STRING | additions
let password = getPasswordObjectWith(content: fileContent) let password = getPasswordObjectWith(content: fileContent)
XCTAssertEqual(password.password, PASSWORD_STRING) assertDefaults(in: password, with: PASSWORD_STRING, and: additions)
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, additions)
XCTAssertTrue(does(password, contain: MULTILINE_BLOCK_START.title => "")) XCTAssert(MULTILINE_BLOCK_START.title => "" ∈ password)
XCTAssertTrue(does(password, contain: MULTILINE_BLOCK_START.title => "")) XCTAssert(MULTILINE_BLOCK_START.title => "" ∈ password)
XCTAssertTrue(does(password, contain: NOTE_FIELD)) XCTAssert(NOTE_FIELD ∈ password)
XCTAssertTrue(does(password, contain: MULTILINE_LINE_START.title => "")) XCTAssert(MULTILINE_LINE_START.title => "" ∈ password)
} }
func testMultilineValues() { func testMultilineValues() {
@ -237,13 +227,11 @@ class PasswordTest: XCTestCase {
let fileContent = PASSWORD_STRING | additions let fileContent = PASSWORD_STRING | additions
let password = getPasswordObjectWith(content: fileContent) let password = getPasswordObjectWith(content: fileContent)
XCTAssertEqual(password.password, PASSWORD_STRING) assertDefaults(in: password, with: PASSWORD_STRING, and: additions)
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, additions)
XCTAssertTrue(does(password, contain: lineBreakField.title => "This is \n text spread over \nmultiple lines!")) XCTAssert(lineBreakField.title => "This is \n text spread over \nmultiple lines!" ∈ password)
XCTAssertTrue(does(password, contain: NOTE_FIELD)) XCTAssert(NOTE_FIELD ∈ password)
XCTAssertTrue(does(password, contain: noLineBreakField.title => "This is text spread over multiple lines!")) XCTAssert(noLineBreakField.title => "This is text spread over multiple lines!" ∈ password)
} }
func testMultilineValuesMixed() { func testMultilineValuesMixed() {
@ -257,11 +245,11 @@ class PasswordTest: XCTestCase {
XCTAssertEqual(password.plainData, fileContent.data(using: .utf8)) XCTAssertEqual(password.plainData, fileContent.data(using: .utf8))
XCTAssertEqual(password.additionsPlainText, additions) XCTAssertEqual(password.additionsPlainText, additions)
XCTAssertTrue(does(password, contain: lineBreakField.title => "This is \n\(HINT_FIELD.asString) spread over")) XCTAssert(lineBreakField.title => "This is \n\(HINT_FIELD.asString) spread over" ∈ password)
XCTAssertTrue(does(password, contain: Constants.unknown(1) => " multiple lines!")) XCTAssert(Constants.unknown(1) => " multiple lines!" ∈ password)
XCTAssertTrue(does(password, contain: noLineBreakField.title => "This is | text spread over")) XCTAssert(noLineBreakField.title => "This is | text spread over" ∈ password)
XCTAssertTrue(does(password, contain: Constants.unknown(2) => "multiple lines!")) XCTAssert(Constants.unknown(2) => "multiple lines!" ∈ password)
XCTAssertTrue(does(password, contain: NOTE_FIELD)) XCTAssert(NOTE_FIELD ∈ password)
} }
func testUpdatePassword() { func testUpdatePassword() {

16
passKitTests/TestBase.swift
View file

@ -32,7 +32,21 @@ func getPasswordObjectWith(content: String, url: URL? = nil) -> Password {
return Password(name: "password", url: url ?? PASSWORD_URL, plainText: content) return Password(name: "password", url: url ?? PASSWORD_URL, plainText: content)
} }
func does(_ password: Password, contain field: AdditionField) -> Bool { func assertDefaults(in password: Password, with passwordString: String, and additions: String,
at file: StaticString = #file, line: UInt = #line) {
let fileContent = (passwordString | additions).data(using: .utf8)
XCTAssertEqual(password.password, passwordString, "Actual passwords do not match.", file: file, line: line)
XCTAssertEqual(password.plainData, fileContent, "Plain data are not equal.", file: file, line: line)
XCTAssertEqual(password.additionsPlainText, additions, "Plain texts are not equal.", file: file, line: line)
XCTAssertEqual(password.otpType, .none, "OTP type is not .none.", file: file, line: line)
}
infix operator ∈: AdditionPrecedence
func ∈(field: AdditionField, password: Password) -> Bool {
return password.getFilteredAdditions().contains(field) return password.getFilteredAdditions().contains(field)
} }
infix operator ∉: AdditionPrecedence
func ∉(field: AdditionField, password: Password) -> Bool {
return !(field ∈ password)
}