fix: type adapter for colorname value (#167)

* fix: type adapter for colorname value * fix: type adapter for colorname value * style: removed needles blank line * fix: execute on app ready callback in run testing * style: removes needles blank line Co-authored-by: Dennis Schröder <[email protected]>
dennisschroeder · Mar 6, 2021 · 22e534b · 22e534b
1 parent 1c0167d
commit 22e534b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/kotlin/khome/Khome.kt b/src/main/kotlin/khome/Khome.kt
@@ -55,6 +55,7 @@ import khome.values.AppName
 import khome.values.Artist
 import khome.values.Azimuth
 import khome.values.Brightness
+import khome.values.ColorName
 import khome.values.ColorTemperature
 import khome.values.Device
 import khome.values.Domain
@@ -300,11 +301,12 @@ internal fun Khome.registerDefaultTypeAdapter() {
     registerTypeAdapter<ObjectId, String>(ObjectId)
     registerTypeAdapter<Service, String>(Service)
     registerTypeAdapter<Device, String>(Device)
-    registerTypeAdapter<Brightness, String>(Brightness)
+    registerTypeAdapter<Brightness, Int>(Brightness)
     registerTypeAdapter<RGBColor, Array<Int>>(RGBColor)
     registerTypeAdapter<HSColor, Array<Double>>(HSColor)
     registerTypeAdapter<XYColor, Array<Double>>(XYColor)
     registerTypeAdapter<ColorTemperature, Int>(ColorTemperature)
+    registerTypeAdapter<ColorName, String>(ColorName)
     registerTypeAdapter<PowerConsumption, Double>(PowerConsumption)
     registerTypeAdapter<Icon, String>(Icon)
     registerTypeAdapter<PresetMode, String>(PresetMode)

diff --git a/src/main/kotlin/khome/KhomeApplicationImpl.kt b/src/main/kotlin/khome/KhomeApplicationImpl.kt
@@ -214,6 +214,7 @@ internal class KhomeApplicationImpl : KhomeApplication {
         }
 
     override fun runTesting(block: KhomeTestApplication.() -> Unit) {
+        applicationReadyCallbacks.forEach { it.invoke(this@KhomeApplicationImpl) }
         val testApp = KhomeTestApplicationImpl(
             sensorsByApiName,
             actuatorsByApiName,

diff --git a/src/main/kotlin/khome/values/Brightness.kt b/src/main/kotlin/khome/values/Brightness.kt
@@ -9,7 +9,7 @@ data class Brightness private constructor(val value: Int) {
 
     companion object : KhomeTypeAdapter<Brightness> {
         override fun <P> from(value: P): Brightness {
-            return Brightness((value as String).toInt())
+            return Brightness(value as Int)
         }
 
         @Suppress("UNCHECKED_CAST")