@@ -3,63 +3,63 @@ import XCTest
33import Yosemite
44
55
6- /// CredentialsStorage Unit Tests
6+ /// SessionManager Unit Tests
77///
8- class CredentialsStorageTests : XCTestCase {
8+ class SessionManagerTests : XCTestCase {
99
1010 /// CredentialsStorage Unit-Testing Instance
1111 ///
12- private let manager = CredentialsStorage ( keychainServiceName : Constants . testingServiceName , defaults : . standard )
12+ private var manager = SessionManager ( defaults : . standard , keychainServiceName : Constants . testingServiceName )
1313
1414
1515 // MARK: - Overridden Methods
1616
1717 override func setUp( ) {
1818 super. setUp ( )
19- manager. removeCredentials ( )
19+ manager. credentials = nil
2020 }
2121
2222
2323 /// Verifies that `loadDefaultCredentials` returns nil whenever there are no default credentials stored.
2424 ///
2525 func testLoadDefaultCredentialsReturnsNilWhenThereAreNoDefaultCredentials( ) {
26- XCTAssertNil ( manager. loadCredentials ( ) )
26+ XCTAssertNil ( manager. credentials )
2727 }
2828
2929 /// Verifies that `loadDefaultCredentials` effectively returns the last stored credentials
3030 ///
3131 func testDefaultCredentialsAreProperlyPersisted( ) {
32- manager. saveCredentials ( Constants . testingCredentials1)
32+ manager. credentials = Constants . testingCredentials1
3333
34- let retrieved = manager. loadCredentials ( )
34+ let retrieved = manager. credentials
3535 XCTAssertEqual ( retrieved? . authToken, Constants . testingCredentials1. authToken)
3636 XCTAssertEqual ( retrieved? . username, Constants . testingCredentials1. username)
3737 }
3838
3939 /// Verifies that `removeDefaultCredentials` effectively nukes everything from the keychain
4040 ///
4141 func testDefaultCredentialsAreEffectivelyNuked( ) {
42- manager. saveCredentials ( Constants . testingCredentials1)
43- manager. removeCredentials ( )
42+ manager. credentials = Constants . testingCredentials1
43+ manager. credentials = nil
4444
45- XCTAssertNil ( manager. loadCredentials ( ) )
45+ XCTAssertNil ( manager. credentials )
4646 }
4747
4848 /// Verifies that `saveDefaultCredentials` overrides previous stored credentials
4949 ///
5050 func testDefaultCredentialsCanBeUpdated( ) {
51- manager. saveCredentials ( Constants . testingCredentials1)
52- XCTAssertEqual ( manager. loadCredentials ( ) , Constants . testingCredentials1)
51+ manager. credentials = Constants . testingCredentials1
52+ XCTAssertEqual ( manager. credentials , Constants . testingCredentials1)
5353
54- manager. saveCredentials ( Constants . testingCredentials2)
55- XCTAssertEqual ( manager. loadCredentials ( ) , Constants . testingCredentials2)
54+ manager. credentials = Constants . testingCredentials2
55+ XCTAssertEqual ( manager. credentials , Constants . testingCredentials2)
5656 }
5757}
5858
5959
6060// MARK: - Nested Types
6161//
62- private extension CredentialsStorageTests {
62+ private extension SessionManagerTests {
6363
6464 struct Constants {
6565 static let testingServiceName = " com.automattic.woocommerce.tests "
0 commit comments