Merge branch 'master' of

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

Conflicts:
	tiku_App/TestData/DataAllWff.xls

tiku_App/src/com/offcn/api/tk/app3/getMockResult.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;
+
+
+
+/**
+ * 69.获取模考总报告
+ * 
+ * @author puhui
+ *
+ */
+public class getMockResult extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String mock_id;//用户id
+
+	@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();
+		mock_id = MapUtil.getParameter(parameter, "mock_id").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 ((!mock_id.equals("")) && mock_id.equals("code")) {
+			mock_id= L_mock_id;
+			parameter = parameter.replace("\"mock_id\":code", "\"mock_id\":\""+ mock_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);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setHeaders(headers);
+		myRequest.setRequest(Request);
+		myRequest.setUrl(Url);
+		myRequest.setParameter(parameter);
+		
+		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;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ 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("retcode") + ".";
+			}
+			
+			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("0".equals(code)){
+				
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

@@ -65,11 +65,11 @@ public class getPaperQuestionsJson extends TK implements API {
 			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
 		}
 		if ((!paper_id.equals("")) && paper_id.equals("code")) {
-			paper_id="2";
+			paper_id= paper_id_L;
 			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
 		}
 		if ((!record_sub_id.equals("")) && record_sub_id.equals("code")) {
-			record_sub_id="324";
+			record_sub_id= L_record_sub_id;
 			parameter = parameter.replace("\"record_sub_id\":code", "\"record_sub_id\":\""+ record_sub_id + "\"");
 		}
 		if ((!orgin.equals("")) && orgin.equals("code")) {
@@ -86,13 +86,23 @@ public class getPaperQuestionsJson extends TK implements API {
 		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("paper_id", paper_id);
+		jsonAsMap.put("record_sub_id", record_sub_id);
+		jsonAsMap.put("orgin", orgin);
+		jsonAsMap.put("appid", tikuString);
+		
 		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
 		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
 		myRequest.setRequest(Request);
-		myRequest.setUrl(Url);
-		myRequest.setParameter(parameter);
-		
-		Response re = RequestDataUtils.RestAssuredApi(data,myRequest);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
 		return re;
 	}
 

tiku_App/src/makeTestCase/MakeTestCases.java

@@ -35,7 +35,7 @@ public class MakeTestCases {
 	
 	public static void main(String[] args) {
 
-		make("TestData/CaseMake.xls","Sheet1","post","tk_3");
+		make("TestData/CaseMakeWff.xls","Sheet1","post","tk_3");
 	}
 	
 	
@@ -319,7 +319,7 @@ public class MakeTestCases {
 //		System.out.println(nameList);
 		
 		for(int i=0;i<MakeTestCases.state;i++){
-			List<Set<String>> a=TestCase_N("TestData/CaseMake.xls",SheetList.get(i),nameList.get(i));
+			List<Set<String>> a=TestCase_N("TestData/CaseMakeWff.xls",SheetList.get(i),nameList.get(i));
 			listt.add(a.get(0));
 			listf.add(a.get(1));
 		}