test: Improve test_send_caps_error in usb_pe_drp

Better mock tx and rx messages, add sop type.

BUG=b:161835483 b:173791979
BRANCH=none
TEST=make run-usb_pe_drp

Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: If1f91b6385d6841d662a8a6262af6382645da92e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2553343
Reviewed-by: Diana Z <dzigterman@chromium.org>

1 files changed, 15 insertions, 14 deletions

diff --git a/test/usb_pe_drp_old.c b/test/usb_pe_drp_old.c
index c6e55f47ca..1c5717a341 100644
--- a/test/usb_pe_drp_old.c
+++ b/test/usb_pe_drp_old.c
@@ -17,6 +17,7 @@
 #include "usb_prl_sm.h"
 #include "usb_sm_checks.h"
 #include "usb_tc_sm.h"
+#include "mock/usb_prl_mock.h"
 
 /**
  * STUB Section
@@ -146,7 +147,7 @@ static int test_pe_frs(void)
 	 * Make sure that we sent FR_Swap
 	 */
 	task_wait_event(10 * MSEC);
-	TEST_ASSERT(fake_prl_get_last_sent_ctrl_msg(PORT0) == PD_CTRL_FR_SWAP);
+	TEST_ASSERT(mock_prl_get_last_sent_ctrl_msg(PORT0) == PD_CTRL_FR_SWAP);
 	TEST_ASSERT(get_state_pe(PORT0) == PE_PRS_SNK_SRC_SEND_SWAP);
 	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_PATH));
 	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
@@ -179,7 +180,7 @@ static int test_pe_frs(void)
 	task_wait_event(PD_POWER_SUPPLY_TURN_ON_DELAY);
 	TEST_ASSERT(get_state_pe(PORT0) == PE_PRS_SNK_SRC_SOURCE_ON);
 	TEST_ASSERT(pe_chk_flag(PORT0, PE_FLAGS_FAST_ROLE_SWAP_PATH));
-	TEST_ASSERT(fake_prl_get_last_sent_ctrl_msg(PORT0) == PD_CTRL_PS_RDY);
+	TEST_ASSERT(mock_prl_get_last_sent_ctrl_msg(PORT0) == PD_CTRL_PS_RDY);
 
 	/*
 	 * Fake the Transmit complete and this will bring us to Source Startup
@@ -207,7 +208,7 @@ static int test_snk_give_source_cap(void)
 
 	TEST_ASSERT(!pe_chk_flag(PORT0, PE_FLAGS_MSG_RECEIVED));
 	TEST_ASSERT(!pe_chk_flag(PORT0, PE_FLAGS_TX_COMPLETE));
-	TEST_EQ(fake_prl_get_last_sent_data_msg_type(PORT0),
+	TEST_EQ(mock_prl_get_last_sent_data_msg(PORT0),
 		PD_DATA_SOURCE_CAP, "%d");
 	TEST_EQ(get_state_pe(PORT0), PE_DR_SNK_GIVE_SOURCE_CAP, "%d");
 
@@ -243,12 +244,12 @@ test_static int test_extended_message_not_supported(void)
 	*(uint16_t *)rx_emsg[PORT0].buf =
 		PD_EXT_HEADER(0, 0, ARRAY_SIZE(rx_emsg[PORT0].buf)) & ~BIT(15);
 	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
-	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	mock_prl_clear_last_sent_msg(PORT0);
 	task_wait_event(10 * MSEC);
 
 	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
 	task_wait_event(10 * MSEC);
-	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
+	TEST_EQ(mock_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
 			"%d");
 	/* At this point, the PE should again be running in PE_SRC_Ready. */
 
@@ -262,12 +263,12 @@ test_static int test_extended_message_not_supported(void)
 	*(uint16_t *)rx_emsg[PORT0].buf =
 		PD_EXT_HEADER(0, 0, PD_MAX_EXTENDED_MSG_CHUNK_LEN);
 	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
-	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	mock_prl_clear_last_sent_msg(PORT0);
 	task_wait_event(10 * MSEC);
 
 	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
 	task_wait_event(10 * MSEC);
-	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
+	TEST_EQ(mock_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
 			"%d");
 	/* At this point, the PE should again be running in PE_SRC_Ready. */
 
@@ -281,20 +282,20 @@ test_static int test_extended_message_not_supported(void)
 	*(uint16_t *)rx_emsg[PORT0].buf =
 		PD_EXT_HEADER(0, 0, ARRAY_SIZE(rx_emsg[PORT0].buf));
 	pe_set_flag(PORT0, PE_FLAGS_MSG_RECEIVED);
-	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	mock_prl_clear_last_sent_msg(PORT0);
 	task_wait_event(10 * MSEC);
 	/*
 	 * The PE should stay in PE_SRC_Chunk_Received for
 	 * tChunkingNotSupported.
 	 */
 	task_wait_event(10 * MSEC);
-	TEST_NE(fake_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
+	TEST_NE(mock_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
 			"%d");
 
 	task_wait_event(PD_T_CHUNKING_NOT_SUPPORTED);
 	pe_set_flag(PORT0, PE_FLAGS_TX_COMPLETE);
 	task_wait_event(10 * MSEC);
-	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
+	TEST_EQ(mock_prl_get_last_sent_ctrl_msg(PORT0), PD_CTRL_NOT_SUPPORTED,
 			"%d");
 	/* At this point, the PE should again be running in PE_SRC_Ready. */
 
@@ -378,12 +379,12 @@ static int test_send_caps_error(void)
 	 *  1) The Protocol Layer indicates that the Message has not been sent
 	 *     and we are presently not Connected
 	 */
-	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	mock_prl_clear_last_sent_msg(PORT0);
 	pe_set_flag(PORT0, PE_FLAGS_PROTOCOL_ERROR);
 	pe_clr_flag(PORT0, PE_FLAGS_PD_CONNECTION);
 	set_state_pe(PORT0, PE_SRC_SEND_CAPABILITIES);
 	task_wait_event(10 * MSEC);
-	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0), 0, "%d");
+	TEST_EQ(mock_prl_get_last_sent_ctrl_msg(PORT0), 0, "%d");
 	TEST_EQ(get_state_pe(PORT0), PE_SRC_DISCOVERY, "%d");
 
 	/*
@@ -391,12 +392,12 @@ static int test_send_caps_error(void)
 	 *  1) The Protocol Layer indicates that the Message has not been sent
 	 *     and we are already Connected
 	 */
-	fake_prl_clear_last_sent_ctrl_msg(PORT0);
+	mock_prl_clear_last_sent_msg(PORT0);
 	pe_set_flag(PORT0, PE_FLAGS_PROTOCOL_ERROR);
 	pe_set_flag(PORT0, PE_FLAGS_PD_CONNECTION);
 	set_state_pe(PORT0, PE_SRC_SEND_CAPABILITIES);
 	task_wait_event(10 * MSEC);
-	TEST_EQ(fake_prl_get_last_sent_ctrl_msg(PORT0),
+	TEST_EQ(mock_prl_get_last_sent_ctrl_msg(PORT0),
 		PD_CTRL_SOFT_RESET, "%d");
 	TEST_EQ(get_state_pe(PORT0), PE_SEND_SOFT_RESET, "%d");