Apply new screenshot logic

Author: hannesa2

extendedSample/src/androidTest/java/info/mqtt/android/extsample/activity/ExtendedPublishSleepTest.kt

@@ -1,18 +1,19 @@
 package info.mqtt.android.extsample.activity
 
+import android.graphics.Bitmap
 import android.view.Gravity
 import androidx.test.core.graphics.writeToTestStorage
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.captureToBitmap
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.DrawerActions
 import androidx.test.espresso.contrib.DrawerMatchers.isClosed
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.espresso.screenshot.captureToBitmap
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -55,19 +56,21 @@ class ExtendedPublishSleepTest {
         onView(withId(R.id.action_add_connection)).perform(click())
         onView(withId(R.id.action_save_connection)).perform(click())
 
-        onView(ViewMatchers.isRoot())
-            .captureToBitmap()
-            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-1AddConnect")
+        onView(isRoot())
+            .perform(captureToBitmap { bitmap: Bitmap ->
+                bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-1AddConnect")
+            })
 
         onView(withId(R.id.disConnectSwitch)).perform(click())
         onView(withId(3)).perform(click())
         // onView(withTagValue(`is`("Subscribe" as Any))).perform(click())
 
         onView(withId(R.id.subscribe_button)).perform(click())
         onView(withId(R.id.subscription_topic_edit_text)).perform(typeText(TOPIC))
-        onView(ViewMatchers.isRoot())
-            .captureToBitmap()
-            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-2Subscribe")
+        onView(isRoot())
+            .perform(captureToBitmap { bitmap: Bitmap ->
+                bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-2Subscribe")
+            })
         onView(withText("OK")).perform(click())
 
         Assert.assertTrue("Device is in sleep mode", device.isScreenOn)
@@ -90,30 +93,34 @@ class ExtendedPublishSleepTest {
         sleep(1000)
 
         Timber.i("Wakeup device")
-        onView(ViewMatchers.isRoot())
-            .captureToBitmap()
-            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-3afterWakeUp")
+        onView(isRoot())
+            .perform(captureToBitmap { bitmap: Bitmap ->
+                bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-3afterWakeUp")
+            })
 
         onView(withId(2)).perform(click())
         onView(withId(R.id.topic)).perform(replaceText(TOPIC))
         onView(withId(R.id.message)).perform(replaceText("Typed message"))
         sleep(200)
-        onView(ViewMatchers.isRoot())
-            .captureToBitmap()
-            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-4publish")
+        onView(isRoot())
+            .perform(captureToBitmap { bitmap: Bitmap ->
+                bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-4publish")
+            })
         onView(withId(R.id.publish_button)).perform(click())
 
         onView(withId(1)).perform(click())
 
         sleep(200)
-        onView(ViewMatchers.isRoot())
-            .captureToBitmap()
-            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-5publish")
+        onView(isRoot())
+            .perform(captureToBitmap { bitmap: Bitmap ->
+                bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-5publish")
+            })
 
         WaitingAssertion.checkAssertion(R.id.history_list_view, Matchers.withListSizeBigger(0), 2500)
-        onView(ViewMatchers.isRoot())
-            .captureToBitmap()
-            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-6End")
+        onView(isRoot())
+            .perform(captureToBitmap { bitmap: Bitmap ->
+                bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-6End")
+            })
     }
 
     companion object {