chore: Add ULongArray to supported data types

eclipse-kuksa · Mar 18, 2024 · 16bb945 · 16bb945
1 parent b3d887c
commit 16bb945
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/...sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectionTest.kt b/...sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/DataBrokerConnectionTest.kt
@@ -23,6 +23,7 @@ import io.grpc.ManagedChannel
 import io.kotest.assertions.nondeterministic.eventually
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
 import io.kotest.matchers.string.shouldContain
 import io.mockk.clearMocks
 import io.mockk.every
@@ -106,7 +107,7 @@ class DataBrokerConnectionTest : BehaviorSpec({
                 val response = dataBrokerConnection.update(updateRequest)
 
                 then("No error should appear") {
-                    Assertions.assertFalse(response.hasError())
+                    response.hasError() shouldBe false
                 }
 
                 and("When fetching it afterwards") {
@@ -177,12 +178,11 @@ class DataBrokerConnectionTest : BehaviorSpec({
                 `when`("Updating the node with an invalid value") {
                     val invalidHeartRate = VssDriver.VssHeartRate(-5) // UInt on DataBroker side
                     val vssNodeUpdateRequest = VssNodeUpdateRequest(invalidHeartRate)
-                    dataBrokerConnection.update(vssNodeUpdateRequest)
+                    val response = dataBrokerConnection.update(vssNodeUpdateRequest)
 
-                    val fetchRequest = VssNodeFetchRequest(invalidHeartRate)
-                    val fetchedVssHeartRate = dataBrokerConnection.fetch(fetchRequest)
-                    then("the updated value should be ignored") {
-                        fetchedVssHeartRate.value shouldBe 60
+                    then("the updated show") {
+                        val errorResponse = response.firstOrNull { it.errorsCount >= 1 }
+                        errorResponse shouldNotBe null
                     }
                 }
             }

diff --git a/vss-core/src/main/kotlin/org/eclipse/kuksa/vsscore/model/VssNode.kt b/vss-core/src/main/kotlin/org/eclipse/kuksa/vsscore/model/VssNode.kt
@@ -89,7 +89,7 @@ interface VssSignal<out T : Any> : VssNode {
     val value: T
 
     /**
-     * The VSS data type which is compatible with the data broker. This may differ from the [value] type because
+     * The VSS data type which is compatible with the Databroker. This may differ from the [value] type because
      * Java compatibility needs to be ensured and inline classes like [UInt] (Kotlin) are not known to Java.
      *
      * ### Example

diff --git a/vss-processor/src/main/kotlin/org/eclipse/kuksa/vssprocessor/spec/VssNodeSpecModel.kt b/vss-processor/src/main/kotlin/org/eclipse/kuksa/vssprocessor/spec/VssNodeSpecModel.kt
@@ -79,7 +79,8 @@ internal class VssNodeSpecModel(
                 "boolean[]" -> BooleanArray::class.asTypeName()
                 "int8[]", "int16[]", "int32[]" -> IntArray::class.asTypeName()
                 "uint8[]", "uint16[]", "uint32[]" -> UIntArray::class.asTypeName()
-                "int64[]", "uint64[]" -> LongArray::class.asTypeName()
+                "int64[]" -> LongArray::class.asTypeName()
+                "uint64[]" -> ULongArray::class.asTypeName()
                 "float[]" -> FloatArray::class.asTypeName()
                 else -> Any::class.asTypeName()
             }
@@ -93,6 +94,7 @@ internal class VssNodeSpecModel(
                 UInt::class.asTypeName() -> Int::class.asTypeName()
                 ULong::class.asTypeName() -> Long::class.asTypeName()
                 UIntArray::class.asTypeName() -> IntArray::class.asTypeName()
+                ULongArray::class.asTypeName() -> LongArray::class.asTypeName()
                 else -> datatypeTypeName
             }
         }
@@ -114,9 +116,10 @@ internal class VssNodeSpecModel(
                 Array::class.parameterizedBy(String::class) -> "emptyArray<String>()"
                 IntArray::class.asTypeName() -> "IntArray(0)"
                 BooleanArray::class.asTypeName() -> "BooleanArray(0)"
+                FloatArray::class.asTypeName() -> "FloatArray(0)"
                 LongArray::class.asTypeName() -> "LongArray(0)"
+                ULongArray::class.asTypeName() -> "ULongArray(0)"
                 UIntArray::class.asTypeName() -> "UIntArray(0)"
-                FloatArray::class.asTypeName() -> "FloatArray(0)"
 
                 else -> throw IllegalArgumentException("No default value found for $valueTypeName!")
             }

diff --git a/vss-processor/src/test/kotlin/org/eclipse/kuksa/vssprocessor/spec/VssNodeSpecModelTest.kt b/vss-processor/src/test/kotlin/org/eclipse/kuksa/vssprocessor/spec/VssNodeSpecModelTest.kt
@@ -65,7 +65,7 @@ class VssNodeSpecModelTest : BehaviorSpec({
                 propertySpec.toString() shouldContain "kotlin.Int = 0"
             }
 
-            then("it should the correct inline class data type") {
+            then("it should have the correct inline class data type") {
                 val propertySpec = classSpec.propertySpecs.find { it.name == "dataType" }
 
                 propertySpec?.getter.toString() shouldContain "kotlin.UInt::class"
@@ -99,7 +99,7 @@ class VssNodeSpecModelTest : BehaviorSpec({
                 propertySpec.toString() shouldContain "kotlin.LongArray = LongArray(0)"
             }
 
-            then("it should the correct inline class data type") {
+            then("it should have the correct inline class data type") {
                 val propertySpec = classSpec.propertySpecs.find { it.name == "dataType" }
 
                 propertySpec?.getter.toString() shouldContain "kotlin.LongArray::class"