Use identifier in android source set instead of Hardcoded string. Add…

… map to set application arguments.

pistakio/src/androidMain/kotlin/com/corrado4eyes/pistakio/DefaultCMApplication.kt

@@ -17,7 +17,7 @@ actual class DefaultApplicationAdapter(
 
         val instrumentation = InstrumentationRegistry.getInstrumentation()
         val appPackage = instrumentation.targetContext.packageName
-        val activityName = "$appPackage.MainActivity"
+        val activityName = "$appPackage.$identifier"
         val intent = Intent(Intent.ACTION_MAIN)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         intent.setClassName(instrumentation.targetContext, activityName)

pistakio/src/commonMain/kotlin/com/corrado4eyes/pistakio/ApplicationAdapter.kt

@@ -2,7 +2,6 @@ package com.corrado4eyes.pistakio
 
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
-import kotlinx.coroutines.flow.MutableStateFlow
 
 class CMAppLaunchedAlreadyException : Throwable() {
     override val message: String = "The app is already launched"
@@ -18,10 +17,12 @@ enum class TimeoutDuration(val duration: Duration) {
     LONG(60.seconds)
 }
 
-typealias ApplicationArguments = Map<String, String>?
+typealias ApplicationArguments = Map<String, String>
 
 interface ApplicationAdapter {
 
+    val applicationArguments: ApplicationArguments
+
     fun launch(identifier: String? = null, arguments: Map<String, String>)
     fun findView(tag: String): Node
     fun tearDown()
@@ -33,27 +34,41 @@ interface ApplicationAdapter {
     interface TearDownHandler {
         fun tearDown()
     }
+
+    operator fun get(key: String): String?
+    operator fun set(key: String, value: String)
 }
 
 abstract class BaseApplicationAdapter : ApplicationAdapter {
-    private val isAppLaunched = MutableStateFlow(false)
+
+    private val _applicationArguments = mutableMapOf<String, String>()
+    override val applicationArguments: ApplicationArguments
+        get() = _applicationArguments
+
+    private var isAppLaunched = false
 
     override fun launch(identifier: String?, arguments: Map<String, String>) {
-        if (isAppLaunched.value) {
+        if (isAppLaunched) {
             throw CMAppLaunchedAlreadyException()
         }
-        isAppLaunched.value = true
+
+        isAppLaunched = true
     }
 
     override fun tearDown() {
-        isAppLaunched.value = false
+        isAppLaunched = false
     }
 
     protected fun assertAppIsRunning() {
-        if (!isAppLaunched.value) {
+        if (!isAppLaunched) {
             throw CMAppNotLaunchedYetException()
         }
     }
+
+    override operator fun get(key: String): String? = applicationArguments[key]
+    override operator fun set(key: String, value: String) {
+        _applicationArguments[key] = value
+    }
 }
 
 expect class DefaultApplicationAdapter: BaseApplicationAdapter

pistakio/src/commonTest/kotlin/com/corrado4eyes/pistakio/mocks/StubApplication.kt

@@ -7,6 +7,7 @@ import com.corrado4eyes.pistakio.Node
 import com.corrado4eyes.pistakio.TimeoutDuration
 
 class StubApplication : BaseApplicationAdapter() {
+
     var launchCalled = 0
     var launchArguments: ApplicationArguments = emptyMap()
     override fun launch(identifier: String?, arguments: Map<String, String>) {

pistakio/src/iosMain/kotlin/com/corrado4eyes/pistakio/CMApplicationAdapter.kt

@@ -6,6 +6,7 @@ import platform.XCTest.XCUIElementTypeAny
 actual class DefaultApplicationAdapter(app: XCUIApplication?) : BaseApplicationAdapter() {
     private val app: XCUIApplication = app ?: XCUIApplication()
 
+    @Suppress("UNCHECKED_CAST")
     override fun launch(identifier: String?, arguments: Map<String, String>) {
         super.launch(identifier, arguments)
         app.setLaunchEnvironment((arguments as Map<Any?, *>))