Updated unit tests to remove "reportAll" tests

This commit is contained in:
Angel Cascarino
2022-01-11 16:27:28 +00:00
parent 9863b37ead
commit 5fa86dabbb
2 changed files with 2 additions and 31 deletions

View File

@@ -59,7 +59,7 @@ void test_validate_report( void ) {
} }
void test_reportid_in_use( void ) { void test_reportid_in_use( void ) {
unsigned reportIdInUse = hidIsReportIdInUse(); unsigned reportIdInUse = hidAreReportIdsInUse();
TEST_ASSERT_EQUAL_UINT( 1, reportIdInUse ); TEST_ASSERT_EQUAL_UINT( 1, reportIdInUse );
} }
@@ -775,7 +775,6 @@ void test_initial_modification_with_subsequent_verification_2( void )
//setIdle and associated timing functionality tests //setIdle and associated timing functionality tests
void test_set_idle( void ) void test_set_idle( void )
{ {
unsigned reportIdAll = 0;
unsigned reportId = 1; unsigned reportId = 1;
unsigned reportId2 = 2; unsigned reportId2 = 2;
@@ -785,23 +784,16 @@ void test_set_idle( void )
setIdle = hidIsIdleActive( reportId2 ); setIdle = hidIsIdleActive( reportId2 );
TEST_ASSERT_EQUAL_UINT( 0, setIdle ); TEST_ASSERT_EQUAL_UINT( 0, setIdle );
setIdle = hidIsIdleActive( reportIdAll );
TEST_ASSERT_EQUAL_UINT( 0, setIdle );
hidSetIdle( reportId, 1 ); hidSetIdle( reportId, 1 );
setIdle = hidIsIdleActive( reportId ); setIdle = hidIsIdleActive( reportId );
TEST_ASSERT_EQUAL_UINT( 1, setIdle ); TEST_ASSERT_EQUAL_UINT( 1, setIdle );
setIdle = hidIsIdleActive( reportIdAll );
TEST_ASSERT_EQUAL_UINT( 0, setIdle );
setIdle = hidIsIdleActive( reportId2 ); setIdle = hidIsIdleActive( reportId2 );
TEST_ASSERT_EQUAL_UINT( 0, setIdle ); TEST_ASSERT_EQUAL_UINT( 0, setIdle );
} }
void test_set_all_idle( void ) void test_set_all_idle( void )
{ {
unsigned reportIdAll = 0;
unsigned reportId = 1; unsigned reportId = 1;
unsigned reportId2 = 2; unsigned reportId2 = 2;
@@ -811,22 +803,14 @@ void test_set_all_idle( void )
setIdle = hidIsIdleActive( reportId2 ); setIdle = hidIsIdleActive( reportId2 );
TEST_ASSERT_EQUAL_UINT( 0, setIdle ); TEST_ASSERT_EQUAL_UINT( 0, setIdle );
setIdle = hidIsIdleActive( reportIdAll );
TEST_ASSERT_EQUAL_UINT( 0, setIdle );
for ( reportId = 1; reportId <= HID_REPORT_COUNT; ++reportId ) { for ( reportId = 1; reportId <= HID_REPORT_COUNT; ++reportId ) {
hidSetIdle( reportId, 1 ); hidSetIdle( reportId, 1 );
setIdle = hidIsIdleActive( reportId ); setIdle = hidIsIdleActive( reportId );
TEST_ASSERT_EQUAL_UINT( 1, setIdle ); TEST_ASSERT_EQUAL_UINT( 1, setIdle );
}
setIdle = hidIsIdleActive( reportIdAll );
TEST_ASSERT_EQUAL_UINT( 1, setIdle );
} }
void test_change_pending( void ) void test_change_pending( void )
{ {
unsigned reportIdAll = 0;
unsigned reportId = 1; unsigned reportId = 1;
unsigned reportId2 = 2; unsigned reportId2 = 2;
@@ -836,39 +820,26 @@ void test_change_pending( void )
changePending = hidIsChangePending( reportId2 ); changePending = hidIsChangePending( reportId2 );
TEST_ASSERT_EQUAL_UINT( 0, changePending ); TEST_ASSERT_EQUAL_UINT( 0, changePending );
changePending = hidIsChangePending( reportIdAll );
TEST_ASSERT_EQUAL_UINT( 0, changePending );
hidSetChangePending( reportId ); hidSetChangePending( reportId );
changePending = hidIsChangePending( reportId ); changePending = hidIsChangePending( reportId );
TEST_ASSERT_EQUAL_UINT( 1, changePending ); TEST_ASSERT_EQUAL_UINT( 1, changePending );
changePending = hidIsChangePending( reportIdAll );
TEST_ASSERT_EQUAL_UINT( 1, changePending );
changePending = hidIsChangePending( reportId2 ); changePending = hidIsChangePending( reportId2 );
TEST_ASSERT_EQUAL_UINT( 0, changePending ); TEST_ASSERT_EQUAL_UINT( 0, changePending );
} }
void test_change_pending_all( void ) void test_change_pending_all( void )
{ {
unsigned reportIdAll = 0;
unsigned reportId = 1; unsigned reportId = 1;
unsigned changePending = hidIsChangePending( reportId ); unsigned changePending = hidIsChangePending( reportId );
TEST_ASSERT_EQUAL_UINT( 0, changePending ); TEST_ASSERT_EQUAL_UINT( 0, changePending );
changePending = hidIsChangePending( reportIdAll );
TEST_ASSERT_EQUAL_UINT( 0, changePending );
for ( reportId = 1; reportId <= HID_REPORT_COUNT; ++reportId ) { for ( reportId = 1; reportId <= HID_REPORT_COUNT; ++reportId ) {
hidSetChangePending( reportId ); hidSetChangePending( reportId );
changePending = hidIsChangePending( reportId ); changePending = hidIsChangePending( reportId );
TEST_ASSERT_EQUAL_UINT( 1, changePending ); TEST_ASSERT_EQUAL_UINT( 1, changePending );
} }
changePending = hidIsChangePending( reportIdAll );
TEST_ASSERT_EQUAL_UINT( 1, changePending );
} }
void test_report_time( void ) void test_report_time( void )

View File

@@ -46,7 +46,7 @@ void test_validate_report( void ) {
} }
void test_reportid_in_use( void ) { void test_reportid_in_use( void ) {
unsigned reportIdInUse = hidIsReportIdInUse(); unsigned reportIdInUse = hidAreReportIdsInUse();
TEST_ASSERT_EQUAL_UINT( 0, reportIdInUse ); TEST_ASSERT_EQUAL_UINT( 0, reportIdInUse );
} }