diff options
| author | hathach <[email protected]> | 2013-05-14 03:03:54 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-05-14 03:03:54 +0700 |
| commit | f8d1c3da3ea65853bed37a22d438407df95c75f8 (patch) | |
| tree | 98e72c37a8e4fdf73c356ccc0c801e9cc8b1f97d /tests/test | |
| parent | 5cd8f3ad004758af07d7495668643bd2726a1f83 (diff) | |
rename tusbh_hid_keyboard/mouse_is_supported to tusbh_hid_keyboard/mouse_is_mounted
Diffstat (limited to 'tests/test')
| -rw-r--r-- | tests/test/host/hid/test_hidh_keyboard.c | 8 | ||||
| -rw-r--r-- | tests/test/host/hid/test_hidh_mouse.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/test/host/hid/test_hidh_keyboard.c b/tests/test/host/hid/test_hidh_keyboard.c index da00e9266..a92040639 100644 --- a/tests/test/host/hid/test_hidh_keyboard.c +++ b/tests/test/host/hid/test_hidh_keyboard.c @@ -102,20 +102,20 @@ void test_keyboard_init(void) void test_keyboard_is_supported_fail_unplug(void) { tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_UNPLUG); - TEST_ASSERT_FALSE( tusbh_hid_keyboard_is_supported(dev_addr) ); + TEST_ASSERT_FALSE( tusbh_hid_keyboard_is_mounted(dev_addr) ); } void test_keyboard_is_supported_fail_not_opened(void) { hidh_init(); tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED); - TEST_ASSERT_FALSE( tusbh_hid_keyboard_is_supported(dev_addr) ); + TEST_ASSERT_FALSE( tusbh_hid_keyboard_is_mounted(dev_addr) ); } void test_keyboard_is_supported_ok(void) { tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED); - TEST_ASSERT_TRUE( tusbh_hid_keyboard_is_supported(dev_addr) ); + TEST_ASSERT_TRUE( tusbh_hid_keyboard_is_mounted(dev_addr) ); } void test_keyboard_open_ok(void) @@ -137,7 +137,7 @@ void test_keyboard_open_ok(void) length); tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED); - TEST_ASSERT_TRUE( tusbh_hid_keyboard_is_supported(dev_addr) ); + TEST_ASSERT_TRUE( tusbh_hid_keyboard_is_mounted(dev_addr) ); TEST_ASSERT_EQUAL(TUSB_INTERFACE_STATUS_READY, p_hidh_kbd->status); } diff --git a/tests/test/host/hid/test_hidh_mouse.c b/tests/test/host/hid/test_hidh_mouse.c index c169a6099..27d32212c 100644 --- a/tests/test/host/hid/test_hidh_mouse.c +++ b/tests/test/host/hid/test_hidh_mouse.c @@ -91,20 +91,20 @@ void test_mouse_init(void) void test_mouse_is_supported_fail_unplug(void) { tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_UNPLUG); - TEST_ASSERT_FALSE( tusbh_hid_mouse_is_supported(dev_addr) ); + TEST_ASSERT_FALSE( tusbh_hid_mouse_is_mounted(dev_addr) ); } void test_mouse_is_supported_fail_not_opened(void) { hidh_init(); tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED); - TEST_ASSERT_FALSE( tusbh_hid_mouse_is_supported(dev_addr) ); + TEST_ASSERT_FALSE( tusbh_hid_mouse_is_mounted(dev_addr) ); } void test_mouse_is_supported_ok(void) { tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED); - TEST_ASSERT_TRUE( tusbh_hid_mouse_is_supported(dev_addr) ); + TEST_ASSERT_TRUE( tusbh_hid_mouse_is_mounted(dev_addr) ); } void test_mouse_open_ok(void) @@ -118,7 +118,7 @@ void test_mouse_open_ok(void) tusbh_hid_mouse_isr_Expect(dev_addr, 0, TUSB_EVENT_INTERFACE_OPEN); //------------- Code Under TEST -------------// - TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, hidh_open_subtask(dev_addr, p_mouse_interface_desc, &length)); + TEST_ASSERT_STATUS( hidh_open_subtask(dev_addr, p_mouse_interface_desc, &length)); TEST_ASSERT_PIPE_HANDLE(pipe_hdl, p_hidh_mouse->pipe_hdl); TEST_ASSERT_EQUAL(8, p_hidh_mouse->report_size); @@ -126,7 +126,7 @@ void test_mouse_open_ok(void) length); tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED); - TEST_ASSERT_TRUE( tusbh_hid_mouse_is_supported(dev_addr) ); + TEST_ASSERT_TRUE( tusbh_hid_mouse_is_mounted(dev_addr) ); TEST_ASSERT_EQUAL(TUSB_INTERFACE_STATUS_READY, p_hidh_mouse->status); } @@ -175,7 +175,7 @@ void test_mouse_get_ok() hcd_pipe_xfer_ExpectAndReturn(p_hidh_mouse->pipe_hdl, (uint8_t*) &report, p_hidh_mouse->report_size, true, TUSB_ERROR_NONE); //------------- Code Under TEST -------------// - TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_hid_mouse_get_report(dev_addr, 0, &report)); + TEST_ASSERT_STATUS( tusbh_hid_mouse_get_report(dev_addr, 0, &report)); TEST_ASSERT_EQUAL(TUSB_INTERFACE_STATUS_BUSY, tusbh_hid_mouse_status(dev_addr, 0)); } |
