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

Enable SwiftLint rule 'identifier_name' and handle all violations

Browse source
This commit is contained in:
Danny Moesch 2020-09-20 15:07:18 +02:00 • committed by Mingshen Sun
parent 7ada4dd96d
commit e8389eb262
21 changed files with 157 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

10
passKitTests/Crypto/PGPAgentTest.swift
View file

@ -90,10 +90,10 @@ class PGPAgentTest: XCTestCase {
try KeyFileManager(keyType: PgpKey.PUBLIC, keyPath: "", keyHandler: keychain.add).importKey(from: RSA2048.publicKey)
XCTAssertFalse(pgpAgent.isPrepared)
XCTAssertThrowsError(try pgpAgent.initKeys()) {
XCTAssertEqual($0 as! AppError, AppError.KeyImport)
XCTAssertEqual($0 as! AppError, AppError.keyImport)
}
XCTAssertThrowsError(try basicEncryptDecrypt(using: pgpAgent, keyID: RSA2048.fingerprint)) {
XCTAssertEqual($0 as! AppError, AppError.KeyImport)
XCTAssertEqual($0 as! AppError, AppError.keyImport)
}
}
@ -109,7 +109,7 @@ class PGPAgentTest: XCTestCase {
try importKeys(ED25519.publicKey, RSA2048.privateKey)
XCTAssert(pgpAgent.isPrepared)
XCTAssertThrowsError(try basicEncryptDecrypt(using: pgpAgent, keyID: ED25519.fingerprint, encryptKeyID: RSA2048.fingerprint)) {
XCTAssertEqual($0 as! AppError, AppError.KeyExpiredOrIncompatible)
XCTAssertEqual($0 as! AppError, AppError.keyExpiredOrIncompatible)
}
}
@ -128,7 +128,7 @@ class PGPAgentTest: XCTestCase {
keychain.removeContent(for: PgpKey.PUBLIC.getKeychainKey())
keychain.removeContent(for: PgpKey.PRIVATE.getKeychainKey())
XCTAssertThrowsError(try basicEncryptDecrypt(using: pgpAgent, keyID: ED25519.fingerprint)) {
XCTAssertEqual($0 as! AppError, AppError.KeyImport)
XCTAssertEqual($0 as! AppError, AppError.keyImport)
}
}
@ -151,7 +151,7 @@ class PGPAgentTest: XCTestCase {
// Provide the wrong passphrase.
XCTAssertThrowsError(try basicEncryptDecrypt(using: pgpAgent, keyID: RSA2048.fingerprint, requestPassphrase: provideIncorrectPassphrase)) {
XCTAssertEqual($0 as! AppError, AppError.WrongPassphrase)
XCTAssertEqual($0 as! AppError, AppError.wrongPassphrase)
}
XCTAssertEqual(passphraseRequestCalledCount, 2)

2
passKitTests/Helpers/KeyFileManagerTest.swift
View file

@ -59,7 +59,7 @@ class KeyFileManagerTest: XCTestCase {
func testImportKeyFromNonAsciiString() throws {
XCTAssertThrowsError(try KeyFileManagerTest.keyFileManager.importKey(from: "≠")) {
XCTAssertEqual($0 as! AppError, AppError.Encoding)
XCTAssertEqual($0 as! AppError, AppError.encoding)
}
}

4
passKitTests/Testbase/TestBase.swift
View file

@ -49,11 +49,11 @@ func assertDefaults(
}
infix operator ∈: AdditionPrecedence
func ∈ (field: AdditionField, password: Password) -> Bool {
func ∈ (field: AdditionField, password: Password) -> Bool { // swiftlint:disable:this identifier_name
password.getFilteredAdditions().contains(field)
}
infix operator ∉: AdditionPrecedence
func ∉ (field: AdditionField, password: Password) -> Bool {
func ∉ (field: AdditionField, password: Password) -> Bool { // swiftlint:disable:this identifier_name
!(field ∈ password)
}