use native JavaScript conditions for performance-intensive checks

Przemek Bruski · pbruski · commit 7df94df03f3d · 2020-01-26T23:35:48.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -42,6 +42,7 @@ dependencies {
     implementation("org.glassfish:javax.json:1.1")
     implementation("org.apache.commons:commons-math3:3.6.1")
     implementation("com.atlassian.performance.tools:concurrency:[1.0.0,2.0.0)")
+    implementation("com.atlassian.performance:selenium-js:[1.0.0,2.0.0)")
     listOf(
         "api",
         "core",
diff --git a/gradle/dependency-locks/compileClasspath.lockfile b/gradle/dependency-locks/compileClasspath.lockfile
@@ -3,6 +3,7 @@
 # This file is expected to be part of source control.
 com.atlassian.performance.tools:concurrency:1.0.0
 com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance:selenium-js:1.0.0
 com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.gson:gson:2.8.2
diff --git a/gradle/dependency-locks/default.lockfile b/gradle/dependency-locks/default.lockfile
@@ -3,6 +3,7 @@
 # This file is expected to be part of source control.
 com.atlassian.performance.tools:concurrency:1.0.0
 com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance:selenium-js:1.0.0
 com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.gson:gson:2.8.2
diff --git a/gradle/dependency-locks/implementationDependenciesMetadata.lockfile b/gradle/dependency-locks/implementationDependenciesMetadata.lockfile
@@ -3,6 +3,7 @@
 # This file is expected to be part of source control.
 com.atlassian.performance.tools:concurrency:1.0.0
 com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance:selenium-js:1.0.0
 com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.gson:gson:2.8.2
diff --git a/gradle/dependency-locks/runtimeClasspath.lockfile b/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -3,6 +3,7 @@
 # This file is expected to be part of source control.
 com.atlassian.performance.tools:concurrency:1.0.0
 com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance:selenium-js:1.0.0
 com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.gson:gson:2.8.2
diff --git a/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -5,6 +5,7 @@ com.atlassian.performance.tools:concurrency:1.0.0
 com.atlassian.performance.tools:docker-infrastructure:0.1.2
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance:selenium-js:1.0.0
 com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.gson:gson:2.8.2
diff --git a/gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile b/gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile
@@ -5,6 +5,7 @@ com.atlassian.performance.tools:concurrency:1.0.0
 com.atlassian.performance.tools:docker-infrastructure:0.1.2
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance:selenium-js:1.0.0
 com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.gson:gson:2.8.2
diff --git a/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -5,6 +5,7 @@ com.atlassian.performance.tools:concurrency:1.0.0
 com.atlassian.performance.tools:docker-infrastructure:0.1.2
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jvm-tasks:1.0.0
+com.atlassian.performance:selenium-js:1.0.0
 com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.gson:gson:2.8.2
diff --git a/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/BrowseProjectsPage.kt b/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/BrowseProjectsPage.kt
@@ -1,10 +1,11 @@
 package com.atlassian.performance.tools.jiraactions.api.page
 
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions.Companion.or
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions.Companion.presenceOfElementLocated
 import com.atlassian.performance.tools.jiraactions.api.memories.Project
 import org.openqa.selenium.By
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.WebElement
-import org.openqa.selenium.support.ui.ExpectedConditions
 import java.time.Duration
 
 class BrowseProjectsPage(
@@ -16,10 +17,10 @@ class BrowseProjectsPage(
         val jiraErrors = JiraErrors(driver)
         driver.wait(
             Duration.ofSeconds(6),
-            ExpectedConditions.or(
-                ExpectedConditions.presenceOfElementLocated(By.cssSelector("tbody.projects-list")),
-                ExpectedConditions.presenceOfElementLocated(By.className("none-panel")),
-                jiraErrors.anyCommonError()
+            or(
+                presenceOfElementLocated(By.cssSelector("tbody.projects-list")),
+                presenceOfElementLocated(By.className("none-panel")),
+                jiraErrors.anyCommonErrorNative()
             )
         )
         jiraErrors.assertNoErrors()
@@ -65,4 +66,4 @@ class BrowseProjectsPage(
             Project(projectKey, projectName)
         }.toSet()
     }
-}
+}
diff --git a/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/IssueNavigatorPage.kt b/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/IssueNavigatorPage.kt
@@ -1,9 +1,11 @@
 package com.atlassian.performance.tools.jiraactions.api.page
 
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions.Companion.and
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions.Companion.or
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions.Companion.presenceOfElementLocated
 import com.atlassian.performance.tools.jiraactions.api.webdriver.JavaScriptUtils
 import org.openqa.selenium.By
 import org.openqa.selenium.WebDriver
-import org.openqa.selenium.support.ui.ExpectedConditions.*
 import java.time.Duration
 
 class IssueNavigatorPage(
@@ -30,7 +32,7 @@ class IssueNavigatorPage(
                     presenceOfElementLocated(By.className("issue-body-content"))
                 ),
                 presenceOfElementLocated(By.className("no-results-hint")),
-                jiraErrors.anyCommonError()
+                jiraErrors.anyCommonErrorNative()
             )
         )
         return this
diff --git a/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/IssuePage.kt b/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/IssuePage.kt
@@ -1,10 +1,11 @@
 package com.atlassian.performance.tools.jiraactions.api.page
 
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions.Companion.or
 import com.atlassian.performance.tools.jiraactions.api.memories.Project
 import com.atlassian.performance.tools.jiraactions.page.UserProfilePage
 import org.openqa.selenium.By
 import org.openqa.selenium.WebDriver
-import org.openqa.selenium.support.ui.ExpectedConditions.or
 import org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated
 import java.time.Duration
 
@@ -17,12 +18,15 @@ class IssuePage(
     private val summaryField = By.id("summary-val")
 
     fun waitForSummary(): IssuePage {
+        //needed to ensure ChromeDriver actually transitioned the page
+        //this is a workaround. Remove the line to find out if the bug has been fixed
+        driver.findElements(By.id("summary-val")).stream().findFirst()
         val jiraErrors = JiraErrors(driver)
         driver.wait(
             timeout = Duration.ofSeconds(10),
             condition = or(
-                visibilityOfElementLocated(summaryField),
-                jiraErrors.anyCommonError()
+                NativeExpectedConditions.visibilityOfElementLocated(summaryField),
+                jiraErrors.anyCommonErrorNative()
             )
         )
         jiraErrors.assertNoErrors()
@@ -78,4 +82,4 @@ class IssuePage(
 
     fun getIssueId(): Long = driver.findElement(By.id("key-val")).getAttribute("rel").toLong()
     fun getIssueType(): String = driver.findElement(By.id("type-val")).text
-}
+}
diff --git a/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/JiraErrors.kt b/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/JiraErrors.kt
@@ -1,5 +1,8 @@
 package com.atlassian.performance.tools.jiraactions.api.page
 
+import com.atlassian.performance.seleniumjs.NativeExpectedCondition
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions
+import com.atlassian.performance.tools.jiraactions.api.webdriver.ExtraExpectedConditions
 import org.openqa.selenium.By
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.WebElement
@@ -19,19 +22,32 @@ class JiraErrors(
 
     fun anyCommonError(): ExpectedCondition<Boolean> {
         val conditions = errorLocators.map { presenceOfElementLocated(it) }.toTypedArray()
-        return or(*conditions)
+        return ExtraExpectedConditions.sometimesApply(or(*conditions))
+    }
+
+    fun anyCommonErrorNative(): NativeExpectedCondition {
+        val conditions = errorLocators.map { NativeExpectedConditions.presenceOfElementLocated(it) }.toTypedArray()
+        return NativeExpectedConditions.or(*conditions)
     }
 
     fun anyCommonWarning(): ExpectedCondition<WebElement> {
-        return presenceOfElementLocated(warningMessageLocator)
+        return ExtraExpectedConditions.sometimesLocate(presenceOfElementLocated(warningMessageLocator))
     }
 
     fun assertNoErrors() {
-        errorLocators.forEach {
-            if (driver.isElementPresent(it)) {
-                val errorMessage = driver.findElement(it).text
-                throw Exception("Error at $it reads: $errorMessage")
+        val detectErrors = NativeExpectedConditions.or(
+            *errorLocators
+                .map { NativeExpectedConditions.presenceOfElementLocated(it) }
+                .toTypedArray()
+        )
+        if (!detectErrors.apply(driver)) {
+            return
+        }
+        errorLocators.forEach { locator ->
+            driver.findElements(locator).firstOrNull()?.let {  el ->
+                val errorMessage = el.text
+                throw Exception("Error at $el reads: $errorMessage")
             }
         }
     }
-}
+}
diff --git a/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/WebDriverExtension.kt b/src/main/kotlin/com/atlassian/performance/tools/jiraactions/api/page/WebDriverExtension.kt
@@ -2,6 +2,8 @@
 
 package com.atlassian.performance.tools.jiraactions.api.page
 
+import com.atlassian.performance.seleniumjs.NativeExpectedCondition
+import com.atlassian.performance.seleniumjs.NativeExpectedConditions
 import org.openqa.selenium.By
 import org.openqa.selenium.JavascriptExecutor
 import org.openqa.selenium.WebDriver
@@ -16,7 +18,7 @@ import java.time.Duration
 fun <T> WebDriver.wait(
     timeout: Duration,
     condition: ExpectedCondition<T>,
-    precision: Duration = Duration.ofMillis(50)
+    precision: Duration = Duration.ofMillis(100)
 ): T {
     return WebDriverWait(
         this,
@@ -25,6 +27,19 @@ fun <T> WebDriver.wait(
     ).until(condition)
 }
 
+@JvmOverloads
+fun WebDriver.wait(
+    timeout: Duration,
+    condition: NativeExpectedCondition,
+    precision: Duration = Duration.ofMillis(100)
+) {
+    WebDriverWait(
+        this,
+        timeout.seconds,
+        precision.toMillis()
+    ).until(NativeExpectedConditions.toSeleniumCondition(condition))
+}
+
 /**
  * @return result of the condition
  */
