diff --git a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/task/TasksPageTable.java b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/task/TasksPageTable.java index 4b42ce7e97d..3e69fe03f82 100644 --- a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/task/TasksPageTable.java +++ b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/task/TasksPageTable.java @@ -9,15 +9,18 @@ import com.codeborne.selenide.Condition; import com.codeborne.selenide.SelenideElement; import com.evolveum.midpoint.schrodinger.MidPoint; +import com.evolveum.midpoint.schrodinger.component.assignmentholder.AssignmentHolderObjectListTable; import com.evolveum.midpoint.schrodinger.component.common.table.TableWithPageRedirect; import com.evolveum.midpoint.schrodinger.page.task.EditTaskPage; +import com.evolveum.midpoint.schrodinger.page.task.ListTasksPage; +import com.evolveum.midpoint.schrodinger.page.user.UserPage; import com.evolveum.midpoint.schrodinger.util.Schrodinger; /** * Created by matus on 6/25/2018. */ -public class TasksPageTable extends TableWithPageRedirect { - public TasksPageTable(T parent, SelenideElement parentElement) { +public class TasksPageTable extends AssignmentHolderObjectListTable { + public TasksPageTable(ListTasksPage parent, SelenideElement parentElement) { super(parent, parentElement); } @@ -31,9 +34,15 @@ public EditTaskPage clickByName(String name) { } @Override - public TableWithPageRedirect selectCheckboxByName(String name) { + public TableWithPageRedirect selectCheckboxByName(String name) { //TODO implement return null; } + + @Override + public EditTaskPage getObjectDetailsPage(){ + return new EditTaskPage(); + } + } diff --git a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/EditTaskPage.java b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/EditTaskPage.java index 33d2a98ef3d..c36ae64543c 100644 --- a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/EditTaskPage.java +++ b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/EditTaskPage.java @@ -9,8 +9,12 @@ import com.codeborne.selenide.Condition; import com.codeborne.selenide.SelenideElement; import com.evolveum.midpoint.schrodinger.MidPoint; +import com.evolveum.midpoint.schrodinger.component.AssignmentHolderBasicTab; +import com.evolveum.midpoint.schrodinger.component.AssignmentsTab; import com.evolveum.midpoint.schrodinger.component.common.SummaryPanel; +import com.evolveum.midpoint.schrodinger.page.AssignmentHolderDetailsPage; import com.evolveum.midpoint.schrodinger.page.BasicPage; +import com.evolveum.midpoint.schrodinger.page.user.UserPage; import com.evolveum.midpoint.schrodinger.util.Schrodinger; import org.openqa.selenium.By; @@ -20,7 +24,7 @@ /** * Created by matus on 3/21/2018. */ -public class EditTaskPage extends BasicPage { +public class EditTaskPage extends AssignmentHolderDetailsPage { public SummaryPanel summary() { @@ -51,4 +55,18 @@ public EditTaskPage clickRunNow() { .waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S).click(); return this; } + + @Override + public AssignmentHolderBasicTab selectTabBasic(){ + SelenideElement element = findTabPanel().clickTab("pageAdminFocus.basic") + .waitUntil(Condition.appear, MidPoint.TIMEOUT_DEFAULT_2_S); + + return new AssignmentHolderBasicTab(this, element); + } + + @Override + public AssignmentsTab selectTabAssignments(){ + //TODO implement + return null; + } } diff --git a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/ListTasksPage.java b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/ListTasksPage.java index 8d8dcbd3343..ec959922bfa 100644 --- a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/ListTasksPage.java +++ b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/ListTasksPage.java @@ -7,8 +7,10 @@ package com.evolveum.midpoint.schrodinger.page.task; import com.codeborne.selenide.SelenideElement; +import com.evolveum.midpoint.schrodinger.component.assignmentholder.AssignmentHolderObjectListPage; import com.evolveum.midpoint.schrodinger.component.common.FeedbackBox; import com.evolveum.midpoint.schrodinger.component.task.TasksPageTable; +import com.evolveum.midpoint.schrodinger.component.user.UsersPageTable; import com.evolveum.midpoint.schrodinger.page.BasicPage; import com.evolveum.midpoint.schrodinger.util.Schrodinger; import org.openqa.selenium.By; @@ -18,12 +20,12 @@ /** * Created by Viliam Repan (lazyman). */ -public class ListTasksPage extends BasicPage { +public class ListTasksPage extends AssignmentHolderObjectListPage { - public TasksPageTable table() { - SelenideElement box = $(Schrodinger.byDataId("div", "taskTable")); + public TasksPageTable table() { + SelenideElement box = $(Schrodinger.byDataId("div", "table")); - return new TasksPageTable<>(this, box); + return new TasksPageTable(this, box); } }