20190418-2

tiku_App/src/com/offcn/TestUnti/RequestDataUtils.java

@@ -49,7 +49,7 @@ public class RequestDataUtils {
 //				RestAssured.config = ra.config().connectionConfig(RestAssured.config().getConnectionConfig().closeIdleConnectionsAfterEachResponse());
 			}
 //			ra.config = RestAssured.config().redirect(RedirectConfig.redirectConfig().followRedirects(false));
-//			RestAssured.config = RestAssured.config().encoderConfig(EncoderConfig.encoderConfig().encodeContentTypeAs("x-www-form-urlencoded", ContentType.ANY).defaultContentCharset("utf-8"));
+			RestAssured.config = RestAssured.config().encoderConfig(EncoderConfig.encoderConfig().encodeContentTypeAs("x-www-form-urlencoded", ContentType.ANY).defaultContentCharset("utf-8"));
 		return ra;
 	}
 	

tiku_App/src/com/offcn/api/tk/ht/getPaperFilter.java

+package com.offcn.api.tk.ht;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.interfaces.API;
+import com.offcn.process.HT;
+import com.offcn.system.MyRequest;
+
+
+
+
+/**
+ * 
+ * 
+ * @author puhui
+ *
+ */
+public class getPaperFilter extends HT implements API {
+	public String parameter;//参数集合
+	
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setRequest(Request);
+		myRequest.setUrl(Url);
+		if(!"".equals(PHPSESSID)){
+			Map<String, String> Cookies=new HashMap<String, String>();
+			Cookies.put("PHPSESSID", PHPSESSID);
+			myRequest.setCookies(Cookies);
+		}
+		
+		Response re = RequestDataUtils.RestAssuredApi(data,myRequest);
+//		Response re = RequestDataUtils.POST_houtai(data,myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		String json = re.asString().substring(1);
+		JsonPath jp = new JsonPath(json);
+		
+		boolean result = true;
+		String failReason = "";
+
+		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) {
+			
+			System.out.println(jp.toString());
+			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("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,",");
+//				System.out.println(jp.getString("custom"));
+//				System.out.println(Arrays.toString(ArrayString));
+				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 (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/ht/mockList.java

@@ -3,27 +3,12 @@ package com.offcn.api.tk.ht;
 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.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Random;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.json.simple.JSONArray;
-
-import test.HttpUtils;
-
-import com.offcn.TestUnti.ListUtil;
-import com.offcn.TestUnti.Log;
 import com.offcn.TestUnti.MapUtil;
-import com.offcn.TestUnti.MySqlUtil;
-import com.offcn.TestUnti.ReadProperties;
 import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
 import com.offcn.interfaces.API;
 import com.offcn.process.HT;
 import com.offcn.system.MyRequest;
@@ -71,11 +56,13 @@ public class mockList extends HT implements API {
 
 	@Override
 	public String handleOutput(Response re, HashMap<String, Object> data) {
-		JsonPath jp = re.body().jsonPath();
+//		JsonPath jp = re.body().jsonPath();
+		
 		boolean result = true;
 		String failReason = "";
 
-		String json = re.asString();
+		String json = re.asString().substring(1);
+		JsonPath jp = new JsonPath(json);
 
 		if ((data.get("statusCode") != null)
 				&& (!data.get("statusCode").toString()
@@ -86,46 +73,39 @@ public class mockList extends HT implements API {
 					+ String.valueOf(re.getStatusCode()) + ". ";
 		}
 
-//		if (json.length() != 0) {
-//			
-//			System.out.println(jp.toString());
-//			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("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,",");
-////				System.out.println(jp.getString("custom"));
-////				System.out.println(Arrays.toString(ArrayString));
-//				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(jp.getString("retcode"))){
-//				System.out.println(json);
-//			}
-			
-			
-//		}
+		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("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,",");
+//				System.out.println(jp.getString("custom"));
+//				System.out.println(Arrays.toString(ArrayString));
+				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 (result)
 			return "Pass";

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

@@ -64,7 +64,6 @@ public class APITest_tk extends BasicsGM{
 	  String codeORerrcode="";
 	  String msgORerrmsy="";
 	  String result = "";
-	  
 	  if(re!=null){
 		  body=re.asString();
 		  if(body.contains("<html")){