diff --git a/pom.xml b/pom.xml
index d934b61d64f18b68df722a6f0edbc34060c5cd2e..7262e2012d9ecde86bd9db681b666dd6c3acae90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
<org.postgresql.version>9.4-1201-jdbc41</org.postgresql.version>
<org.infinispan.version>6.0.2.Final</org.infinispan.version>
<lucene.version>4.8.0</lucene.version>
- <version.selenium>2.45.0</version.selenium>
+ <version.selenium>2.46.0</version.selenium>
<activemq.version>5.11.1</activemq.version>
<!-- properties for testing and Q&A -->
diff --git a/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java b/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
index b8183cc1ea9d7b1ea64d0c4d967dafbd3d6b6297..cfe78711c2ea3ba0f96fb9734feaa47ff485b7b6 100644
--- a/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
+++ b/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
@@ -71,6 +71,7 @@ import org.olat.core.id.context.StateEntry;
import org.olat.core.logging.AssertException;
import org.olat.core.logging.activity.OlatResourceableType;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
+import org.olat.core.util.CodeHelper;
import org.olat.core.util.StringHelper;
import org.olat.core.util.UserSession;
import org.olat.core.util.Util;
@@ -220,6 +221,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
private HistoryPoint launchedFromPoint;
// not null indicates tool is enabled
+ private final String nodeIdPrefix;
private GenericTreeNode nodeFolder, nodeForum, nodeWiki, nodeCal, nodePortfolio, nodeOpenMeetings;
private GenericTreeNode nodeContact, nodeGroupOwners, nodeResources, nodeInformation, nodeAdmin;
private boolean groupRunDisabled;
@@ -243,6 +245,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
super(ureq, control);
assessmentEventOres = OresHelper.createOLATResourceableType(AssessmentEvent.class);
+ nodeIdPrefix = "bgmr".concat(Long.toString(CodeHelper.getRAMUniqueID()));
toolbarPanel = new TooledStackedPanel("courseStackPanel", getTranslator(), this);
toolbarPanel.setInvisibleCrumb(0); // show root (course) level
@@ -454,6 +457,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
if (event == Event.CHANGED_EVENT) {
TreeModel trMdl = buildTreeModel();
bgTree.setTreeModel(trMdl);
+ bgTree.setSelectedNode(nodeAdmin);
} else if (event == Event.CANCELLED_EVENT) {
// could not get lock on business group, back to inital screen
bgTree.setSelectedNodeId(bgTree.getTreeModel().getRootNode().getIdent());
@@ -1029,7 +1033,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
GenericTreeNode gtnChild, root;
GenericTreeModel gtm = new GenericTreeModel();
- root = new GenericTreeNode();
+ root = new GenericTreeNode(nodeIdPrefix.concat("-root"));
root.setTitle(businessGroup.getName());
root.setUserObject(ACTIVITY_MENUSELECT_OVERVIEW);
root.setAltText(translate("menutree.top.alt") + " " + businessGroup.getName());
@@ -1039,7 +1043,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
CollaborationTools collabTools = CollaborationToolsFactory.getInstance().getOrCreateCollaborationTools(this.businessGroup);
if (collabTools.isToolEnabled(CollaborationTools.TOOL_NEWS)) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("new"));
gtnChild.setTitle(translate("menutree.news"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_INFORMATION);
gtnChild.setAltText(translate("menutree.news.alt"));
@@ -1050,7 +1054,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
}
if (calendarModule.isEnabled() && calendarModule.isEnableGroupCalendar() && collabTools.isToolEnabled(CollaborationTools.TOOL_CALENDAR)) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("cal"));
gtnChild.setTitle(translate("menutree.calendar"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_CALENDAR);
gtnChild.setAltText(translate("menutree.calendar.alt"));
@@ -1062,7 +1066,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
boolean hasResources = businessGroupService.hasResources(businessGroup);
if(hasResources) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("courses"));
gtnChild.setTitle(translate("menutree.resources"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_SHOW_RESOURCES);
gtnChild.setAltText(translate("menutree.resources.alt"));
@@ -1075,7 +1079,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
if (businessGroup.isOwnersVisibleIntern() || businessGroup.isParticipantsVisibleIntern()) {
// either owners or participants, or both are visible
// otherwise the node is not visible
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("members"));
gtnChild.setTitle(translate("menutree.members"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_MEMBERSLIST);
gtnChild.setAltText(translate("menutree.members.alt"));
@@ -1086,7 +1090,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
}
if (collabTools.isToolEnabled(CollaborationTools.TOOL_CONTACT)) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("contact"));
gtnChild.setTitle(translate("menutree.contactform"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_CONTACTFORM);
gtnChild.setAltText(translate("menutree.contactform.alt"));
@@ -1097,7 +1101,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
}
if (collabTools.isToolEnabled(CollaborationTools.TOOL_FOLDER)) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("folder"));
gtnChild.setTitle(translate("menutree.folder"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_FOLDER);
gtnChild.setAltText(translate("menutree.folder.alt"));
@@ -1108,7 +1112,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
}
if (collabTools.isToolEnabled(CollaborationTools.TOOL_FORUM)) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("forum"));
gtnChild.setTitle(translate("menutree.forum"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_FORUM);
gtnChild.setAltText(translate("menutree.forum.alt"));
@@ -1118,9 +1122,8 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
nodeForum = gtnChild;
}
-
if (chatAvailable) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("chat"));
gtnChild.setTitle(translate("menutree.chat"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_CHAT);
gtnChild.setAltText(translate("menutree.chat.alt"));
@@ -1131,7 +1134,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
BaseSecurityModule securityModule = CoreSpringFactory.getImpl(BaseSecurityModule.class);
if (collabTools.isToolEnabled(CollaborationTools.TOOL_WIKI) && securityModule.isWikiEnabled()) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("wiki"));
gtnChild.setTitle(translate("menutree.wiki"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_WIKI);
gtnChild.setAltText(translate("menutree.wiki.alt"));
@@ -1143,7 +1146,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
PortfolioModule portfolioModule = (PortfolioModule) CoreSpringFactory.getBean("portfolioModule");
if (collabTools.isToolEnabled(CollaborationTools.TOOL_PORTFOLIO) && portfolioModule.isEnabled()) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("eportfolio"));
gtnChild.setTitle(translate("menutree.portfolio"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_PORTFOLIO);
gtnChild.setAltText(translate("menutree.portfolio.alt"));
@@ -1155,7 +1158,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
OpenMeetingsModule openMeetingsModule = CoreSpringFactory.getImpl(OpenMeetingsModule.class);
if (openMeetingsModule.isEnabled() && collabTools.isToolEnabled(CollaborationTools.TOOL_OPENMEETINGS)) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("meetings"));
gtnChild.setTitle(translate("menutree.openmeetings"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_OPENMEETINGS);
gtnChild.setAltText(translate("menutree.openmeetings.alt"));
@@ -1165,7 +1168,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
}
if (isAdmin) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("admin"));
gtnChild.setTitle(translate("menutree.administration"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_ADMINISTRATION);
gtnChild.setIdent(ACTIVITY_MENUSELECT_ADMINISTRATION);
@@ -1177,7 +1180,7 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
AccessControlModule acModule = (AccessControlModule)CoreSpringFactory.getBean("acModule");
if(acModule.isEnabled() && acService.isResourceAccessControled(businessGroup.getResource(), null)) {
- gtnChild = new GenericTreeNode();
+ gtnChild = new GenericTreeNode(nodeIdPrefix.concat("ac"));
gtnChild.setTitle(translate("menutree.ac"));
gtnChild.setUserObject(ACTIVITY_MENUSELECT_AC);
gtnChild.setIdent(ACTIVITY_MENUSELECT_AC);
diff --git a/src/test/java/org/olat/selenium/AssessmentTest.java b/src/test/java/org/olat/selenium/AssessmentTest.java
index cccaee383eada27d1ba31b910c877c0f8e4a897f..ac36b877d4ac79ec249c725486dea17b27cbfbaf 100644
--- a/src/test/java/org/olat/selenium/AssessmentTest.java
+++ b/src/test/java/org/olat/selenium/AssessmentTest.java
@@ -1067,8 +1067,8 @@ public class AssessmentTest {
Assume.assumeTrue(browser instanceof FirefoxDriver);
UserVO author = new UserRestClient(deploymentUrl).createAuthor();
- UserVO kanu = new UserRestClient(deploymentUrl).createRandomUser("Kanu");
- UserVO ryomou = new UserRestClient(deploymentUrl).createRandomUser("Ryomou");
+ UserVO kanu = new UserRestClient(deploymentUrl).createRandomUser("kanu");
+ UserVO ryomou = new UserRestClient(deploymentUrl).createRandomUser("ryomou");
authorLoginPage.loginAs(author.getLogin(), author.getPassword());
diff --git a/src/test/java/org/olat/selenium/BusinessGroupTest.java b/src/test/java/org/olat/selenium/BusinessGroupTest.java
index 44145858bfacd1b8dd8801ee0d630bc824d32a15..92add67157d06f447f07373533fc03b935863361 100644
--- a/src/test/java/org/olat/selenium/BusinessGroupTest.java
+++ b/src/test/java/org/olat/selenium/BusinessGroupTest.java
@@ -504,7 +504,8 @@ public class BusinessGroupTest {
.openAdministration()
.openAdminMembers()
.setVisibility(true, true, true)
- .openMembers();
+ .openMembers()
+ .assertParticipantList();
//Rei open the course
Enrollment[] participantDrivers = new Enrollment[]{
@@ -731,7 +732,8 @@ public class BusinessGroupTest {
.openAdministration()
.openAdminMembers()
.setVisibility(false, true, false)
- .openMembers();
+ .openMembers()
+ .assertParticipantList();
Enrollment[] participantDrivers = new Enrollment[]{
new Enrollment(ryomou, ryomouBrowser),
@@ -769,6 +771,9 @@ public class BusinessGroupTest {
enrollment.getEnrollmentPage().enrollNoWait();
}
//wait
+ for(Enrollment enrollment:participantDrivers) {
+ OOGraphene.waitBusy(enrollment.getDriver());
+ }
int errors = 0;
for(Enrollment enrollment:participantDrivers) {
if(enrollment.getEnrollmentPage().hasError()) {
@@ -859,7 +864,8 @@ public class BusinessGroupTest {
.openAdministration()
.openAdminMembers()
.setVisibility(false, true, false)
- .openMembers();
+ .openMembers()
+ .assertParticipantList();
Enrollment[] participantDrivers = new Enrollment[]{
new Enrollment(ryomou, ryomouBrowser),
diff --git a/src/test/java/org/olat/selenium/page/group/GroupPage.java b/src/test/java/org/olat/selenium/page/group/GroupPage.java
index 9c42cc7455768bc6091f1b1319795630c45b951a..92671a1add10d4be5889bd549810d97c7996c8c3 100644
--- a/src/test/java/org/olat/selenium/page/group/GroupPage.java
+++ b/src/test/java/org/olat/selenium/page/group/GroupPage.java
@@ -273,6 +273,15 @@ public class GroupPage {
return this;
}
+ public GroupPage assertParticipantList() {
+ By participantListBy = By.id("o_sel_group_participants");
+ List<WebElement> participantListEl = browser.findElements(participantListBy);
+ if(participantListEl.size() == 0) {
+ System.out.println();
+ }
+ return this;
+ }
+
public GroupPage assertMembersInOwnerList(UserVO owner) {
return assertMembers(owner, "o_sel_group_coaches");
}