From 9b0efc923e970306a2d475cb97e900f8af7873e8 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Thu, 28 Sep 2017 14:29:23 +0800
Subject: [PATCH] update tests

---
 tests/api/demo.yml                | 43 ++++++++++++++
 tests/api_server.py               |  1 -
 tests/data/demo_testset_layer.yml | 96 ++++++++++++++++++++++++++++---
 3 files changed, 130 insertions(+), 10 deletions(-)

diff --git a/tests/api/demo.yml b/tests/api/demo.yml
index 1e641a54..ee752e39 100644
--- a/tests/api/demo.yml
+++ b/tests/api/demo.yml
@@ -24,3 +24,46 @@
         json:
             name: $user_name
             password: $user_password
+
+- api:
+    def: get_user($uid, $token)
+    request:
+        url: /api/users/$uid
+        method: GET
+        headers:
+            token: $token
+
+- api:
+    def: update_user($uid, $user_name, $user_password, $token)
+    request:
+        url: /api/users/$uid
+        method: PUT
+        headers:
+            token: $token
+        json:
+            name: $user_name
+            password: $user_password
+
+- api:
+    def: delete_user($uid, $token)
+    request:
+        url: /api/users/$uid
+        method: DELETE
+        headers:
+            token: $token
+
+- api:
+    def: get_users($token)
+    request:
+        url: /api/users
+        method: GET
+        headers:
+            token: $token
+
+- api:
+    def: reset_all($token)
+    request:
+        url: /api/reset-all
+        method: GET
+        headers:
+            token: $token
diff --git a/tests/api_server.py b/tests/api_server.py
index f5f51b63..8517dc70 100644
--- a/tests/api_server.py
+++ b/tests/api_server.py
@@ -1,5 +1,4 @@
 import hashlib
-import hmac
 import json
 from functools import wraps
 
diff --git a/tests/data/demo_testset_layer.yml b/tests/data/demo_testset_layer.yml
index 87758abf..d731c18a 100644
--- a/tests/data/demo_testset_layer.yml
+++ b/tests/data/demo_testset_layer.yml
@@ -20,14 +20,18 @@
         - token: content.token
 
 - test:
-    name: create user which does not exist
-    variable_binds:
-        - user_name: "user1"
-        - user_password: "123456"
-    api: create_user(1000, $user_name, $user_password, $token)
+    name: reset all users
+    api: reset_all($token)
     validators:
-        - {"check": "status_code", "comparator": "eq", "expected": 201}
-        - {"check": "content.success", "comparator": "eq", "expected": true}
+        - {"check": "status_code", "expected": 200}
+        - {"check": "content.success", "expected": true}
+
+- test:
+    name: get user that does not exist
+    api: get_user(1000, $token)
+    validators:
+        - {"check": "status_code", "expected": 404}
+        - {"check": "content.success", "expected": false}
 
 - test:
     name: create user which does not exist
@@ -36,5 +40,79 @@
         - user_password: "123456"
     api: create_user(1000, $user_name, $user_password, $token)
     validators:
-        - {"check": "status_code", "comparator": "eq", "expected": 500}
-        - {"check": "content.success", "comparator": "eq", "expected": false}
+        - {"check": "status_code", "expected": 201}
+        - {"check": "content.success", "expected": true}
+
+- test:
+    name: get user that has been created
+    api: get_user(1000, $token)
+    validators:
+        - {"check": "status_code", "expected": 200}
+        - {"check": "content.success", "expected": true}
+        - {"check": "content.data.password", "expected": "123456"}
+
+- test:
+    name: create user which exists
+    variable_binds:
+        - user_name: "user1"
+        - user_password: "123456"
+    api: create_user(1000, $user_name, $user_password, $token)
+    validators:
+        - {"check": "status_code", "expected": 500}
+        - {"check": "content.success", "expected": false}
+
+- test:
+    name: update user which exists
+    variable_binds:
+        - user_name: "user1"
+        - user_password: "654321"
+    api: update_user(1000, $user_name, $user_password, $token)
+    validators:
+        - {"check": "status_code", "expected": 200}
+        - {"check": "content.success", "expected": true}
+
+- test:
+    name: get user that has been created
+    api: get_user(1000, $token)
+    validators:
+        - {"check": "status_code", "expected": 200}
+        - {"check": "content.success", "expected": true}
+        - {"check": "content.data.password", "expected": "654321"}
+
+- test:
+    name: get users
+    api: get_users($token)
+    validators:
+        - {"check": "status_code", "expected": 200}
+        - {"check": "content.count", "expected": 1}
+
+- test:
+    name: delete user that exists
+    api: delete_user(1000, $token)
+    validators:
+        - {"check": "status_code", "expected": 200}
+        - {"check": "content.success", "expected": true}
+
+- test:
+    name: get users
+    api: get_users($token)
+    validators:
+        - {"check": "status_code", "expected": 200}
+        - {"check": "content.count", "expected": 0}
+
+- test:
+    name: create user which has been deleted
+    variable_binds:
+        - user_name: "user1"
+        - user_password: "123456"
+    api: create_user(1000, $user_name, $user_password, $token)
+    validators:
+        - {"check": "status_code", "expected": 201}
+        - {"check": "content.success", "expected": true}
+
+- test:
+    name: get users
+    api: get_users($token)
+    validators:
+        - {"check": "status_code", "expected": 200}
+        - {"check": "content.count", "expected": 1}