impl: add tests for types

- Added tests for all the basic types

Author: vinodreddy-g

src/rust/rust_kvs/src/kvs_value.rs

@@ -113,8 +113,6 @@ impl From<KvsMap> for KvsValue {
     }
 }
 
-
-
 // Trait for extracting inner values from KvsValue
 pub trait KvsValueGet {
     fn get_inner_value(val: &KvsValue) -> Option<&Self>;

src/rust/rust_kvs/tests/common.rs

@@ -13,46 +13,41 @@ use std::iter::zip;
 ///   * `true` if provided values are same.
 pub fn compare_kvs_values(left: &KvsValue, right: &KvsValue) -> bool {
     match (left, right) {
-        (KvsValue::Number(l), KvsValue::Number(r)) => l == r,
-        (KvsValue::Boolean(l), KvsValue::Boolean(r)) => l == r,
-        (KvsValue::String(l), KvsValue::String(r)) => l == r,
+        (KvsValue::I32(i32_val_l), KvsValue::I32(i32_val_r)) => i32_val_l == i32_val_r,
+        (KvsValue::U32(u32_val_l), KvsValue::U32(u32_val_r)) => u32_val_l == u32_val_r,
+        (KvsValue::I64(i64_val_l), KvsValue::I64(i64_val_r)) => i64_val_l == i64_val_r,
+        (KvsValue::U64(u64_val_l), KvsValue::U64(u64_val_r)) => u64_val_l == u64_val_r,
+        (KvsValue::F64(f64_val_l), KvsValue::F64(f64_val_r)) => f64_val_l == f64_val_r,
+        (KvsValue::Boolean(bool_val_l), KvsValue::Boolean(bool_val_r)) => bool_val_l == bool_val_r,
+        (KvsValue::String(string_val_l), KvsValue::String(string_val_r)) => {
+            string_val_l == string_val_r
+        }
         (KvsValue::Null, KvsValue::Null) => true,
-        (KvsValue::Array(l), KvsValue::Array(r)) => {
-            // Check size.
-            if l.len() != r.len() {
+        (KvsValue::Array(array_l), KvsValue::Array(array_r)) => {
+            if array_l.len() != array_r.len() {
                 return false;
             }
-
-            // Iterate over elements.
-            for (lv, rv) in zip(l, r) {
-                if !compare_kvs_values(lv, rv) {
+            for (elem_l, elem_r) in zip(array_l, array_r) {
+                if !compare_kvs_values(elem_l, elem_r) {
                     return false;
                 }
             }
-
             true
         }
-        (KvsValue::Object(l), KvsValue::Object(r)) => {
-            // Check size.
-            if l.len() != r.len() {
+        (KvsValue::Object(object_l), KvsValue::Object(object_r)) => {
+            if object_l.len() != object_r.len() {
                 return false;
             }
-
-            // Check keys.
-            if l.keys().ne(r.keys()) {
+            if object_l.keys().ne(object_r.keys()) {
                 return false;
             }
-
-            // Iterate over elements.
-            let keys = l.keys();
-            for k in keys {
-                if !compare_kvs_values(&l[k], &r[k]) {
+            for k in object_l.keys() {
+                if !compare_kvs_values(&object_l[k], &object_r[k]) {
                     return false;
                 }
             }
-
             true
         }
-        (_, _) => false,
+        _ => false,
     }
 }

src/rust/rust_kvs/tests/kvs_0_default.json

@@ -1,5 +1,5 @@
 {
-  "string1": "Hello",
-  "bool1": false,
-  "number1": 987
+  "string1": { "type": "String", "value": "Hello" },
+  "bool1": { "type": "Boolean", "value": false },
+  "number1": { "type": "I32", "value": 987 }
 }

src/rust/rust_kvs_tool/src/kvs_tool.rs

@@ -115,7 +115,7 @@ enum SupportedTypes {
 /// Converts a TinyJSON value to a KVS value.
 fn from_tinyjson(value: &JsonValue) -> KvsValue {
     match value {
-        JsonValue::Number(n) => KvsValue::Number(*n),
+        JsonValue::Number(n) => KvsValue::F64(*n),
         JsonValue::Boolean(b) => KvsValue::Boolean(*b),
         JsonValue::String(s) => KvsValue::String(s.clone()),
         JsonValue::Null => KvsValue::Null,