Authored by zhaoyue

Fix little bug

@@ -10,7 +10,7 @@ import java.util.HashMap; @@ -10,7 +10,7 @@ import java.util.HashMap;
10 import java.util.Map; 10 import java.util.Map;
11 11
12 /** 12 /**
13 - * 上传软件登录、退出、修改密码测试。 13 + * USPIH login and logout
14 * zhaoyue 14 * zhaoyue
15 * 2017-1-14 15 * 2017-1-14
16 */ 16 */
@@ -18,10 +18,16 @@ import java.util.Map; @@ -18,10 +18,16 @@ import java.util.Map;
18 public class AccountTest { 18 public class AccountTest {
19 private static final String URL_LOGIN = Constants.URL_PREFIX + "/uspih/account"; 19 private static final String URL_LOGIN = Constants.URL_PREFIX + "/uspih/account";
20 20
  21 + /**
  22 + *
  23 + * @param user user account
  24 + * @param pass user password
  25 + * @return
  26 + */
21 public static String loginAndGetToken(String user, String pass) { 27 public static String loginAndGetToken(String user, String pass) {
22 Map<String, String> params = new HashMap<String, String>(); 28 Map<String, String> params = new HashMap<String, String>();
23 params.put("account", user); 29 params.put("account", user);
24 - params.put("password", EncodeTools.encode("MD5", pass)); 30 + params.put("password", EncodeTools.encode("MD5", pass)); // encode password with MD5 algorithm
25 params.put("t", HttpTools.getNow()); 31 params.put("t", HttpTools.getNow());
26 String response = HttpTools.requestByMap(URL_LOGIN, "POST", params); 32 String response = HttpTools.requestByMap(URL_LOGIN, "POST", params);
27 System.out.println("login success:" + response); 33 System.out.println("login success:" + response);
@@ -30,11 +36,20 @@ public class AccountTest { @@ -30,11 +36,20 @@ public class AccountTest {
30 return content.getString("userId") + "_" + content.getString("token"); 36 return content.getString("userId") + "_" + content.getString("token");
31 } 37 }
32 38
  39 + /**
  40 + * login success test
  41 + */
33 @Test 42 @Test
34 - public void testLogin() { 43 + public void testLoginSuccess() {
35 System.out.println(loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD)); 44 System.out.println(loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD));
36 } 45 }
37 - 46 + /**
  47 + * login fail test
  48 + */
  49 + @Test
  50 + public void testLoginFail() {
  51 + System.out.println(loginAndGetToken(Data.ADMIN_ACCOUNT+"ppppp", Data.ADMIN_PWD));
  52 + }
38 @Test 53 @Test
39 public void testLogout() { 54 public void testLogout() {
40 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD); 55 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD);
@@ -43,4 +58,13 @@ public class AccountTest { @@ -43,4 +58,13 @@ public class AccountTest {
43 String response = HttpTools.requestByMapWithToken(URL_LOGIN, "DELETE", params, token); 58 String response = HttpTools.requestByMapWithToken(URL_LOGIN, "DELETE", params, token);
44 System.out.println("logout success:" + response); 59 System.out.println("logout success:" + response);
45 } 60 }
  61 +
  62 + @Test
  63 + public void testLogoutFail() {
  64 + String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD);
  65 + Map<String, String> params = new HashMap<String, String>();
  66 + params.put("t", HttpTools.getNow());
  67 + String response = HttpTools.requestByMapWithToken(URL_LOGIN, "DELETE", params, token+"PPPPPP");
  68 + System.out.println("logout success:" + response);
  69 + }
46 } 70 }
@@ -11,7 +11,9 @@ import java.text.DecimalFormat; @@ -11,7 +11,9 @@ import java.text.DecimalFormat;
11 * Created by zhao yue on 2017/1/14. 11 * Created by zhao yue on 2017/1/14.
12 */ 12 */
13 public class Data { 13 public class Data {
  14 + // admin account
14 public static final String ADMIN_ACCOUNT = "user1"; 15 public static final String ADMIN_ACCOUNT = "user1";
  16 + // admin password
15 public static final String ADMIN_PWD = "pass1"; 17 public static final String ADMIN_PWD = "pass1";
16 public static final String USR_ACCOUNT = "15211112222"; 18 public static final String USR_ACCOUNT = "15211112222";
17 // "{\"ABD\":\"35.66\",\"LAC\":\"36.23\",\"LCA\":\"32.94\",\"RAC\":\"35.84\",\"RCA\":\"33.05\",\"age\":\"24\",\"atmospheric_pressure\":\"756.58\",\"basic_result\":\"初步检测结果(仅供参考):\\n\\n低渗性血管张力异常 \\n\\n有必要排除血凝异常 血凝升高 \\n\\n建议向胃肠病专家(精于胃十二指肠炎)进一步咨询 \\n\\n血管张力异常,静脉循环障碍 酒精性高血压 \\n\\n第三脑室宽度=6.42 \\n\\n建议向妇科医生进一步咨询 其它器官血流量占=4.1 \\n\\nTiffeneau指数持续减少83.6 (Tiffeneau测试) \\n\\n----------------------------------------------------------------------------------------------------------\\n\\n\\n\",\"basic_result_ids\":[1,2,3,4],\"detail\":{\"1\":\"117.54\",\"10\":\"01.29\",\"100\":\"5.06\",\"101\":\"250.60\",\"102\":\"8.61\",\"103\":\"0.319\",\"104\":\"370.02\",\"105\":\"45.98\",\"106\":\"62.96\",\"107\":\"325.68\",\"108\":\"3.750\",\"109\":\"71.52\",\"11\":\"02.13\",\"110\":\"0.136\",\"111\":\"0.392\",\"112\":\"0.079\",\"113\":\"67.78\",\"114\":\"113.66\",\"115\":\"71.55\",\"116\":\"6.42\",\"117\":\"0.91\",\"118\":\"78.4\",\"119\":\"66.0\",\"12\":\"245.28\",\"120\":\"31\",\"121\":\"90\",\"122\":\"340\",\"123\":\"0.93\",\"124\":\"0.97\",\"125\":\"15\",\"13\":\"2.45\",\"14\":\"0.86\",\"15\":\"4.06\",\"16\":\"134.78\",\"17\":\"1.56\",\"18\":\"7.33\",\"19\":\"5.18\",\"2\":\"3.81\",\"20\":\"42.62\",\"21\":\"5.21\",\"22\":\"0.26\",\"23\":\"0.26\",\"24\":\"13.12\",\"25\":\"14.87\",\"26\":\"1.01\",\"27\":\"10.52\",\"28\":\"2.83\",\"29\":\"7.69\",\"3\":\"36.87\",\"30\":\"61.82\",\"31\":\"82.57\",\"32\":\"28.00\",\"33\":\"1.41\",\"34\":\"5.53\",\"35\":\"5.00\",\"36\":\"38.19\",\"37\":\"4.01\",\"38\":\"2.34\",\"39\":\"0.30\",\"4\":\"7.34\",\"40\":\"1.13\",\"41\":\"0.80\",\"42\":\"4.77\",\"43\":\"14.55\",\"44\":\"21.39\",\"45\":\"40.28\",\"46\":\"56.21\",\"47\":\"8.04\",\"48\":\"162.71\",\"49\":\"75.6\",\"5\":\"46.70\",\"50\":\"25.41\",\"51\":\"86.24\",\"52\":\"251.45\",\"53\":\"0.0050\",\"54\":\"1.68\",\"55\":\"475.35\",\"56\":\"35.47\",\"57\":\"3.8396\",\"58\":\"1052.84\",\"59\":\"64.17\",\"6\":\"5.07\",\"60\":\"3.82\",\"61\":\"265.63\",\"62\":\"3953.54\",\"63\":\"58.44\",\"64\":\"4.52\",\"65\":\"18.93\",\"66\":\"14.01\",\"67\":\"25.61\",\"68\":\"26.05\",\"69\":\"6.66\",\"7\":\"5.36\",\"70\":\"4.08\",\"71\":\"261.67\",\"72\":\"1209.45\",\"73\":\"819.37\",\"74\":\"2134.08\",\"75\":\"1726.00\",\"76\":\"421.24\",\"77\":\"265.40\",\"78\":\"140.33\",\"79\":\"72.37\",\"8\":\"7.35\",\"80\":\"19.51\",\"81\":\"4.78\",\"82\":\"53.24\",\"83\":\"3.94\",\"84\":\"3.19\",\"85\":\"160.94\",\"86\":\"2.22\",\"87\":\"80.94\",\"88\":\"34.53\",\"89\":\"3607.41\",\"9\":\"3.72\",\"90\":\"7.38\",\"91\":\"1922.57\",\"92\":\"85.16\",\"93\":\"83.59\",\"94\":\"71.95\",\"95\":\"6.64\",\"96\":\"0.96\",\"97\":\"1135.53\",\"98\":\"2.48\",\"99\":\"96.97\"},\"name\":\"测试\",\"number\":\"12345678901\",\"pulse\":\"79\",\"report_date\":\"2014-12-17 17:01:40\",\"respiratory_rate\":\"18\",\"sex\":0,\"stable\":\"99999\",\"total\":\"173.62\",\"weight\":\"45\",\"title\":\"AMP TITLE\",\"account\":\"user1\",\"machine_num\":\"10311212\"}"; 19 // "{\"ABD\":\"35.66\",\"LAC\":\"36.23\",\"LCA\":\"32.94\",\"RAC\":\"35.84\",\"RCA\":\"33.05\",\"age\":\"24\",\"atmospheric_pressure\":\"756.58\",\"basic_result\":\"初步检测结果(仅供参考):\\n\\n低渗性血管张力异常 \\n\\n有必要排除血凝异常 血凝升高 \\n\\n建议向胃肠病专家(精于胃十二指肠炎)进一步咨询 \\n\\n血管张力异常,静脉循环障碍 酒精性高血压 \\n\\n第三脑室宽度=6.42 \\n\\n建议向妇科医生进一步咨询 其它器官血流量占=4.1 \\n\\nTiffeneau指数持续减少83.6 (Tiffeneau测试) \\n\\n----------------------------------------------------------------------------------------------------------\\n\\n\\n\",\"basic_result_ids\":[1,2,3,4],\"detail\":{\"1\":\"117.54\",\"10\":\"01.29\",\"100\":\"5.06\",\"101\":\"250.60\",\"102\":\"8.61\",\"103\":\"0.319\",\"104\":\"370.02\",\"105\":\"45.98\",\"106\":\"62.96\",\"107\":\"325.68\",\"108\":\"3.750\",\"109\":\"71.52\",\"11\":\"02.13\",\"110\":\"0.136\",\"111\":\"0.392\",\"112\":\"0.079\",\"113\":\"67.78\",\"114\":\"113.66\",\"115\":\"71.55\",\"116\":\"6.42\",\"117\":\"0.91\",\"118\":\"78.4\",\"119\":\"66.0\",\"12\":\"245.28\",\"120\":\"31\",\"121\":\"90\",\"122\":\"340\",\"123\":\"0.93\",\"124\":\"0.97\",\"125\":\"15\",\"13\":\"2.45\",\"14\":\"0.86\",\"15\":\"4.06\",\"16\":\"134.78\",\"17\":\"1.56\",\"18\":\"7.33\",\"19\":\"5.18\",\"2\":\"3.81\",\"20\":\"42.62\",\"21\":\"5.21\",\"22\":\"0.26\",\"23\":\"0.26\",\"24\":\"13.12\",\"25\":\"14.87\",\"26\":\"1.01\",\"27\":\"10.52\",\"28\":\"2.83\",\"29\":\"7.69\",\"3\":\"36.87\",\"30\":\"61.82\",\"31\":\"82.57\",\"32\":\"28.00\",\"33\":\"1.41\",\"34\":\"5.53\",\"35\":\"5.00\",\"36\":\"38.19\",\"37\":\"4.01\",\"38\":\"2.34\",\"39\":\"0.30\",\"4\":\"7.34\",\"40\":\"1.13\",\"41\":\"0.80\",\"42\":\"4.77\",\"43\":\"14.55\",\"44\":\"21.39\",\"45\":\"40.28\",\"46\":\"56.21\",\"47\":\"8.04\",\"48\":\"162.71\",\"49\":\"75.6\",\"5\":\"46.70\",\"50\":\"25.41\",\"51\":\"86.24\",\"52\":\"251.45\",\"53\":\"0.0050\",\"54\":\"1.68\",\"55\":\"475.35\",\"56\":\"35.47\",\"57\":\"3.8396\",\"58\":\"1052.84\",\"59\":\"64.17\",\"6\":\"5.07\",\"60\":\"3.82\",\"61\":\"265.63\",\"62\":\"3953.54\",\"63\":\"58.44\",\"64\":\"4.52\",\"65\":\"18.93\",\"66\":\"14.01\",\"67\":\"25.61\",\"68\":\"26.05\",\"69\":\"6.66\",\"7\":\"5.36\",\"70\":\"4.08\",\"71\":\"261.67\",\"72\":\"1209.45\",\"73\":\"819.37\",\"74\":\"2134.08\",\"75\":\"1726.00\",\"76\":\"421.24\",\"77\":\"265.40\",\"78\":\"140.33\",\"79\":\"72.37\",\"8\":\"7.35\",\"80\":\"19.51\",\"81\":\"4.78\",\"82\":\"53.24\",\"83\":\"3.94\",\"84\":\"3.19\",\"85\":\"160.94\",\"86\":\"2.22\",\"87\":\"80.94\",\"88\":\"34.53\",\"89\":\"3607.41\",\"9\":\"3.72\",\"90\":\"7.38\",\"91\":\"1922.57\",\"92\":\"85.16\",\"93\":\"83.59\",\"94\":\"71.95\",\"95\":\"6.64\",\"96\":\"0.96\",\"97\":\"1135.53\",\"98\":\"2.48\",\"99\":\"96.97\"},\"name\":\"测试\",\"number\":\"12345678901\",\"pulse\":\"79\",\"report_date\":\"2014-12-17 17:01:40\",\"respiratory_rate\":\"18\",\"sex\":0,\"stable\":\"99999\",\"total\":\"173.62\",\"weight\":\"45\",\"title\":\"AMP TITLE\",\"account\":\"user1\",\"machine_num\":\"10311212\"}";
@@ -46,7 +46,7 @@ public class ReportTest { @@ -46,7 +46,7 @@ public class ReportTest {
46 public void testDelReport() { 46 public void testDelReport() {
47 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD); 47 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD);
48 Map<String, String> params = new HashMap<String, String>(); 48 Map<String, String> params = new HashMap<String, String>();
49 - params.put("report_id", "121"); 49 + params.put("report_id", "100");
50 String response = HttpTools.requestByMapWithToken(URL_REPORT, "DELETE", params, token); 50 String response = HttpTools.requestByMapWithToken(URL_REPORT, "DELETE", params, token);
51 System.out.println("delete report:" + response); 51 System.out.println("delete report:" + response);
52 } 52 }
@@ -10,7 +10,7 @@ import java.util.HashMap; @@ -10,7 +10,7 @@ import java.util.HashMap;
10 import java.util.Map; 10 import java.util.Map;
11 11
12 /** 12 /**
13 - * 上传软件登录、退出、修改密码测试。 13 + * User Account Verify
14 * zhaoyue 14 * zhaoyue
15 * 2017-1-14 15 * 2017-1-14
16 */ 16 */
@@ -44,7 +44,7 @@ public class UsrAccountTest { @@ -44,7 +44,7 @@ public class UsrAccountTest {
44 44
45 45
46 @Test 46 @Test
47 - public void testAccountNotExistVerify() { 47 + public void testAccountNotExist() {
48 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD); 48 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD);
49 Map<String, String> params = new HashMap<String, String>(); 49 Map<String, String> params = new HashMap<String, String>();
50 params.put("usraccount", Data.USR_ACCOUNT+"not exist account"); 50 params.put("usraccount", Data.USR_ACCOUNT+"not exist account");