andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename tusbh_hid_keyboard/mouse_is_supported to tusbh_hid_keyboard/mouse_is_mounted

Browse Source
This commit is contained in:
hathach
2013-05-14 03:03:54 +07:00
parent 5cd8f3ad00
commit f8d1c3da3e
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test/host/hid/test_hidh_keyboard.c
View File

@@ -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);
}

12
tests/test/host/hid/test_hidh_mouse.c
View File

@@ -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));
}