11

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

@@ -91,21 +91,21 @@ public class APITest_tk extends BasicsGM{
 	  
 	  
 	  //数据回写
-//	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-//	  SheetUtils sheet = new SheetUtils("DataAll.xls", "Output");
-//	  sheet.writeExcel(
-//			  		data.get("NO").toString(),
-//				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
-//				  	data.get("Description").toString(),
-//				  	parameter.length()>1000?"内容超长。":parameter, 
-//					JSONObject.fromObject(ExpectResult).toString(),
-//					StringUtils.decodeUnicode(re.asString().length()>10000?"内容超长。状态码："+re.getStatusCode():re.asString()),
-//					codeORerrcode,
-//					msgORerrmsy,
-//					result,
-//					time
-//					);
-//	  
+	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
+	  SheetUtils sheet = new SheetUtils("DataAllMr.xls", "Output");
+	  sheet.writeExcel(
+			  		data.get("NO").toString(),
+				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
+				  	data.get("Description").toString(),
+				  	parameter.length()>1000?"内容超长。":parameter, 
+					JSONObject.fromObject(ExpectResult).toString(),
+					StringUtils.decodeUnicode(re.asString().length()>10000?"内容超长。状态码："+re.getStatusCode():re.asString()),
+					codeORerrcode,
+					msgORerrmsy,
+					result,
+					time
+					);
+	  
 	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();

tiku_App/src/makeTestCase/MakeTestCases.java

 package makeTestCase;
 
-
+//支持get方式 
 
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
@@ -35,22 +35,17 @@ public class MakeTestCases {
 	
 	public static void main(String[] args) {
 
-		make("TestData/CaseMake.xls","Sheet1");
+		make("TestData/CaseMake.xls","Sheet1","get","nwn");
 	}
 	
 	
-	public static void make(String FilePath,String SheetName){
+	public static void make(String FilePath,String SheetName,String getOrPost,String qudao){
 		//获取用例
 		List<String> listSum=TestCase(FilePath,SheetName);
         Set<String> set=new HashSet<String>();         
         set.addAll(listSum);
         listSum.clear();   
         listSum.addAll(set);
-        
-        for (String string : listSum) {
-			System.out.println(string);	
-		}
-		
         List<String> TeseName= TestCaseName(listSum);
 //        System.out.println("用例数"+listSum.size());
 //        System.out.println("用例名字数"+TeseName.size());
@@ -76,12 +71,20 @@ public class MakeTestCases {
 		String jieKouMing=apipath[0];
 		//生成测试用例
 		for(int i=0;i<listSum.size();i++){
-			outCase(i,leiming,jieKouMing,TeseName.get(i),path,listSum.get(i),name,"OutPage");
+			String cases=listSum.get(i);
+			if("get".equals(getOrPost)){
+				cases=cases.replace(":", "=");
+				cases=cases.replace("\"", "");
+				cases=cases.replace(",", "&");
+			}
+			System.out.println(cases);	
+			outCase(i,leiming,jieKouMing,TeseName.get(i),path,cases,name,"OutPage",getOrPost,qudao);
 		}
 				
 	}
 	//第一个参数是数量，第二个参数是接口类名，第三个参数是中文名
-	public static void outCase(int i,String leiming,String jieKouMing,String TeseName,String path,String cases,String wenjianming,String Sheet){
+	public static void outCase(int i,String leiming,String jieKouMing,String TeseName,
+			String path,String cases,String wenjianming,String Sheet,String getOrPost,String qudao){
 		
 		Date d = new Date();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -95,10 +98,10 @@ public class MakeTestCases {
 				  		leiming + "_" + (i+1),
 				  		(i+1)+"", 
 				  		jieKouMing+"-"+TeseName,
-				  		"tk_2",
+				  		qudao,
 					  	path,
 						"N", 
-						"post",
+						getOrPost,
 						"200",
 						cases
 						);
@@ -352,7 +355,7 @@ public class MakeTestCases {
 //				System.out.println("yongli="+yongli);
 				
 				listSum.add(yongli);
-//				System.out.println("listSum="+listSum);
+				//System.out.println("listSum="+listSum);
 			}
 		}
 //		System.out.println(listSum.toString());