Merge branch 'master' of

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

Conflicts:
	tiku_App/src/resources/test.properties

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

@@ -31,7 +31,6 @@ import net.sf.json.JSONObject;
 
 
 /**
-<<<<<<< HEAD
  * 77. 获取模考科目的状态=======
  * 
  * @author puhui
@@ -51,132 +50,6 @@ public class visitor extends TK implements API {
 		}
 	}
 
-	@Override
-	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
-		// 获取parameter对应的内容
-		parameter = MapUtil.getValue("parameter", data);
-		device_id = MapUtil.getParameter(parameter, "device_id").trim();
-		platform = MapUtil.getParameter(parameter, "platform").trim();
-		version = MapUtil.getParameter(parameter, "version").trim();
-		
-		if ((!device_id.equals("")) && device_id.equals("code")) {
-			device_id= "09F959041C5B4F469E4B3D58FBBCD04A";
-			parameter = parameter.replace("\"device_id\":code", "\"device_id\":\""+ device_id + "\"");
-		}
-		if ((!platform.equals("")) && platform.equals("code")) {
-			platform="iphone";
-			parameter = parameter.replace("\"platform\":code", "\"platform\":\""+ platform + "\"");
-		}
-		if ((!version.equals("")) && version.equals("code")) {
-			version="1.0";
-			parameter = parameter.replace("\"version\":code", "\"version\":\""+ version + "\"");
-		}
-		data.put("parameter", parameter);
-		return data;
-	}
-
-	@Override
-	public Response SendRequest(HashMap<String, Object> data, String Url,
-			String Request) {
-//		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
-//		return re;
-		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, "\"");
-//		String sign= MapUtil.getParameter(parameter, "sign").trim();
-//		tikuString = MapUtil.killQuotes(tikuString, "\"");
-		
-//		jsonAsMap.put("device_id", device_id);
-//		jsonAsMap.put("platform", platform);
-//		jsonAsMap.put("version", version);
-//		jsonAsMap.put("appid", tikuString);
-//		jsonAsMap.put("sign", sign);
-		
-		MyRequest myRequest=new MyRequest();
-//		myRequest.setUrl("http://tiku.t.eoffcn.com/apiv3/user/register/visitor");
-		myRequest.setUrl(Url);
-		myRequest.setHeaders(headers);
-//		myRequest.setFormParameter(jsonAsMap);		
-		myRequest.setParameter(parameter);
-		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;
-				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{//如果只有一个希望结果，就直接包含比较。
-=======
- * 游客模式登录
- * 
- * @author puhui
- *
- */
-public class visitor extends TK implements API {
-	public String parameter;//
-	
-	public String device_id;//
-	public String platform;//
-	public String version;//
-
-	@Override
-	public void initialize(HashMap<String, Object> data) {
-//		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
-//			cleanUser_FromDB();
-//		}
-	}
 
 	@Override
 	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
@@ -268,7 +141,6 @@ public class visitor extends TK implements API {
 						}
 					}
 				}else{//
->>>>>>> branch 'master' of https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git
 					if(!json.contains(data.get("custom").toString())){
 						result = result && false;
 						failReason = failReason + "custom is expected "

tiku_App/src/resources/test.properties

 xls=DataAllWff.xls
 sheet=Sheet1
 mysql_local_Online=local
-Percentage=60
+Percentage=60