Index: lams_tests/tests/org/lamsfoundation/lams/monitor/AddLessonTests.java =================================================================== diff -u -rdd6a6fcd79ef385c6d0eb01a15f5f6b24712c25a -rd1ed86c9c773aed2ac975918b88018e9bb191953 --- lams_tests/tests/org/lamsfoundation/lams/monitor/AddLessonTests.java (.../AddLessonTests.java) (revision dd6a6fcd79ef385c6d0eb01a15f5f6b24712c25a) +++ lams_tests/tests/org/lamsfoundation/lams/monitor/AddLessonTests.java (.../AddLessonTests.java) (revision d1ed86c9c773aed2ac975918b88018e9bb191953) @@ -183,14 +183,10 @@ @Test(dependsOnMethods="checkOnlyOneMonitorSelected") public void checkOnlyAllLearnersSelected() { - int expectedUnselectedLearners = 0; - - int unSelectedLearners = addLesson - .openClasstab() - .getNumberUnselectedLearners(); - + Boolean emptyUnselectedLearners = addLesson.openClasstab().isUnselectedLearnersEmpty(); + // Assert - Assert.assertEquals(unSelectedLearners, expectedUnselectedLearners, + Assert.assertTrue(emptyUnselectedLearners, "There shouldn't be any unselected learners"); // addLesson.closeDialog(); @@ -250,8 +246,6 @@ addLesson = openDialog(index); - selectRandomDesign(addLesson, "Only one learner " + RANDOM_INT); - // Remove all learners addLesson.openClasstab().removeAllLearnersFromLesson(); @@ -318,14 +312,14 @@ Assert.assertFalse(isScheduledEnable, "Scheduling should be OFF"); + //addLesson.closeDialog(); + } @Test(dependsOnMethods="checksDefaultAdvancedSettings") public void createLessonWithIntro() { String introHTMLTxt = "Hi! This is a new lesson

Try to have a go at it

"; - addLesson = openDialog(index); - String lessonName = "Lesson with Intro " + RANDOM_INT; selectRandomDesign(addLesson, lessonName); @@ -357,47 +351,228 @@ @Test(dependsOnMethods="createLessonWithIntro") public void createLessonStartInMonitor() { + addLesson = openDialog(index); + String lessonName = "Lesson start in monitor " + RANDOM_INT; + + // + addLesson + .openAdvancedTab() + .setStartInMonitor(); + + selectRandomDesign(addLesson, lessonName); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + boolean wasLessonCreated = index.isLessonPresent(lessonName); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); + } @Test(dependsOnMethods="createLessonStartInMonitor") public void createLessonStartAlwaysFirstActivity() { + addLesson = openDialog(index); + + String lessonName = "Lesson always start from 1st act " + RANDOM_INT; + selectRandomDesign(addLesson, lessonName); + + // + addLesson + .openAdvancedTab() + .setLearnerRestart(); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + boolean wasLessonCreated = index.isLessonPresent(lessonName); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); + } @Test(dependsOnMethods="createLessonStartInMonitor") public void createLessonWithOutLiveEdit() { + addLesson = openDialog(index); + + String lessonName = "Without live edit " + RANDOM_INT; + + // + addLesson + .openAdvancedTab() + .setEnableLiveEdit(); + + selectRandomDesign(addLesson, lessonName); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + boolean wasLessonCreated = index.isLessonPresent(lessonName); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); + + } @Test(dependsOnMethods="createLessonWithOutLiveEdit") public void createLessonStartWithOutLessonNotifications() { + addLesson = openDialog(index); + String lessonName = "Without notifications " + RANDOM_INT; + + // + addLesson + .openAdvancedTab() + .setEnableLessonNotifications(); + + selectRandomDesign(addLesson, lessonName); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + boolean wasLessonCreated = index.isLessonPresent(lessonName); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); + + } @Test(dependsOnMethods="createLessonStartWithOutLessonNotifications") public void createLessonEnableExportPortfolio() { + addLesson = openDialog(index); + String lessonName = "Enable Export Portfolio " + RANDOM_INT; + + // + addLesson + .openAdvancedTab() + .setEnablePortfolio(); + + selectRandomDesign(addLesson, lessonName); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + boolean wasLessonCreated = index.isLessonPresent(lessonName); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); + } @Test(dependsOnMethods="createLessonEnableExportPortfolio") public void createLessonEnableWhosOnline() { + addLesson = openDialog(index); + String lessonName = "Enable presence " + RANDOM_INT; + + // + addLesson + .openAdvancedTab() + .setEnablePresence(); + + selectRandomDesign(addLesson, lessonName); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + boolean wasLessonCreated = index.isLessonPresent(lessonName); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); + } @Test(dependsOnMethods="createLessonEnableWhosOnline") public void createLessonEnableIM() { + addLesson = openDialog(index); + String lessonName = "Enable IM " + RANDOM_INT; + + // + addLesson + .openAdvancedTab() + .setEnablePresence() + .setEnableIM(); + + selectRandomDesign(addLesson, lessonName); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + boolean wasLessonCreated = index.isLessonPresent(lessonName); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); } @Test(dependsOnMethods="createLessonEnableIM") public void createLessonSplitInMultiple() { + addLesson = openDialog(index); + String lessonName = "Split " + RANDOM_INT; + + // + addLesson + .openAdvancedTab() + .setSplitLearners() + .setSplitCounter("2"); + + selectRandomDesign(addLesson, lessonName); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + + for (int i = 1; i < 4; i++) { + + boolean wasLessonCreated = index.isLessonPresent(lessonName + " " + i); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); + + } + + } - @Test(dependsOnMethods="createLessonEnableIM") + @Test(dependsOnMethods="createLessonSplitInMultiple") public void createLessonScheduleStart() { + addLesson = openDialog(index); + String lessonName = "Scheduled " + RANDOM_INT; + + // + addLesson + .openAdvancedTab() + .setScheduleEnable(); + + selectRandomDesign(addLesson, lessonName); + + // Add lesson + addLesson + .addLessonNow(); + + // Assert that lesson was created + boolean wasLessonCreated = index.isLessonPresent(lessonName); + + Assert.assertTrue(wasLessonCreated, "Lesson " + lessonName + " was not found!"); + } @@ -425,6 +600,7 @@ Assert.assertTrue(addLesson.openLessontab().isDesignImageDisplayed(), "Design image is not displayed"); + addLesson .openLessontab() .setLessonName(lessonName); Index: lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/AdvancedTab.java =================================================================== diff -u -r36c74b7c00291e798a9455c7a9539776fa2f6937 -rd1ed86c9c773aed2ac975918b88018e9bb191953 --- lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/AdvancedTab.java (.../AdvancedTab.java) (revision 36c74b7c00291e798a9455c7a9539776fa2f6937) +++ lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/AdvancedTab.java (.../AdvancedTab.java) (revision d1ed86c9c773aed2ac975918b88018e9bb191953) @@ -23,6 +23,7 @@ package org.lamsfoundation.lams.pages.monitor.addlesson; import org.lamsfoundation.lams.pages.AbstractPage; +import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -73,7 +74,10 @@ @FindBy(id = "schedulingDatetime") private WebElement schedulingDatetime; + @FindBy(id = "schedulingDatetimeField") + private WebElement schedulingDatetimeField; + public AdvancedTab(WebDriver driver) { super(driver); @@ -231,9 +235,11 @@ } - public AdvancedTab setSplitCounter() { + public AdvancedTab setSplitCounter(String numberOfLearners) { splitLearnersCountField.click(); + splitLearnersCountField.clear(); + splitLearnersCountField.sendKeys(numberOfLearners); return PageFactory.initElements(driver, AdvancedTab.class); } @@ -247,6 +253,8 @@ public AdvancedTab setScheduleEnable() { schedulingEnableField.click(); + schedulingDatetimeField.click(); + driver.findElement(By.className("ui-datepicker-today")).click(); return PageFactory.initElements(driver, AdvancedTab.class); } Index: lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/ClassTab.java =================================================================== diff -u -r53fc2fde004cbbd2d6dac00c57cb27b07837da63 -rd1ed86c9c773aed2ac975918b88018e9bb191953 --- lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/ClassTab.java (.../ClassTab.java) (revision 53fc2fde004cbbd2d6dac00c57cb27b07837da63) +++ lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/ClassTab.java (.../ClassTab.java) (revision d1ed86c9c773aed2ac975918b88018e9bb191953) @@ -68,7 +68,7 @@ @FindBys({ @FindBy(id = "unselected-learners"), - @FindBy(id = "div") + @FindBy(tagName = "div") }) private List allUnselectedLearners; @@ -141,6 +141,14 @@ return allUnselectedLearners.size(); } + + public Boolean isUnselectedLearnersEmpty() { + WebElement uLearners = driver.findElement(By.id("unselected-learners")); + String uLearnersTxt = uLearners.getAttribute("innerHTML"); + + return ((uLearnersTxt.isEmpty() ? true : false)); + + }