Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r27012 -r27844 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 27012) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 27844) @@ -64,6 +64,7 @@ private Set_manager set_manager = new Set_manager(); private Intervene intervene = new Intervene(); boolean displayed = false; + private TousseInfo tousseInfo= new TousseInfo(); /** * 申请前(包括申请单的申请、修改、终止、删除操作)以及申请操作(通用申请单、外来器械申请单、借物单、自定义器械申请单) @@ -983,6 +984,20 @@ recyle.recyle_return(); logger.info("供应室回收还物单和回收终止完成"); + /** + * 器械包废弃 + */ + login.login_oneSupplyRoom();//一级供应室登录 + //点击器械包信息图标 + Utils.retryingFindAndClick(By.id("tousseInstance")); + //跳转到器械包信息选项卡 + Utils.retryingFindAndSwitchToFrame(By.id("iframe_tousseInstance")); + //废弃一个器械包 + tousseInfo.discardTousse(); + //废弃完成,跳转到登录页面 + JSWaiter.waitUntilJQueryReady(); + Utils.driver.get(SERVER_URL); + afterMethod(); } catch (Exception e) { logger.error(e, e); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/TousseInfo.java =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/TousseInfo.java (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/TousseInfo.java (revision 27844) @@ -0,0 +1,40 @@ +package test.forgon.disinfectsystem.selenium; + +import org.apache.log4j.Logger; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import test.forgon.disinfectsystem.selenium.tools.JSWaiter; +import test.forgon.disinfectsystem.selenium.tools.Utils; + +public class TousseInfo { + protected Logger logger = Logger.getLogger(this.getClass()); + + @Test + /** + * 器械包废弃 + */ + public void discardTousse(){ + String tousseInstanceLocator="//div[@class='x-grid3-scroller']//tbody[1]//tr[1]"; + String discardButtonLocator = "//button[contains(text(),'废弃')]"; + String discardDivLocator = "iframe[src $='selectTousseDiscardCause.jsp']"; + String confirmButtonLocator = "//input[contains(text(),'确定')]"; + //等待加载完成 + JSWaiter.waitUntilJQueryReady(); + //勾选第一行器械包 + Utils.retryingFindAndClick(By.xpath(tousseInstanceLocator)); + //点击废弃按钮 + Utils.retryingFindAndClick(By.xpath(discardButtonLocator)); + //跳转到废弃原因小窗口 + WebElement iframe = Utils.driver.findElement(By.cssSelector(discardDivLocator));//匹配到src尾部 + Utils.switchToFrame(iframe); + //选中其他原因 + Utils.retryingFindAndClick(By.id("other")); + Utils.retryingFindAndSendKeys(By.id("tem"), "自动化测试废弃器械包"); + //确认 + Utils.retryingFindAndClick(By.xpath(confirmButtonLocator)); + Utils.driver.switchTo().defaultContent(); + logger.info("废弃成功"); + } +}