修复bug后首次提交

nwn_Api_auto_test/src/DefectTest.xml

@@ -6,7 +6,7 @@
     <classes>
       <class name="com.puhui.test.RenMai_APITest">
         <methods>
-          <include name="f" invocation-numbers="0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 "/>
+          <include name="f" invocation-numbers=""/>
         </methods>
       </class>
     </classes>

nwn_Api_auto_test/src/com/offcn/api/nwn/addAccount.java

@@ -51,13 +51,16 @@ public class addAccount extends NWN implements API {
 		// 获取parameter对应的内容
 		parameter = MapUtil.getValue("parameter", data);
 		card_no = MapUtil.getParameter(parameter, "card_no").trim();
-//		phone = MapUtil.getParameter(parameter, "phone").trim();
+		username = MapUtil.getParameter(parameter, "username").trim();
 		
 		if ((!card_no.equals("")) && card_no.equals("code")) {
 			card_no="lgd58408";//从sso数据库中查询的已激活账户，作为备用账户使用
 			parameter = parameter.replace("\"card_no\":code", "\"card_no\":\""+ card_no + "\"");
 		}
-		
+		if ((!username.equals("")) && username.equals("random")) {
+			username="1391"+(new Random().nextInt(9000000)+ 1000000);
+			parameter = parameter.replace("\"username\":random", "\"username\":\""+ username + "\"");
+		}
 		
 		data.put("parameter", parameter);
 		return data;

nwn_Api_auto_test/src/com/offcn/api/nwn/process/sign.java

@@ -37,6 +37,18 @@ public class sign extends NWN implements API {
 	public void initialize(HashMap<String, Object> data) {
 		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
 			NWN.PHPSESSID="";
+//			nwn_sign="";
+//			admin_login_ssid="";
+//			nwn_url="";
+//			admin_31_encode="";
+			level_id_List="";
+//			
+//			n_package_idList.clear();
+//			n_admin_card_no_List.clear();
+//			n_admin_id_List.clear();
+//			n_admin_phone_List.clear();
+//			n_admin_username_List.clear();
+//			user_id_List.clear();
 			  this.cleann_n_admin_card_no_List_FromDB();
 			  this.cleann_n_package_List_FromDB();
 			  this.cleann_user_id_List_FromDB();

nwn_Api_auto_test/src/com/offcn/process/NWN.java

@@ -103,6 +103,24 @@ public class NWN extends BasicsGM{
 //		System.out.println(user_idList.toString());
 	}
 	
+	
+	//清除注册数据根据
+//	public void cleann_n_admin_card_id_List_FromDB() {
+//		List<String> user_List = new ArrayList<String>();
+//		for(int i=0;i<n_admin_card_no_List.size();i++){
+//			try {
+//				deleteFromDB("n_admin", "card_no", n_admin_card_no_List.get(i));
+//				user_List.add(n_admin_card_no_List.get(i));
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//				Log.logInfo("清除数据失败n_admin_card_no_List");
+//			}
+//			
+//		}
+//		n_admin_card_no_List.removeAll(user_List);
+////			System.out.println(user_idList.toString());
+//	}
+	
 	//清除注册数据根据n_package_idList
 	public void cleann_n_package_List_FromDB() {
 		List<String> user_List = new ArrayList<String>();

nwn_Api_auto_test/src/resources/test.properties

 xls=DataAll.xls
-sheet=TestCase2
+sheet=TestCase4
 mysql_local_Online=local
\ No newline at end of file