Merge pull request #11 from spring-media/feature/support_Android_9_10

Feature/support android 9 and 10

Author: paulinabls

src/main/kotlin/internal/Constants.kt

@@ -6,6 +6,7 @@ import org.gradle.api.GradleException
 object ShellCommands {
     const val DUMPSYS_INPUT_METHOD = "dumpsys input_method"
     const val DUMPSYS_WINDOW = "dumpsys window"
+    const val DUMPSYS_WINDOW_DISPLAYS = "dumpsys window displays"
     const val DUMPSYS_WIFI = "dumpsys wifi"
     const val INPUT_WAKE_UP_CALL = "input keyevent 224"
     const val INPUT_SLEEP_CALL = "input keyevent 223"

src/main/kotlin/internal/DeviceWrapper.kt

@@ -8,6 +8,7 @@ import internal.ShellCommands.CHANGE_LANGUAGE_VIA_APP
 import internal.ShellCommands.DUMPSYS_INPUT_METHOD
 import internal.ShellCommands.DUMPSYS_WIFI
 import internal.ShellCommands.DUMPSYS_WINDOW
+import internal.ShellCommands.DUMPSYS_WINDOW_DISPLAYS
 import internal.ShellCommands.SETTINGS_GET_ANDROID_ID
 import internal.ShellCommands.SETTINGS_GET_GLOBAL
 import internal.ShellCommands.SETTINGS_GET_STAY_ON
@@ -32,7 +33,14 @@ class DeviceWrapper(val device: IDevice, val outputReceiverProvider: OutputRecei
     }
 
     fun getDeviceScreenResolution(): ScreenResolution {
-        val output = analyzeOutputOfShellCommandByRegex(DUMPSYS_WINDOW, "mUnrestrictedScreen.*?(\\d+)x(\\d+)")
+        val output: Matcher = try {
+            analyzeOutputOfShellCommandByRegex(DUMPSYS_WINDOW, "mUnrestrictedScreen.*?(\\d+)x(\\d+)")
+        }
+        catch (e: GradleException) {
+            // Android 9 & 10
+            analyzeOutputOfShellCommandByRegex(DUMPSYS_WINDOW_DISPLAYS, "mUnrestricted.*?\\[.*\\]\\[(\\d+),(\\d+)\\]")
+        }
+
         val screenWidth = output.group(1).trim().toInt()
         val screenHeight = output.group(2).trim().toInt()
         return ScreenResolution(xValue = screenWidth, yValue = screenHeight)
@@ -44,10 +52,16 @@ class DeviceWrapper(val device: IDevice, val outputReceiverProvider: OutputRecei
     }
 
     fun checkWifi(wifi: String) {
-        val output = analyzeOutputOfShellCommandByRegex(DUMPSYS_WIFI, "mNetworkInfo .+ extra: \"(.+)\"")
+        val output: Matcher = try {
+            analyzeOutputOfShellCommandByRegex(DUMPSYS_WIFI, "mNetworkInfo .+ extra: \"(.+)\"")
+        }
+        catch (e: GradleException) {
+            // Android 9 & 10
+            analyzeOutputOfShellCommandByRegex(DUMPSYS_WIFI, "mWifiInfo\\s+SSID:\\s+(.+?),")
+        }
         val currentWifi = output.group(1)
         if (currentWifi != wifi) {
-            throw GradleException("Device ${getDetails()} is not connected to wifi with name $wifi")
+            throw GradleException("Device ${getDetails()} is not connected to WiFi named $wifi. Current WiFi is: $currentWifi")
         }
     }
 

src/test/kotlin/unitTest/tasks/CheckWifiTaskUnitTest.kt

@@ -29,13 +29,16 @@ class CheckWifiTaskUnitTest : BaseUnitTest() {
     val bridge: AndroidDebugBridge = mock()
     val outputReceiver: CollectingOutputReceiver = mock()
     val outputReceiverProvider: OutputReceiverProvider = mock()
-    val defaultPluginTask: DefaultPluginTask = mock()
 
     val deviceCommunicator = DeviceCommunicator(bridge, outputReceiverProvider)
-    val noDevices = emptyArray<IDevice>()
-    val wifi = "wifi"
+    val wifi = "wlanName"
     val devices = arrayOf(device)
     val mNetworkInfo = "mNetworkInfo [type: WIFI[], extra: \"$wifi\"]"
+    val wifiDumpsysAndroid9 = "mWifiInfo SSID: $wifi, BSSID: 50:06:04:50:06:04, MAC: a8:db:03:a8:db:03, Supplicant state: COMPLETED, RSSI: -62, Link speed: 270Mbps, Frequency: 5180MHz, Net ID: 2, Metered hint: false, GigaAp: false, VenueName: null, WifiMode: 4, score: 60\n" +
+            "mDhcpResults IP address xxx.xx.xx.xx/20 Gateway xxx.xx.xx.xx  DNS servers: [ xxx.xx.xx.xx 8.8.8.8 8.8.4.4 ] Domains asv.cor DHCP server /xxx.xx.xx.xx Vendor info null lease 1800 seconds\n" +
+            "mNetworkInfo [type: WIFI[], state: CONNECTED/CONNECTED, reason: (unspecified), extra: (none), failover: false, available: true, roaming: false]\n"
+
+
 
     lateinit var projectDir: File
     lateinit var project: Project
@@ -53,31 +56,39 @@ class CheckWifiTaskUnitTest : BaseUnitTest() {
         task.wifi = wifi
 
         given(outputReceiverProvider.get()).willReturn(outputReceiver)
+        given(bridge.devices).willReturn(devices)
+
     }
 
     @Test(expected = GradleException::class)
     fun `throw gradle exception when string in extension is empty`() {
         task.wifi = ""
-        given(bridge.devices).willReturn(devices)
 
         task.runTask1()
     }
 
     @Test(expected = GradleException::class)
     fun `throw gradle exception when string in extension is blank`() {
         task.wifi = " "
-        given(bridge.devices).willReturn(devices)
 
         task.runTask1()
     }
 
     @Test
     fun `no gradle exception is thrown when connected to right wifi`() {
-        given(bridge.devices).willReturn(devices)
         given(outputReceiver.output).willReturn(mNetworkInfo)
 
         task.runTask2(device)
 
         thenDeviceShouldGetDetails(device)
     }
+
+    @Test
+    fun `no gradle exception is thrown when connected to right wifi on Android 9 and 10`() {
+        given(outputReceiver.output).willReturn(wifiDumpsysAndroid9)
+
+        task.runTask2(device)
+
+        thenDeviceShouldGetDetails(device)
+    }
 }

src/test/kotlin/unitTest/tasks/internal/UnlockerTest.kt

@@ -9,6 +9,7 @@ import com.android.ddmlib.CollectingOutputReceiver
 import com.android.ddmlib.IDevice
 import com.nhaarman.mockito_kotlin.*
 import internal.OutputReceiverProvider
+import internal.ShellCommands.DUMPSYS_WINDOW_DISPLAYS
 import org.gradle.api.GradleException
 import org.junit.Before
 import org.junit.Test
@@ -31,10 +32,20 @@ class UnlockerTest {
     val wrongPin1 = "111"
     val wrongPin2 = "11aa"
     val mUnrestrictedScreen = "mUnrestrictedScreen=(0,0) 100x200"
+    val mUnrestrictedAndroid9 = "mUnrestricted=[0,0][100,200]"
     val mFocusedWindow = "mFocusedWindow=Window{7045664 u0 StatusBar}"
+
+
     val output = "$mUnrestrictedScreen + $mFocusedWindow"
     val wrongMethod = "wrong method"
 
+    val classToTestSwipe = Unlocker(
+            deviceWrapper,
+            SWIPE.string,
+            pin,
+            password
+    )
+
     @Before
     fun setup() {
         given(outputReceiverProvider.get()).willReturn(outputReceiver)
@@ -56,33 +67,30 @@ class UnlockerTest {
 
     @Test
     fun `device can be unlocked by swipe`() {
-        val classToTest = Unlocker(
-                deviceWrapper,
-                SWIPE.string,
-                pin,
-                password
-        )
-
         given(outputReceiver.output).willReturn(mUnrestrictedScreen)
 
-        classToTest.unlock()
+        classToTestSwipe.unlock()
+
+        then(device).should().executeShellCommand(eq(DUMPSYS_WINDOW), any())
+        then(device).should().executeShellCommand(eq("input swipe 50 160 80 40"), any())
+    }
+
+    @Test
+    fun `device with Android 9 can be unlocked by swipe`() {
+        given(outputReceiver.output).willReturn(mUnrestrictedAndroid9)
+
+        classToTestSwipe.unlock()
 
         then(device).should().executeShellCommand(eq(DUMPSYS_WINDOW), any())
+        then(device).should().executeShellCommand(eq(DUMPSYS_WINDOW_DISPLAYS), any())
         then(device).should().executeShellCommand(eq("input swipe 50 160 80 40"), any())
     }
 
     @Test(expected = GradleException::class)
     fun `gradle exception is thrown when resolution cannot be retrieved from device`() {
-        val classToTest = Unlocker(
-                deviceWrapper,
-                SWIPE.string,
-                pin,
-                password
-        )
-
         given(outputReceiver.output).willReturn(emptyString)
 
-        classToTest.unlock()
+        classToTestSwipe.unlock()
     }
 
     @Test(expected = GradleException::class)