Merge branch 'master' into feature/multi-connector-scripting

Evolveum · Nov 19, 2019 · 5b78f83 · 5b78f83
2 parents f95eafc + b1f1286
commit 5b78f83
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/...c/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java b/...c/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
@@ -10,16 +10,21 @@
 import com.evolveum.midpoint.schrodinger.MidPoint;
 import com.evolveum.midpoint.schrodinger.component.user.UserProjectionsTab;
 import com.evolveum.midpoint.schrodinger.page.resource.ListResourcesPage;
+import com.evolveum.midpoint.schrodinger.page.task.EditTaskPage;
 import com.evolveum.midpoint.schrodinger.page.task.ListTasksPage;
 import com.evolveum.midpoint.schrodinger.page.user.ListUsersPage;
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import com.evolveum.midpoint.testing.schrodinger.TestBase;
 
 import javax.naming.ConfigurationException;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
 /**
  * Created by matus on 5/21/2018.
@@ -28,6 +33,7 @@ public class SynchronizationTests extends TestBase {
 
     private static File CSV_TARGET_FILE;
 
+    private static final Logger LOG = LoggerFactory.getLogger(SynchronizationTests.class);
 
     private static final File CSV_INITIAL_SOURCE_FILE = new File("./src/test/resources/midpoint-groups-authoritative-initial.csv");
     private static final File CSV_UPDATED_SOURCE_FILE = new File("./src/test/resources/midpoint-groups-authoritative-updated.csv");
@@ -159,6 +165,15 @@ public void newResourceAccountCreatedLinked() throws IOException {
                             .isSuccess();
 
         FileUtils.copyFile(ScenariosCommons.CSV_SOURCE_FILE,CSV_TARGET_FILE);
+        Selenide.sleep(MidPoint.TIMEOUT_LONG_1_M);
+        LOG.info("Copied data to csv file, {}", Files.readString(CSV_TARGET_FILE.toPath(), StandardCharsets.US_ASCII));
+
+
+        ListTasksPage tasksPage = basicPage.listTasks();
+        EditTaskPage taskPage = tasksPage.table().clickByName("LiveSyncTest");
+        if (taskPage.isRunNowVisible()){
+            taskPage.clickRunNow();
+        }
         Selenide.sleep(MidPoint.TIMEOUT_EXTRA_LONG_1_M);
 
         usersPage = basicPage.listUsers();

diff --git a/...n/java/com/evolveum/midpoint/schrodinger/page/resource/EditResourceConfigurationPage.java b/...n/java/com/evolveum/midpoint/schrodinger/page/resource/EditResourceConfigurationPage.java
@@ -7,6 +7,7 @@
 package com.evolveum.midpoint.schrodinger.page.resource;
 
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import com.evolveum.midpoint.schrodinger.MidPoint;
 import com.evolveum.midpoint.schrodinger.component.common.TabPanel;
@@ -59,6 +60,7 @@ public ResourceResultsHandlersTab selectTabResultHandlers() {
 
     public TestConnectionModal<EditResourceConfigurationPage> clickSaveAndTestConnection() {
         $(Schrodinger.byDataId("testConnection")).click();
+        Selenide.sleep(MidPoint.TIMEOUT_LONG_1_M);
         SelenideElement testModalBox = $(Schrodinger
                 .byElementAttributeValue("div", "aria-labelledby", "Test connection result(s)"))
                 .waitUntil(Condition.appears, MidPoint.TIMEOUT_LONG_1_M);

diff --git a/...inger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ViewResourcePage.java b/...inger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ViewResourcePage.java
@@ -43,7 +43,7 @@ public ResourceAccountsTab<ViewResourcePage> clickAccountsTab() {
 
         $(Schrodinger.byDataResourceKey("schrodinger", "PageResource.tab.content.account")).parent()
                 .waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S).click();
-
+        $(By.className("resource-content-selection")).waitUntil(Condition.visible, MidPoint.TIMEOUT_MEDIUM_6_S);
         SelenideElement tabContent = $(By.cssSelector(".tab-pane.active"))
                 .waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S);
 

diff --git a/...s/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/EditTaskPage.java b/...s/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/task/EditTaskPage.java
@@ -36,4 +36,15 @@ public EditTaskPage clickResume() {
 
         return this;
     }
+
+
+    public boolean isRunNowVisible(){
+        return   $(Schrodinger.byDataResourceKey("a", "pageTaskEdit.button.runNow")).is(Condition.visible);
+    }
+
+    public EditTaskPage clickRunNow() {
+        $(Schrodinger.byDataResourceKey("a", "pageTaskEdit.button.runNow"))
+                .waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S).click();
+        return this;
+    }
 }