Index: ssts-selenium-test/src/test/java/test_4_1/Disinfection.java =================================================================== diff -u -r17983 -r18000 --- ssts-selenium-test/src/test/java/test_4_1/Disinfection.java (.../Disinfection.java) (revision 17983) +++ ssts-selenium-test/src/test/java/test_4_1/Disinfection.java (.../Disinfection.java) (revision 18000) @@ -12,9 +12,12 @@ import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.openqa.selenium.Alert; import org.openqa.selenium.By; @@ -50,8 +53,8 @@ moveover.moveToElement( Utils.retryingFind(By.id("sterilizationRecord"))).perform(); - Utils.retryingFindAndClick(By.linkText(Utils.settings.getJSONObject("灭菌炉分组") - .getString("大型压力蒸汽"))); + Utils.retryingFindAndClick(By.linkText(Utils.settings + .getJSONObject("灭菌炉分组").getString("大型压力蒸汽"))); /** * 调试用 * @@ -95,22 +98,48 @@ Utils.retryingFindAndClick(By.id("sterilizationLoading")); WebElement frame = Utils.retryingFindAndSwitchToFrame(By .id("iframe_sterilizationLoading")); - String barcode = Utils.settings.getJSONObject("灭菌篮筐01") - .getString("条码"); + String barcode = Utils.settings.getJSONObject("灭菌篮筐01").getString( + "条码"); Utils.retryingFindAndSendKeys(By.id("barcode"), barcode + "\n"); displayed = false; - WebElement element =Utils.retryingFind(By + WebElement element = Utils.retryingFind(By .xpath("//button[contains(text(), '是')]")); if (element != null) { displayed = element.isDisplayed(); - - if (displayed) { - Utils.retryingFindAndClick(By - .xpath("//button[contains(text(), '是')]")); - }} - - + if (displayed) { + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '是')]")); + } + } + String b = null; + List singleRow = null; + List allRows = Utils.driver.findElements(By + .cssSelector("table[class='x-grid3-row-table']")); + System.out.println("rows size = " + allRows.size()); + for (WebElement row : allRows) { + b = row.getText(); + b = b.trim(); + String regEx = "[^0-9]"; + Pattern p = Pattern.compile(regEx); + Matcher m = p.matcher(b); + b = m.replaceAll("").trim(); + System.out.println(b); + if (b.length() == 9) { + b = b.substring(b.indexOf("0"), b.indexOf("0") + 9); + int a = Integer.valueOf(b).intValue(); + if (a % 2 != 0) { + WebElement single= row.findElement(By.tagName("img")); + singleRow.add(single); + } + } + else{ + continue; + } + } + for (WebElement single : singleRow) { + single.click(); + } } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -130,8 +159,8 @@ Utils.retryingFindAndClick(By.id("sterilizationLoading")); WebElement frame = Utils.retryingFindAndSwitchToFrame(By .id("iframe_sterilizationLoading")); - String barcode = Utils.settings.getJSONObject("灭菌筐02") - .getString("条码"); + String barcode = Utils.settings.getJSONObject("灭菌筐02").getString( + "条码"); Utils.retryingFindAndSendKeys(By.id("barcode"), barcode + "\n"); @@ -156,13 +185,17 @@ @Test public void disinfection_frist() { try { - JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉"); + JSONObject sterilizerObj = Utils.settings + .getJSONObject("1号高温蒸汽灭菌炉"); String sterilizerBarcode = sterilizerObj.getString("条码"); - String sterilizationProcedureBarcode = ((JSONObject)sterilizerObj.getJSONArray("灭菌程序").get(0)).getString("条码"); - - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizerBarcode + "\n"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizationProcedureBarcode + "\n"); + String sterilizationProcedureBarcode = ((JSONObject) sterilizerObj + .getJSONArray("灭菌程序").get(0)).getString("条码"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizerBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizationProcedureBarcode + "\n"); + // Utils.retryingFindAndClick(By.id("sterilizationPurpose")); // click.click(Utils.retryingFind(By.xpath("//div[contains(text(), '每天例行监测')]"))).perform(); Utils.retryingFindAndClick(By @@ -211,12 +244,16 @@ } }); Purpose.click(); - JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉"); + JSONObject sterilizerObj = Utils.settings + .getJSONObject("1号高温蒸汽灭菌炉"); String sterilizerBarcode = sterilizerObj.getString("条码"); - String sterilizationProcedureBarcode = ((JSONObject)sterilizerObj.getJSONArray("灭菌程序").get(0)).getString("条码"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizerBarcode + "\n"); + String sterilizationProcedureBarcode = ((JSONObject) sterilizerObj + .getJSONArray("灭菌程序").get(0)).getString("条码"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizerBarcode + "\n"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizationProcedureBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizationProcedureBarcode + "\n"); Utils.retryingFindAndSendKeys(By.id("inputBarcode"), Utils.settings .getJSONObject("灭菌筐02").getString("条码") + "\n"); @@ -308,12 +345,16 @@ } }); Purpose.click(); - JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉"); + JSONObject sterilizerObj = Utils.settings + .getJSONObject("1号高温蒸汽灭菌炉"); String sterilizerBarcode = sterilizerObj.getString("条码"); - String sterilizationProcedureBarcode = ((JSONObject)sterilizerObj.getJSONArray("灭菌程序").get(0)).getString("条码"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizerBarcode + "\n"); + String sterilizationProcedureBarcode = ((JSONObject) sterilizerObj + .getJSONArray("灭菌程序").get(0)).getString("条码"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizerBarcode + "\n"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizationProcedureBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizationProcedureBarcode + "\n"); Utils.retryingFindAndSendKeys(By.id("inputBarcode"), Utils.settings .getJSONObject("一级供应室用户").getString("条码") + "\n"); @@ -417,12 +458,16 @@ } }); Purpose.click(); - JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉"); + JSONObject sterilizerObj = Utils.settings + .getJSONObject("1号高温蒸汽灭菌炉"); String sterilizerBarcode = sterilizerObj.getString("条码"); - String sterilizationProcedureBarcode = ((JSONObject)sterilizerObj.getJSONArray("灭菌程序").get(0)).getString("条码"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizerBarcode + "\n"); + String sterilizationProcedureBarcode = ((JSONObject) sterilizerObj + .getJSONArray("灭菌程序").get(0)).getString("条码"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizerBarcode + "\n"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizationProcedureBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizationProcedureBarcode + "\n"); Utils.retryingFindAndSendKeys(By.id("inputBarcode"), Utils.settings .getJSONObject("一级供应室用户").getString("条码") + "\n"); @@ -519,18 +564,23 @@ @Test public void disinfection_failAndSuccess() { try { - String text = Utils.retryingFindAndGetText(By.id("sterilizationUser")); + String text = Utils.retryingFindAndGetText(By + .id("sterilizationUser")); Utils.retryingFindAndSendKeys(By.id("sterilizationPurpose"), Keys.DOWN); - JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉"); + JSONObject sterilizerObj = Utils.settings + .getJSONObject("1号高温蒸汽灭菌炉"); String sterilizerBarcode = sterilizerObj.getString("条码"); - String sterilizationProcedureBarcode = ((JSONObject)sterilizerObj.getJSONArray("灭菌程序").get(0)).getString("条码"); + String sterilizationProcedureBarcode = ((JSONObject) sterilizerObj + .getJSONArray("灭菌程序").get(0)).getString("条码"); Utils.retryingFindAndClick(By .xpath("//div[contains(text(), '器械包灭菌')]")); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizerBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizerBarcode + "\n"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizationProcedureBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizationProcedureBarcode + "\n"); Utils.retryingFindAndSendKeys(By.id("inputBarcode"), Utils.settings .getJSONObject("灭菌篮筐01").getString("条码") + "\n"); @@ -569,7 +619,7 @@ * .getJSONObject("一级供应室清洗篮筐1").getString("条码")+"\n"); **/ Utils.retryingFindAndSendKeys(By.id("tousseName"), Keys.DOWN); - + Utils.retryingFindAndClear(By.id("amount")); Utils.retryingFindAndSendKeys(By.id("amount"), x + "\n"); // Utils.retryingFindAndSendKeys(By.id("configItemOption102"), @@ -663,14 +713,18 @@ Utils.retryingFindAndSendKeys(By.id("sterilizationPurpose"), Keys.DOWN); - JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉"); + JSONObject sterilizerObj = Utils.settings + .getJSONObject("1号高温蒸汽灭菌炉"); String sterilizerBarcode = sterilizerObj.getString("条码"); - String sterilizationProcedureBarcode = ((JSONObject)sterilizerObj.getJSONArray("灭菌程序").get(0)).getString("条码"); + String sterilizationProcedureBarcode = ((JSONObject) sterilizerObj + .getJSONArray("灭菌程序").get(0)).getString("条码"); Utils.retryingFindAndClick(By .xpath("//div[contains(text(), '器械包灭菌')]")); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizerBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizerBarcode + "\n"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizationProcedureBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizationProcedureBarcode + "\n"); Utils.retryingFindAndSendKeys(By.id("inputBarcode"), Utils.settings .getJSONObject("灭菌篮筐01").getString("条码") + "\n"); @@ -775,14 +829,18 @@ Utils.retryingFindAndSendKeys(By.id("sterilizationPurpose"), Keys.DOWN); - JSONObject sterilizerObj = Utils.settings.getJSONObject("1号高温蒸汽灭菌炉"); + JSONObject sterilizerObj = Utils.settings + .getJSONObject("1号高温蒸汽灭菌炉"); String sterilizerBarcode = sterilizerObj.getString("条码"); - String sterilizationProcedureBarcode = ((JSONObject)sterilizerObj.getJSONArray("灭菌程序").get(0)).getString("条码"); + String sterilizationProcedureBarcode = ((JSONObject) sterilizerObj + .getJSONArray("灭菌程序").get(0)).getString("条码"); Utils.retryingFindAndClick(By .xpath("//div[contains(text(), '器械包灭菌')]")); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizerBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizerBarcode + "\n"); - Utils.retryingFindAndSendKeys(By.id("inputBarcode"), sterilizationProcedureBarcode + "\n"); + Utils.retryingFindAndSendKeys(By.id("inputBarcode"), + sterilizationProcedureBarcode + "\n"); Utils.retryingFindAndSendKeys(By.id("inputBarcode"), Utils.settings .getJSONObject("灭菌篮筐01").getString("条码") + "\n");