[gryadav@saturn jtharness]$ git diff gui-tests/src/gui/src/jthtest/ReportCreate/ReportCreate.java diff --git a/gui-tests/src/gui/src/jthtest/ReportCreate/ReportCreate.java b/gui-tests/src/gui/src/jthtest/ReportCreate/ReportCreate.java index c1d885e..fc6d39f 100644 --- a/gui-tests/src/gui/src/jthtest/ReportCreate/ReportCreate.java +++ b/gui-tests/src/gui/src/jthtest/ReportCreate/ReportCreate.java @@ -569,14 +569,14 @@ public class ReportCreate extends ReportTools { if (i == -1) { error.append("report doesn't contain configuration url '#Configuration and Other Settings'\n"); } - if (!browser.getText().contains("name=\"Configuration and Other Settings\"")) { + if (!browser.getText().replaceAll("[^a-zA-Z]", " ").trim().replaceAll(" +", " ").contains("Configuration and Other Settings")) { error.append("report doesn't contain configuration block\n"); } // i = findInStringArray(urls, "#locations"); // if (i == -1) { // error.append("report doesn't contain url to 'Where to put the results' block\n"); // } - if (!browser.getText().contains("name=locations") && !browser.getText().contains("name=\"locations\"")) { + if (!browser.getText().contains("name=locations") && !browser.getText().contains("id=\"locations\"")) { error.append("report doesn't contain 'Where to put the results' block\n"); } @@ -627,7 +627,7 @@ public class ReportCreate extends ReportTools { // if (i == -1) { // error.append("report doesn't contain url to test enviroment ('How to run') block\n"); // } - if (!browser.getText().contains("name=execution") && !browser.getText().contains("name=\"execution\"")) { + if (!browser.getText().contains("name=execution") && !browser.getText().contains("id=\"execution\"")) { error.append("report doesn't contain test enviroment ('How to run') block\n"); } if (!(new File(htmlPath + "env.html").exists())) { @@ -694,14 +694,14 @@ public class ReportCreate extends ReportTools { if (i == -1) { error.append("report doesn't contain url to Statistics block (produced by options-keywords)\n"); } - if (!browser.getText().contains("name=Statistics") && !browser.getText().contains("name=\"Statistics\"")) { + if (!browser.getText().contains("name=Statistics") && !browser.getText().contains("id=\"Statistics\"")) { error.append("report doesn't contain Statistics block (produced by options-keywords)\n"); } i = findInStringArray(urls, "#keywordSummary"); if (i == -1) { error.append("report doesn't contain url to keywordSummary block\n"); } - if (!browser.getText().contains("name=keywordSummary") && !browser.getText().contains("name=\"keywordSummary\"")) { + if (!browser.getText().contains("name=keywordSummary") && !browser.getText().contains("id=\"keywordSummary\"")) { error.append("report doesn't contain keywordSummary block\n"); } } else { @@ -726,7 +726,7 @@ public class ReportCreate extends ReportTools { if (i == -1) { error.append("report doesn't contain url to Results block\n"); } - if (!browser.getText().contains("name=Results") && !browser.getText().contains("name=\"Results\"")) { + if (!browser.getText().contains("name=Results") && !browser.getText().contains("id=\"Results\"")) { error.append("report doesn't contain Results block\n"); } } else { @@ -788,8 +788,6 @@ public class ReportCreate extends ReportTools { if (type == ReportType.REPORT_HTML && htmlReport.isFPutInReport()) { URL u = urlFile(basePath + File.separator + "html"); - browser.clickUrl(u); - browser.waitForPageLoading("", "Directory listing for html"); u = urlFile(basePath + File.separator + "html" + File.separator + "report.html"); browser.clickUrl(u); browser.waitForPageLoading("", "" + WINDOWNAME + " Harness : Report");