no-jira: 2 selenium tests for the question pool and the review process of questions

src/main/java/org/olat/core/configuration/AbstractSpringModule.java

@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.olat.core.gui.control.Event;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
+import org.olat.core.util.StringHelper;
 import org.olat.core.util.coordinate.CoordinatorManager;
 import org.olat.core.util.event.GenericEventListener;
 import org.springframework.beans.factory.DisposableBean;
@@ -99,6 +100,9 @@ public abstract class AbstractSpringModule implements GenericEventListener, Init
 
 	@Override
 	public void afterPropertiesSet()  {
+		if (!StringHelper.containsNonWhitespace(userDataDirectory)) {
+			userDataDirectory = System.getProperty("java.io.tmpdir") + "/olatdata";
+		}
 		moduleConfigProperties.setUserDataDirectory(userDataDirectory);
 		moduleConfigProperties.init();
 		initDefaultProperties();

src/main/java/org/olat/ims/qti/qpool/QTI12ItemFactory.java

@@ -44,6 +44,11 @@ public class QTI12ItemFactory implements QItemFactory {
 	public QTI12ItemFactory(Type type) {
 		this.type = type;
 	}
+	
+	@Override
+	public String getType() {
+		return "qti12_".concat(type.name());
+	}
 
 	@Override
 	public String getLabel(Locale locale) {
@@ -61,8 +66,7 @@ public class QTI12ItemFactory implements QItemFactory {
 	@Override
 	public QuestionItem createItem(Identity owner, String title, Locale locale) {
 		QTIQPoolServiceProvider spi = CoreSpringFactory.getImpl(QTIQPoolServiceProvider.class);
-		QuestionItem newItem = spi.createItem(owner, type, title, locale);
-		return newItem;
+		return spi.createItem(owner, type, title, locale);
 	}
 	
 	public enum Type {

src/main/java/org/olat/ims/qti21/pool/QTI21AssessmentItemFactory.java

@@ -43,6 +43,11 @@ public class QTI21AssessmentItemFactory implements QItemFactory {
 	public QTI21AssessmentItemFactory(QTI21QuestionType type) {
 		this.type = type;
 	}
+	
+	@Override
+	public String getType() {
+		return "qti21_".concat(type.name());
+	}
 
 	@Override
 	public String getLabel(Locale locale) {

src/main/java/org/olat/modules/qpool/QItemFactory.java

@@ -31,6 +31,8 @@ import org.olat.core.id.Identity;
  */
 public interface QItemFactory {
 	
+	public String getType();
+	
 	public String getLabel(Locale locale);
 	
 	public QuestionItem createItem(Identity owner, String title, Locale locale);

src/main/java/org/olat/modules/qpool/site/QuestionPoolSite.java

@@ -67,8 +67,7 @@ public class QuestionPoolSite extends AbstractSiteInstance {
 		OLATResourceable ores = OresHelper.createOLATResourceableInstance("QPool", 0l);
 		ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
 		WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ores, new StateSite(this), wControl, true);
-		MainLayoutController c = new QuestionPoolSiteMainController(ureq, bwControl);
-		return c;
+		return new QuestionPoolSiteMainController(ureq, bwControl);
 	}
 	
 	@Override

src/main/java/org/olat/modules/qpool/ui/NewItemOptionsController.java

@@ -85,8 +85,10 @@ public class NewItemOptionsController extends FormBasicController {
 	
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_new_item_form");
 		//title
 		titleEl = uifactory.addTextElement("general.title", "general.title", 128, "", formLayout);
+		titleEl.setElementCssClass("o_sel_item_title");
 
 		//type
 		List<QItemFactory> factories = new ArrayList<>();
@@ -100,7 +102,7 @@ public class NewItemOptionsController extends FormBasicController {
 		String[] typeKeys = new String[factories.size()];
 		String[] valueKeys = new String[factories.size()];
 		for(QItemFactory factory:factories) {
-			String typeKey = "item.type." + count;
+			String typeKey = factory.getType();
 			typeKeys[count] = typeKey;
 			keyToFactoryMap.put(typeKey, factory);
 			valueKeys[count] = factory.getLabel(getLocale());
@@ -108,6 +110,7 @@ public class NewItemOptionsController extends FormBasicController {
 		}
 
 		typeEl = uifactory.addDropdownSingleselect("question.type", "menu.admin.types", formLayout, typeKeys, valueKeys, null);
+		typeEl.setElementCssClass("o_sel_item_type");
 		
 		//subject
 		taxonomyLevelEl = uifactory.addDropdownSingleselect("process.start.review.taxonomy.level", formLayout,
@@ -121,6 +124,7 @@ public class NewItemOptionsController extends FormBasicController {
 			}
 		}
 		taxonomyLevelEl.setVisible(qPoolSecurityCallback.canUseTaxonomy());
+		taxonomyLevelEl.setElementCssClass("o_sel_item_taxonomy_level");
 		
 		FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		buttonLayout.setRootForm(mainForm);

src/main/java/org/olat/modules/qpool/ui/QuestionPoolMainEditorController.java

@@ -117,6 +117,7 @@ public class QuestionPoolMainEditorController extends BasicController implements
 		
 		content = new Panel("list");
 		columnLayoutCtr = new LayoutMain3ColsController(ureq, getWindowControl(), menuTree, content, "qpool");
+		columnLayoutCtr.addCssClassToMain("o_qpool");
 		
 		doSelectControllerTreeNode(ureq, treeModel.getMyNode(), null, null);
 		putInitialPanel(columnLayoutCtr.getInitialComponent());

src/main/java/org/olat/modules/qpool/ui/ReviewController.java

@@ -56,6 +56,7 @@ public class ReviewController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormDescription("process.rating.description");
+		formLayout.setElementCssClass("o_sel_qpool_review_form");
 		
 		ratingEl = uifactory.addRatingItem("process.rating", "process.rating", 0f, 5, true, formLayout);
 		

src/main/java/org/olat/modules/qpool/ui/ReviewStartController.java

@@ -66,6 +66,7 @@ public class ReviewStartController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_qpool_confirm_start_form");
 		setFormDescription("process.start.review.description", new String[] {item.getTitle()});
 		
 		qpoolTaxonomyTreeBuilder.loadTaxonomyLevelsSelection(getIdentity(), false, ignoreCompetences);

src/main/java/org/olat/modules/qpool/ui/admin/QuestionPoolAdminConfigurationController.java

@@ -103,6 +103,7 @@ public class QuestionPoolAdminConfigurationController extends FormBasicControlle
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer moduleCont = FormLayoutContainer.createDefaultFormLayout("module", getTranslator());
+		moduleCont.setElementCssClass("o_sel_qpool_configuration");
 		moduleCont.setFormTitle(translate("admin.configuration.title"));
 		moduleCont.setRootForm(mainForm);
 		formLayout.add("module", moduleCont);
@@ -110,6 +111,7 @@ public class QuestionPoolAdminConfigurationController extends FormBasicControlle
 		String[] onValues = new String[] { translate("on") };
 		reviewProcessEnabledEl = uifactory.addCheckboxesHorizontal("review.process.enabled", moduleCont, onKeys, onValues);
 		reviewProcessEnabledEl.addActionListener(FormEvent.ONCHANGE);
+		reviewProcessEnabledEl.setElementCssClass("o_sel_qpool_review_process");
 		if (qpoolModule.isReviewProcessEnabled()) {
 			reviewProcessEnabledEl.select(onKeys[0], true);
 		}
@@ -196,6 +198,7 @@ public class QuestionPoolAdminConfigurationController extends FormBasicControlle
 		poolManagerRightsEl.select(POOL_MANAGER_EDUCATIONAL_CONTEXT, qpoolModule.isPoolAdminAllowedToConfigEducationalContext());
 		
 		FormLayoutContainer buttonsWrapperCont = FormLayoutContainer.createDefaultFormLayout("global", getTranslator());
+		buttonsWrapperCont.setElementCssClass("o_sel_qpool_buttons");
 		buttonsWrapperCont.setRootForm(mainForm);
 		formLayout.add("buttonsWrapper", buttonsWrapperCont);
 		FormLayoutContainer buttonsCont = FormLayoutContainer.createButtonLayout("buttons", getTranslator());

src/main/java/org/olat/modules/qpool/ui/admin/ReviewProcessActivationController.java

@@ -51,10 +51,12 @@ public class ReviewProcessActivationController extends FormBasicController {
 	
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_qpool_reset_status_form");
 		uifactory.addStaticTextElement("description", "", translate("review.process.confirm.enable.description"), formLayout);
 		
 		String[] resetValues = new String[] { translate("reset.status") };
 		resetStatusaEl = uifactory.addCheckboxesHorizontal("reset.status", "", formLayout, resetKeys, resetValues);
+		resetStatusaEl.setElementCssClass("o_sel_qpool_reset_status");
 		
 		FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		formLayout.add("buttons", buttonLayout);

src/main/java/org/olat/modules/qpool/ui/admin/ReviewProcessAdminController.java

@@ -67,6 +67,7 @@ public class ReviewProcessAdminController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_qpool_review_process_admin");
 		setFormTitle("admin.review.process.title");
 		
 		// decision provider
@@ -98,6 +99,7 @@ public class ReviewProcessAdminController extends FormBasicController {
 		
 		String numberOfRatings = Integer.toString(qpoolModule.getReviewDecisionNumberOfRatings());
 		numberOfRatingsEl = uifactory.addTextElement("number.of.ratings", 5, numberOfRatings, formLayout);
+		numberOfRatingsEl.setElementCssClass("o_sel_qpool_num_of_reviews");
 		numberOfRatingsEl.setMandatory(true);
 		numberOfRatingsEl.setDisplaySize(5);
 
@@ -112,6 +114,7 @@ public class ReviewProcessAdminController extends FormBasicController {
 				translate(FINAL_VISIBILITY_MANAGER),
 				translate(FINAL_VISIBILITY_MANAGER_TEACHER)};
 		finalVisibilityEl = uifactory.addDropdownSingleselect("final.visibility", formLayout, finalVisibilityKeys, finalVisibilityValues);
+		finalVisibilityEl.setElementCssClass("o_sel_qpool_final_visibility");
 		String selectedKey = qpoolModule.isFinalVisibleTeach()? FINAL_VISIBILITY_MANAGER_TEACHER: FINAL_VISIBILITY_MANAGER;
 		finalVisibilityEl.select(selectedKey, true);
 

src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolMenuTreeModel.java

@@ -295,6 +295,7 @@ public class QuestionPoolMenuTreeModel extends GenericTreeModel implements DnDTr
 		if(!taxonomyLevels.isEmpty()) {
 			reviewNode = new GenericTreeNode(translator.translate("menu.review"));
 			reviewNode.setTitle(translator.translate("menu.review"));
+			reviewNode.setCssClass("o_sel_qpool_review_taxonomy_levels");
 			rootNode.addChild(reviewNode);
 			
 			for(TaxonomyLevel taxonomyLevel:taxonomyLevels) {

src/main/java/org/olat/modules/taxonomy/ui/EditTaxonomyLevelController.java

@@ -121,6 +121,8 @@ public class EditTaxonomyLevelController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_taxonomy_level_form");
+		
 		if(level == null || level.getKey() == null) {
 			String[] pathKeys;
 			String[] pathValues;
@@ -141,10 +143,12 @@ public class EditTaxonomyLevelController extends FormBasicController {
 		String identifier = level == null ? "" : level.getIdentifier();
 		identifierEl = uifactory.addTextElement("level.identifier", "level.identifier", 255, identifier, formLayout);
 		identifierEl.setEnabled(!TaxonomyLevelManagedFlag.isManaged(level, TaxonomyLevelManagedFlag.identifier));
+		identifierEl.setElementCssClass("o_sel_taxonomy_level_identifier");
 		identifierEl.setMandatory(true);
 
 		String displayName = level == null ? "" : level.getDisplayName();
 		displayNameEl = uifactory.addTextElement("level.displayname", "level.displayname", 255, displayName, formLayout);
+		displayNameEl.setElementCssClass("o_sel_taxonomy_level_name");
 		displayNameEl.setMandatory(true);
 		displayNameEl.setEnabled(!TaxonomyLevelManagedFlag.isManaged(level, TaxonomyLevelManagedFlag.displayName));
 		if(!StringHelper.containsNonWhitespace(displayName)) {

src/main/java/org/olat/modules/taxonomy/ui/TaxonomyLevelCompetenceController.java

@@ -126,6 +126,7 @@ public class TaxonomyLevelCompetenceController extends FormBasicController {
 				|| !TaxonomyLevelManagedFlag.isManaged(taxonomyLevel, TaxonomyLevelManagedFlag.haveCompetence)
 				|| !TaxonomyLevelManagedFlag.isManaged(taxonomyLevel, TaxonomyLevelManagedFlag.targetCompetence)) {
 			addCompetencesButton = uifactory.addFormLink("add.competences", formLayout, Link.BUTTON);
+			addCompetencesButton.setElementCssClass("o_sel_competence_add");
 			removeCompetencesButton = uifactory.addFormLink("delete", formLayout, Link.BUTTON);
 			multiSelect = true;
 		}
@@ -216,7 +217,7 @@ public class TaxonomyLevelCompetenceController extends FormBasicController {
 			} else if (event instanceof MultiIdentityChosenEvent) {
 				MultiIdentityChosenEvent multiEvent = (MultiIdentityChosenEvent)event;
 				List<Identity> toAdd = multiEvent.getChosenIdentities();
-				if(toAdd.size() > 0) {
+				if(!toAdd.isEmpty()) {
 					doAddCompetence(toAdd, (TaxonomyCompetenceTypes)userSearchCtrl.getUserObject());
 					loadModel();
 				}

src/main/java/org/olat/modules/taxonomy/ui/TaxonomyLevelOverviewController.java

@@ -26,7 +26,6 @@ import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.link.Link;
 import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.tabbedpane.TabCreator;
 import org.olat.core.gui.components.tabbedpane.TabbedPane;
 import org.olat.core.gui.components.velocity.VelocityContainer;
 import org.olat.core.gui.control.Controller;
@@ -86,6 +85,7 @@ public class TaxonomyLevelOverviewController extends BasicController implements
 		actionButton.setIconLeftCSS("o_icon o_icon_actions");
 		
 		tabPane = new TabbedPane("tabs", ureq.getLocale());
+		tabPane.setElementCssClass("o_sel_taxonomy_level_tabs");
 		tabPane.addListener(this);
 		
 		metadataCtrl = new EditTaxonomyLevelController(ureq, getWindowControl(), taxonomyLevel);
@@ -100,22 +100,16 @@ public class TaxonomyLevelOverviewController extends BasicController implements
 	}
 	
 	private void initTabPane() {
-		tabPane.addTab(translate("taxonomy.level.competences"), new TabCreator() {
-			@Override
-			public Component create(UserRequest uureq) {
-				competencesCtrl = new TaxonomyLevelCompetenceController(uureq, getWindowControl(), taxonomyLevel);
-				listenTo(competencesCtrl);
-				return competencesCtrl.getInitialComponent();
-			}
+		tabPane.addTab(translate("taxonomy.level.competences"), uureq -> {
+			competencesCtrl = new TaxonomyLevelCompetenceController(uureq, getWindowControl(), taxonomyLevel);
+			listenTo(competencesCtrl);
+			return competencesCtrl.getInitialComponent();
 		});
 		
-		tabPane.addTab(translate("taxonomy.level.relations"), new TabCreator() {
-			@Override
-			public Component create(UserRequest uureq) {
-				relationsCtrl = new TaxonomyLevelRelationsController(uureq, getWindowControl(), taxonomyLevel);
-				listenTo(relationsCtrl);
-				return relationsCtrl.getInitialComponent();
-			}
+		tabPane.addTab(translate("taxonomy.level.relations"),  uureq -> {
+			relationsCtrl = new TaxonomyLevelRelationsController(uureq, getWindowControl(), taxonomyLevel);
+			listenTo(relationsCtrl);
+			return relationsCtrl.getInitialComponent();
 		});
 	}
 	

src/main/java/org/olat/modules/taxonomy/ui/TaxonomyOverviewController.java

@@ -69,14 +69,18 @@ public class TaxonomyOverviewController extends BasicController implements Bread
 		
 		segmentView = SegmentViewFactory.createSegmentView("segments", mainVC, this);
 		metadataLink = LinkFactory.createLink("taxonomy.metadata", mainVC, this);
+		metadataLink.setElementCssClass("o_sel_taxonomy_metadata");
 		segmentView.addSegment(metadataLink, true);
 		doOpenMetadata(ureq);
 		
 		typesLink = LinkFactory.createLink("taxonomy.types", mainVC, this);
+		typesLink.setElementCssClass("o_sel_taxonomy_types");
 		segmentView.addSegment(typesLink, false);
 		levelsLink = LinkFactory.createLink("taxonomy.levels", mainVC, this);
+		levelsLink.setElementCssClass("o_sel_taxonomy_levels");
 		segmentView.addSegment(levelsLink, false);
 		lostFoundLink = LinkFactory.createLink("taxonomy.lost.found", mainVC, this);
+		lostFoundLink.setElementCssClass("o_sel_taxonomy_lost_found");
 		segmentView.addSegment(lostFoundLink, false);
 
 		putInitialPanel(mainVC);

src/main/java/org/olat/modules/taxonomy/ui/TaxonomyTreeTableController.java

@@ -120,6 +120,7 @@ public class TaxonomyTreeTableController extends FormBasicController implements
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 
 		newLevelButton = uifactory.addFormLink("add.taxonomy.level", formLayout, Link.BUTTON);
+		newLevelButton.setElementCssClass("o_sel_taxonomy_new_level");
 		deleteButton = uifactory.addFormLink("delete", formLayout, Link.BUTTON);
 		mergeButton = uifactory.addFormLink("merge.taxonomy.level", formLayout, Link.BUTTON);
 		typeButton = uifactory.addFormLink("type.taxonomy.level", formLayout, Link.BUTTON);

src/main/java/org/olat/modules/taxonomy/ui/_content/admin_taxonomy_levels.html

-#if($r.available("add.taxonomy.level"))
-<div class="o_button_group o_button_group_right">
-	$r.render("add.taxonomy.level")
-</div>
-#end
-$r.render("table")
-<div class="o_button_group">
-	#if($r.available("type.taxonomy.level"))
-		$r.render("type.taxonomy.level")
-	#end
-	#if($r.available("move.taxonomy.level"))
-		$r.render("move.taxonomy.level")
-	#end
-	#if($r.available("merge.taxonomy.level"))
-		$r.render("merge.taxonomy.level")
-	#end
-	#if($r.available("delete"))
-		$r.render("delete")
+<div class="o_sel_taxonomy_levels_tree">
+	#if($r.available("add.taxonomy.level"))
+	<div class="o_button_group o_button_group_right">
+		$r.render("add.taxonomy.level")
+	</div>
 	#end
+	$r.render("table")
+	<div class="o_button_group">
+		#if($r.available("type.taxonomy.level"))
+			$r.render("type.taxonomy.level")
+		#end
+		#if($r.available("move.taxonomy.level"))
+			$r.render("move.taxonomy.level")
+		#end
+		#if($r.available("merge.taxonomy.level"))
+			$r.render("merge.taxonomy.level")
+		#end
+		#if($r.available("delete"))
+			$r.render("delete")
+		#end
+	</div>
 </div>

src/main/java/org/olat/modules/taxonomy/ui/_content/level_competences.html

-#if($r.available("add.competences"))
-<div class="o_button_group o_button_group_right">
-	$r.render("add.competences")
-</div>
-#end
-$r.render("table")
-#if($r.available("delete"))
-<div class="o_button_group">
-	$r.render("delete")
-</div>
-#end
+<div class="o_sel_taxonomy_level_competences">
+	#if($r.available("add.competences"))
+	<div class="o_button_group o_button_group_right">
+		$r.render("add.competences")
+	</div>
+	#end
+	$r.render("table")
+	#if($r.available("delete"))
+	<div class="o_button_group">
+		$r.render("delete")
+	</div>
\ No newline at end of file
+	#end
+</div>
\ No newline at end of file