OO-296: fixed wrong alias in checkUploadFileArtefactWithinBinder() and fixed...

OO-296: fixed wrong alias in checkUploadFileArtefactWithinBinder() and fixed missing selector in artefactExists().

src/test/java/org/olat/portfolio/FunctionalArtefactTest.java

@@ -780,7 +780,7 @@ public class FunctionalArtefactTest {
 		/* verify */
 		Assert.assertTrue(checkArtefact(artefact));
 		//FIXME:JK: analyse why it always fails
-		//Assert.assertTrue(checkMap(binder));
+		Assert.assertTrue(checkMap(binder));
 
 		functionalUtil.logout(browser);
 	}
@@ -818,7 +818,7 @@ public class FunctionalArtefactTest {
 				TEXT_ARTEFACT_CREATED_WITHIN_BINDER_BINDER, TEXT_ARTEFACT_CREATED_WITHIN_BINDER_PAGE, TEXT_ARTEFACT_CREATED_WITHIN_BINDER_STRUCTURE,
 				ArtefactAlias.TEXT, TEXT_ARTEFACT_CREATED_WITHIN_BINDER_CONTENT,
 				TEXT_ARTEFACT_CREATED_WITHIN_BINDER_TITLE, TEXT_ARTEFACT_CREATED_WITHIN_BINDER_DESCRIPTION,
-				TEXT_ARTEFACT_TAGS));
+				TEXT_ARTEFACT_CREATED_WITHIN_BINDER_TAGS));
 		
 		/*
 		 * Test for content and make assumptions if the changes were applied.
@@ -870,7 +870,7 @@ public class FunctionalArtefactTest {
 		/* upload file artefact */
 		Assert.assertTrue(functionalEportfolioUtil.createArtefact(browser,
 				FILE_ARTEFACT_CREATED_WITHIN_BINDER_BINDER, FILE_ARTEFACT_CREATED_WITHIN_BINDER_PAGE, FILE_ARTEFACT_CREATED_WITHIN_BINDER_STRUCTURE,
-				ArtefactAlias.LEARNING_JOURNAL, FunctionalArtefactTest.class.getResource(FILE_ARTEFACT_CREATED_WITHIN_BINDER_PATH).toURI(),
+				ArtefactAlias.FILE, FunctionalArtefactTest.class.getResource(FILE_ARTEFACT_CREATED_WITHIN_BINDER_PATH).toURI(),
 				FILE_ARTEFACT_CREATED_WITHIN_BINDER_TITLE, FILE_ARTEFACT_CREATED_WITHIN_BINDER_DESCRIPTION,
 				FILE_ARTEFACT_CREATED_WITHIN_BINDER_TAGS));
 		
@@ -940,7 +940,7 @@ public class FunctionalArtefactTest {
 		/* verify */
 		Assert.assertTrue(checkArtefact(artefact));
 		//FIXME:JK: analyse why it always fails
-		//Assert.assertTrue(checkMap(binder));
+		Assert.assertTrue(checkMap(binder));
 		
 		functionalUtil.logout(browser);
 	}

src/test/java/org/olat/util/FunctionalEPortfolioUtil.java

@@ -692,11 +692,11 @@ public class FunctionalEPortfolioUtil {
 		.append(getEPortfolioTableOfContentsCss())
 		.append("')]//ul//li");
 
-		page = page.replaceAll("\\\\", "&92;");
-		page = page.replaceAll("/", "&47;");
+		//page = page.replaceAll("\\\\", "&92;");
+		page = page.replaceAll("/", "\\/");
 
-		title = title.replaceAll("\\\\", "&92;");
-		title = title.replaceAll("/", "&47;");
+		//title = title.replaceAll("\\\\", "&92;");
+		title = title.replaceAll("/", "\\/");
 				
 		VelocityContext context = new VelocityContext();
 
@@ -859,13 +859,26 @@ public class FunctionalEPortfolioUtil {
 			.append("']/..");
 		}
 		
-		selectorBuffer.append("//div[contains(@class, '")
+		/* create selector of typical artefact */
+		StringBuffer artefactBuffer = new StringBuffer(selectorBuffer);
+		
+		artefactBuffer.append("//div[contains(@class, '")
 		.append(getEPortfolioArtefactCss())
 		.append("')]//h4[text()='")
 		.append(artefact)
 		.append("']");
 		
-		if(browser.isElementPresent(selectorBuffer.toString())){
+		/* create selector of liveblog artefact */
+		StringBuffer liveblogBuffer = new StringBuffer(selectorBuffer);
+		
+		liveblogBuffer.append("//div[contains(@class, '")
+		.append(getEPortfolioArtefactCss())
+		.append("')]//h3[text()='")
+		.append(artefact)
+		.append("']");
+		
+		/* check */
+		if(browser.isElementPresent(artefactBuffer.toString()) || browser.isElementPresent(liveblogBuffer.toString())){
 			return(true);
 		}else{
 			return(false);
@@ -885,6 +898,7 @@ public class FunctionalEPortfolioUtil {
 		if(!openPage(browser, binder, page))
 			return(false);
 		
+		/*  */
 		StringBuffer selectorBuffer = new StringBuffer();
 		
 		selectorBuffer.append("xpath=//div[contains(@class, '")

src/test/java/org/olat/util/FunctionalUtil.java

@@ -538,13 +538,6 @@ public class FunctionalUtil {
 	public String openBusinessPath(Selenium browser, String businessPath){
 		idle(browser);
 		
-		/* cut off http:// or domain */
-		if(businessPath.startsWith("http://")){
-			//businessPath = businessPath.substring(businessPath.indexOf('/', 7));
-		}else if(businessPath.startsWith(getDeploymentUrl().substring(7))){
-			//TODO:JK: implement me
-		}
-		
 		browser.open(businessPath);
 
 		idle(browser);