Merge branch 'master' of

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

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

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/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(),
@@ -104,7 +104,6 @@ public class APITest_tk extends BasicsGM{
 					);
 	  */
 	  
-	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();
 		  String Expect2=data.get("msg")==null?"":data.get("msg").toString();

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