diff options
Diffstat (limited to 'zephyr/test/drivers/default/src/integration/usbc')
8 files changed, 79 insertions, 121 deletions
diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb.c b/zephyr/test/drivers/default/src/integration/usbc/usb.c index 31c8887bf1..9fc8f66505 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb.c @@ -3,10 +3,14 @@ * found in the LICENSE file. */ +#include <zephyr/kernel.h> +#include <zephyr/ztest.h> +#include <zephyr/drivers/gpio/gpio_emul.h> + #include "battery_smart.h" -#include "driver/tcpm/ps8xxx_public.h" #include "ec_commands.h" #include "ec_tasks.h" +#include "driver/tcpm/ps8xxx_public.h" #include "emul/emul_isl923x.h" #include "emul/emul_smart_battery.h" #include "emul/tcpc/emul_ps8xxx.h" @@ -23,10 +27,6 @@ #include "test/usb_pe.h" #include "usb_tc_sm.h" -#include <zephyr/drivers/gpio/gpio_emul.h> -#include <zephyr/kernel.h> -#include <zephyr/ztest.h> - #define BATTERY_NODE DT_NODELABEL(battery) #define GPIO_AC_OK_PATH DT_PATH(named_gpios, acok_od) diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c index f2afa5be9a..07b1b5143e 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c @@ -3,6 +3,8 @@ * found in the LICENSE file. */ +#include <zephyr/ztest.h> + #include "battery_smart.h" #include "emul/emul_isl923x.h" #include "emul/emul_smart_battery.h" @@ -11,8 +13,6 @@ #include "test/drivers/utils.h" #include "usb_pd.h" -#include <zephyr/ztest.h> - #define BATTERY_NODE DT_NODELABEL(battery) struct usb_attach_20v_3a_pd_charger_fixture { @@ -26,7 +26,7 @@ static inline void connect_charger_to_port(struct usb_attach_20v_3a_pd_charger_fixture *fixture) { set_ac_enabled(true); - zassert_ok(tcpci_partner_connect_to_tcpci(&fixture->charger_20v, + zassume_ok(tcpci_partner_connect_to_tcpci(&fixture->charger_20v, fixture->tcpci_emul), NULL); @@ -43,7 +43,7 @@ static inline void disconnect_charger_from_port( struct usb_attach_20v_3a_pd_charger_fixture *fixture) { set_ac_enabled(false); - zassert_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul)); + zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul)); isl923x_emul_set_adc_vbus(fixture->charger_emul, 0); k_sleep(K_SECONDS(1)); } @@ -88,7 +88,7 @@ ZTEST(usb_attach_20v_3a_pd_charger, test_battery_is_charging) const struct emul *emul = EMUL_DT_GET(BATTERY_NODE); uint16_t battery_status; - zassert_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, + zassume_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, &battery_status), NULL); zassert_equal(battery_status & STATUS_DISCHARGING, 0, @@ -176,9 +176,9 @@ ZTEST_F(usb_attach_20v_3a_pd_charger, test_disconnect_charge_state) "Max charge current expected 0mA, but was %dmA", charge_state.get_state.chg_current); zassert_equal(charge_state.get_state.chg_input_current, - CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, + CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, "Charge input current limit expected %dmA, but was %dmA", - CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, + CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, charge_state.get_state.chg_input_current); } diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c index 6795e72c11..e3584470a0 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c @@ -3,6 +3,9 @@ * found in the LICENSE file. */ +#include <stdint.h> +#include <zephyr/ztest.h> + #include "battery_smart.h" #include "emul/emul_isl923x.h" #include "emul/emul_smart_battery.h" @@ -13,10 +16,6 @@ #include "timer.h" #include "usb_pd.h" -#include <stdint.h> - -#include <zephyr/ztest.h> - struct usb_attach_5v_3a_pd_sink_fixture { struct tcpci_partner_data sink_5v_3a; struct tcpci_snk_emul_data snk_ext; @@ -86,7 +85,7 @@ ZTEST(usb_attach_5v_3a_pd_sink, test_battery_is_discharging) const struct emul *emul = EMUL_DT_GET(DT_NODELABEL(battery)); uint16_t battery_status; - zassert_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, + zassume_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, &battery_status)); zassert_equal(battery_status & STATUS_DISCHARGING, STATUS_DISCHARGING, "Battery is not discharging: %d", battery_status); @@ -159,9 +158,9 @@ ZTEST_F(usb_attach_5v_3a_pd_sink, test_disconnect_charge_state) "Max charge current expected 0mA, but was %dmA", charge_state.get_state.chg_current); zassert_equal(charge_state.get_state.chg_input_current, - CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, + CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, "Charge input current limit expected %dmA, but was %dmA", - CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, + CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, charge_state.get_state.chg_input_current); } diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c index c57054881d..c73cf26f37 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c @@ -3,6 +3,10 @@ * found in the LICENSE file. */ +#include <zephyr/sys/byteorder.h> +#include <zephyr/sys/slist.h> +#include <zephyr/ztest.h> + #include "battery.h" #include "battery_smart.h" #include "dps.h" @@ -15,18 +19,11 @@ #include "test/drivers/utils.h" #include "usb_pd.h" -#include <zephyr/shell/shell_dummy.h> -#include <zephyr/sys/byteorder.h> -#include <zephyr/sys/slist.h> -#include <zephyr/ztest.h> - #define BATTERY_NODE DT_NODELABEL(battery) #define GPIO_BATT_PRES_ODL_PATH DT_PATH(named_gpios, ec_batt_pres_odl) #define GPIO_BATT_PRES_ODL_PORT DT_GPIO_PIN(GPIO_BATT_PRES_ODL_PATH, gpios) -#define TEST_PORT 0 - struct usb_attach_5v_3a_pd_source_fixture { struct tcpci_partner_data source_5v_3a; struct tcpci_src_emul_data src_ext; @@ -39,8 +36,8 @@ static void *usb_attach_5v_3a_pd_source_setup(void) static struct usb_attach_5v_3a_pd_source_fixture test_fixture; /* Get references for the emulators */ - test_fixture.tcpci_emul = EMUL_GET_USBC_BINDING(TEST_PORT, tcpc); - test_fixture.charger_emul = EMUL_GET_USBC_BINDING(TEST_PORT, chg); + test_fixture.tcpci_emul = EMUL_GET_USBC_BINDING(0, tcpc); + test_fixture.charger_emul = EMUL_GET_USBC_BINDING(0, chg); /* Initialized the charger to supply 5V and 3A */ tcpci_partner_init(&test_fixture.source_5v_3a, PD_REV20); @@ -73,7 +70,7 @@ static void control_battery_present(bool present) DEVICE_DT_GET(DT_GPIO_CTLR(GPIO_BATT_PRES_ODL_PATH, gpios)); /* 0 means battery present */ - zassert_ok(gpio_emul_input_set(dev, GPIO_BATT_PRES_ODL_PORT, !present)); + zassume_ok(gpio_emul_input_set(dev, GPIO_BATT_PRES_ODL_PORT, !present)); } ZTEST_SUITE(usb_attach_5v_3a_pd_source, drivers_predicate_post_main, @@ -85,7 +82,7 @@ ZTEST(usb_attach_5v_3a_pd_source, test_battery_is_charging) const struct emul *emul = EMUL_DT_GET(BATTERY_NODE); uint16_t battery_status; - zassert_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, + zassume_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, &battery_status)); zassert_equal(battery_status & STATUS_DISCHARGING, 0, "Battery is discharging: %d", battery_status); @@ -93,8 +90,7 @@ ZTEST(usb_attach_5v_3a_pd_source, test_battery_is_charging) ZTEST(usb_attach_5v_3a_pd_source, test_charge_state) { - struct ec_response_charge_state state = - host_cmd_charge_state(TEST_PORT); + struct ec_response_charge_state state = host_cmd_charge_state(0); zassert_true(state.get_state.ac, "AC_OK not triggered"); zassert_true(state.get_state.chg_voltage > 0, @@ -165,16 +161,16 @@ ZTEST_F(usb_attach_5v_3a_pd_source, test_disconnect_charge_state) struct ec_response_charge_state charge_state; disconnect_source_from_port(fixture->tcpci_emul, fixture->charger_emul); - charge_state = host_cmd_charge_state(TEST_PORT); + charge_state = host_cmd_charge_state(0); zassert_false(charge_state.get_state.ac, "AC_OK not triggered"); zassert_equal(charge_state.get_state.chg_current, 0, "Max charge current expected 0mA, but was %dmA", charge_state.get_state.chg_current); zassert_equal(charge_state.get_state.chg_input_current, - CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, + CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, "Charge input current limit expected %dmA, but was %dmA", - CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, + CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, charge_state.get_state.chg_input_current); } @@ -325,39 +321,3 @@ ZTEST_F(usb_attach_5v_3a_pd_source, test_dps_enable) dps_enable(true); zassert_true(dps_is_enabled()); } - -ZTEST_F(usb_attach_5v_3a_pd_source, test_dps_info) -{ - const struct shell *shell_zephyr = get_ec_shell(); - - const char *outbuffer; - uint32_t buffer_size; - /* Arbitrary array size for sprintf should not need this amount */ - char format_buffer[100]; - - shell_backend_dummy_clear_output(shell_zephyr); - - /* Print current status to console */ - zassert_ok(shell_execute_cmd(shell_zephyr, "dps"), NULL); - outbuffer = shell_backend_dummy_get_output(shell_zephyr, &buffer_size); - - /* Should include extra information about the charging port */ - /* Charging Port */ - sprintf(format_buffer, "C%d", TEST_PORT); - zassert_not_null(strstr(outbuffer, format_buffer)); - /* We are a sink to a 5v3a source, so check requested mv/ma */ - sprintf(format_buffer, "Requested: %dmV/%dmA", 5000, 3000); - zassert_not_null(strstr(outbuffer, format_buffer)); - /* - * Measured input power is shown (values vary so not asserting on - * numbers) - */ - zassert_not_null(strstr(outbuffer, "Measured:")); - /* Efficient Voltage - Value varies based on battery*/ - zassert_not_null(strstr(outbuffer, "Efficient:")); - /* Battery Design Voltage (varies based on battery) */ - zassert_not_null(strstr(outbuffer, "Batt:")); - /* PDMaxMV */ - sprintf(format_buffer, "PDMaxMV: %dmV", pd_get_max_voltage()); - zassert_not_null(strstr(outbuffer, format_buffer)); -} diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c index 401a89cb11..0b65f9b135 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_attach_src_snk.c @@ -3,24 +3,24 @@ * found in the LICENSE file. */ -#include "driver/tcpm/ps8xxx_public.h" +#include <zephyr/kernel.h> +#include <zephyr/ztest.h> +#include <zephyr/drivers/gpio/gpio_emul.h> + #include "ec_commands.h" #include "ec_tasks.h" +#include "driver/tcpm/ps8xxx_public.h" #include "emul/emul_isl923x.h" #include "emul/tcpc/emul_ps8xxx.h" #include "emul/tcpc/emul_tcpci.h" #include "emul/tcpc/emul_tcpci_partner_snk.h" #include "emul/tcpc/emul_tcpci_partner_src.h" #include "host_command.h" -#include "tcpm/tcpci.h" #include "test/drivers/stubs.h" -#include "test/drivers/test_state.h" -#include "test/drivers/utils.h" +#include "tcpm/tcpci.h" #include "test/usb_pe.h" - -#include <zephyr/drivers/gpio/gpio_emul.h> -#include <zephyr/kernel.h> -#include <zephyr/ztest.h> +#include "test/drivers/utils.h" +#include "test/drivers/test_state.h" #define SNK_PORT USBC_PORT_C0 #define SRC_PORT USBC_PORT_C1 @@ -117,21 +117,21 @@ static void attach_src_snk_common_before(struct emul_state *my_emul_state) /* TODO(b/217737667): Remove driver specific code. */ isl923x_emul_set_adc_vbus(charger_emul, 0); - zassert_ok(tcpc_config[SNK_PORT].drv->init(SNK_PORT)); + zassume_ok(tcpc_config[SNK_PORT].drv->init(SNK_PORT)); /* * Arbitrary FW ver. The emulator should really be setting this * during its init. */ tcpci_emul_set_reg(tcpci_emul_snk, PS8XXX_REG_FW_REV, 0x31); - zassert_ok(tcpc_config[SRC_PORT].drv->init(SRC_PORT)); + zassume_ok(tcpc_config[SRC_PORT].drv->init(SRC_PORT)); pd_set_suspend(SNK_PORT, false); pd_set_suspend(SRC_PORT, false); /* Reset to disconnected state. */ - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul_src)); - zassert_ok(tcpci_emul_disconnect_partner(tcpci_emul_snk)); + zassume_ok(tcpci_emul_disconnect_partner(tcpci_emul_src)); + zassume_ok(tcpci_emul_disconnect_partner(tcpci_emul_snk)); /* Set chipset to ON, this will set TCPM to DRP */ test_set_chipset_to_s0(); @@ -177,7 +177,7 @@ static void attach_emulated_snk(struct emul_state *my_emul_state) tcpci_emul_set_reg(tcpci_emul_snk, TCPC_REG_EXT_STATUS, TCPC_REG_EXT_STATUS_SAFE0V); - zassert_ok(tcpci_partner_connect_to_tcpci(my_snk, tcpci_emul_snk), + zassume_ok(tcpci_partner_connect_to_tcpci(my_snk, tcpci_emul_snk), NULL); /* TODO(b/214401892): Check why need to give time TCPM to spin */ @@ -207,7 +207,7 @@ static void attach_emulated_src(struct emul_state *my_emul_state) tcpci_emul_set_reg(tcpci_emul_src, TCPC_REG_EXT_STATUS, TCPC_REG_EXT_STATUS_SAFE0V); - zassert_ok(tcpci_partner_connect_to_tcpci(my_src, tcpci_emul_src), + zassume_ok(tcpci_partner_connect_to_tcpci(my_src, tcpci_emul_src), NULL); isl923x_emul_set_adc_vbus(charger_emul, DEFAULT_VBUS_MV); } @@ -542,7 +542,7 @@ struct usb_detach_test_fixture { static void integration_usb_test_detach(const struct emul *e) { - zassert_ok(tcpci_emul_disconnect_partner(e)); + zassume_ok(tcpci_emul_disconnect_partner(e)); } static void integration_usb_test_sink_detach(struct emul_state *fixture) diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c index 36a417d22c..47e26f97d6 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c @@ -3,6 +3,8 @@ * found in the LICENSE file. */ +#include <zephyr/ztest.h> + #include "emul/emul_isl923x.h" #include "emul/emul_smart_battery.h" #include "emul/tcpc/emul_tcpci_partner_snk.h" @@ -13,8 +15,6 @@ #include "usb_pd.h" #include "util.h" -#include <zephyr/ztest.h> - struct usb_pd_bist_shared_fixture { struct tcpci_partner_data sink_5v_500ma; struct tcpci_snk_emul_data snk_ext_500ma; @@ -99,7 +99,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_mode) /* Start up BIST shared test mode */ bist_data = BDO(BDO_MODE_SHARED_ENTER, 0); - zassert_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma, + zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma, PD_DATA_BIST, &bist_data, 1, 0), "Failed to send BIST enter message"); @@ -116,7 +116,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_mode) /* Leave BIST shared test mode */ bist_data = BDO(BDO_MODE_SHARED_EXIT, 0); - zassert_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma, + zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma, PD_DATA_BIST, &bist_data, 1, 0), "Failed to send BIST exit message"); @@ -152,7 +152,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_no_snk_entry) /* Have the source send the BIST Enter Mode */ bist_data = BDO(BDO_MODE_SHARED_ENTER, 0); - zassert_ok(tcpci_partner_send_data_msg(&fixture->src, PD_DATA_BIST, + zassume_ok(tcpci_partner_send_data_msg(&fixture->src, PD_DATA_BIST, &bist_data, 1, 0), "Failed to send BIST enter message"); @@ -181,7 +181,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_exit_no_action) tcpci_snk_emul_clear_last_5v_cap(&fixture->snk_ext_500ma); bist_data = BDO(BDO_MODE_SHARED_EXIT, 0); - zassert_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma, + zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma, PD_DATA_BIST, &bist_data, 1, 0), "Failed to send BIST exit message"); @@ -198,7 +198,7 @@ ZTEST_F(usb_pd_bist_shared, verify_control_bist_shared_mode) uint32_t f5v_cap; host_cmd_typec_control_bist_share_mode(USBC_PORT_C0, 1); - zassert_ok(tcpci_partner_send_control_msg(&fixture->sink_5v_500ma, + zassume_ok(tcpci_partner_send_control_msg(&fixture->sink_5v_500ma, PD_CTRL_GET_SOURCE_CAP, 0), "Failed to send get src cap"); /* wait tSenderResponse (26 ms) */ diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c index 1d3da4921f..e35e2a7ec1 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_ctrl_msg.c @@ -3,6 +3,9 @@ * found in the LICENSE file. */ +#include <stdint.h> +#include <zephyr/ztest.h> + #include "common.h" #include "ec_tasks.h" #include "emul/emul_isl923x.h" @@ -14,10 +17,6 @@ #include "test/usb_pe.h" #include "usb_pd.h" -#include <stdint.h> - -#include <zephyr/ztest.h> - #define TEST_USB_PORT 0 BUILD_ASSERT(TEST_USB_PORT == USBC_PORT_C0); @@ -60,13 +59,13 @@ tcpci_drp_emul_connect_partner(struct tcpci_partner_data *partner_emul, tcpci_tcpc_alert(TEST_USB_PORT); - zassert_ok(tcpci_partner_connect_to_tcpci(partner_emul, tcpci_emul), + zassume_ok(tcpci_partner_connect_to_tcpci(partner_emul, tcpci_emul), NULL); } static void disconnect_partner(struct usb_pd_ctrl_msg_test_fixture *fixture) { - zassert_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul)); + zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul)); k_sleep(K_SECONDS(1)); } diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c index 781a0cc06a..fdea74a691 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_rev3.c @@ -3,6 +3,10 @@ * found in the LICENSE file. */ +#include <zephyr/sys/byteorder.h> +#include <zephyr/sys/slist.h> +#include <zephyr/ztest.h> + #include "battery.h" #include "battery_smart.h" #include "chipset.h" @@ -17,10 +21,6 @@ #include "usb_pd.h" #include "util.h" -#include <zephyr/sys/byteorder.h> -#include <zephyr/sys/slist.h> -#include <zephyr/ztest.h> - struct usb_attach_5v_3a_pd_source_rev3_fixture { struct tcpci_partner_data source_5v_3a; struct tcpci_src_emul_data src_ext; @@ -62,11 +62,11 @@ static void usb_attach_5v_3a_pd_source_before(void *data) /* Clear Alert and Status receive checks */ tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassert_false(fixture->src_ext.alert_received); - zassert_false(fixture->src_ext.status_received); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); /* Initial check on power state */ - zassert_true(chipset_in_state(CHIPSET_STATE_ON)); + zassume_true(chipset_in_state(CHIPSET_STATE_ON)); } static void usb_attach_5v_3a_pd_source_after(void *data) @@ -112,8 +112,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_batt_cap) /* See pe_give_battery_cap_entry() in common/usbc/usb_pe_drp_sm.c */ - zassert_true(battery_is_present(), "Battery must be present"); - zassert_true(IS_ENABLED(HAS_TASK_HOSTCMD) && + zassume_true(battery_is_present(), "Battery must be present"); + zassume_true(IS_ENABLED(HAS_TASK_HOSTCMD) && *host_get_memmap(EC_MEMMAP_BATTERY_VERSION) != 0, "Cannot access battery data"); @@ -171,7 +171,7 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, test_batt_cap_invalid) ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_msg) { - zassert_equal(pd_broadcast_alert_msg(ADO_OTP_EVENT), EC_SUCCESS); + zassume_equal(pd_broadcast_alert_msg(ADO_OTP_EVENT), EC_SUCCESS); k_sleep(K_SECONDS(2)); zassert_true(fixture->src_ext.alert_received); @@ -186,8 +186,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change) zassert_true(fixture->src_ext.status_received); tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassert_false(fixture->src_ext.alert_received); - zassert_false(fixture->src_ext.status_received); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); /* Shutdown and check partner received Alert and Status messages */ hook_notify(HOOK_CHIPSET_SHUTDOWN); @@ -196,8 +196,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change) zassert_true(fixture->src_ext.status_received); tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassert_false(fixture->src_ext.alert_received); - zassert_false(fixture->src_ext.status_received); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); /* Startup and check partner received Alert and Status messages */ hook_notify(HOOK_CHIPSET_STARTUP); @@ -206,8 +206,8 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_alert_on_power_state_change) zassert_true(fixture->src_ext.status_received); tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassert_false(fixture->src_ext.alert_received); - zassert_false(fixture->src_ext.status_received); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); /* Resume and check partner received Alert and Status messages */ hook_notify(HOOK_CHIPSET_RESUME); @@ -247,9 +247,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, /* Clear alert and status flags set during shutdown */ tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassert_false(fixture->src_ext.alert_received); - zassert_false(fixture->src_ext.status_received); - zassert_true(chipset_in_state(CHIPSET_STATE_ANY_OFF)); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); + zassume_true(chipset_in_state(CHIPSET_STATE_ANY_OFF)); /* While in S5/G3 expect nothing on invalid (too long) press */ ado = ADO_EXTENDED_ALERT_EVENT | ADO_POWER_BUTTON_PRESS; @@ -283,9 +283,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source_rev3, verify_startup_on_pd_button_press) /* Clear alert and status flags set during shutdown */ tcpci_src_emul_clear_alert_received(&fixture->src_ext); tcpci_src_emul_clear_status_received(&fixture->src_ext); - zassert_false(fixture->src_ext.alert_received); - zassert_false(fixture->src_ext.status_received); - zassert_true(chipset_in_state(CHIPSET_STATE_ANY_OFF)); + zassume_false(fixture->src_ext.alert_received); + zassume_false(fixture->src_ext.status_received); + zassume_true(chipset_in_state(CHIPSET_STATE_ANY_OFF)); /* While in S5/G3 expect Alert->Get_Status->Status on valid press */ ado = ADO_EXTENDED_ALERT_EVENT | ADO_POWER_BUTTON_PRESS; |