Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java =================================================================== diff -u -r19469 -r19473 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 19469) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 19473) @@ -703,25 +703,6 @@ } /** - * 在对应的文本框输入想要的内容,输入前清空输入框 - * - * @param keys - * 要输入的内容 - */ - public static WebElement retryingFindAndClearBeforeSendKeys(By by, - java.lang.CharSequence... keys) { - // 先清空文本框上面的然后再输入 - // WebElement webElement = findByAwaitAndClear(by); - // WebElement webElement = findByAwait(by); - // webElement.clear(); - retryingFindAndClear(by); - return retryingFindAndSendKeys(by, keys); - - // webElement.sendKeys(keys); - // return webElement; - } - - /** * 运行js脚本 * * @param script @@ -1273,7 +1254,7 @@ + "').getStore().isLoading();"; // 输入前先等待,看看是否已经加载完,因为处理科室改变物品会重新加载 Utils.waitPageLoaded(script); - Utils.retryingFindAndClearBeforeSendKeys( + Utils.retryingFindAndSendKeys( By.cssSelector("input[name='" + comboBoxName + "']"), text); // 输入完等待加载完毕,加载完毕后才能点 Utils.waitPageLoaded(script); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/BorrowApplyServiceImpl.java =================================================================== diff -u -r19469 -r19473 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/BorrowApplyServiceImpl.java (.../BorrowApplyServiceImpl.java) (revision 19469) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/BorrowApplyServiceImpl.java (.../BorrowApplyServiceImpl.java) (revision 19473) @@ -41,8 +41,8 @@ String supplyRoomName = Utils.settings.getJSONObject(name).optString(SettingConstants.科室名称, null); assertNotNull(supplyRoomName); //这里要按两下下才出来 - Utils.retryingFindAndClearBeforeSendKeys(By.id("handleDepart"), Keys.DOWN); - Utils.retryingFindAndClearBeforeSendKeys(By.id("handleDepart"), Keys.DOWN); + Utils.retryingFindAndSendKeys(By.id("handleDepart"), Keys.DOWN); + Utils.retryingFindAndSendKeys(By.id("handleDepart"), Keys.DOWN); Utils.retryingFindAndClick(By.xpath("//div/div/div[contains(text(), '" + supplyRoomName + "')]")); } @@ -70,10 +70,10 @@ private void setGood(String goodName, Integer amount) { String js = "return top.tousseAndDiposableGoodsStoreForBorrowingIsLoaded == true ? false : true;"; Utils.waitPageLoaded(js); - Utils.retryingFindAndClearBeforeSendKeys(By.id("leaseTousseName"), goodName); + Utils.retryingFindAndSendKeys(By.id("leaseTousseName"), goodName); Utils.waitPageLoaded(js); Utils.retryingFindAndClick(By.xpath("//div/div/div[contains(text(), '" + goodName + "')]")); - Utils.retryingFindAndClearBeforeSendKeys(By.id("applicantAmount"), amount + "\n"); + Utils.retryingFindAndSendKeys(By.id("applicantAmount"), amount + "\n"); // Utils.findByAwaitAndClear(By.id("leaseTousseName")); // Utils.findByAwaitAndClear(By.id("applicantAmount")); } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java =================================================================== diff -u -r19469 -r19473 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java (.../ApplyHelper.java) (revision 19469) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java (.../ApplyHelper.java) (revision 19473) @@ -125,7 +125,7 @@ public static void applyCustomTousse(String customTousse, Map applyGoods) { String tousse = Utils.settings.getJSONObject(customTousse).optString(SettingConstants.名称, null); assertNotNull(tousse); - Utils.retryingFindAndClearBeforeSendKeys(By.id("name"), tousse); + Utils.retryingFindAndSendKeys(By.id("name"), tousse); for (Map.Entry applyGood : applyGoods.entrySet()) { addApplyMaterial(applyGood.getKey(), applyGood.getValue()); } @@ -176,7 +176,7 @@ */ private static void fillInFields(Map fields) { for (Map.Entry entry : fields.entrySet()) { - Utils.retryingFindAndClearBeforeSendKeys(By.id(entry.getKey()), entry.getValue()); + Utils.retryingFindAndSendKeys(By.id(entry.getKey()), entry.getValue()); } } @@ -190,7 +190,7 @@ private static void addApplyMaterial(String goodName, Integer count) { String material = Utils.settings.getJSONObject(goodName).optString(SettingConstants.名称, null); assertNotNull(material); - Utils.retryingFindAndClearBeforeSendKeys(By.id("material"), material); + Utils.retryingFindAndSendKeys(By.id("material"), material); Utils.retryingFindAndClick(By.xpath("//div/div[contains(text(), '" + material + "')]")); Utils.retryingFindAndSendKeys(By.id("count1"), count + "\n"); } @@ -303,7 +303,7 @@ */ private static void setAmount(String goodName, int amount) { Utils.extJS4comboBoxInput("package1", goodName); - Utils.retryingFindAndClearBeforeSendKeys(By.cssSelector("input[name='count1']"), amount + "\n"); + Utils.retryingFindAndSendKeys(By.cssSelector("input[name='count1']"), amount + "\n"); } }