Address more review comments; merge tests, rename instance under test

Author: kcoppock

app/src/test/kotlin/io/homeassistant/companion/android/sensors/DynamicColorSensorManagerTest.kt

@@ -29,13 +29,13 @@ import org.robolectric.annotation.Config
 
 @HiltAndroidTest
 @RunWith(RobolectricTestRunner::class)
-@Config(application = HiltTestApplication::class)
+@Config(sdk = [36], application = HiltTestApplication::class)
 class DynamicColorSensorManagerTest {
     @get:Rule(order = 0)
     val hiltRule = HiltAndroidRule(this)
 
     @Inject
-    internal lateinit var dynamicColorSensor: DynamicColorSensorManager
+    internal lateinit var sensorManager: DynamicColorSensorManager
 
     @Inject
     internal lateinit var sensorRepository: SensorRepository
@@ -48,41 +48,36 @@ class DynamicColorSensorManagerTest {
 
     @Config(maxSdk = Build.VERSION_CODES.R)
     @Test
-    fun `Given SDK is lower than Android 12 then sensor is absent`() {
-        assertFalse(dynamicColorSensor.hasSensor())
+    fun `Given SDK is lower than Android 12 then sensor manager is absent`() {
+        assertFalse(sensorManager.hasSensor())
     }
 
     @Config(minSdk = Build.VERSION_CODES.S)
     @Test
-    fun `Given SDK is at least Android 12 then sensor is present`() {
-        assertTrue(dynamicColorSensor.hasSensor())
+    fun `Given SDK is at least Android 12 then sensor manager is present`() {
+        assertTrue(sensorManager.hasSensor())
     }
 
     @Test
-    fun `Given dynamic color sensor when available sensors then includes color sensor`() = runTest {
-        val availableSensors = dynamicColorSensor.getAvailableSensors()
+    fun `Given dynamic color sensor when available sensors then includes color and palette sensors`() = runTest {
+        val availableSensors = sensorManager.getAvailableSensors()
         assertTrue(availableSensors.contains(DynamicColorSensorManager.accentColorSensor))
-    }
-
-    @Test
-    fun `Given dynamic color sensor when available sensors then includes palette sensor`() = runTest {
-        val availableSensors = dynamicColorSensor.getAvailableSensors()
         assertTrue(availableSensors.contains(DynamicColorSensorManager.tonalPaletteSensor))
     }
 
     @Test
     fun `Given accent color sensor when required permissions then none specified`() {
         assertArrayEquals(
             emptyArray<String>(),
-            dynamicColorSensor.requiredPermissions(DynamicColorSensorManager.accentColorSensor.id),
+            sensorManager.requiredPermissions(DynamicColorSensorManager.accentColorSensor.id),
         )
     }
 
     @Test
     fun `Given tonal palette sensor when required permissions then none specified`() {
         assertArrayEquals(
             emptyArray<String>(),
-            dynamicColorSensor.requiredPermissions(DynamicColorSensorManager.tonalPaletteSensor.id),
+            sensorManager.requiredPermissions(DynamicColorSensorManager.tonalPaletteSensor.id),
         )
     }
 
@@ -91,20 +86,12 @@ class DynamicColorSensorManagerTest {
         val id = DynamicColorSensorManager.accentColorSensor.id
         sensorRepository.setSensorEnabled(id, listOf(1), true)
 
-        dynamicColorSensor.requestSensorUpdate()
+        sensorManager.requestSensorUpdate()
 
         val state = sensorRepository.get(id).single().state
 
         // Default accent color for Robolectric
         assertEquals("#475D92", state)
-    }
-
-    @Test
-    fun `Given enabled accent color sensor when request update then sets rgb color attribute`() = runTest {
-        val id = DynamicColorSensorManager.accentColorSensor.id
-        sensorRepository.setSensorEnabled(id, listOf(1), true)
-
-        dynamicColorSensor.requestSensorUpdate()
 
         val attrs = getSensorAttributes(id)
         val rgbColor = attrs.find { it.name == "rgb_color" }
@@ -119,7 +106,7 @@ class DynamicColorSensorManagerTest {
         val id = DynamicColorSensorManager.accentColorSensor.id
         sensorRepository.setSensorEnabled(id, listOf(1), false)
 
-        dynamicColorSensor.requestSensorUpdate()
+        sensorManager.requestSensorUpdate()
 
         assertEquals("", sensorRepository.get(id).single().state)
     }
@@ -135,7 +122,7 @@ class DynamicColorSensorManagerTest {
             """{ "android.theme.customization.theme_style": "VIBRANT" }""",
         )
 
-        dynamicColorSensor.requestSensorUpdate()
+        sensorManager.requestSensorUpdate()
 
         assertEquals("VIBRANT", sensorRepository.get(id).single().state)
     }
@@ -151,7 +138,7 @@ class DynamicColorSensorManagerTest {
             """android.theme.customization.theme_style""",
         )
 
-        dynamicColorSensor.requestSensorUpdate()
+        sensorManager.requestSensorUpdate()
 
         assertEquals(STATE_UNKNOWN, sensorRepository.get(id).single().state)
     }
@@ -167,7 +154,7 @@ class DynamicColorSensorManagerTest {
             null,
         )
 
-        dynamicColorSensor.requestSensorUpdate()
+        sensorManager.requestSensorUpdate()
 
         assertEquals(STATE_UNAVAILABLE, sensorRepository.get(id).single().state)
     }
@@ -177,7 +164,7 @@ class DynamicColorSensorManagerTest {
         val id = DynamicColorSensorManager.tonalPaletteSensor.id
         sensorRepository.setSensorEnabled(id, listOf(1), true)
 
-        dynamicColorSensor.requestSensorUpdate()
+        sensorManager.requestSensorUpdate()
 
         val attrs = getSensorAttributes(id)
         val options = attrs.find { it.name == "options" }?.value