From 193950b59c5cab3d25498fe38fa633125bc2f426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Kr=C3=A4hemann?= <joel.kraehemann@frentix.com> Date: Mon, 3 Jun 2013 13:48:27 +0200 Subject: [PATCH] FXOLAT-208: adjusted timeouts and fixed XPath Selector for tinyMCE. --- .../org/olat/util/FunctionalRepositorySiteUtil.java | 4 ++-- src/test/java/org/olat/util/FunctionalUtil.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java b/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java index bfd885a75ab..ac49c803197 100644 --- a/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java +++ b/src/test/java/org/olat/util/FunctionalRepositorySiteUtil.java @@ -1122,7 +1122,7 @@ public class FunctionalRepositorySiteUtil { selectorBuffer.append("xpath=//div[contains(@class, '") .append(getRepositoryPopupCss()) - .append("')]//form//input[@type='text']"); + .append("')]//input[@type='text']"); functionalUtil.waitForPageToLoadElement(browser, selectorBuffer.toString()); browser.type(selectorBuffer.toString(), title); @@ -1135,7 +1135,7 @@ public class FunctionalRepositorySiteUtil { selectorBuffer.append("xpath=(//div[contains(@class, '") .append(getRepositoryPopupCss()) - .append("')]//form//div[contains(@class, '") + .append("')]//div[contains(@class, '") .append(getRepositorySaveDetailsCss()) .append("')]//button[contains(@class, '") .append(functionalUtil.getButtonDirtyCss()) diff --git a/src/test/java/org/olat/util/FunctionalUtil.java b/src/test/java/org/olat/util/FunctionalUtil.java index 680fc26cd1d..ff3d23984ed 100644 --- a/src/test/java/org/olat/util/FunctionalUtil.java +++ b/src/test/java/org/olat/util/FunctionalUtil.java @@ -47,14 +47,14 @@ public class FunctionalUtil { public final static String LOGIN_PAGE = "dmz"; public final static String ACKNOWLEDGE_CHECKBOX = "acknowledge_checkbox"; - public final static long TIMEOUT = 60000; - public final static long POLL_INTERVAL = 100; + public final static long TIMEOUT = 20000; + public final static long POLL_INTERVAL = 200; public enum WaitLimitAttribute { NORMAL("10000"), - EXTENDED("20000"), - SAVE("30000"), - VERY_SAVE("60000"); + EXTENDED("15000"), + SAVE("20000"), + VERY_SAVE("30000"); private String extend; private long extendAsLong; -- GitLab