refractor test

This commit is contained in:
hathach
2013-05-13 23:18:56 +07:00
parent 706523ebff
commit 409ff2eaa3
12 changed files with 57 additions and 86 deletions

View File

@@ -41,6 +41,7 @@
#include "tusb_option.h"
#include "errors.h"
#include "binary.h"
#include "type_helper.h"
#include "hal.h"
#include "mock_osal.h"
@@ -73,7 +74,8 @@ void setUp(void)
ehci_controller_init();
helper_usbh_init();
helper_usbh_init_expect();
usbh_init();
helper_usbh_device_emulate(dev_addr, hub_addr, hub_port, hostid, TUSB_SPEED_HIGH);
regs = get_operational_register(hostid);
@@ -91,11 +93,9 @@ void test_addr0_control_close(void)
dev_addr = 0;
helper_usbh_device_emulate(0, hub_addr, hub_port, hostid, TUSB_SPEED_HIGH);
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE,
hcd_pipe_control_open(dev_addr, control_max_packet_size) );
TEST_ASSERT_STATUS( hcd_pipe_control_open(dev_addr, control_max_packet_size) );
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE,
hcd_pipe_control_xfer(dev_addr,
TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr,
&(tusb_std_request_t) {
.bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bRequest = TUSB_REQUEST_SET_ADDRESS,
@@ -103,8 +103,7 @@ void test_addr0_control_close(void)
NULL) ) ;
ehci_qhd_t *p_qhd = async_head;
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE,
hcd_pipe_control_close(dev_addr) );
TEST_ASSERT_STATUS( hcd_pipe_control_close(dev_addr) );
//------------- Code Under Test -------------//
regs->usb_sts_bit.port_change_detect = 0; // clear port change detect
@@ -119,11 +118,9 @@ void test_addr0_control_close(void)
void test_isr_disconnect_then_async_advance_control_pipe(void)
{
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE,
hcd_pipe_control_open(dev_addr, control_max_packet_size) );
TEST_ASSERT_STATUS( hcd_pipe_control_open(dev_addr, control_max_packet_size) );
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE,
hcd_pipe_control_xfer(dev_addr,
TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr,
&(tusb_std_request_t) {
.bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bRequest = TUSB_REQUEST_SET_ADDRESS,
@@ -163,17 +160,14 @@ void test_bulk_pipe_close(void)
uint8_t xfer_data[100];
pipe_handle_t pipe_hdl = hcd_pipe_open(dev_addr, &desc_ept_bulk_in, TUSB_CLASS_MSC);
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE,
hcd_pipe_xfer(pipe_hdl, xfer_data, sizeof(xfer_data), 100) );
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE,
hcd_pipe_xfer(pipe_hdl, xfer_data, sizeof(xfer_data), 50) );
TEST_ASSERT_STATUS( hcd_pipe_xfer(pipe_hdl, xfer_data, sizeof(xfer_data), 100) );
TEST_ASSERT_STATUS( hcd_pipe_xfer(pipe_hdl, xfer_data, sizeof(xfer_data), 50) );
ehci_qhd_t *p_qhd = &ehci_data.device[dev_addr-1].qhd[pipe_hdl.index];
ehci_qtd_t *p_qtd_head = p_qhd->p_qtd_list_head;
ehci_qtd_t *p_qtd_tail = p_qhd->p_qtd_list_tail;
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE,
hcd_pipe_close(pipe_hdl) );
TEST_ASSERT_STATUS( hcd_pipe_close(pipe_hdl) );
//------------- Code Under Test -------------//
regs->usb_sts_bit.async_advance = 1;