Merge pull request #117 from joreilly/cmp_ui_tests

Initial CMP UI test

Author: joreilly

.github/workflows/android.yml

@@ -17,7 +17,5 @@ jobs:
     - name: Build android app
       run: ./gradlew assembleDebug
     - name: Run Unit Tests
-      run: ./gradlew test
-    - name: Build iOS shared code
-      run: ./gradlew :composeApp:compileKotlinIosSimulatorArm64
+      run: ./gradlew allTests
 

.github/workflows/build-and-publish-web.yml

@@ -28,7 +28,7 @@ jobs:
       # If main branch update, deploy to gh-pages
       - name: Deploy
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
-        uses: JamesIves/[email protected].4
+        uses: JamesIves/[email protected].8
         with:
           BRANCH: gh-pages # The branch the action should deploy to.
           FOLDER: composeApp/build/dist/wasmJs/productionExecutable # The folder the action should deploy.

composeApp/build.gradle.kts

@@ -1,6 +1,7 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
+import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -15,7 +16,6 @@ plugins {
 kotlin {
     jvmToolchain(17)
 
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmJs {
         moduleName = "composeApp"
         browser {
@@ -27,7 +27,13 @@ kotlin {
     }
 
 
-    androidTarget()
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
+
+    }
+
+
     jvm("desktop")
 
     listOf(
@@ -81,6 +87,13 @@ kotlin {
             api(libs.compose.adaptive.layout)
         }
 
+        commonTest.dependencies {
+            implementation(kotlin("test"))
+
+            @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
+            implementation(compose.uiTest)
+        }
+
         jsMain.dependencies {
             implementation(compose.html.core)
             implementation(libs.kstore.storage)
@@ -139,7 +152,10 @@ android {
         targetSdk = libs.versions.android.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -157,6 +173,14 @@ android {
     dependencies {
         debugImplementation(libs.compose.ui.tooling)
     }
+
+    testOptions {
+        unitTests {
+            all {
+                it.exclude("**/screen/**")
+            }
+        }
+    }
 }
 
 compose.desktop {

composeApp/src/commonTest/kotlin/dev/johnoreilly/climatetrace/screen/ClimateTraceTestsScreen.kt

@@ -0,0 +1,24 @@
+package dev.johnoreilly.climatetrace.screen
+
+import androidx.compose.material3.Text
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.runComposeUiTest
+import dev.johnoreilly.climatetrace.remote.Country
+import dev.johnoreilly.climatetrace.ui.CountryListView
+import kotlin.test.Test
+
+@OptIn(ExperimentalTestApi::class)
+class ClimateTraceScreenTest {
+    private val countryList = listOf<Country>(Country("IRL", "IE", "Ireland", "Europe"))
+
+    @Test
+    fun testCountryListScreen() = runComposeUiTest {
+        setContent {
+            CountryListView(countryList, null, {})
+        }
+
+        onNodeWithText("Ireland").assertExists()
+    }
+}
+

gradle/libs.versions.toml

@@ -8,8 +8,8 @@ agp = "8.7.1"
 android-compileSdk = "34"
 android-minSdk = "24"
 android-targetSdk = "34"
-androidx-activityCompose = "1.9.2"
-compose = "1.7.3"
+androidx-activityCompose = "1.9.3"
+compose = "1.7.4"
 compose-plugin = "1.7.0"
 composeAdaptiveLayout = "1.0.0"
 harawata-appdirs = "1.2.2"
@@ -21,7 +21,7 @@ kmpObservableViewModel = "1.0.0-BETA-6"
 kstore = "0.8.0"
 ktor = "3.0.0"
 treemapChart = "0.1.1"
-voyager= "1.1.0-beta02"
+voyager= "1.1.0-beta03"
 molecule =  "2.0.0"