Commit 02185881 by Li Yongyu

update cases

parent 6ec23d36
...@@ -58,7 +58,7 @@ public class getExpoundingPaperBlocks extends TK implements API { ...@@ -58,7 +58,7 @@ public class getExpoundingPaperBlocks extends TK implements API {
parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\""); parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
} }
if ((!paper_id.equals("")) && paper_id.equals("code")) { if ((!paper_id.equals("")) && paper_id.equals("code")) {
paper_id = "4321"; paper_id = paper_id_L;
parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\""); parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
} }
if ((!exam_id.equals("")) && exam_id.equals("code")) { if ((!exam_id.equals("")) && exam_id.equals("code")) {
......
...@@ -61,7 +61,7 @@ public class getExpoundingStepExplain extends TK implements API { ...@@ -61,7 +61,7 @@ public class getExpoundingStepExplain extends TK implements API {
parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\""); parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
} }
if ((!record_id.equals("")) && record_id.equals("code")) { if ((!record_id.equals("")) && record_id.equals("code")) {
record_id = nwn_record_id; record_id = record_id_L;
parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\""); parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
} }
if ((!exam_id.equals("")) && exam_id.equals("code")) { if ((!exam_id.equals("")) && exam_id.equals("code")) {
......
...@@ -41,7 +41,6 @@ public class getPaperStatusNwn extends TK implements API { ...@@ -41,7 +41,6 @@ public class getPaperStatusNwn extends TK implements API {
public String parameter;//参数集合 public String parameter;//参数集合
public String record_id;//试卷使用记录id public String record_id;//试卷使用记录id
public String record_id_excel;//试卷使用记录id
public String status;//试卷状态(默认值:0) public String status;//试卷状态(默认值:0)
@Override @Override
...@@ -49,32 +48,17 @@ public class getPaperStatusNwn extends TK implements API { ...@@ -49,32 +48,17 @@ public class getPaperStatusNwn extends TK implements API {
if (!isProduct && data.get("CleanDB").toString().contains("Y")) { if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
cleanUser_FromDB();//清除注册用户根据user_id cleanUser_FromDB();//清除注册用户根据user_id
} }
try {
String sql = "SELECT use_id FROM `t_paper_use_record` WHERE is_statis = 2 AND is_done =1 AND is_release =0 AND channel <>1 LIMIT 1";
ResultSet rs_bankcard = this.sqlFromDB(sql);
rs_bankcard.last();
record_id =rs_bankcard.getString("use_id");
} catch (Exception e) {
e.printStackTrace();
}
} }
@Override @Override
public HashMap<String, Object> handleInput(HashMap<String, Object> data) { public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
// 获取parameter对应的内容 // 获取parameter对应的内容
parameter = MapUtil.getValue("parameter", data); parameter = MapUtil.getValue("parameter", data);
record_id_excel = MapUtil.getParameter(parameter, "record_id").trim(); record_id = MapUtil.getParameter(parameter, "record_id").trim();
status = MapUtil.getParameter(parameter, "status").trim(); status = MapUtil.getParameter(parameter, "status").trim();
if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) { if ((!record_id.equals("")) && record_id.equals("code")) {
//record_id= nwn_record_id; record_id= nwn_record_id;
parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\""); parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
} }
data.put("parameter", parameter); data.put("parameter", parameter);
...@@ -98,7 +82,6 @@ public class getPaperStatusNwn extends TK implements API { ...@@ -98,7 +82,6 @@ public class getPaperStatusNwn extends TK implements API {
MyRequest myRequest=new MyRequest(); MyRequest myRequest=new MyRequest();
myRequest.setUrl("/apiv3/api/api/getPaperStatus"); myRequest.setUrl("/apiv3/api/api/getPaperStatus");
//myRequest.setUrl("Url");
myRequest.setHeaders(headers); myRequest.setHeaders(headers);
myRequest.setFormParameter(jsonAsMap); myRequest.setFormParameter(jsonAsMap);
myRequest.setRequest(Request); myRequest.setRequest(Request);
......
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.TestUnti.ListUtil;
import net.sf.json.JSONObject;
/**
* .IIP获取user_id及token接口
*
* @author lyy
*
*/
public class getUserIdBySsoId extends TK implements API {
public String parameter;//参数集合
public String sso_id;//用户id
public String phone;//用户手机号
public String code;//手机验证码
public String login_type;//第三方登录方式
@Override
public void initialize(HashMap<String, Object> data) {
}
@Override
public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
// 获取parameter对应的内容
parameter = MapUtil.getValue("parameter", data);
sso_id = MapUtil.getParameter(parameter, "sso_id").trim();
if ((!sso_id.equals("")) && sso_id.equals("code")) {
sso_id="3620016";
parameter = parameter.replace("\"sso_id\":code", "\"sso_id\":\""+ sso_id + "\"");
}
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);
Response re = RequestDataUtils.Post_NOToken(data, Url);
return re;
}
@Override
public String handleOutput(Response re, HashMap<String, Object> data) {
JsonPath jp = re.body().jsonPath();
boolean result = true;
String failReason = "";
String json = 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=StringUtils.decodeUnicode(getMsg(re));
String code=getCode(re);
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("code") + ".";
}
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") + ".";
}
if(data.get("custom") != null && jp.getString("data")!=null){
String custom=data.get("custom").toString();
String[] ArrayString=StringUtils.getArrayString(custom,",");
if(!StringUtils.VerificationString(jp.getString("data"),ArrayString)){
result = result && false;
failReason = failReason + "custom is expected "
+ data.get("custom").toString() + " but actually "
+ jp.getString("data") + ".";
}
}
if("0".equals(code)){
String token=jp.getString("data.token");
tk_token = MapUtil.killQuotes(token, "\"");//保存token
System.out.println("tk_token=====" + tk_token);
//是否验证数据库
if (!isProduct) {
// if(phone.length()<60){
// if(!(dataPhone.equals(act_phone) && (dataPhone.equals(phone)))){
// result = result && false;
// failReason = failReason + "t_user info phone is not in DB;";
// }
// }
//
// if(login_type.length()<60){
// if(!(datalogin_type.equals(act_login_type) && (datalogin_type.equals(login_type)))){
// result = result && false;
// failReason = failReason + "t_user info system is not in DB;";
// }
// }
}
}
}
if (result)
return "Pass";
else
return "Fail:" + failReason;
}
}
...@@ -29,6 +29,9 @@ import com.offcn.TestUnti.ListUtil; ...@@ -29,6 +29,9 @@ import com.offcn.TestUnti.ListUtil;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
public class register extends TK implements API { public class register extends TK implements API {
public String parameter;//参数集合 public String parameter;//参数集合
......
...@@ -41,7 +41,6 @@ public class releaseScoreToStudent extends TK implements API { ...@@ -41,7 +41,6 @@ public class releaseScoreToStudent extends TK implements API {
public String parameter;//参数集合 public String parameter;//参数集合
public String record_id;//试卷使用记录id public String record_id;//试卷使用记录id
public String record_id_excel;//试卷使用记录id
@Override @Override
...@@ -49,22 +48,6 @@ public class releaseScoreToStudent extends TK implements API { ...@@ -49,22 +48,6 @@ public class releaseScoreToStudent extends TK implements API {
if (!isProduct && data.get("CleanDB").toString().contains("Y")) { if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
cleanUser_FromDB();//清除注册用户根据user_id cleanUser_FromDB();//清除注册用户根据user_id
} }
try {
String sql = "SELECT use_id FROM `t_paper_use_record` WHERE is_statis = 2 AND is_done =1 AND is_release =0 AND channel <>1 LIMIT 1";
ResultSet rs_bankcard = this.sqlFromDB(sql);
rs_bankcard.last();
record_id =rs_bankcard.getString("use_id");
} catch (Exception e) {
e.printStackTrace();
}
} }
@Override @Override
...@@ -72,10 +55,10 @@ public class releaseScoreToStudent extends TK implements API { ...@@ -72,10 +55,10 @@ public class releaseScoreToStudent extends TK implements API {
// 获取parameter对应的内容 // 获取parameter对应的内容
parameter = MapUtil.getValue("parameter", data); parameter = MapUtil.getValue("parameter", data);
record_id_excel = MapUtil.getParameter(parameter, "record_id").trim(); record_id = MapUtil.getParameter(parameter, "record_id").trim();
if ((!record_id_excel.equals("")) && record_id_excel.equals("code")) { if ((!record_id.equals("")) && record_id.equals("code")) {
record_id= nwn_record_id;
parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\""); parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
} }
data.put("parameter", parameter); data.put("parameter", parameter);
...@@ -131,7 +114,9 @@ public class releaseScoreToStudent extends TK implements API { ...@@ -131,7 +114,9 @@ public class releaseScoreToStudent extends TK implements API {
if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) { if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
result = result && false; result = result && false;
// if(shelf_id =="" && shelf_id.equals("")){
// failReason = "10001";
// }
failReason = failReason + "code is expected " failReason = failReason + "code is expected "
+ data.get("code").toString() + " but actually " + data.get("code").toString() + " but actually "
+ jp.getString("code") + "."; + jp.getString("code") + ".";
...@@ -139,7 +124,9 @@ public class releaseScoreToStudent extends TK implements API { ...@@ -139,7 +124,9 @@ public class releaseScoreToStudent extends TK implements API {
if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) { if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
result = result && false; result = result && false;
// if(shelf_id =="" && shelf_id.equals("")){
// failReason = "参数接收失败!";
// }
failReason = failReason + "msg is expected " failReason = failReason + "msg is expected "
+ data.get("msg").toString() + " but actually " + data.get("msg").toString() + " but actually "
+ jp.getString("msg") + "."; + jp.getString("msg") + ".";
......
...@@ -23,6 +23,7 @@ import com.offcn.TestUnti.StringUtils; ...@@ -23,6 +23,7 @@ import com.offcn.TestUnti.StringUtils;
import com.offcn.TestUnti.VerificationMethod; import com.offcn.TestUnti.VerificationMethod;
import com.offcn.interfaces.API; import com.offcn.interfaces.API;
import com.offcn.process.TK; import com.offcn.process.TK;
import com.offcn.system.MyRequest;
import com.offcn.TestUnti.ListUtil; import com.offcn.TestUnti.ListUtil;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
...@@ -53,15 +54,15 @@ public class submitMockExpounding extends TK implements API { ...@@ -53,15 +54,15 @@ public class submitMockExpounding extends TK implements API {
// 获取parameter对应的内容 // 获取parameter对应的内容
parameter = MapUtil.getValue("parameter", data); parameter = MapUtil.getValue("parameter", data);
user_id = MapUtil.getParameter(parameter, "user_id").trim(); user_id = MapUtil.getParameter(parameter, "user_id").trim();
parameterData = MapUtil.getParameter(parameter, "parameterData").trim(); parameterData = MapUtil.getParameter(parameter, "data").trim();
if ((!user_id.equals("")) && user_id.equals("code")) { if ((!user_id.equals("")) && user_id.equals("code")) {
user_id=ListUtil.getListValue(user_idList,0); user_id=ListUtil.getListValue(user_idList,0);
parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\""); parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
} }
if ((!parameterData.equals("")) && parameterData.equals("code")) { if ((!parameterData.equals("")) && parameterData.equals("code")) {
parameterData="{\\\"channel\\\":\\\"1\\\",\\\"orgin\\\":\\\"3\\\",\\\"orgin_id\\\":\\\"4362\\\",\\\"record_id\\\":\\\"458\\\",\\\"is_final\\\":\\\"1\\\",\\\"user_id\\\":\\\"11292\\\",\\\"questions\\\":[{\\\"question_number\\\":\\\"1\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"作为中国城镇化推进过程中的一个实验性物种,特色小镇外溢出了不小的经济价值。\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"31\\\",\\\"question_id\\\":\\\"109015\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"2\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"南有周庄,北有周窝\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"71\\\",\\\"question_id\\\":\\\"109016\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"3\\\",\\\"user_answer\\\":[],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"999\\\",\\\"question_id\\\":\\\"109017\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"4\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"呵呵就不给机会\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"23\\\",\\\"question_id\\\":\\\"109018\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"}],\\\"exam_id\\\":\\\"51\\\"}"; parameterData="{\\\"channel\\\":\\\"1\\\",\\\"orgin\\\":\\\"3\\\",\\\"orgin_id\\\":\\\"4362\\\",\\\"record_id\\\":\\\"458\\\",\\\"is_final\\\":\\\"1\\\",\\\"user_id\\\":"+ListUtil.getListValue(user_idList,0)+",\\\"questions\\\":[{\\\"question_number\\\":\\\"1\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"作为中国城镇化推进过程中的一个实验性物种,特色小镇外溢出了不小的经济价值。\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"31\\\",\\\"question_id\\\":\\\"109015\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"2\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"南有周庄,北有周窝\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"71\\\",\\\"question_id\\\":\\\"109016\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"3\\\",\\\"user_answer\\\":[],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"999\\\",\\\"question_id\\\":\\\"109017\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"},{\\\"question_number\\\":\\\"4\\\",\\\"user_answer\\\":[{\\\"score_section_id\\\":\\\"0\\\",\\\"content\\\":\\\"呵呵就不给机会\\\",\\\"content_section_id\\\":\\\"0\\\"}],\\\"is_hf\\\":\\\"1\\\",\\\"duration\\\":\\\"23\\\",\\\"question_id\\\":\\\"109018\\\",\\\"is_signed\\\":\\\"0\\\",\\\"type\\\":\\\"1\\\"}],\\\"exam_id\\\":\\\"51\\\"}";
parameter = parameter.replace("\"parameterData\":code", "\"data\":\""+ parameterData+"\"" ); parameter = parameter.replace("\"data\":code", "\"data\":\""+ parameterData.replace("\\\"", "")+"\"" );
} }
data.put("parameter", parameter); data.put("parameter", parameter);
return data; return data;
...@@ -70,6 +71,23 @@ public class submitMockExpounding extends TK implements API { ...@@ -70,6 +71,23 @@ public class submitMockExpounding extends TK implements API {
@Override @Override
public Response SendRequest(HashMap<String, Object> data, String Url, public Response SendRequest(HashMap<String, Object> data, String Url,
String Request) { 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("data", parameterData);
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);
Response re = RequestDataUtils.Post_token(data, Url, tk_token); Response re = RequestDataUtils.Post_token(data, Url, tk_token);
return re; return re;
} }
......
...@@ -90,7 +90,7 @@ public class APITest_tk extends BasicsGM{ ...@@ -90,7 +90,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"); // SheetUtils sheet = new SheetUtils("DataAllWff.xls", "Output");
// sheet.writeExcel( // sheet.writeExcel(
// data.get("NO").toString(), // data.get("NO").toString(),
// data.get("TCNO").toString() + "_Step" + data.get("Step").toString(), // data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
......
...@@ -33,12 +33,12 @@ public class NewMakeTestCases { ...@@ -33,12 +33,12 @@ public class NewMakeTestCases {
public static List<List<String>> list_all=new ArrayList<List<String>>();//缺失字段,最后判断是否应该算正向还是反向 public static List<List<String>> list_all=new ArrayList<List<String>>();//缺失字段,最后判断是否应该算正向还是反向
public static String CaseKeLiDu="3";//设置用例颗粒度,2元祖测试为null,其他自行设置3,4,5,6,看参数数量而定 public static String CaseKeLiDu=null;//设置用例颗粒度,2元祖测试为null,其他自行设置3,4,5,6,看参数数量而定
public static void main(String[] args) { public static void main(String[] args) {
make("TestData/CaseMake.xls","Sheet1","post","tk"); make("TestData/CaseMakeWff.xls","Sheet1","post","tk_3");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment