diff options
author | Abe Levkoy <alevkoy@chromium.org> | 2020-12-07 17:39:09 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-12-15 15:39:18 +0000 |
commit | 0a561def48d4e673c834f4d01506ba8b9886cdd4 (patch) | |
tree | cbca0104ac3fe7058c0d58d14abd95decb39da6e /test/usb_pe_drp.c | |
parent | 160208413d16840428e42ecae18457e862e6ed49 (diff) | |
download | chrome-ec-0a561def48d4e673c834f4d01506ba8b9886cdd4.tar.gz |
mock: Clean up TCPMv2 mocks
Place mock functions in the mock libraries corresponding to the layers
of the real implementations. Broadly, move towards one layer of the TCPM
stack as a UUT, with mocks for the other layers as needed. There should
be a one-to-one correspondence between real modules and mock modules.
usb_pd_mock.c does not correspond to any real implementation module or
TCPM stack layer, so remove it and move its contents to the layers
corresponding to their real implementations.
Also clean up some redundant or misplaced mocks inside tests.
BUG=b:153071799,b:173791979
TEST=make buildall
BRANCH=none
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: Ic44df8675de2b9f1f8c7669cd97dcdc296bf107f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2578200
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
Diffstat (limited to 'test/usb_pe_drp.c')
-rw-r--r-- | test/usb_pe_drp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/usb_pe_drp.c b/test/usb_pe_drp.c index be040dff0c..10269db779 100644 --- a/test/usb_pe_drp.c +++ b/test/usb_pe_drp.c @@ -16,7 +16,6 @@ #include "mock/usb_tc_sm_mock.h" #include "mock/tcpc_mock.h" #include "mock/usb_mux_mock.h" -#include "mock/usb_pd_mock.h" #include "mock/usb_pd_dpm_mock.h" #include "mock/dp_alt_mode_mock.h" #include "mock/usb_prl_mock.h" @@ -39,7 +38,6 @@ void before_test(void) mock_tc_port_reset(); mock_tcpc_reset(); mock_usb_mux_reset(); - mock_pd_reset(); mock_dpm_reset(); mock_dp_alt_mode_reset(); mock_prl_reset(); @@ -138,7 +136,7 @@ test_static int finish_src_discovery(void) test_static int test_send_caps_error_before_connected(void) { /* Enable PE as source, expect SOURCE_CAP. */ - mock_pd_port[PORT0].power_role = PD_ROLE_SOURCE; + mock_tc_port[PORT0].power_role = PD_ROLE_SOURCE; mock_tc_port[PORT0].pd_enable = 1; mock_tc_port[PORT0].vconn_src = true; TEST_EQ(mock_prl_wait_for_tx_msg(PORT0, TCPC_TX_SOP, @@ -205,7 +203,7 @@ test_static int test_send_caps_error_before_connected(void) test_static int test_send_caps_error_when_connected(void) { /* Enable PE as source, expect SOURCE_CAP. */ - mock_pd_port[PORT0].power_role = PD_ROLE_SOURCE; + mock_tc_port[PORT0].power_role = PD_ROLE_SOURCE; mock_tc_port[PORT0].pd_enable = 1; mock_tc_port[PORT0].vconn_src = true; TEST_EQ(mock_prl_wait_for_tx_msg(PORT0, TCPC_TX_SOP, |