20181018

Api_auto_test/src/com/offcn/test/APITest.java

@@ -37,9 +37,6 @@ public class APITest extends XYZB{
 	  
 	  Log.logInfo(data.get("TCNO").toString() + " Step " + data.get("Description").toString() + " is running......");
 	  
-	  if("84".equals(data.get("NO").toString())){
-		  System.out.println("到啦");
-	  }
 	  API obj = new Reflect_api().Reflections(data);
 	  BasicsGM.map=new XMLread().getSystem();
 	  
@@ -95,17 +92,11 @@ public class APITest extends XYZB{
 //					time
 //					);
 	  if(result.indexOf("Fail")!=-1){
-//		try {
-//			Assert.assertTrue(false);
-//		}catch (Exception e) {
-//		}finally{
 		  String Expect1=data.get("code")==null?"":data.get("code").toString();
 		  String Expect2=data.get("msg")==null?"":data.get("msg").toString();
 		  String Expect3=data.get("custom")==null?"":data.get("custom").toString();
 			
-//		  Assert.assertEquals(StringUtils.decodeUnicode(body),Expect3);
-			Assert.assertEquals(StringUtils.decodeUnicode(body),Expect1+","+Expect2+","+Expect3);
-//		}
+		  Assert.assertEquals(StringUtils.decodeUnicode(body),Expect1+","+Expect2+","+Expect3);
 	  }else{
 		  Assert.assertTrue(true);
 	  }
@@ -118,7 +109,7 @@ public class APITest extends XYZB{
 	  if (!isProduct) {
 //		  cleanEnterprise_usersFromDB();//清除企业用户
 //		  cleanBusiness_AdministratorFromDB();//清除企业管理员
-//		  ReadProperties.ClearProperty();//清除环境配置文件
+		  ReadProperties.ClearProperty();//清除环境配置文件
 		  try { 
 				if(stmt!=null){
 					stmt.close();