Merge pull request #29 from android/test-refactoring

romanofranz · web-flow · commit 59dc71c80cee · 2025-11-10T09:32:49.000+01:00
Minor refactoring of testing code
diff --git a/app/src/androidTest/java/com/example/cahier/CahierListDetailTest.kt b/app/src/androidTest/java/com/example/cahier/CahierListDetailTest.kt
@@ -1,5 +1,6 @@
 package com.example.cahier
 
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.test.DeviceConfigurationOverride
 import androidx.compose.ui.test.ForcedSize
 import androidx.compose.ui.test.junit4.createComposeRule
@@ -25,19 +26,9 @@ class CahierListDetailTest {
     fun homeScreen_showListOnly() {
         composeTestRule.setContent {
             DeviceConfigurationOverride(
-                DeviceConfigurationOverride.ForcedSize(
-                    DpSize(
-                        width = 400.dp,
-                        height = 900.dp
-                    )
-                )
+                DeviceConfigurationOverride.ForcedSize(compatWidthWindow)
             ) {
-                HomePane(
-                    navigateToCanvas = { _ -> },
-                    navigateToDrawingCanvas = { _ -> },
-                    navigateUp = {},
-                    homeScreenViewModel = fakeViewModel
-                )
+                HomeContent()
             }
         }
 
@@ -49,23 +40,34 @@ class CahierListDetailTest {
     fun homeScreen_showListAndDetail() {
         composeTestRule.setContent {
             DeviceConfigurationOverride(
-                DeviceConfigurationOverride.ForcedSize(
-                    DpSize(
-                        width = 1200.dp,
-                        height = 900.dp
-                    )
-                )
+                DeviceConfigurationOverride.ForcedSize(mediumWidthWindow)
             ) {
-                HomePane(
-                    navigateToCanvas = { _ -> },
-                    navigateToDrawingCanvas = { _ -> },
-                    navigateUp = {},
-                    homeScreenViewModel = fakeViewModel
-                )
+                HomeContent()
             }
         }
 
         composeTestRule.onNodeWithTag("List").assertExists()
         composeTestRule.onNodeWithTag("Detail").assertExists()
     }
+
+
+    private val mediumWidthWindow = DpSize(
+        width = 1200.dp,
+        height = 900.dp
+    )
+
+    private val compatWidthWindow = DpSize(
+        width = 400.dp,
+        height = 900.dp
+    )
+
+    @Composable
+    private fun HomeContent() {
+        HomePane(
+            navigateToCanvas = { _ -> },
+            navigateToDrawingCanvas = { _ -> },
+            navigateUp = {},
+            homeScreenViewModel = fakeViewModel
+        )
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,6 @@ agp = "8.13.0"
 appcompatV7 = "1.7.1"
 coilCompose = "3.3.0"
 foundation = "1.9.2"
-gson = "2.13.2"
 hiltAndroid = "2.57.1"
 hiltNavigationCompose = "1.3.0"
 ink = "1.0.0-beta01"
@@ -54,7 +53,6 @@ appcompat-v7 = { module = "androidx.appcompat:appcompat", version.ref = "appcomp
 appcompat-v7-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "appcompatV7" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }
 coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coilCompose" }
-gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hiltAndroid" }
 hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hiltAndroid" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
