|
@@ -219,7 +219,7 @@ class KeychainAccessTests: XCTestCase {
|
|
func testDefaultInitializer() {
|
|
func testDefaultInitializer() {
|
|
let keychain = Keychain()
|
|
let keychain = Keychain()
|
|
XCTAssertEqual(keychain.service, NSBundle.mainBundle().bundleIdentifier)
|
|
XCTAssertEqual(keychain.service, NSBundle.mainBundle().bundleIdentifier)
|
|
- XCTAssertEqual(keychain.service, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(keychain.service, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertNil(keychain.accessGroup)
|
|
XCTAssertNil(keychain.accessGroup)
|
|
}
|
|
}
|
|
|
|
|
|
@@ -231,7 +231,7 @@ class KeychainAccessTests: XCTestCase {
|
|
|
|
|
|
func testInitializerWithAccessGroup() {
|
|
func testInitializerWithAccessGroup() {
|
|
let keychain = Keychain(accessGroup: "27AEDK3C9F.shared")
|
|
let keychain = Keychain(accessGroup: "27AEDK3C9F.shared")
|
|
- XCTAssertEqual(keychain.service, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(keychain.service, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(keychain.accessGroup, "27AEDK3C9F.shared")
|
|
XCTAssertEqual(keychain.accessGroup, "27AEDK3C9F.shared")
|
|
}
|
|
}
|
|
|
|
|
|
@@ -496,7 +496,7 @@ class KeychainAccessTests: XCTestCase {
|
|
XCTAssertNotNil(attributes?.persistentRef)
|
|
XCTAssertNotNil(attributes?.persistentRef)
|
|
XCTAssertEqual(attributes?.accessible, Accessibility.WhenPasscodeSetThisDeviceOnly.rawValue)
|
|
XCTAssertEqual(attributes?.accessible, Accessibility.WhenPasscodeSetThisDeviceOnly.rawValue)
|
|
XCTAssertNotNil(attributes?.accessControl)
|
|
XCTAssertNotNil(attributes?.accessControl)
|
|
- XCTAssertEqual(attributes?.accessGroup, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(attributes?.accessGroup, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertNotNil(attributes?.synchronizable)
|
|
XCTAssertNotNil(attributes?.synchronizable)
|
|
XCTAssertNotNil(attributes?.creationDate)
|
|
XCTAssertNotNil(attributes?.creationDate)
|
|
XCTAssertNotNil(attributes?.modificationDate)
|
|
XCTAssertNotNil(attributes?.modificationDate)
|
|
@@ -566,7 +566,7 @@ class KeychainAccessTests: XCTestCase {
|
|
} else {
|
|
} else {
|
|
XCTAssertNotNil(attributes?.accessControl)
|
|
XCTAssertNotNil(attributes?.accessControl)
|
|
}
|
|
}
|
|
- XCTAssertEqual(attributes?.accessGroup, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(attributes?.accessGroup, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertNotNil(attributes?.synchronizable)
|
|
XCTAssertNotNil(attributes?.synchronizable)
|
|
XCTAssertNotNil(attributes?.creationDate)
|
|
XCTAssertNotNil(attributes?.creationDate)
|
|
XCTAssertNotNil(attributes?.modificationDate)
|
|
XCTAssertNotNil(attributes?.modificationDate)
|
|
@@ -608,7 +608,7 @@ class KeychainAccessTests: XCTestCase {
|
|
} else {
|
|
} else {
|
|
XCTAssertNotNil(attributes?.accessControl)
|
|
XCTAssertNotNil(attributes?.accessControl)
|
|
}
|
|
}
|
|
- XCTAssertEqual(attributes?.accessGroup, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(attributes?.accessGroup, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertNotNil(attributes?.synchronizable)
|
|
XCTAssertNotNil(attributes?.synchronizable)
|
|
XCTAssertNotNil(attributes?.creationDate)
|
|
XCTAssertNotNil(attributes?.creationDate)
|
|
XCTAssertNotNil(attributes?.modificationDate)
|
|
XCTAssertNotNil(attributes?.modificationDate)
|
|
@@ -651,7 +651,7 @@ class KeychainAccessTests: XCTestCase {
|
|
} else {
|
|
} else {
|
|
XCTAssertNotNil(attributes?.accessControl)
|
|
XCTAssertNotNil(attributes?.accessControl)
|
|
}
|
|
}
|
|
- XCTAssertEqual(attributes?.accessGroup, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(attributes?.accessGroup, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertNotNil(attributes?.synchronizable)
|
|
XCTAssertNotNil(attributes?.synchronizable)
|
|
XCTAssertNotNil(attributes?.creationDate)
|
|
XCTAssertNotNil(attributes?.creationDate)
|
|
XCTAssertNotNil(attributes?.modificationDate)
|
|
XCTAssertNotNil(attributes?.modificationDate)
|
|
@@ -1043,39 +1043,39 @@ class KeychainAccessTests: XCTestCase {
|
|
}
|
|
}
|
|
|
|
|
|
#if !os(OSX)
|
|
#if !os(OSX)
|
|
- XCTAssertEqual(sortedItems[0]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[0]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[0]["synchronizable"] as? String, "false")
|
|
XCTAssertEqual(sortedItems[0]["synchronizable"] as? String, "false")
|
|
- XCTAssertEqual(sortedItems[0]["service"] as? String, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[0]["service"] as? String, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[0]["value"] as? String, "value1")
|
|
XCTAssertEqual(sortedItems[0]["value"] as? String, "value1")
|
|
XCTAssertEqual(sortedItems[0]["key"] as? String, "key1")
|
|
XCTAssertEqual(sortedItems[0]["key"] as? String, "key1")
|
|
XCTAssertEqual(sortedItems[0]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[0]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[0]["accessibility"] as? String, "AfterFirstUnlock")
|
|
XCTAssertEqual(sortedItems[0]["accessibility"] as? String, "AfterFirstUnlock")
|
|
|
|
|
|
- XCTAssertEqual(sortedItems[1]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[1]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[1]["synchronizable"] as? String, "false")
|
|
XCTAssertEqual(sortedItems[1]["synchronizable"] as? String, "false")
|
|
- XCTAssertEqual(sortedItems[1]["service"] as? String, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[1]["service"] as? String, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[1]["value"] as? String, "value2")
|
|
XCTAssertEqual(sortedItems[1]["value"] as? String, "value2")
|
|
XCTAssertEqual(sortedItems[1]["key"] as? String, "key2")
|
|
XCTAssertEqual(sortedItems[1]["key"] as? String, "key2")
|
|
XCTAssertEqual(sortedItems[1]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[1]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[1]["accessibility"] as? String, "AfterFirstUnlock")
|
|
XCTAssertEqual(sortedItems[1]["accessibility"] as? String, "AfterFirstUnlock")
|
|
|
|
|
|
- XCTAssertEqual(sortedItems[2]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[2]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[2]["synchronizable"] as? String, "false")
|
|
XCTAssertEqual(sortedItems[2]["synchronizable"] as? String, "false")
|
|
- XCTAssertEqual(sortedItems[2]["service"] as? String, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[2]["service"] as? String, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[2]["value"] as? String, "value3")
|
|
XCTAssertEqual(sortedItems[2]["value"] as? String, "value3")
|
|
XCTAssertEqual(sortedItems[2]["key"] as? String, "key3")
|
|
XCTAssertEqual(sortedItems[2]["key"] as? String, "key3")
|
|
XCTAssertEqual(sortedItems[2]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[2]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[2]["accessibility"] as? String, "AfterFirstUnlock")
|
|
XCTAssertEqual(sortedItems[2]["accessibility"] as? String, "AfterFirstUnlock")
|
|
#else
|
|
#else
|
|
- XCTAssertEqual(sortedItems[0]["service"] as? String, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[0]["service"] as? String, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[0]["key"] as? String, "key1")
|
|
XCTAssertEqual(sortedItems[0]["key"] as? String, "key1")
|
|
XCTAssertEqual(sortedItems[0]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[0]["class"] as? String, "GenericPassword")
|
|
|
|
|
|
- XCTAssertEqual(sortedItems[1]["service"] as? String, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[1]["service"] as? String, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[1]["key"] as? String, "key2")
|
|
XCTAssertEqual(sortedItems[1]["key"] as? String, "key2")
|
|
XCTAssertEqual(sortedItems[1]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[1]["class"] as? String, "GenericPassword")
|
|
|
|
|
|
- XCTAssertEqual(sortedItems[2]["service"] as? String, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[2]["service"] as? String, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[2]["key"] as? String, "key3")
|
|
XCTAssertEqual(sortedItems[2]["key"] as? String, "key3")
|
|
XCTAssertEqual(sortedItems[2]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[2]["class"] as? String, "GenericPassword")
|
|
#endif
|
|
#endif
|
|
@@ -1106,7 +1106,7 @@ class KeychainAccessTests: XCTestCase {
|
|
}
|
|
}
|
|
|
|
|
|
#if !os(OSX)
|
|
#if !os(OSX)
|
|
- XCTAssertEqual(sortedItems[0]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[0]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[0]["synchronizable"] as? String, "true")
|
|
XCTAssertEqual(sortedItems[0]["synchronizable"] as? String, "true")
|
|
XCTAssertEqual(sortedItems[0]["service"] as? String, "service1")
|
|
XCTAssertEqual(sortedItems[0]["service"] as? String, "service1")
|
|
XCTAssertEqual(sortedItems[0]["value"] as? String, "service1_value1")
|
|
XCTAssertEqual(sortedItems[0]["value"] as? String, "service1_value1")
|
|
@@ -1114,7 +1114,7 @@ class KeychainAccessTests: XCTestCase {
|
|
XCTAssertEqual(sortedItems[0]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[0]["class"] as? String, "GenericPassword")
|
|
XCTAssertEqual(sortedItems[0]["accessibility"] as? String, "WhenUnlockedThisDeviceOnly")
|
|
XCTAssertEqual(sortedItems[0]["accessibility"] as? String, "WhenUnlockedThisDeviceOnly")
|
|
|
|
|
|
- XCTAssertEqual(sortedItems[1]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedItems[1]["accessGroup"] as? String, "27AEDK3C9F.com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedItems[1]["synchronizable"] as? String, "false")
|
|
XCTAssertEqual(sortedItems[1]["synchronizable"] as? String, "false")
|
|
XCTAssertEqual(sortedItems[1]["service"] as? String, "service1")
|
|
XCTAssertEqual(sortedItems[1]["service"] as? String, "service1")
|
|
XCTAssertEqual(sortedItems[1]["value"] as? String, "service1_value2")
|
|
XCTAssertEqual(sortedItems[1]["value"] as? String, "service1_value2")
|
|
@@ -1197,11 +1197,11 @@ class KeychainAccessTests: XCTestCase {
|
|
let sortedKeys = allKeys.sort { (key1, key2) -> Bool in
|
|
let sortedKeys = allKeys.sort { (key1, key2) -> Bool in
|
|
return key1.1.compare(key2.1) == .OrderedAscending || key1.1.compare(key2.1) == .OrderedSame
|
|
return key1.1.compare(key2.1) == .OrderedAscending || key1.1.compare(key2.1) == .OrderedSame
|
|
}
|
|
}
|
|
- XCTAssertEqual(sortedKeys[0].0, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedKeys[0].0, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedKeys[0].1, "key1")
|
|
XCTAssertEqual(sortedKeys[0].1, "key1")
|
|
- XCTAssertEqual(sortedKeys[1].0, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedKeys[1].0, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedKeys[1].1, "key2")
|
|
XCTAssertEqual(sortedKeys[1].1, "key2")
|
|
- XCTAssertEqual(sortedKeys[2].0, "com.kishikawakatsumi.TestHost")
|
|
|
|
|
|
+ XCTAssertEqual(sortedKeys[2].0, "com.kishikawakatsumi.KeychainAccess.TestHost")
|
|
XCTAssertEqual(sortedKeys[2].1, "key3")
|
|
XCTAssertEqual(sortedKeys[2].1, "key3")
|
|
XCTAssertEqual(sortedKeys[3].0, "service1")
|
|
XCTAssertEqual(sortedKeys[3].0, "service1")
|
|
XCTAssertEqual(sortedKeys[3].1, "service1_key1")
|
|
XCTAssertEqual(sortedKeys[3].1, "service1_key1")
|