Merge branch 'master' of

https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git

Conflicts:
	tiku_App/TestData/CaseMakeMr.xls
	tiku_App/TestData/DataAllMr.xls
	tiku_App/src/com/offcn/api/tk/app3/getPracticeListByShelf.java

tiku_App/src/com/offcn/api/tk/app3/getBookshelfInfo.java

@@ -146,10 +146,16 @@ public class getBookshelfInfo extends TK implements API {
 			}
 			
 			if("接口响应成功！".equals(msg)){
-				List<String> list=jp.getList("data");
+				List<String> list=jp.getList("data.children.children");
+				System.out.println(list);
 				if (list!=null && list.size()>0 && list.get(0)!=null) {
 					for(int i=0;i<list.size();i++){
-						L_shelf_id=jp.getString("data["+i+"].shelf_id");
+						String shelfIds =jp.getString("data.children.children[0].shelf_id");
+						String[] shelfId = shelfIds.split(",");
+						for (String string : shelfId) {
+							L_shelf_id = string.replace("[", "").replace("]", "").trim();
+//							 System.out.println(string.replace("[", "").replace("]", ""));
+						}
 					}
 //					
 				}

tiku_App/src/com/offcn/api/tk/app3/getPracticeDetail.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 2. 最近练习的练习册列表
+ * 
+ */
+
+public class getPracticeDetail extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+	public String practice_id;//练习册id
+	public String channel;//做题平台来源
+	public String package_id;//学习包id
+	//public String appid;//标识
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		practice_id = MapUtil.getParameter(parameter, "practice_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		package_id = MapUtil.getParameter(parameter, "package_id").trim();
+		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
+		
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!package_id.equals("")) && package_id.equals("code")) {
+			package_id="";
+			parameter = parameter.replace("\"package_id\":code", "\"package_id\":\""+ package_id + "\"");
+		}
+		if ((!channel.equals("")) && channel.equals("code")) {
+			channel="";
+			parameter = parameter.replace("\"channel\":code", "\"channel\":\""+ channel + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("practice_id", practice_id);
+		jsonAsMap.put("package_id", package_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getPracticeListByShelf.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 2. 获取考试列表 （v1 . 17）
+ * 
+ */
+
+public class getPracticeListByShelf extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String exam_id;//考试id
+	public String user_id;//用户id
+	public String shelf_id;//书架id
+	public String channel;//用户id
+	//public String appid;//标识
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		shelf_id = MapUtil.getParameter(parameter, "shelf_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
+		
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!shelf_id.equals("")) && shelf_id.equals("code")) {
+			shelf_id=L_shelf_id;
+			parameter = parameter.replace("\"shelf_id\":code", "\"shelf_id\":\""+ "" + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("shelf_id", shelf_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getPracticequestion.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 练习册试题获取接口 
+ * 
+ */
+
+public class getPracticequestion extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String practice_id;//考试id
+	public String cate_id;//产品线id
+	public String type;//页码
+	public String exam_id;//页码
+	public String is_return;//页码
+	public String channel;//页码
+	//public String appid;//标识
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		practice_id = MapUtil.getParameter(parameter, "practice_id").trim();
+		cate_id = MapUtil.getParameter(parameter, "cate_id").trim();
+		type = MapUtil.getParameter(parameter, "type").trim();
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		is_return = MapUtil.getParameter(parameter, "is_return").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!cate_id.equals("")) && cate_id.equals("code")) {
+			cate_id="";
+			parameter = parameter.replace("\"cate_id\":code", "\"cate_id\":\""+ cate_id + "\"");
+		}
+		if ((!type.equals("")) && type.equals("code")) {
+			type="";
+			parameter = parameter.replace("\"type\":code", "\"type\":\""+ type + "\"");
+		}
+		if ((!is_return.equals("")) && is_return.equals("code")) {
+			is_return="";
+			parameter = parameter.replace("\"is_return\":code", "\"is_return\":\""+ is_return + "\"");
+		}
+		if ((!channel.equals("")) && channel.equals("code")) {
+			channel="";
+			parameter = parameter.replace("\"channel\":code", "\"channel\":\""+ channel + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("practice_id", practice_id);
+		jsonAsMap.put("cate_id", cate_id);
+		jsonAsMap.put("type", type);
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("is_return", is_return);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getRecentPracticeList.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 2. 最近练习的练习册列表
+ * 
+ */
+
+public class getRecentPracticeList extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String exam_id;//考试id
+	public String channel;//产品线id
+	public String page;//页码
+	//public String appid;//标识
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		page = MapUtil.getParameter(parameter, "page").trim();
+		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
+		
+		if ((!exam_id.equals("")) && exam_id.equals("code")) {
+			exam_id=L_exam_id;
+			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		}
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("exam_id", exam_id);
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("page", page);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app2/getRecommend.java → tiku_App/src/com/offcn/api/tk/app3/getRecommend.java

-package com.offcn.api.tk.app2;
+package com.offcn.api.tk.app3;
 
 import io.restassured.path.json.JsonPath;
 import io.restassured.response.Response;
@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.xmlbeans.impl.common.IdentityConstraint.IdState;
 import org.json.simple.JSONArray;
 
 import com.offcn.TestUnti.Log;
@@ -30,14 +29,16 @@ import com.offcn.TestUnti.ListUtil;
 import net.sf.json.JSONObject;
 
 
+
 /**
- * 7. 获取首页轮播图（v1 . 19号接口）
+ * 8. 获取首页轮播图
  * 
+ * @author liyy
+ *
  */
-
 public class getRecommend extends TK implements API {
 	public String parameter;//参数集合
-	
+
 	public String exam_id;//考试id
 
 	@Override
@@ -51,14 +52,13 @@ public class getRecommend extends TK implements API {
 	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
+		
 		exam_id = MapUtil.getParameter(parameter, "exam_id").trim();
 		
-		if ((!exam_id.equals("")) && exam_id.equals("code")) {
-			exam_id=L_exam_id;
-			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
+		if ((!exam_id.equals("")) && exam_id.equals("exam_id")) {
+			exam_id="80";
+			parameter = parameter.replace("\"exam_id\":exam_id", "\"exam_id\":\""+ exam_id + "\"");
 		}
-
-		exam_id = MapUtil.killQuotes(exam_id, "\"");
 		
 		data.put("parameter", parameter);
 		return data;
@@ -67,23 +67,16 @@ public class getRecommend extends TK implements API {
 	@Override
 	public Response SendRequest(HashMap<String, Object> data, String Url,
 			String Request) {
-
-		Map<String, String>  headers=new HashMap<String, String>();
+		Map<String, String> headers=new HashMap<String, String>();
 		headers.put("Authorization", tk_token);
 		
-		Map<String, String>  jsonAsMap=new HashMap<String, String>();
-		parameter = MapUtil.getValue("parameter", data);
-		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
-		tikuString = MapUtil.killQuotes(tikuString, "\"");
-		jsonAsMap.put("exam_id", exam_id);
-		jsonAsMap.put("appid", tikuString);
-		
 		MyRequest myRequest=new MyRequest();
-		myRequest.setUrl("/apiv2/exam/recommend/getRecommend");
 		myRequest.setHeaders(headers);
-		myRequest.setFormParameter(jsonAsMap);		
 		myRequest.setRequest(Request);
-		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		myRequest.setUrl(Url);
+		myRequest.setParameter(parameter);
+		
+		Response re = RequestDataUtils.RestAssuredApi(data,myRequest);
 		return re;
 	}
 
@@ -114,16 +107,17 @@ public class getRecommend extends TK implements API {
 				result = result && false;
 				failReason = failReason + "code is expected "
 						+ data.get("code").toString() + " but actually "
-						+ jp.getString("code") + ".";
+						+ jp.getString("retcode") + ".";
 			}
 
 			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
 				result = result && false;
 				failReason = failReason + "msg is expected "
 						+ data.get("msg").toString() + " but actually "
-						+ jp.getString("msg") + ".";
+						+ jp.getString("retcode") + ".";
 			}
-			
+		
+		
 			if(data.get("custom") != null && json!=null){
 				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
 				if(data.get("custom").toString().contains(",")){
@@ -147,8 +141,9 @@ public class getRecommend extends TK implements API {
 				}
 			}
 			
-			if("接口响应成功！".equals(msg)){
-				conn=ConnectionsMap.get("tk");
+			if("0".equals(code)){
+				/*L_record_sub_id=jp.getString("data.record_sub_id");
+				L_mock_subject_id=jp.getString("data.mock_subject_id");*/
 			}
 		}
 		if (result)

tiku_App/src/com/offcn/api/tk/app3/reStudyPracticeV3.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+/**
+ * 2. 最近练习的练习册列表
+ * 
+ */
+
+public class reStudyPracticeV3 extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String practice_id;//练习册id
+	//public String appid;//标识
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		practice_id = MapUtil.getParameter(parameter, "practice_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+
+		Map<String, String>  headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("practice_id", practice_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/test/APITest_tk.java

@@ -88,7 +88,7 @@ public class APITest_tk extends BasicsGM{
 	  
 	  
 	  //数据回写
-	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
+	/*  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
 	  SheetUtils sheet = new SheetUtils("DataAll.xls", "Output");
 	  sheet.writeExcel(
 			  		data.get("NO").toString(),
@@ -102,7 +102,7 @@ public class APITest_tk extends BasicsGM{
 					result,
 					time
 					);
-	  
+	  */
 	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();

tiku_App/src/makeTestCase/MakeTestCases.java

@@ -35,7 +35,7 @@ public class MakeTestCases {
 	
 	public static void main(String[] args) {
 
-		make("TestData/CaseMake.xls","Sheet1","get","tk_3");
+		make("TestData/CaseMake.xls","Sheet1","post","tk_3");
 	}
 	
 	

tiku_App/src/resources/abc.bat

-pict C:\Users\ibm\git\tiku_app\tiku_App\src\resources\case.txt>C:\Users\ibm\git\tiku_app\tiku_App\src\resources\caseOut.txt
\ No newline at end of file

tiku_App/src/resources/test.properties

 xls=DataAll.xls
-sheet=TestCase1
+sheet=test
 mysql_local_Online=local
 Percentage=60
\ No newline at end of file