Watcher with Kotlin support (#34)

* Watcher with Kotlin support

* version = "0.6.4"

* targetSdkVersion 29

.circleci/config.yml.not.used

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-    - image: circleci/android:api-28
+    - image: circleci/android:api-29
     environment:
       JVM_OPTS: -Xmx3200m
     steps:

.travis.yml

@@ -5,7 +5,7 @@ android:
   - tools
   - platform-tools
   - build-tools-29.0.2
-  - android-28
+  - android-29
   - android-22
   - sys-img-armeabi-v7a-android-22
   - extra

library/build.gradle

@@ -5,14 +5,14 @@ plugins {
     id 'digital.wup.android-maven-publish' version '3.6.3'
 }
 
-version = "0.6.3"
+version = "0.6.4"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
@@ -35,10 +35,10 @@ dependencies {
     api "androidx.test.espresso:espresso-contrib:$espressoVersion"
     api "androidx.test.espresso:espresso-intents:$espressoVersion"
     api "androidx.test.uiautomator:uiautomator:$uiAutomatorVersion"
-    api "com.azimolabs.conditionwatcher:conditionwatcher:$conditionWatcherVersion"
 
     testImplementation 'junit:junit:4.13'
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
 }
 
 repositories {

library/src/main/java/com/qautomatron/kopi/library/steps/DeviceSteps.kt

@@ -6,10 +6,10 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
-import com.azimolabs.conditionwatcher.ConditionWatcher
 import com.qautomatron.kopi.library.element.action.SleepAction
 import com.qautomatron.kopi.library.instrumentation
 import com.qautomatron.kopi.library.wait.WaitForActivity
+import com.qautomatron.kopi.library.watcher.Watcher
 import org.junit.Assert.assertTrue
 
 /**
@@ -20,7 +20,7 @@ object DeviceSteps {
     /**
      * Wait for activity by name
      */
-    fun waitForActivity(fullName: String) = ConditionWatcher.waitForCondition(WaitForActivity(fullName))
+    fun waitForActivity(fullName: String) = Watcher.waitForCondition(WaitForActivity(fullName))
 
     /**
      * Will use UI Automator to wait for package with name to be active

library/src/main/java/com/qautomatron/kopi/library/wait/BaseInstruction.kt

@@ -3,8 +3,8 @@ package com.qautomatron.kopi.library.wait
 import android.app.Activity
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
 import androidx.test.runner.lifecycle.Stage
-import com.azimolabs.conditionwatcher.Instruction
 import com.qautomatron.kopi.library.instrumentation
+import com.qautomatron.kopi.library.watcher.Instruction
 
 /**
  * Base instruction to provide activity to watchers

library/src/main/java/com/qautomatron/kopi/library/wait/ViewMatcherWaiter.kt

@@ -7,8 +7,8 @@ import androidx.test.espresso.Root
 import androidx.test.espresso.ViewAssertion
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers
-import com.azimolabs.conditionwatcher.ConditionWatcher.waitForCondition
-import com.azimolabs.conditionwatcher.Instruction
+import com.qautomatron.kopi.library.watcher.Instruction
+import com.qautomatron.kopi.library.watcher.Watcher.waitForCondition
 import org.hamcrest.Matcher
 import org.hamcrest.StringDescription
 
@@ -34,12 +34,13 @@ class ViewMatcherWaiter constructor(val viewMatcher: Matcher<View>, val inRoot:
      */
     fun toMatch(viewChecker: Matcher<View>) =
         waitForCondition(object : Instruction() {
-            override fun getDescription(): String {
-                val desc = desc
-                desc.appendText(" to match ")
-                viewChecker.describeTo(desc)
-                return desc.toString()
-            }
+            override val description: String
+                get() {
+                    val desc = desc
+                    desc.appendText(" to match ")
+                    viewChecker.describeTo(desc)
+                    return desc.toString()
+                }
 
             override fun checkCondition(): Boolean {
                 return try {
@@ -55,7 +56,8 @@ class ViewMatcherWaiter constructor(val viewMatcher: Matcher<View>, val inRoot:
 
     fun toCheck(viewAssertion: ViewAssertion) =
         waitForCondition(object : Instruction() {
-            override fun getDescription(): String = desc.appendText(" to check ").toString()
+            override val description: String
+                get() = desc.appendText(" to check ").toString()
 
             override fun checkCondition(): Boolean {
                 return try {

library/src/main/java/com/qautomatron/kopi/library/wait/WaitForActivity.kt

@@ -5,8 +5,8 @@ package com.qautomatron.kopi.library.wait
  */
 class WaitForActivity(private val name: String) : BaseInstruction() {
 
-    override fun getDescription(): String =
-        "Current activity should be same as <$name> but was <${activityInstance?.localClassName}>"
+    override val description: String
+        get() = "Current activity should be same as <$name> but was <${activityInstance?.localClassName}>"
 
     override fun checkCondition(): Boolean {
         val activity = activityInstance ?: return false

library/src/main/java/com/qautomatron/kopi/library/watcher/Instruction.kt

@@ -0,0 +1,10 @@
+package com.qautomatron.kopi.library.watcher
+
+import android.os.Bundle
+
+abstract class Instruction {
+    var dataContainer = Bundle()
+
+    abstract val description: String
+    abstract fun checkCondition(): Boolean
+}

library/src/main/java/com/qautomatron/kopi/library/watcher/Watcher.kt

@@ -0,0 +1,36 @@
+package com.qautomatron.kopi.library.watcher
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+
+object Watcher {
+
+    private const val DEFAULT_TIMEOUT_LIMIT = 1000 * 60
+    private const val DEFAULT_INTERVAL = 250
+
+    var timeoutLimit = DEFAULT_TIMEOUT_LIMIT
+    var watchInterval = DEFAULT_INTERVAL
+
+    @Throws(Exception::class)
+    fun waitForCondition(instruction: Instruction) {
+        var status = Status.CONDITION_NOT_MET
+        var elapsedTime = 0
+        do {
+            if (instruction.checkCondition()) {
+                status = Status.CONDITION_MET
+            } else {
+                elapsedTime += watchInterval
+                runBlocking { delay(watchInterval.toLong()) }
+            }
+            if (elapsedTime >= timeoutLimit) {
+                status = Status.TIMEOUT
+                break
+            }
+        } while (status != Status.CONDITION_MET)
+        if (status == Status.TIMEOUT) throw Exception(instruction.description + " - took more than " + timeoutLimit / 1000 + " seconds. Test stopped.")
+    }
+
+    enum class Status {
+        CONDITION_NOT_MET, CONDITION_MET, TIMEOUT
+    }
+}

sample/build.gradle

@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.qautomatron.kopi.sample"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"