tests: cloud: Adapt tests to new message types

Adapt the tests to handle CLOUD_CONNECT/_DISCONNECT instead of
_READY_TO_SEND/_PAUSED.

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

Author: jtguggedal

tests/module/cloud/src/cloud_module_test.c

@@ -80,8 +80,7 @@ ZBUS_LISTENER_DEFINE(cloud_test_listener, cloud_chan_cb);
 #define FAKE_DEVICE_ID		"test_device"
 
 static K_SEM_DEFINE(cloud_disconnected, 0, 1);
-static K_SEM_DEFINE(cloud_connected_ready, 0, 1);
-static K_SEM_DEFINE(cloud_connected_paused, 0, 1);
+static K_SEM_DEFINE(cloud_connected, 0, 1);
 static K_SEM_DEFINE(data_sent, 0, 1);
 
 static int nrf_cloud_client_id_get_custom_fake(char *buf, size_t len)
@@ -105,10 +104,8 @@ static void cloud_chan_cb(const struct zbus_channel *chan)
 
 		if (status == CLOUD_DISCONNECTED) {
 			k_sem_give(&cloud_disconnected);
-		} else if (status == CLOUD_CONNECTED_READY_TO_SEND) {
-			k_sem_give(&cloud_connected_ready);
-		} else if (status == CLOUD_CONNECTED_PAUSED) {
-			k_sem_give(&cloud_connected_paused);
+		} else if (status == CLOUD_CONNECTED) {
+			k_sem_give(&cloud_connected);
 		}
 	}
 }
@@ -162,7 +159,7 @@ void test_connecting_backoff(void)
 	/* Transport module needs CPU to run state machine */
 	k_sleep(K_MSEC(10));
 
-	err = k_sem_take(&cloud_connected_ready, K_SECONDS(60));
+	err = k_sem_take(&cloud_connected, K_SECONDS(60));
 	TEST_ASSERT_EQUAL(-EAGAIN, err);
 
 	connect_duration_sec = k_uptime_delta(&connect_start_time) / MSEC_PER_SEC;
@@ -182,7 +179,7 @@ void test_transition_disconnected_connected_ready(void)
 
 	zbus_chan_pub(&NETWORK_CHAN, &status, K_NO_WAIT);
 
-	err = k_sem_take(&cloud_connected_ready, K_SECONDS(1));
+	err = k_sem_take(&cloud_connected, K_SECONDS(1));
 	TEST_ASSERT_EQUAL(0, err);
 }
 
@@ -208,7 +205,7 @@ void test_sending_payload(void)
 	TEST_ASSERT_EQUAL(false, nrf_cloud_coap_json_message_send_fake.arg2_val);
 }
 
-void test_connected_ready_to_paused(void)
+void test_connected_to_disconnected(void)
 {
 	int err;
 	enum network_msg_type status = NETWORK_DISCONNECTED;
@@ -218,17 +215,17 @@ void test_connected_ready_to_paused(void)
 	/* Transport module needs CPU to run state machine */
 	k_sleep(K_MSEC(100));
 
-	err = k_sem_take(&cloud_connected_paused, K_SECONDS(1));
+	err = k_sem_take(&cloud_disconnected, K_SECONDS(1));
 	TEST_ASSERT_EQUAL(0, err);
 }
 
-void test_connected_paused_to_ready_send_payload(void)
+void test_connected_disconnected_to_connected_send_payload(void)
 {
 	int err;
 	enum network_msg_type status = NETWORK_CONNECTED;
 	struct cloud_msg msg = {
 		.type = CLOUD_PAYLOAD_JSON,
-		.payload.buffer = "{\"Another\": \"test\"}",
+		.payload.buffer = "{\"Another\": \"1\"}",
 		.payload.buffer_data_len = strnlen(msg.payload.buffer, sizeof(msg.payload.buffer)),
 	};
 
@@ -241,7 +238,7 @@ void test_connected_paused_to_ready_send_payload(void)
 	/* Transport module needs CPU to run state machine */
 	k_sleep(K_MSEC(100));
 
-	err = k_sem_take(&cloud_connected_ready, K_SECONDS(1));
+	err = k_sem_take(&cloud_connected, K_SECONDS(1));
 	TEST_ASSERT_EQUAL(0, err);
 
 	err = zbus_chan_pub(&CLOUD_CHAN, &msg, K_NO_WAIT);

tests/module/main/src/main.c

@@ -123,10 +123,10 @@ static void button_handler(uint32_t button_states, uint32_t has_changed)
 	}
 }
 
-static void send_cloud_connected_ready_to_send(void)
+static void send_cloud_connected(void)
 {
 	struct cloud_msg cloud_msg = {
-		.type = CLOUD_CONNECTED_READY_TO_SEND,
+		.type = CLOUD_CONNECTED,
 	};
 
 	int err = zbus_chan_pub(&CLOUD_CHAN, &cloud_msg, K_SECONDS(1));
@@ -202,7 +202,7 @@ static void send_network_disconnected(void)
 void test_init_to_triggering_state(void)
 {
 	/* Transition the module into STATE_TRIGGERING */
-	send_cloud_connected_ready_to_send();
+	send_cloud_connected();
 
 	/* There's an initial transition to STATE_SAMPLE_DATA, where the entry function
 	 * sends a location search trigger.
@@ -226,7 +226,7 @@ void test_init_to_triggering_state(void)
 void test_button_press_on_connected(void)
 {
 	/* Transition to STATE_SAMPLE_DATA */
-	send_cloud_connected_ready_to_send();
+	send_cloud_connected();
 	expect_location_event(LOCATION_SEARCH_TRIGGER);
 
 	/* Transistion to STATE_WAIT_FOR_TRIGGER */
@@ -263,7 +263,7 @@ void test_button_press_on_disconnected(void)
 void test_trigger_interval_change_in_connected(void)
 {
 	/* Transition to STATE_SAMPLE_DATA */
-	send_cloud_connected_ready_to_send();
+	send_cloud_connected();
 	expect_location_event(LOCATION_SEARCH_TRIGGER);
 
 	/* As response to the shadow poll, the interval is set to 12 hours. */
@@ -303,7 +303,7 @@ void test_trigger_disconnect_and_connect_when_triggering(void)
 	bool first_trigger_after_connect = true;
 
 	/* Transition to STATE_SAMPLE_DATA */
-	send_cloud_connected_ready_to_send();
+	send_cloud_connected();
 
 	/* As response to the shadow poll, the interval is set to 12 hours. */
 	twelve_hour_interval_set();
@@ -331,7 +331,7 @@ void test_trigger_disconnect_and_connect_when_triggering(void)
 		if (i % 2 == 0) {
 			send_cloud_disconnected();
 			expect_no_events(7200);
-			send_cloud_connected_ready_to_send();
+			send_cloud_connected();
 
 			first_trigger_after_connect = true;
 		}
@@ -349,7 +349,7 @@ void test_fota_downloading(void)
 	expect_fota_event(FOTA_DOWNLOADING_UPDATE);
 
 	/* A cloud ready message and button trigger should now cause no action */
-	send_cloud_connected_ready_to_send();
+	send_cloud_connected();
 	expect_no_events(7200);
 	button_handler(DK_BTN1_MSK, DK_BTN1_MSK);
 	expect_no_events(7200);