Relax.flow -> Relax

Author: ngsilverman

README.md

@@ -3,7 +3,7 @@
 Relax is a lightweight wrapper around Android's UI Automator library. It helps write clear and concise UI tests:
 
 ```kotlin
-Relax.flow("com.example.myapp") {
+Relax("com.example.myapp") {
     pressHome()
     launch()
     inputText("me@example.com", "id/email")
@@ -56,7 +56,7 @@ dependencies {
 Relax allows you to build UI test flows as a sequence of actions:
 
 ```kotlin
-Relax.flow("<your app's package name>") {
+Relax("<your app's package name>") {
     // Arbitrary actions
 }
 ```
@@ -222,7 +222,7 @@ click("Purchase")
 Ignoring all failures by default:
 ```kotlin
 val config = FlowConfig(errorHandler = NoOpFlowErrorHandler)
-Relax.flow("id", config) {
+Relax("id", config) {
     // …
 }
 ```
@@ -235,7 +235,7 @@ val errorHandler = object : FlowErrorHandler {
     }
 }
 val config = FlowConfig(errorHandler = errorHandler)
-Relax.flow("id", config) {
+Relax("id", config) {
     // …
 }
 ```
@@ -245,7 +245,7 @@ Relax.flow("id", config) {
 Relax is a lightweight wrapper around UI Automator, therefore it's easy to leverage the full feature set of UI Automator. For example:
 
 ```kotlin
-Relax.flow(/* … */) {
+Relax(/* … */) {
     if (!device.isScreenOn) device.wakeUp()
     launch()
     click("Next")

app/src/androidTest/java/com/emergetools/relaxexamples/ExampleInstrumentedTest.kt

@@ -13,7 +13,7 @@ class ExampleInstrumentedTest {
     @Test
     fun test() {
         val config = FlowConfig(debug = true)
-        Relax.flow("com.emergetools.relaxexamples", config) {
+        Relax("com.emergetools.relaxexamples", config) {
             pressHome()
             launch()
             click("id/fab")

relax/src/main/java/com/emergetools/relax/Relax.kt

@@ -4,7 +4,7 @@ object Relax {
 
     internal val TAG = "Relax"
 
-    fun flow(packageName: String, config: FlowConfig = FlowConfig(), flow: Flow.() -> Unit) {
+    operator fun invoke(packageName: String, config: FlowConfig = FlowConfig(), flow: Flow.() -> Unit) {
         Flow(packageName, config).flow()
     }
 }

tests/src/main/java/com/emergetools/relaxtests/ClickTest.kt

@@ -13,7 +13,7 @@ class ClickTest {
 
     @Test
     fun click() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
 
@@ -28,7 +28,7 @@ class ClickTest {
 
     @Test
     fun clickObjectDoesntExist() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
 
@@ -40,7 +40,7 @@ class ClickTest {
 
     @Test
     fun optionalClick() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
 

tests/src/main/java/com/emergetools/relaxtests/FindObjectTest.kt

@@ -13,7 +13,7 @@ class FindObjectTest {
 
     @Test
     fun findObject() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
             val obj = findObject("NEXT")
@@ -24,7 +24,7 @@ class FindObjectTest {
 
     @Test
     fun findObjectDoesntExist() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
 
@@ -36,7 +36,7 @@ class FindObjectTest {
 
     @Test
     fun optionalFindObject() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
 

tests/src/main/java/com/emergetools/relaxtests/InputTextTest.kt

@@ -15,7 +15,7 @@ class InputTextTest {
 
     @Test
     fun inputText() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
             click("NEXT")
@@ -27,7 +27,7 @@ class InputTextTest {
 
     @Test
     fun inputTextObjectDoesntExist() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
             click("NEXT")
@@ -40,7 +40,7 @@ class InputTextTest {
 
     @Test
     fun optionalInputText() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
             click("NEXT")

tests/src/main/java/com/emergetools/relaxtests/LaunchTest.kt

@@ -15,7 +15,7 @@ class LaunchTest {
 
     @Test
     fun launch() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             waitForReportFullyDrawn {
                 launch()
@@ -28,7 +28,7 @@ class LaunchTest {
 
     @Test
     fun launchArbitraryPackage() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             val intent = Intent(Settings.ACTION_SETTINGS)
 
@@ -43,7 +43,7 @@ class LaunchTest {
 
     @Test
     fun launchWithLink() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launchWithLink("emerge://deep")
 
@@ -53,7 +53,7 @@ class LaunchTest {
 
     @Test
     fun coldLaunch() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             coldLaunch()
 

tests/src/main/java/com/emergetools/relaxtests/LongClickTest.kt

@@ -13,7 +13,7 @@ class LongClickTest {
 
     @Test
     fun longClick() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
 
@@ -28,7 +28,7 @@ class LongClickTest {
 
     @Test
     fun longClickObjectDoesntExist() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()
 
@@ -40,7 +40,7 @@ class LongClickTest {
 
     @Test
     fun optionalLongClick() {
-        Relax.flow("com.emergetools.relaxexamples") {
+        Relax("com.emergetools.relaxexamples") {
             pressHome()
             launch()