浏览代码

Rename function

Evgenii Neumerzhitckii 11 年之前
父节点
当前提交
e105a47e14
共有 4 个文件被更改,包括 9 次插入9 次删除
  1. 1 1
      README.md
  2. 1 1
      keychain/TegKeychain.swift
  3. 1 1
      keychain/ViewController.swift
  4. 6 6
      keychainTests/keychainTests.swift

+ 1 - 1
README.md

@@ -14,7 +14,7 @@ Copy [TegKeychain.swift](https://raw.githubusercontent.com/exchangegroup/keychai
 ```Swift
 TegKeychain.set("my key", value: "hello world")
 
-TegKeychain.getString("my key")
+TegKeychain.get("my key")
 
 TegKeychain.delete("my key")
 

+ 1 - 1
keychain/TegKeychain.swift

@@ -32,7 +32,7 @@ public class TegKeychain {
     return status == noErr
   }
 
-  public class func getString(key: String) -> String? {
+  public class func get(key: String) -> String? {
     if let currentData = getData(key) {
       return NSString(data: currentData, encoding: NSUTF8StringEncoding)
     }

+ 1 - 1
keychain/ViewController.swift

@@ -38,7 +38,7 @@ class ViewController: UIViewController {
   }
   
   private func updateValueLabel() {
-    if let currentValue = TegKeychain.getString(TegKeychainDemo_keyName) {
+    if let currentValue = TegKeychain.get(TegKeychainDemo_keyName) {
       valueLabel.text = "In Keychain: \(currentValue)"
     } else {
       valueLabel.text = "no value in keychain"

+ 6 - 6
keychainTests/keychainTests.swift

@@ -22,14 +22,14 @@ class keychainTests: XCTestCase {
 
   func testSet() {
     XCTAssertTrue(TegKeychain.set("key 1", value: "hello :)"))
-    XCTAssertEqual("hello :)", TegKeychain.getString("key 1")!)
+    XCTAssertEqual("hello :)", TegKeychain.get("key 1")!)
   }
 
   // Get
   // -----------------------
 
   func testGet_returnNilWhenValueNotSet() {
-    XCTAssert(TegKeychain.getString("key 1") == nil)
+    XCTAssert(TegKeychain.get("key 1") == nil)
   }
 
   // Delete
@@ -39,7 +39,7 @@ class keychainTests: XCTestCase {
     TegKeychain.set("key 1", value: "hello :)")
     TegKeychain.delete("key 1")
     
-    XCTAssert(TegKeychain.getString("key 1") == nil)
+    XCTAssert(TegKeychain.get("key 1") == nil)
   }
 
   func testDelete_deleteOnSingleKey() {
@@ -48,7 +48,7 @@ class keychainTests: XCTestCase {
 
     TegKeychain.delete("key 1")
     
-    XCTAssertEqual("hello two", TegKeychain.getString("key 2")!)
+    XCTAssertEqual("hello two", TegKeychain.get("key 2")!)
   }
 
   // Clear
@@ -60,7 +60,7 @@ class keychainTests: XCTestCase {
     
     TegKeychain.clear()
     
-    XCTAssert(TegKeychain.getString("key 1") == nil)
-    XCTAssert(TegKeychain.getString("key 2") == nil)
+    XCTAssert(TegKeychain.get("key 1") == nil)
+    XCTAssert(TegKeychain.get("key 2") == nil)
   }
 }