fixed outdated functional tests.

pom.xml

@@ -577,13 +577,17 @@
 						<artifactId>maven-surefire-plugin</artifactId>
 						<version>2.12</version>
 						<configuration>
+							<forkMode>always</forkMode>
 							<systemProperties>
 								<arquillian.launch>tomcat-7-managed</arquillian.launch>
 							</systemProperties>
 							<testNGArtifactName>none:none</testNGArtifactName>
+							<!-- commented out because surefire plugin doesn't understand @Suite annotation of JUnit and openolat won't undeploy.
 							<includes>
-               					 <include>org/olat/test/Selenium2TestsJunit4.java</include>
-              				</includes>
+               					 <include>org/olat/test/Selenium2TestsJunit4.java</include>  
+              				</includes> 
+              				-->
+              				<test>**/Functional*Test.java</test>
 						</configuration>
 					</plugin>
 				</plugins>

src/test/java/org/olat/course/FunctionalBackTest.java

@@ -31,6 +31,7 @@ import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.olat.restapi.support.vo.CourseVO;
@@ -86,6 +87,7 @@ public class FunctionalBackTest {
 		user = userVO.get(0);
 	}
 	
+	@Ignore
 	@Test
 	@RunAsClient
 	public void checkBack() throws URISyntaxException, IOException{

src/test/java/org/olat/course/FunctionalCourseTest.java

@@ -100,7 +100,6 @@ public class FunctionalCourseTest {
 		}
 	}
 	
-	@Ignore
 	@Test
 	@RunAsClient
 	public void checkCreateUsingWizard(){

src/test/java/org/olat/course/nodes/iq/FunctionalIQTestTest.java

@@ -90,20 +90,26 @@ public class FunctionalIQTestTest {
 	@Test
 	@RunAsClient
 	public void checkCreate() throws URISyntaxException, IOException{
+		/* import empty course via REST */
 		CourseVO course = functionalVOUtil.importEmptyCourse(deploymentUrl);
 		
 		/* login for test setup */
 		Assert.assertTrue(functionalUtil.login(browser, functionalUtil.getUsername(), functionalUtil.getPassword(), true));
 		
-		/*  */
+		/* open the imported course and start editor */
 		Assert.assertTrue(functionalRepositorySiteUtil.openCourse(browser, course.getRepoEntryKey()));
 		Assert.assertTrue(functionalCourseUtil.openCourseEditor(browser));
 		
+		/* create course node and assign qti test to it */
 		Assert.assertTrue(functionalCourseUtil.createCourseNode(browser, CourseNodeAlias.IQ_TEST, IQ_TEST_SHORT_TITLE, IQ_TEST_LONG_TITLE, IQ_TEST_DESCRIPTION, 0));
 		Assert.assertTrue(functionalCourseUtil.createQTITest(browser, IQ_TEST_SHORT_TITLE, IQ_TEST_DESCRIPTION));
 		
+		/* publish entire course */
 		Assert.assertTrue(functionalCourseUtil.publishEntireCourse(browser, null, null));
 		
+		/* close editor, open course and click nth course node */
+		Assert.assertTrue(functionalCourseUtil.closeActiveTab(browser));
+		Assert.assertTrue(functionalRepositorySiteUtil.openCourse(browser, course.getRepoEntryKey()));
 		Assert.assertTrue(functionalCourseUtil.open(browser, course.getRepoEntryKey(), 0));
 	}
 }

src/test/java/org/olat/login/FunctionalResumeTest.java

@@ -39,6 +39,7 @@ import org.olat.util.FunctionalCourseUtil;
 import org.olat.util.FunctionalHomeSiteUtil;
 import org.olat.util.FunctionalRepositorySiteUtil;
 import org.olat.util.FunctionalUtil;
+import org.olat.util.FunctionalCourseUtil.AccessSettings;
 import org.olat.util.FunctionalUtil.OlatSite;
 import org.olat.util.FunctionalVOUtil;
 
@@ -90,9 +91,9 @@ public class FunctionalResumeTest {
 		/* create xpath to check if course is open */
 		StringBuffer selectorBuffer = new StringBuffer();
 		
-		selectorBuffer.append("xpath=//li[@class='b_nav_tab b_nav_active b_resource_CourseModule']")
+		selectorBuffer.append("xpath=//li[contains(@class, 'b_resource_CourseModule')]")
 		.append("//a[@title='")
-		.append(functionalVOUtil.getAllElementsCourseFilename().substring(0, functionalVOUtil.getAllElementsCourseFilename().indexOf('.')))
+		.append(functionalVOUtil.getAllElementsCourseDisplayname())
 		.append("']");
 		
 		String courseXPath = selectorBuffer.toString();
@@ -106,7 +107,7 @@ public class FunctionalResumeTest {
 		/* open course and check if it's open */
 		Assert.assertTrue(functionalUtil.openSite(browser, OlatSite.LEARNING_RESOURCES));
 		Assert.assertTrue(functionalRepositorySiteUtil.openCourse(browser, course.getRepoEntryKey()));
-
+		
 		/*
 		 * There's a need to click something in the course because
 		 * else it won't open up again after resume.

src/test/java/org/olat/portal/FunctionalSettingsTest.java

@@ -181,7 +181,7 @@ public class FunctionalSettingsTest {
 		FunctionalLocatorPairsFactory pairsFactory = new FunctionalLocatorPairsFactory(functionalUtil);
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteHomeCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteHomeCss()));
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteAdministrationCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteAdministrationCss()));
-		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteGroupAdministrationCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteGroupAdministrationCss()));
+		//pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteGroupAdministrationCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteGroupAdministrationCss()));
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteGroupsCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteGroupsCss()));
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteLearningResourcesCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteLearningResourcesCss()));
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteUserManagementCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteUserManagementCss()));
@@ -326,7 +326,7 @@ public class FunctionalSettingsTest {
 		FunctionalLocatorPairsFactory pairsFactory = new FunctionalLocatorPairsFactory(functionalUtil);
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteHomeCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteHomeCss()));
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteAdministrationCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteAdministrationCss()));
-		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteGroupAdministrationCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteGroupAdministrationCss()));
+		//pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteGroupAdministrationCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteGroupAdministrationCss()));
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteGroupsCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteGroupsCss()));
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteLearningResourcesCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteLearningResourcesCss()));
 		pages.put(pairsFactory.getLocatorOfSite(functionalUtil.getOlatSiteUserManagementCss()), pairsFactory.getApprovalOfSite(functionalUtil.getOlatSiteUserManagementCss()));

src/test/java/org/olat/test/Selenium2TestsJunit4.java

@@ -23,6 +23,8 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 /**
+ * Description:<br/>
+ * May be deprecated, see pom.xml surefire configuration.
  * 
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  * @author jkraehemann, joel.kraehemann@frentix.com, frentix.com

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

@@ -1281,8 +1281,6 @@ public class FunctionalCourseUtil {
 		if(!createRepositoryResource(browser, getTestChooseRepositoryFileCss(), title, description)){
 			return(false);
 		}
-		
-		functionalUtil.waitForPageToLoad(browser);
 				
 		return(true);
 	}

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

@@ -87,7 +87,8 @@ public class FunctionalUtil {
 	public final static String OLAT_SITE_HOME_CSS = "o_site_home";
 	public final static String OLAT_SITE_GROUPS_CSS = "o_site_groups";
 	public final static String OLAT_SITE_LEARNING_RESOURCES_CSS = "o_site_repository";
-	public final static String OLAT_SITE_GROUP_ADMINISTRATION_CSS = "o_site_groupsmanagement";
+	//TODO:JK: remove
+	//public final static String OLAT_SITE_GROUP_ADMINISTRATION_CSS = "o_site_groupsmanagement";
 	public final static String OLAT_SITE_USER_MANAGEMENT_CSS = "o_site_useradmin";
 	public final static String OLAT_SITE_ADMINISTRATION_CSS = "o_site_admin";
 
@@ -125,7 +126,8 @@ public class FunctionalUtil {
 	private String olatSiteHomeCss;
 	private String olatSiteGroupsCss;
 	private String olatSiteLearningResourcesCss;
-	private String olatSiteGroupAdministrationCss;
+	//TODO:JK: remove
+	//private String olatSiteGroupAdministrationCss;
 	private String olatSiteUserManagementCss;
 	private String olatSiteAdministrationCss;
 	
@@ -184,7 +186,8 @@ public class FunctionalUtil {
 		olatSiteHomeCss = OLAT_SITE_HOME_CSS;
 		olatSiteGroupsCss = OLAT_SITE_GROUPS_CSS;
 		olatSiteLearningResourcesCss = OLAT_SITE_LEARNING_RESOURCES_CSS;
-		olatSiteGroupAdministrationCss = OLAT_SITE_GROUP_ADMINISTRATION_CSS;
+		//TODO:JK: remove
+		//olatSiteGroupAdministrationCss = OLAT_SITE_GROUP_ADMINISTRATION_CSS;
 		olatSiteUserManagementCss = OLAT_SITE_USER_MANAGEMENT_CSS;
 		olatSiteAdministrationCss = OLAT_SITE_ADMINISTRATION_CSS;
 		
@@ -1018,6 +1021,8 @@ public class FunctionalUtil {
 		this.olatSiteLearningResourcesCss = olatSiteLearningResourcesCss;
 	}
 
+	//TODO:JK: remove
+	/*
 	public String getOlatSiteGroupAdministrationCss() {
 		return olatSiteGroupAdministrationCss;
 	}
@@ -1026,7 +1031,8 @@ public class FunctionalUtil {
 			String olatSiteGroupAdministrationCss) {
 		this.olatSiteGroupAdministrationCss = olatSiteGroupAdministrationCss;
 	}
-
+	*/
+	
 	public String getOlatSiteUserManagementCss() {
 		return olatSiteUserManagementCss;
 	}

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

@@ -53,8 +53,8 @@ public class FunctionalVOUtil {
 
 	public final static String WAIT_LIMIT = "15000";
 	
-	public final static String ALL_ELEMENTS_COURSE_DISPLAYNAME = "All Elements Course";
-	public final static String ALL_ELEMENTS_COURSE_FILENAME = "All_Elements_Course.zip";
+	public final static String ALL_ELEMENTS_COURSE_DISPLAYNAME = "All Elements Course Without External Content";
+	public final static String ALL_ELEMENTS_COURSE_FILENAME = "All_Elements_Course_Without_External_Content.zip";
 
 	public enum SysGroups{
 		USERMANAGERS,

src/test/resources/arquillian.xml

@@ -12,7 +12,7 @@
         <configuration>
             <property name="workDir">target/arquillianDeployments</property>
 			<property name="catalinaHome">target/arq-apache-tomcat-7.0.27</property>
-			<property name="javaVmArguments">-XX:MaxPermSize=256m -Xmx2048m -Xms512m -Djava.awt.headless=true</property>
+			<property name="javaVmArguments">-XX:MaxPermSize=128m -Xmx512m -Xms256m -Djava.awt.headless=true</property>
 			<!-- debugging arguments for javaVm: -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y -->
         </configuration>
     </container>