解决冲突

nwn_Api_auto_test/src/com/offcn/test/APITest_nwn.java

@@ -99,13 +99,18 @@ public class APITest_nwn extends NWN{
 			  if(data.get("Description").toString().contains("流程")){
 				  result = obj.handleOutput(re, data);
 			  }
-		  }else{
-			  result = obj.handleOutput(re, data);
 		  }
-		  codeORerrcode=getCode(re);
-		  msgORerrmsy=getMsg(re);
+//		  else{
+//			  result = obj.handleOutput(re, data);
+//		  }
+//		  codeORerrcode=getCode(re);
+//		  msgORerrmsy=getMsg(re);
 		  
-	  }
+	  } 
+	  result = obj.handleOutput(re, data);
+	  
+	  codeORerrcode=getCode(re);
+	  msgORerrmsy=getMsg(re);
 	  
 	  Log.logInfo("返回结果="+StringUtils.decodeUnicode(body));
 	  System.out.println();
@@ -113,7 +118,7 @@ public class APITest_nwn extends NWN{
 	  
 	  //数据回写
 	 // HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-	  SheetUtils sheet = new SheetUtils("DataAllWff.xls", "Output");
+	/*  SheetUtils sheet = new SheetUtils("DataAll.xls", "Output");
 	  sheet.writeExcel(
 			  		data.get("NO").toString(),
 				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),
@@ -127,7 +132,7 @@ public class APITest_nwn extends NWN{
 					msgORerrmsy,
 					result,
 					time
-					);
+					);*/
 	  
 	  if(result.indexOf("Fail")!=-1){
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();
@@ -147,7 +152,7 @@ public class APITest_nwn extends NWN{
 		//测试结束删除测试所用的数据
 	  if (!isClearMysql) {
 		  this.cleann_n_admin_card_no_List_FromDB();
-		  //this.cleann_n_package_List_FromDB();
+		  this.cleann_n_package_List_FromDB();
 		  this.cleann_user_id_List_FromDB();
 		  this.cleann_getcode_id_List_FromDB();
 		  try { 

nwn_Api_auto_test/src/makeTestCase/MakeTestCases.java

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