From 676e3e16c392e83a13fbd412046cc451bac5d280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Kr=C3=A4hemann?= <joel.kraehemann@frentix.com>
Date: Tue, 2 Oct 2012 12:54:00 +0200
Subject: [PATCH] fixed outdated functional tests.
---
pom.xml | 8 ++++++--
...ements_Course_Without_External_Content.zip | Bin 339277 -> 340122 bytes
.../org/olat/course/FunctionalBackTest.java | 2 ++
.../org/olat/course/FunctionalCourseTest.java | 1 -
.../course/nodes/iq/FunctionalIQTestTest.java | 8 +++++++-
.../org/olat/login/FunctionalResumeTest.java | 7 ++++---
.../olat/portal/FunctionalSettingsTest.java | 4 ++--
.../org/olat/test/Selenium2TestsJunit4.java | 2 ++
.../org/olat/util/FunctionalCourseUtil.java | 2 --
.../java/org/olat/util/FunctionalUtil.java | 14 ++++++++++----
.../java/org/olat/util/FunctionalVOUtil.java | 4 ++--
src/test/resources/arquillian.xml | 2 +-
12 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 27a899f65f9..0ba53d79016 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/test/java/org/olat/course/All_Elements_Course_Without_External_Content.zip b/src/test/java/org/olat/course/All_Elements_Course_Without_External_Content.zip
index 959269705ad49de29e0f43c94ddc078517da7147..870280b9e77883e9bc8f3178c2af06adcfcc66a2 100644
GIT binary patch
delta 3280
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
K<+Vr_!2bXR{i65)
delta 2497
zcmZ`*drVVT7{BfL4p7@t#e#)yyoFNeLkOcN4yqt3s5r@t8b!@~@Gzjk2s(UCr!m<C
z?zYd2iMlP@obf@3yE9}Wn{#FphsiQ!nVbHx7^h5wa}P7!&N;V*7F?UtbMJS4-|u^z
zbAIXDH_g32n2lv61k6$x`<m*#9mcN+VY7Ud<cN73%-}QjJS0hS6By-RbcNb%kK70A
z@x&h_lsXnxR#)PjQnEI>aUlFfn?{n7*a%|vd+S<5Kt5uO^)V;Q&AP;4_ENpB^QNvy
z6KJstXqEnZVZ1+`JO?ZrFLwOy%TF<62}pv`Du)@Pe9!sOi_aw71+66gJ2Dq}93;u_
z7?T7cuL`%>sIK!j<BZ|J++=uVwMkiR(u632lX+q51x<jPDUBMGTNgC50{oawx2NKw
zMya@{UD+_?c&mU2M;;s9UiC#Zg}(uAvs0?<^pd#&RQ`pq2#r?z_;FA_<tlv)I;WFv
zQABW8jJ!Xcw&qVhkR<7d++#=+X|Vp_=|bXfkQHwilH}-ha#?LC>ynm@;0Qd^Sw#V9
zxB6bxwCAPs;)}?lfQ*?<hqc8df(KM~6_Z?Xl<?eaQV_kd><QgRBxyGrqa)>&1ok97
zgORtCkjVk$%%)Qwm6BZxM9n)6li_oz3>+r2hq21icZo&7M8DhE9*d0FW^WimWhg8E
zB<*fN#uhA!)dsyHU*%3ZoKtZp9N-m*K?jrxjv^;ewW>LjV5%^^HVM*01**#f;?gJ&
zJurpf$voJL?mXCrr>4SET)qMtmAV>uli-sIFr!;X7b|0@!4{(~H!C+YJ2NxegFSf=
z^VZAkNR(AVBsR<J$@Dx#VBhONl|x0)rNQklG3V}?5Q6)+LYi`8K6F?xt^vX@ZzF8N
z_cy_H9xG8X)j(GsmL7$D`1MDy6RX;wiNA*9$pL6k`agzpJvRRgjp#hh*xbKDJ;p1r
z8xuc;%_=(e3}a+uda9XUb3(?J(-5On90Q$J>Fa|54d$LzD>;s*5TcYZXW_kYboat8
zJbsBqb6p0+L+2TL^;Ot{P1hh*8Mq7$VSJ?+9oL|2cv)e~?OE7lqSa~v76UCHyk&0?
z+-jzgyk)*X<z{Nr;9w-}#<*x|z#WmaO6iEATQqpcLieE4Lf7MgXu1hgqG`QiilLQy
z>tDx~wJy0UN%Pq#E754p(va?<JdsWjn|Ng+%@hx3Q>hgbQfP{}QA65><ta2jo?kL{
zza+|k*e6z<e7`+ZzG5^pxzu4_3N;PUX(K}Tf;-cb;~J5G_p^KbWBuY8%(g^0$xI$`
zc`7xD*n#pEjQ%!M#4gnv@MJ1A49AWe!xk(VBje`%J^AxACX&f)1T(GW4)K`Jv{10j
zwNb0~x}F)I#l5zGvPk3?8aV;R<2N=sRzQDZP_oQtWuj;iR(l$=_Mca=Tq+|rSJsWl
z2YK5`)l?z~KTPux3Tvm&Dx~oqlV8F5gtPt=xWwfYJ$7me<J-hF4(Hiv6lu&?S^d&#
z7XE_zl2=`t;|dHIIZd_d(|y+1bY7Rw%Jj}6B5-ZP+H@A-_H@;OOX2?(*IlfFZuwas
zan`Vzs+9?yC4uK%ef0d|H47wZB^$vTQ$K46s>AIWfjg0UkYLMUGQlyTt=_`#maO7i
z95-s4>wGS#cTls4T(xL_{@@FeG{8o1<QwfOJuYO};qJu_61?*8DN&<(zwCVa;aa1*
z#Nj=Me;*yJ3qL*(OwXXl=__ltlbyPw$+*TzGnVqcwB_fndzDqOgAG&AwQI3~w5p-5
zc0;{u!>YPkXT!Rhk!|33|D7Ed<XmpY`%W4+>So6Wp$^#5<)The`f?Y`?2a9qTvYs{
z!FFzV;J_|63q(JE$Z`T6oCFgv-0iEBNsKjTMK(w^D;jGz){l~cK%E*N6uvDRYu$8W
JNKPUz;y*JKhRy&0
diff --git a/src/test/java/org/olat/course/FunctionalBackTest.java b/src/test/java/org/olat/course/FunctionalBackTest.java
index e2ae3871cab..fd04875eea8 100644
--- a/src/test/java/org/olat/course/FunctionalBackTest.java
+++ b/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{
diff --git a/src/test/java/org/olat/course/FunctionalCourseTest.java b/src/test/java/org/olat/course/FunctionalCourseTest.java
index b37765a7ed7..1c65cc6b05d 100644
--- a/src/test/java/org/olat/course/FunctionalCourseTest.java
+++ b/src/test/java/org/olat/course/FunctionalCourseTest.java
@@ -100,7 +100,6 @@ public class FunctionalCourseTest {
}
}
- @Ignore
@Test
@RunAsClient
public void checkCreateUsingWizard(){
diff --git a/src/test/java/org/olat/course/nodes/iq/FunctionalIQTestTest.java b/src/test/java/org/olat/course/nodes/iq/FunctionalIQTestTest.java
index 39e513f6a99..2da6c3e788e 100644
--- a/src/test/java/org/olat/course/nodes/iq/FunctionalIQTestTest.java
+++ b/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));
}
}
diff --git a/src/test/java/org/olat/login/FunctionalResumeTest.java b/src/test/java/org/olat/login/FunctionalResumeTest.java
index 7f1a4e71995..438f97715e1 100644
--- a/src/test/java/org/olat/login/FunctionalResumeTest.java
+++ b/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.
diff --git a/src/test/java/org/olat/portal/FunctionalSettingsTest.java b/src/test/java/org/olat/portal/FunctionalSettingsTest.java
index 7f59e598780..e8610ec6817 100644
--- a/src/test/java/org/olat/portal/FunctionalSettingsTest.java
+++ b/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()));
diff --git a/src/test/java/org/olat/test/Selenium2TestsJunit4.java b/src/test/java/org/olat/test/Selenium2TestsJunit4.java
index 89c0f2d616f..232f4a89706 100644
--- a/src/test/java/org/olat/test/Selenium2TestsJunit4.java
+++ b/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
diff --git a/src/test/java/org/olat/util/FunctionalCourseUtil.java b/src/test/java/org/olat/util/FunctionalCourseUtil.java
index 4d08244ad7c..fc7b3d720b2 100644
--- a/src/test/java/org/olat/util/FunctionalCourseUtil.java
+++ b/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);
}
diff --git a/src/test/java/org/olat/util/FunctionalUtil.java b/src/test/java/org/olat/util/FunctionalUtil.java
index f684abff83d..375617aedcc 100644
--- a/src/test/java/org/olat/util/FunctionalUtil.java
+++ b/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;
}
diff --git a/src/test/java/org/olat/util/FunctionalVOUtil.java b/src/test/java/org/olat/util/FunctionalVOUtil.java
index 4688b79c461..013813c83de 100644
--- a/src/test/java/org/olat/util/FunctionalVOUtil.java
+++ b/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,
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
index 332bf55c336..d291045a2c3 100644
--- a/src/test/resources/arquillian.xml
+++ b/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>
--
GitLab