From 6193c692375f361a4453722eda5a2f1fa1f6cf4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Kr=C3=A4hemann?= <joel.kraehemann@frentix.com>
Date: Fri, 12 Oct 2012 09:41:35 +0200
Subject: [PATCH] non-jira: fixed tree node selectors.
---
.../org/olat/repository/FunctionalCatalogTest.java | 2 ++
.../java/org/olat/util/FunctionalCourseUtil.java | 2 +-
.../org/olat/util/FunctionalEPortfolioUtil.java | 14 +++++++-------
.../olat/util/FunctionalRepositorySiteUtil.java | 4 ++++
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/olat/repository/FunctionalCatalogTest.java b/src/test/java/org/olat/repository/FunctionalCatalogTest.java
index cfbabfa8aa7..760f4caafea 100644
--- a/src/test/java/org/olat/repository/FunctionalCatalogTest.java
+++ b/src/test/java/org/olat/repository/FunctionalCatalogTest.java
@@ -176,6 +176,8 @@ public class FunctionalCatalogTest {
.append(functionalRepositorySiteUtil.getCatalogNavigationCss())
.append("')]//a");
+ functionalUtil.idle(browser);
+
if(browser.isElementPresent(selectorBuffer.toString())){
browser.click(selectorBuffer.toString());
}
diff --git a/src/test/java/org/olat/util/FunctionalCourseUtil.java b/src/test/java/org/olat/util/FunctionalCourseUtil.java
index 3082a26b6b0..d28cb02a8b2 100644
--- a/src/test/java/org/olat/util/FunctionalCourseUtil.java
+++ b/src/test/java/org/olat/util/FunctionalCourseUtil.java
@@ -924,7 +924,7 @@ public class FunctionalCourseUtil {
selectorBuffer = new StringBuffer();
- selectorBuffer.append("xpath=//li//div[contains(@class, 'x-tree-selected')]//a//span[contains(text(), '")
+ selectorBuffer.append("xpath=//li//div[contains(@class, 'x-tree-node')]//a//span[contains(text(), '")
.append((structure != null) ? structure: page)
.append("')]");
diff --git a/src/test/java/org/olat/util/FunctionalEPortfolioUtil.java b/src/test/java/org/olat/util/FunctionalEPortfolioUtil.java
index 599c88ae736..964e8d0eddf 100644
--- a/src/test/java/org/olat/util/FunctionalEPortfolioUtil.java
+++ b/src/test/java/org/olat/util/FunctionalEPortfolioUtil.java
@@ -945,8 +945,8 @@ public class FunctionalEPortfolioUtil {
public boolean addTextArtefact(Selenium browser, String binder, String page, String structure,
String content, String title, String description, String[] tags){
/* create binder, page or structure if necessary */
- if(!createElements(browser, binder, page, structure))
- return(false);
+// if(!createElements(browser, binder, page, structure))
+// return(false);
/* navigate to the right place */
if(!functionalUtil.openSite(browser, OlatSite.HOME))
@@ -1019,8 +1019,8 @@ public class FunctionalEPortfolioUtil {
*/
public boolean uploadFileArtefact(Selenium browser, String binder, String page, String structure,
URI file, String title, String description, String[] tags) throws MalformedURLException{
- if(!createElements(browser, binder, page, structure))
- return(false);
+// if(!createElements(browser, binder, page, structure))
+// return(false);
if(!functionalUtil.openSite(browser, OlatSite.HOME))
return(false);
@@ -1104,8 +1104,8 @@ public class FunctionalEPortfolioUtil {
*/
public boolean createLearningJournal(Selenium browser, String binder, String page, String structure,
String title, String description, String[] tags){
- if(!createElements(browser, binder, page, structure))
- return(false);
+// if(!createElements(browser, binder, page, structure))
+// return(false);
if(!functionalUtil.openSite(browser, OlatSite.HOME))
return(false);
@@ -1142,7 +1142,7 @@ public class FunctionalEPortfolioUtil {
locatorBuffer = new StringBuffer();
- locatorBuffer.append("xpath=//li//div[contains(@class, 'x-tree-selected')]//a//span[contains(text(), '")
+ locatorBuffer.append("xpath=//li//div[contains(@class, 'x-tree-node')]//a//span[contains(text(), '")
.append((structure != null) ? structure: page)
.append("')]");
diff --git a/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java b/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java
index fe0ae4300fa..81f5587c13f 100644
--- a/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java
+++ b/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java
@@ -470,6 +470,8 @@ public class FunctionalRepositorySiteUtil {
.append(getCatalogNavigationCss())
.append("')]//a");
+ functionalUtil.idle(browser);
+
if(browser.isElementPresent(selectorBuffer.toString())){
browser.click(selectorBuffer.toString());
}
@@ -489,6 +491,8 @@ public class FunctionalRepositorySiteUtil {
/* check if catalog already exists */
String selector = createCatalogSelector(name);
+ functionalUtil.idle(browser);
+
if(browser.isElementPresent(selector)){
return(true);
}
--
GitLab