From 149ab95769a78252cc3e5a79d4eff62d1478160a Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Mon, 2 Mar 2015 19:24:32 +0200
Subject: [PATCH] [misc] Update extension test page objects and make them run
faster.
---
.../xwiki/extension/test/po/ExtensionDependenciesPane.java | 2 +-
.../java/org/xwiki/extension/test/po/ExtensionPane.java | 2 +-
.../java/org/xwiki/extension/test/po/SearchResultsPane.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/ExtensionDependenciesPane.java b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/ExtensionDependenciesPane.java
index 5e1cd22acc0..76b42651180 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/ExtensionDependenciesPane.java
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/ExtensionDependenciesPane.java
@@ -85,7 +85,7 @@ public List<DependencyPane> getBackwardDependencies()
List<DependencyPane> getDependenciesAfter(String label)
{
By xpath =
- By.xpath(".//*[contains(@class, 'dependency-item') and ancestor::ul[preceding-sibling::p[starts-with(., '"
+ By.xpath(".//*[contains(@class, 'dependency-item') and ancestor::dd[preceding-sibling::dt[starts-with(., '"
+ label + "')]]]");
List<DependencyPane> dependencies = new ArrayList<DependencyPane>();
for (WebElement element : getDriver().findElementsWithoutWaiting(container, xpath)) {
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/ExtensionPane.java b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/ExtensionPane.java
index 4128bdd7a49..eba15002616 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/ExtensionPane.java
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/ExtensionPane.java
@@ -345,7 +345,7 @@ private WebElement clickTab(String label)
String sectionAnchor = StringUtils.substringAfterLast(found.get(0).getAttribute("href"), "#");
found.get(0).click();
By sectionXPath =
- By.xpath(".//div[contains(@class, 'extension-body-section') and preceding-sibling::*[1][@id = '"
+ By.xpath(".//*[contains(@class, 'extension-body-section') and preceding-sibling::*[1][@id = '"
+ sectionAnchor + "']]");
return getDriver().findElementWithoutWaiting(container, sectionXPath);
}
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/SearchResultsPane.java b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/SearchResultsPane.java
index f110128d7f7..80015ed2873 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/SearchResultsPane.java
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test-pageobjects/src/main/java/org/xwiki/extension/test/po/SearchResultsPane.java
@@ -39,7 +39,7 @@ public class SearchResultsPane extends BaseElement
*/
public PaginationFilterPane getPagination()
{
- return getDriver().findElements(By.className("paginationFilter")).size() > 0 ? new PaginationFilterPane()
+ return getDriver().hasElementWithoutWaiting(By.className("paginationFilter")) ? new PaginationFilterPane()
: null;
}
@@ -48,7 +48,7 @@ public PaginationFilterPane getPagination()
*/
public int getDisplayedResultsCount()
{
- return getDriver().findElements(By.className("extension-item")).size();
+ return getDriver().findElementsWithoutWaiting(By.className("extension-item")).size();
}
/**
@@ -58,7 +58,7 @@ public String getNoResultsMessage()
{
String xpath =
"//div[contains(@class, 'infomessage') and preceding-sibling::div[1][@class = 'extension-search-bar']]";
- List<WebElement> found = getDriver().findElements(By.xpath(xpath));
+ List<WebElement> found = getDriver().findElementsWithoutWaiting(By.xpath(xpath));
return found.size() > 0 ? found.get(0).getText() : null;
}
--
GitLab