Merge OpenOLAT default branch to OpenOLAT qti with d5dd524669ffc109876abff2e012d18436159f4e

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/FileElementImpl.java

@@ -105,6 +105,9 @@ public class FileElementImpl extends FormItemImpl
 	private String i18nErrMimeType;
 	private String[] i18nErrMaxSizeArgs;
 	private String[] i18nErrMimeTypeArgs;
+	
+	private String fileExampleKey;
+	private String[] fileExampleParams;
 
 	private WindowControl wControl;
 	private DialogBoxController dialogCtr;
@@ -194,9 +197,9 @@ public class FileElementImpl extends FormItemImpl
 	}
 
 	private void doConfirmDelete(UserRequest ureq) {
-		Translator translator = Util.createPackageTranslator(FileElementImpl.class, ureq.getLocale(), getTranslator());
-		String title = translator.translate("confirm.delete.file.title");
-		String text = translator.translate("confirm.delete.file");
+		Translator fileTranslator = Util.createPackageTranslator(FileElementImpl.class, ureq.getLocale(), getTranslator());
+		String title = fileTranslator.translate("confirm.delete.file.title");
+		String text = fileTranslator.translate("confirm.delete.file");
 		dialogCtr = DialogBoxUIFactory.createOkCancelDialog(ureq, wControl, title, text);
 		dialogCtr.addControllerListener(this);
 		dialogCtr.activate();
@@ -334,6 +337,23 @@ public class FileElementImpl extends FormItemImpl
 		clearError();
 	}
 
+	@Override
+	public String getExampleText() {
+		if(fileExampleKey != null) {
+			if(fileExampleParams != null) {
+				return translator.translate(fileExampleKey, fileExampleParams);
+			}
+			return translator.translate(fileExampleKey);
+		}
+		return null;
+	}
+	
+	@Override
+	public void setExampleKey(String exampleKey, String[] params) {
+		this.fileExampleKey = exampleKey;
+		this.fileExampleParams = params;
+	}
+
 	@Override
 	public void setPreview(UserSession usess, boolean enable) {
 		if (enable) {

src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java

@@ -37,7 +37,7 @@ import org.openqa.selenium.WebElement;
  */
 public class MenuTreePageFragment {
 	
-	private static final By treeBy = By.className("o_tree");
+	public static final By treeBy = By.className("o_tree");
 	
 	private final  WebDriver browser;
 

src/test/java/org/olat/selenium/page/course/CoursePageFragment.java

@@ -124,6 +124,7 @@ public class CoursePageFragment {
 	 * @return
 	 */
 	public MenuTreePageFragment clickTree() {
+		OOGraphene.waitElement(MenuTreePageFragment.treeBy, 2, browser);
 		MenuTreePageFragment menuTree = new MenuTreePageFragment(browser);
 		menuTree.selectRoot();
 		return menuTree;

src/test/java/org/olat/selenium/page/repository/CPPage.java

@@ -46,7 +46,8 @@ public class CPPage {
 	}
 	
 	public CPPage assertInIFrame(By by) {
-		By iframeBy = By.xpath("//iframe");
+		By iframeBy = By.xpath("//div[contains(@class,'o_iframedisplay')]//iframe");
+		OOGraphene.waitElement(iframeBy, 2, browser);
 		List<WebElement> iframes = browser.findElements(iframeBy);
 		browser = browser.switchTo().frame(iframes.get(0));
 		

src/test/java/org/olat/selenium/page/wiki/WikiPage.java

@@ -67,12 +67,13 @@ public class WikiPage {
 	public WikiPage createPage(String name, String content) {
 		//open the create popover
 		By createBy = By.className("o_sel_wiki_create_page");
+		OOGraphene.waitElement(createBy, 2, browser);
 		WebElement createButton = browser.findElement(createBy);
 		createButton.click();
 		
 		//fill the name of the new page
 		By pageNameBy = By.cssSelector("div.o_callout_content form input[type='text']");
-		OOGraphene.waitElement(pageNameBy, browser);
+		OOGraphene.waitElement(pageNameBy, 2, browser);
 		WebElement pageNameEl = browser.findElement(pageNameBy);
 		pageNameEl.sendKeys(name);
 		//search for it