Merge pull request #25 from posix4e/tests

puppet/app/build.gradle

@@ -1,4 +1,3 @@
-
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
@@ -16,10 +15,17 @@ android {
     }
     defaultConfig {
         applicationId "com.ttt246.puppet"
-        minSdkVersion 32
+        minSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        // Enable unit tests to run off the device using the JVM.
+        testOptions {
+            unitTests {
+                includeAndroidResources = true
+            }
+        }
     }
 
     buildTypes {
@@ -35,13 +41,15 @@ android {
     }
 }
 
-
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
-    implementation 'com.eclipsesource.j2v8:j2v8:6.2.1@aar'
     implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.test:core-ktx:1.5.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    // Add Robolectric and Mockito dependencies for unit testing.
+    testImplementation 'org.robolectric:robolectric:4.7.2'
+    testImplementation 'org.mockito:mockito-core:4.1.0'
 }

puppet/app/src/androidTest/java/com/ttt246/puppet/MyAccessibilityServiceTest.kt

@@ -1,31 +0,0 @@
-package com.ttt246.puppet
-
-import android.content.pm.PackageManager
-import android.util.Log
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class MyAccessibilityServiceTest {
-    @get:Rule
-    var rule: ActivityScenarioRule<ChatterAct> = ActivityScenarioRule(ChatterAct::class.java)
-
-    private val context = InstrumentationRegistry.getInstrumentation().targetContext
-
-    @Test
-    fun testHandleEvent() {
-        val myService = PuppetAS()
-        val packageManager = context.packageManager
-
-        val applications = packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
-        for (applicationInfo in applications) {
-            val packageName = applicationInfo.packageName
-            val appName = packageManager.getApplicationLabel(applicationInfo).toString()
-            Log.d("AppList", "App: $appName, Package: $packageName")
-        }
-    }
-}

puppet/app/src/main/java/com/ttt246/puppet/ChatterAct.kt

@@ -8,7 +8,6 @@ import android.provider.Settings
 import android.webkit.WebView
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
-import com.eclipsesource.v8.V8
 
 class ChatterAct : AppCompatActivity() {
     private lateinit var webView: WebView

puppet/app/src/main/java/com/ttt246/puppet/PuppetAS.kt

@@ -20,7 +20,7 @@ import java.util.LinkedList
 import java.util.Queue
 
 
-class PuppetAS : AccessibilityService() {
+open class PuppetAS : AccessibilityService() {
     private fun getServerUrl(): String =
         PreferenceManager.getDefaultSharedPreferences(this).getString("SERVER_URL", "") ?: ""
 
@@ -42,27 +42,27 @@ class PuppetAS : AccessibilityService() {
         Thread {
             while (true) {
                 val uid = getUUID()
-                if (logs.isNotEmpty()) {
-                    try {
-                        heartbeat(uid, logs.joinToString())
-                    } catch (e: Exception) {
-                        Log.e("PuppetAS", "Error in sending POST request: ${e.message}")
-                    } finally {
-                        logs.clear()
+                try {
+                    val logMessage = logs.joinToString()
+                    val jsonObject = JSONObject().apply {
+                        put("uid", uid)
+                        put("event", logMessage)
                     }
+                    heartbeat(jsonObject)
+                } catch (e: Exception) {
+                    Log.e("PuppetAS", "Error in sending POST request: ${e.message}")
+                } finally {
+                    logs.clear()
+                    Thread.sleep((1000..3000).random().toLong())
                 }
-                Thread.sleep((1000..3000).random().toLong())
             }
         }.start()
     }
 
-    private fun heartbeat(uid: String, logMessage: String) {
+    private fun heartbeat(jsonObject: JSONObject) {
         val serverUrl = getServerUrl()
         val url = URL("$serverUrl/send_event")
-        val jsonObject = JSONObject().apply {
-            put("uid", uid)
-            put("event", logMessage)
-        }
+
 
         val conn = url.openConnection() as HttpURLConnection
         conn.requestMethod = "POST"
@@ -101,7 +101,7 @@ class PuppetAS : AccessibilityService() {
         }
     }
 
-    private fun processCommands(commands: List<String>) {
+     fun processCommands(commands: List<String>) {
         commands.forEach { command ->
             when {
                 isIntentCommand(command) -> executeIntentCommand(command)
@@ -111,15 +111,15 @@ class PuppetAS : AccessibilityService() {
         }
     }
 
-    private fun isIntentCommand(command: String): Boolean {
+    fun isIntentCommand(command: String): Boolean {
         return command.startsWith("intent:")
     }
 
-    private fun isAccCommand(command: String): Boolean {
+     fun isAccCommand(command: String): Boolean {
         return command.startsWith("acc:")
     }
 
-    private fun executeAccCommand(command: String) {
+     fun executeAccCommand(command: String) {
         val accCommand = command.removePrefix("acc:")
         Log.i("PuppetAS", "Executing Acc command: $accCommand")
 
@@ -136,8 +136,8 @@ class PuppetAS : AccessibilityService() {
             }
 
             accCommand.startsWith("TYPE") -> {
-                if (accCommand == "TYPE FIRST") {
-                    val text = "default text"  // or whatever text you want to input
+                if (accCommand.startsWith("TYPE FIRST ")) {
+                    val text = accCommand.substringAfter("TYPE FIRST ")
                     val arguments = Bundle()
                     arguments.putCharSequence(
                         AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text
@@ -145,10 +145,16 @@ class PuppetAS : AccessibilityService() {
                     getFirstTypeableNode()?.performAction(
                         AccessibilityNodeInfo.ACTION_SET_TEXT, arguments
                     )
-                } else {
-                    val id = accCommand.removePrefix("TYPE ").substringBefore("\"").trim()
-                    val text = accCommand.substringAfter("\"").removeSuffix("\"")
-                    typeInView(id, text)
+                } else if (accCommand.startsWith("TYPE HERE")) {
+                    val focusedNode: AccessibilityNodeInfo? = rootInActiveWindow.findFocus(AccessibilityNodeInfo.FOCUS_INPUT)
+                    val text = accCommand.substringAfter("TYPE HERE ")
+                    val arguments = Bundle()
+                    arguments.putCharSequence(
+                        AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text
+                    )
+                    focusedNode?.performAction(
+                        AccessibilityNodeInfo.ACTION_SET_TEXT, arguments
+                    )
                 }
             }
         }
@@ -227,25 +233,14 @@ class PuppetAS : AccessibilityService() {
 
     private fun clickView(id: String) {
         val rootNode = rootInActiveWindow ?: return
-        val nodes = rootNode.findAccessibilityNodeInfosByViewId(id)
-        nodes.forEach {
-            it.performAction(AccessibilityNodeInfo.ACTION_CLICK)
-        }
-    }
+        val nodes = rootNode.findAccessibilityNodeInfosByText(id)
 
-    private fun typeInView(id: String, text: String) {
-        val rootNode = rootInActiveWindow ?: return
-        val nodes = rootNode.findAccessibilityNodeInfosByViewId(id)
         nodes.forEach {
-            val arguments = Bundle()
-            arguments.putCharSequence(
-                AccessibilityNodeInfo.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text
-            )
-            it.performAction(AccessibilityNodeInfo.ACTION_SET_TEXT, arguments)
+            it.performAction(AccessibilityNodeInfo.ACTION_CLICK)
         }
     }
 
-    private fun executeIntentCommand(command: String) {
+    fun executeIntentCommand(command: String) {
         val intentCommand = command.removePrefix("intent:")
 
         Log.i("PuppetAS", "Executing Intent command: $intentCommand")

puppet/app/src/test/java/com/ttt246/puppet/PuppetASTest.kt

@@ -0,0 +1,44 @@
+package com.ttt246.puppet
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.junit.runner.RunWith
+import org.junit.Test
+import org.junit.Before
+import org.mockito.Mockito
+
+class TestablePuppetAS : PuppetAS() {
+    fun attachBaseContextPublic(context: Context) {
+        attachBaseContext(context)
+    }
+}
+
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [Config.OLDEST_SDK])
+class PuppetASTest {
+    private lateinit var puppetService: TestablePuppetAS
+
+    @Before
+    fun setUp() {
+        puppetService = Mockito.spy(TestablePuppetAS())
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        puppetService.attachBaseContextPublic(context)
+    }
+
+    @Test
+    fun processCommands_executesIntentCommands() {
+        val command = "intent:test"
+        puppetService.processCommands(listOf(command))
+        Mockito.verify(puppetService).executeIntentCommand("intent:test")
+    }
+
+    @Test
+    fun processCommands_executesAccCommands() {
+        val command = "acc:UP"
+        puppetService.processCommands(listOf(command))
+
+        Mockito.verify(puppetService).executeAccCommand(command)
+    }
+}

puppet/app/src/test/java/com/ttt246/puppet/SumTest.kt

@@ -1,17 +0,0 @@
-package com.ttt246.puppet
-
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class SumTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}

puppet/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+mock-maker-inline