Check language tasks refactoring. Updated ReadMe. Version set to 1.2

Author: Paulina Strychacz

README.md

@@ -21,12 +21,16 @@ The following things can be managed by the plugin:
 
 - Checking for connection to a specific WLAN - A check for a connection to a specific WLAN can be done
 
+- checking language set on the device
+
+- setting language on the device - possible only when additional app is installed: AdbChangeLanguage available in Google Play: https://play.google.com/store/apps/details?id=net.sanapeli.adbchangelanguage
+
 # Integration into the project
 ## Groovy
 ### Plugins DSL
 ```
 plugins {
-  id "de.welt.apps.testdevicemanager" version "1.1"
+  id "de.welt.apps.testdevicemanager" version "1.2"
 }
 ```
 ### Legacy plugin application
@@ -38,7 +42,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "de.welt.apps:testdevicemanager:1.1"
+    classpath "de.welt.apps:testdevicemanager:1.2"
   }
 }
 
@@ -48,7 +52,7 @@ apply plugin: "de.welt.apps.testdevicemanager"
 ### Plugins DSL
 ```
 plugins {
-  id("de.welt.apps.testdevicemanager") version "1.1"
+  id("de.welt.apps.testdevicemanager") version "1.2"
 }
 ```
 ### Legacy plugin application
@@ -74,6 +78,7 @@ testDeviceManager {
     pin = "9999"
     password = "password"
     wifi = "wifi-name"
+    language = "en-US"
 }
 ```
 # Compatibility
@@ -93,9 +98,11 @@ The following tasks will be added to the ```device setup``` section of the gradl
 ```
 -connectedAnimationsDisable
 -connectedAnimationsEnable
+-connectedCheckLanguage
 -connectedCheckWifi
 -connectedDeviceLock
 -connectedDeviceUnlock
+-connectedSetLanguage
 -connectedStayAwakeDisable
 -connectedStayAwakeEnable
 ```

build.gradle

@@ -10,7 +10,7 @@ plugins {
 apply from: 'properties-loader.gradle'
 
 group 'de.welt.apps'
-version '1.1'
+version '1.2'
 
 repositories {
     mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Sep 19 10:24:55 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

src/main/kotlin/tasks/CheckLanguageTask.kt

@@ -1,5 +1,7 @@
 package tasks
 
+import com.android.ddmlib.IDevice
+import tasks.internal.LanguageCheckException
 import tasks.internal.LanguageTask
 
 
@@ -9,4 +11,12 @@ open class CheckLanguageTask : LanguageTask() {
         description = "check if specific locale is set as current language"
     }
 
+    override fun runTask2(device: IDevice) {
+        if (hasLocaleDifferentThanExpected(device)) {
+            throw LanguageCheckException("Different language set on ${deviceWrapper.getDetails()}. " +
+                    "It's $currentLanguage, while $language was expected.")
+        }
+        println("Device ${deviceWrapper.getDetails()} has locale set to $currentLanguage.")
+    }
+
 }

src/main/kotlin/tasks/SetLanguageTask.kt

@@ -1,35 +1,29 @@
 package tasks
 
 import com.android.ddmlib.IDevice
-import internal.DeviceWrapper
 import org.gradle.api.GradleException
-import tasks.internal.LanguageCheckException
 import tasks.internal.LanguageTask
 
-
 open class SetLanguageTask : LanguageTask() {
 
     init {
         description = "check if specific locale is set. if not tries to set it using the external app"
     }
 
     override fun runTask2(device: IDevice) {
-        try {
-            super.runTask2(device)
-        }
-        catch (e: LanguageCheckException) {
-            val deviceWrapper = DeviceWrapper(device, outputReceiverProvider)
-            println("Device ${deviceWrapper.getDetails()} setting language to $language.")
-            deviceWrapper.setLanguage(language)
+        if (!hasLocaleDifferentThanExpected(device)) return
+
+        val deviceDetails = deviceWrapper.getDetails()
+        println("Device $deviceDetails setting language to $language.")
+        deviceWrapper.setLanguage(language)
 
-            Thread.sleep(1000) //external app changes language via UI, so we need to wait for it
+        Thread.sleep(1000) //external app changes language via UI, so we need to wait for it
 
-            val languageAfterChange = deviceWrapper.getLanguage()
-            if (languageAfterChange != language) {
-                throw GradleException("Different language set on ${deviceWrapper.getDetails()}. " +
-                        "It's $languageAfterChange, while $language was expected.")
-            }
-            println("Device ${deviceWrapper.getDetails()} has locale set to $language.")
+        val languageAfterChange = deviceWrapper.getLanguage()
+        if (languageAfterChange != language) {
+            throw GradleException("Different language set on $deviceDetails. " +
+                    "It's $languageAfterChange, while $language was expected.")
         }
+        println("Device $deviceDetails has locale set to $language.")
     }
 }

src/main/kotlin/tasks/internal/LanguageTask.kt

@@ -6,6 +6,9 @@ import org.gradle.api.GradleException
 import org.gradle.api.tasks.Input
 
 open class LanguageTask : DefaultPluginTask() {
+    protected lateinit var deviceWrapper: DeviceWrapper
+    protected lateinit var currentLanguage: String
+
     @Input
     lateinit var language: String
 
@@ -16,13 +19,14 @@ open class LanguageTask : DefaultPluginTask() {
     }
 
     override fun runTask2(device: IDevice) {
-        val deviceWrapper = DeviceWrapper(device, outputReceiverProvider)
-        val currentLanguage = deviceWrapper.getLanguage()
-        if (currentLanguage != language) {
-            throw LanguageCheckException("Different language set on ${deviceWrapper.getDetails()}. " +
-                    "It's $currentLanguage, while $language was expected.")
-        }
-        println("Device ${deviceWrapper.getDetails()} has locale set to $currentLanguage.")
+        hasLocaleDifferentThanExpected(device)
+    }
+
+    protected fun hasLocaleDifferentThanExpected(device: IDevice) :Boolean {
+        deviceWrapper = DeviceWrapper(device, outputReceiverProvider)
+        currentLanguage = deviceWrapper.getLanguage()
+
+        return currentLanguage != language
     }
 
     override fun runTask3() {}