fix tests

Signed-off-by: Jan Zachmann <[email protected]>

Author: JanZachmann

src/twin/mod.rs

@@ -31,7 +31,7 @@ use firmware_update::update_validation::UpdateValidation;
 use futures::stream;
 use futures_util::StreamExt;
 use log::{error, info, warn};
-use serde_json::{json, Value};
+use serde_json::json;
 use signal_hook::consts::TERM_SIGNALS;
 use signal_hook_tokio::Signals;
 use std::{
@@ -139,10 +139,10 @@ impl Twin {
         Ok(twin)
     }
 
-    fn feature_info(&self) -> serde_json::Map<K, V> {
+    fn feature_info(&self) -> serde_json::Value {
         let mut features = serde_json::Map::new();
 
-         // report feature availability and version
+        // report feature availability and version
         for f in self.features.values() {
             let value = if f.is_enabled() {
                 json!({ "version": f.version() })
@@ -153,7 +153,7 @@ impl Twin {
             features.insert(f.name(), value);
         }
 
-        features
+        serde_json::Value::Object(features)
     }
 
     async fn connect_twin(&mut self) -> Result<()> {

src/twin/mod_test.rs

@@ -457,9 +457,21 @@ pub mod mod_test {
 
         let expect = |mock: &mut MockMyIotHub| {
             mock.expect_twin_report()
-                .with(eq(json!({"system_info":{"version":1,}})))
+                .with(eq(json!({
+                    "device_update_consent": {"version": 1},
+                    "factory_reset": null,
+                    "firmware_update": {"version": 1},
+                    "modem_info": null,
+                    "network_status": {"version": 3},
+                    "provisioning_config": {"version": 1},
+                    "reboot": {"version": 2},
+                    "ssh_tunnel": {"version": 2},
+                    "system_info": {"version": 1},
+                    "wifi_commissioning": null,
+                })))
                 .times(1)
                 .returning(|_| Ok(()));
+
             let s = IotHubClient::sdk_version_string();
             mock.expect_twin_report()
                 .with(eq(json!({"system_info":{
@@ -474,21 +486,6 @@ pub mod mod_test {
                 .times(1)
                 .returning(|_| Ok(()));
 
-            mock.expect_twin_report()
-                .with(eq(json!({ "factory_reset": null })))
-                .times(1)
-                .returning(|_| Ok(()));
-
-            mock.expect_twin_report()
-                .with(eq(json!({"ssh_tunnel":{"version":2}})))
-                .times(1)
-                .returning(|_| Ok(()));
-
-            mock.expect_twin_report()
-                .with(eq(json!({"firmware_update":{"version":1}})))
-                .times(1)
-                .returning(|_| Ok(()));
-
             mock.expect_twin_report()
                 .with(eq(json!({
                     "ssh_tunnel":{
@@ -498,21 +495,6 @@ pub mod mod_test {
                 .times(1)
                 .returning(|_| Ok(()));
 
-            mock.expect_twin_report()
-                .with(eq(json!({"device_update_consent":{"version":1}})))
-                .times(1)
-                .returning(|_| Ok(()));
-
-            mock.expect_twin_report()
-                .with(eq(json!({"modem_info":null})))
-                .times(1)
-                .returning(|_| Ok(()));
-
-            mock.expect_twin_report()
-                .with(eq(json!({"network_status":{"version": 3}})))
-                .times(1)
-                .returning(|_| Ok(()));
-
             mock.expect_twin_report()
                 .with(eq(json!({
                     "network_status":{
@@ -545,16 +527,6 @@ pub mod mod_test {
                 .times(1)
                 .returning(|_| Ok(()));
 
-            mock.expect_twin_report()
-                .with(eq(json!({"reboot":{"version":2}})))
-                .times(1)
-                .returning(|_| Ok(()));
-
-            mock.expect_twin_report()
-                .with(eq(json!({ "wifi_commissioning": null })))
-                .times(1)
-                .returning(|_| Ok(()));
-
             mock.expect_twin_report()
                 .with(eq(
                     json!({"wait_online_timeout_secs":{"nanos":0, "secs": 300}}),
@@ -579,11 +551,6 @@ pub mod mod_test {
                 .times(1)
                 .returning(|_| Ok(()));
 
-            mock.expect_twin_report()
-                .with(eq(json!({"provisioning_config":{"version": 1}})))
-                .times(1)
-                .returning(|_| Ok(()));
-
             mock.expect_twin_report()
                 .with(eq(json!({
                     "provisioning_config":{
@@ -632,7 +599,7 @@ pub mod mod_test {
         ];
 
         let expect = |mock: &mut MockMyIotHub| {
-            mock.expect_twin_report().times(12).returning(|_| Ok(()));
+            mock.expect_twin_report().times(3).returning(|_| Ok(()));
         };
 
         let test = |test_attr: &mut TestConfig| {
@@ -656,7 +623,7 @@ pub mod mod_test {
         ];
 
         let expect = |mock: &mut MockMyIotHub| {
-            mock.expect_twin_report().times(20).returning(|_| Ok(()));
+            mock.expect_twin_report().times(11).returning(|_| Ok(()));
 
             mock.expect_twin_report()
                 .with(eq(json!({
@@ -732,7 +699,7 @@ pub mod mod_test {
         let test_dirs = vec!["testfiles/positive/test_component"];
 
         let expect = |mock: &mut MockMyIotHub| {
-            mock.expect_twin_report().times(20).returning(|_| Ok(()));
+            mock.expect_twin_report().times(11).returning(|_| Ok(()));
         };
 
         let test = |test_attr: &mut TestConfig| {