Merge branch 'master' into feature/error-management-improvements

Author: Fran Montiel

gradle.properties

@@ -20,3 +20,6 @@ android.enableJetifier=true
 
 # fixing issue with not be able to load the project within Intellij IDEA because an issue with Android Studio
 android.injected.studio.version.check=false
+
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.native.enableDependencyPropagation=false

harmony-kotlin/build.gradle

@@ -29,8 +29,7 @@ android {
   defaultConfig {
     minSdkVersion android_min_sdk_version
     compileSdkVersion android_compile_sdk_version
-
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 
   sourceSets {
@@ -41,14 +40,20 @@ android {
       res.srcDirs = ['src/androidMain/res']
     }
     test {
+      manifest.srcFile 'src/androidMain/AndroidManifest.xml'
       java.srcDirs = ['src/androidTest/kotlin']
+      resources.srcDirs = ['src/androidTest/kotlin']
     }
   }
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  testOptions {
+    unitTests.includeAndroidResources = true
+  }
 }
 
 kotlin {
@@ -68,6 +73,14 @@ kotlin {
   jvm()
 
   sourceSets {
+
+    all {
+      languageSettings {
+        optIn("kotlin.RequiresOptIn")
+        optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+      }
+    }
+
     commonMain {
       dependencies {
 
@@ -153,15 +166,17 @@ kotlin {
 
     androidTest {
       dependencies {
+        implementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
         implementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 
         implementation "io.ktor:ktor-client-mock-jvm:$ktor_version"
 
         // Instrumentation tests
-        implementation 'androidx.test.ext:junit:1.1.3'
-        implementation 'androidx.test:runner:1.4.0'
-        implementation 'androidx.test:rules:1.4.0'
-        implementation 'org.robolectric:robolectric:4.6.1'
+        implementation("androidx.test:core:1.4.0")
+        implementation("androidx.test:runner:1.4.0")
+        implementation("androidx.test:rules:1.4.0")
+        implementation 'androidx.test.ext:junit-ktx:1.1.3'
+        implementation("org.robolectric:robolectric:4.7.1")
       }
     }
 

harmony-kotlin/src/androidMain/kotlin/com/harmony/kotlin/common/Coroutines.kt

@@ -0,0 +1,18 @@
+package com.harmony.kotlin.common
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+
+@RunWith(AndroidJUnit4::class)
+@Config(manifest = Config.NONE)
+actual abstract class BaseTest {
+
+  @OptIn(ExperimentalCoroutinesApi::class)
+  actual fun <T> runTest(block: suspend CoroutineScope.() -> T) {
+    runBlockingTest { block() }
+  }
+}

harmony-kotlin/src/androidTest/kotlin/com/harmony/kotlin/common/BaseTest.kt

@@ -0,0 +1,12 @@
+package com.harmony.kotlin.data.datasource.cache
+
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
+import com.harmony.kotlin.data.datasource.database.CacheDatabase
+import com.squareup.sqldelight.android.AndroidSqliteDriver
+
+actual fun cacheDatabaseTests(): CacheDatabase {
+  val app = ApplicationProvider.getApplicationContext<Application>()
+  val driver = AndroidSqliteDriver(CacheDatabase.Schema, app, "tests")
+  return CacheDatabase(driver)
+}

harmony-kotlin/src/androidTest/kotlin/com/harmony/kotlin/data/datasource/cache/CacheSQLStorageAndroidObjectMother.kt

@@ -30,8 +30,7 @@ class CacheSQLStorageDataSource(private val database: CacheDatabase) : GetDataSo
         database.cacheQueries.selectAll().executeAsList()
       }
       is KeyQuery -> {
-        val sql = "${query.key}-%"
-        database.cacheQueries.value(sql).executeAsList()
+        database.cacheQueries.value(listSQLQuery(query)).executeAsList()
       }
       else -> notSupportedQuery()
     }
@@ -53,16 +52,18 @@ class CacheSQLStorageDataSource(private val database: CacheDatabase) : GetDataSo
   }
 
   override suspend fun putAll(query: Query, value: List<ByteArray>?): List<ByteArray> {
-    return when (query) {
+    when (query) {
       is KeyQuery -> {
         value?.let {
           database.transaction {
+            // delete the current content, because we can't update it as we store it by indexes instead of the whole context
+            database.cacheQueries.delete(listSQLQuery(query))
             it.forEachIndexed { idx, raw ->
-              database.cacheQueries.insertOrUpdate("${query.key}-$idx", raw)
+              database.cacheQueries.insertOrUpdate(listSQLKey(query, idx), raw)
             }
           }
           return it
-        } ?: emptyList<ByteArray>()
+        } ?: throw IllegalArgumentException("values != null")
       }
       else -> notSupportedQuery()
     }
@@ -74,9 +75,13 @@ class CacheSQLStorageDataSource(private val database: CacheDatabase) : GetDataSo
         database.cacheQueries.deleteAll()
       }
       is KeyQuery -> {
+        database.cacheQueries.delete(listSQLQuery(query))
         database.cacheQueries.delete(query.key)
       }
       else -> notSupportedQuery()
     }
   }
+
+  private fun listSQLQuery(query: KeyQuery) = "harmony-generated-${query.key}-%"
+  private fun listSQLKey(query: KeyQuery, idx: Int) = "harmony-generated-${query.key}-$idx"
 }

harmony-kotlin/src/commonMain/kotlin/com.harmony.kotlin/common/Coroutines.kt

@@ -0,0 +1,7 @@
+package com.harmony.kotlin.common
+
+import kotlinx.coroutines.CoroutineScope
+
+expect abstract class BaseTest() {
+  fun <T> runTest(block: suspend CoroutineScope.() -> T)
+}