Skip to content

Commit

Permalink
replace char* by std::vector<char> in Checker unit tests
Browse files Browse the repository at this point in the history 
issue #33
  • Loading branch information
Valentin Noel committed Dec 10, 2013
1 parent b5e7dd0 commit eb57237
Show file tree
Hide file tree
Showing 11 changed files with 335 additions and 335 deletions.
32 changes: 16 additions & 16 deletions libraries/ElementChecker/test/checkerTest.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_data )

std::shared_ptr< basic_element::Element > elem( new basic_element::Element( node ) );

const char buff[4] { 'W', 'A', 'V', 'E' };
elem->set( (const char*)&buff, 4 );
std::vector< char > buff { 'W', 'A', 'V', 'E' };
elem->set( buff, 4 );

checker.check( elem );
BOOST_CHECK_EQUAL( elem->_status, eStatusPassOver );
Expand All @@ -43,8 +43,8 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_data )

std::shared_ptr< basic_element::Element > elem( new basic_element::Element( node ) );

const char buff[4] { 'W', 'A', 'V', 'E' };
elem->set( (const char*)&buff, 4 );
std::vector< char > buff { 'W', 'A', 'V', 'E' };
elem->set( buff, 4 );

checker.check( elem );
BOOST_CHECK_EQUAL( elem->_status, eStatusValid );
Expand All @@ -58,8 +58,8 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_data )

std::shared_ptr< basic_element::Element > elem( new basic_element::Element( node ) );

const char buff[4] { 'W', 'A', 'V', 'E' };
elem->set( (const char*)&buff, 4 );
std::vector< char > buff { 'W', 'A', 'V', 'E' };
elem->set( buff, 4 );

checker.check( elem );
BOOST_CHECK_EQUAL( elem->_status, eStatusValid );
Expand All @@ -73,8 +73,8 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_data )

std::shared_ptr< basic_element::Element > elem( new basic_element::Element( node ) );

const char buff[4] { 'W', 'A', 'V', 'E' };
elem->set( (const char*)&buff, 4 );
std::vector< char > buff { 'W', 'A', 'V', 'E' };
elem->set( buff, 4 );

checker.check( elem );
BOOST_CHECK_EQUAL( elem->_status, eStatusInvalid );
Expand Down Expand Up @@ -111,8 +111,8 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_number )

std::shared_ptr< basic_element::Element > elem( new basic_element::Element( node ) );

const char buff[4] { 0x00, 0x00, 0x00, 0x01 };
elem->set( (const char*)&buff, 4 );
std::vector< char > buff { 0x00, 0x00, 0x00, 0x01 };
elem->set( buff, 4 );

checker.check( elem );
BOOST_CHECK_EQUAL( elem->_type, eTypeUInt32 );
Expand All @@ -126,8 +126,8 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_number )

std::shared_ptr< basic_element::Element > elem( new basic_element::Element( node ) );

const char buff[4] { 0x00, 0x00, 0x00, 0x05 };
elem->set( (const char*)&buff, 4 );
std::vector< char > buff { 0x00, 0x00, 0x00, 0x05 };
elem->set( buff, 4 );

checker.check( elem );
BOOST_CHECK_EQUAL( elem->_type, eTypeUInt32 );
Expand All @@ -141,8 +141,8 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_number )

std::shared_ptr< basic_element::Element > elem( new basic_element::Element( node ) );

const char buff[4] { 0x05, 0x00, 0x00, 0x00 };
elem->set( (const char*)&buff, 4 );
std::vector< char > buff { 0x05, 0x00, 0x00, 0x00 };
elem->set( buff, 4 );

checker.check( elem );
BOOST_CHECK_EQUAL( elem->_type, eTypeUInt32 );
Expand All @@ -156,8 +156,8 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_number )

std::shared_ptr< basic_element::Element > elem( new basic_element::Element( node ) );

const char buff[4] { 0x00, 0x00, 0x00, 0x08 };
elem->set( (const char*)&buff, 4 );
std::vector< char > buff { 0x00, 0x00, 0x00, 0x08 };
elem->set( buff, 4 );

checker.check( elem );
BOOST_CHECK_EQUAL( elem->_type, eTypeUInt32 );
Expand Down
18 changes: 9 additions & 9 deletions libraries/ElementChecker/test/checkerTestCount.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_count )
}
)*";

const char buff1[4] { 0x00, 0x00, 0x00, 0x05 };
const char buff2[5] { 'W', 'A', 'V', 'E', '2' };
const char buff3[5] { 'W', 'A', 'V', 'E', '3' };
std::vector< char > buff1 { 0x00, 0x00, 0x00, 0x05 };
std::vector< char > buff2 { 'W', 'A', 'V', 'E', '2' };
std::vector< char > buff3 { 'W', 'A', 'V', 'E', '3' };

LOG_INFO( "\n>>> element_checker_checker_count <<<" );
{
Expand All @@ -50,22 +50,22 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_count )
std::shared_ptr< basic_element::Element > elem1( new basic_element::Element( node ) );
BOOST_CHECK_EQUAL( elem1->_status, eStatusNotChecked );
BOOST_CHECK_EQUAL( checker.getSize( elem1 ), 4 );
elem1->set( (const char*)&buff1, checker.getSize( elem1 ) );
elem1->set( buff1, checker.getSize( elem1 ) );
BOOST_CHECK_EQUAL( elem1->_data.size(), 4 );
checker.check( elem1 );
BOOST_CHECK_EQUAL( elem1->_status, eStatusPassOver );

std::shared_ptr< basic_element::Element > elem2( new basic_element::Element( elem1->next(), elem1 ) );
BOOST_CHECK_EQUAL( elem2->_data.size(), 0 );
BOOST_CHECK_EQUAL( checker.getSize( elem2 ), 5 );
elem2->set( (const char*)&buff2, checker.getSize( elem2 ) );
elem2->set( buff2, checker.getSize( elem2 ) );
checker.check( elem2 );
BOOST_CHECK_EQUAL( elem2->_data.size(), 5 );
BOOST_CHECK_EQUAL( elem2->_status, eStatusPassOver );

std::shared_ptr< basic_element::Element > elem3( new basic_element::Element( elem2->next(), elem2 ) );
BOOST_CHECK_EQUAL( checker.getSize( elem3 ), 5 );
elem3->set( (const char*)&buff3, checker.getSize( elem3 ) );
elem3->set( buff3, checker.getSize( elem3 ) );
BOOST_CHECK_EQUAL( elem3->_data.size(), 5 );
checker.check( elem3 );
BOOST_CHECK_EQUAL( elem3->_status, eStatusValid );
Expand All @@ -89,22 +89,22 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_count )
std::shared_ptr< basic_element::Element > elem1( new basic_element::Element( node ) );
BOOST_CHECK_EQUAL( elem1->_status, eStatusNotChecked );
BOOST_CHECK_EQUAL( checker.getSize( elem1 ), 4 );
elem1->set( (const char*)&buff1, checker.getSize( elem1 ) );
elem1->set( buff1, checker.getSize( elem1 ) );
BOOST_CHECK_EQUAL( elem1->_data.size(), 4 );
checker.check( elem1 );
BOOST_CHECK_EQUAL( elem1->_status, eStatusPassOver );

std::shared_ptr< basic_element::Element > elem2( new basic_element::Element( elem1->next(), elem1 ) );
BOOST_CHECK_EQUAL( elem2->_data.size(), 0 );
BOOST_CHECK_EQUAL( checker.getSize( elem2 ), 3 );
elem2->set( (const char*)&buff2, checker.getSize( elem2 ) );
elem2->set( buff2, checker.getSize( elem2 ) );
checker.check( elem2 );
BOOST_CHECK_EQUAL( elem2->_data.size(), 3 );
BOOST_CHECK_EQUAL( elem2->_status, eStatusPassOver );

std::shared_ptr< basic_element::Element > elem3( new basic_element::Element( elem2->next(), elem2 ) );
BOOST_CHECK_EQUAL( checker.getSize( elem3 ), 5 );
elem3->set( (const char*)&buff3, checker.getSize( elem3 ) );
elem3->set( buff3, checker.getSize( elem3 ) );
BOOST_CHECK_EQUAL( elem3->_data.size(), 5 );
checker.check( elem3 );
BOOST_CHECK_EQUAL( elem3->_status, eStatusValid );
Expand Down
16 changes: 8 additions & 8 deletions libraries/ElementChecker/test/checkerTestDisplayType.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ BOOST_AUTO_TEST_CASE( element_checker_test_checker_display_type )
}
)*";

const char buff1[5] { 'W', 'A', 'V', 'E', '1' };
const char buff2[5] { 'W', 'A', 'V', 'E', '2' };
const char buff3[5] { 'W', 'A', 'V', 'E', '3' };
const char buff4[5] { 'W', 'A', 'V', 'E', '4' };
std::vector< char > buff1 { 'W', 'A', 'V', 'E', '1' };
std::vector< char > buff2 { 'W', 'A', 'V', 'E', '2' };
std::vector< char > buff3 { 'W', 'A', 'V', 'E', '3' };
std::vector< char > buff4 { 'W', 'A', 'V', 'E', '4' };

LOG_INFO( "\n>>> element_checker_test_checker_display_type <<<" );
{
Expand All @@ -35,31 +35,31 @@ BOOST_AUTO_TEST_CASE( element_checker_test_checker_display_type )
std::shared_ptr< basic_element::Element > elem1( new basic_element::Element( node ) );
BOOST_CHECK_EQUAL( elem1->_id, node->getId() );
BOOST_CHECK_EQUAL( elem1->_displayType, eDisplayTypeAscii );
elem1->set( (const char*)&buff1, checker.getSize( elem1 ) );
elem1->set( buff1, checker.getSize( elem1 ) );
checker.check( elem1 );
BOOST_CHECK_EQUAL( elem1->_status, eStatusPassOver );
BOOST_CHECK_EQUAL( elem1->_dispValue, "WAVE1" );

std::shared_ptr< basic_element::Element > elem2( new basic_element::Element( elem1->next(), elem1 ) );
BOOST_CHECK_EQUAL( elem2->_id, node->next()->getId() );
BOOST_CHECK_EQUAL( elem2->_displayType, eDisplayTypeNumbers );
elem2->set( (const char*)&buff2, checker.getSize( elem2 ) );
elem2->set( buff2, checker.getSize( elem2 ) );
checker.check( elem2 );
BOOST_CHECK_EQUAL( elem2->_status, eStatusPassOver );
BOOST_CHECK_EQUAL( elem2->_dispValue, "8765866950" );

std::shared_ptr< basic_element::Element > elem3( new basic_element::Element( elem2->next(), elem2 ) );
BOOST_CHECK_EQUAL( elem3->_id, node->next()->next()->getId() );
BOOST_CHECK_EQUAL( elem3->_displayType, eDisplayTypeDefault );
elem3->set( (const char*)&buff3, checker.getSize( elem3 ) );
elem3->set( buff3, checker.getSize( elem3 ) );
checker.check( elem3 );
BOOST_CHECK_EQUAL( elem3->_status, eStatusPassOver );
BOOST_CHECK_EQUAL( elem3->_dispValue, "WAV" );

std::shared_ptr< basic_element::Element > elem4( new basic_element::Element( elem3->next(), elem3 ) );
BOOST_CHECK_EQUAL( elem4->_id, node->next()->next()->next()->getId() );
BOOST_CHECK_EQUAL( elem4->_displayType, eDisplayTypeDefault );
elem4->set( (const char*)&buff4, checker.getSize( elem4 ) );
elem4->set( buff4, checker.getSize( elem4 ) );
checker.check( elem4 );
BOOST_CHECK_EQUAL( elem4->_status, eStatusValid );
BOOST_CHECK_EQUAL( elem4->_dispValue, "WAVE4" );
Expand Down
68 changes: 34 additions & 34 deletions libraries/ElementChecker/test/checkerTestGroupSize.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_groupSize )
}
)*";

const char buff1[4] { 0x00, 0x00, 0x00, 0x14 };
const char buff2[5] { 'W', 'A', 'V', 'E', '2' };
const char buff3[5] { 'W', 'A', 'V', 'E', '3' };
const char buff4[5] { 'W', 'A', 'V', 'E', '4' };
const char buff5[5] { 'W', 'A', 'V', 'E', '5' };
const char buff6[5] { 'W', 'A', 'V', 'E', '6' };
const char buff7[5] { 'W', 'A', 'V', 'E', '7' };
std::vector< char > buff1 { 0x00, 0x00, 0x00, 0x14 };
std::vector< char > buff2 { 'W', 'A', 'V', 'E', '2' };
std::vector< char > buff3 { 'W', 'A', 'V', 'E', '3' };
std::vector< char > buff4 { 'W', 'A', 'V', 'E', '4' };
std::vector< char > buff5 { 'W', 'A', 'V', 'E', '5' };
std::vector< char > buff6 { 'W', 'A', 'V', 'E', '6' };
std::vector< char > buff7 { 'W', 'A', 'V', 'E', '7' };

spec_reader::Specification spec;
spec.setFromString( jsonString );
Expand All @@ -42,44 +42,44 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_groupSize )

std::shared_ptr< basic_element::Element > elem1( new basic_element::Element( node ) );
BOOST_CHECK_EQUAL( elem1->_id, node->getId() );
elem1->set( (const char*)&buff1, checker.getSize( elem1 ) );
elem1->set( buff1, checker.getSize( elem1 ) );
checker.check( elem1 );
BOOST_CHECK_EQUAL( elem1->_status, eStatusPassOver );

std::shared_ptr< basic_element::Element > elem2( new basic_element::Element( elem1->next(), elem1 ) );
BOOST_CHECK_EQUAL( elem2->_id, node->next()->getId() );
BOOST_CHECK_EQUAL( elem2->_groupSizeExpr, node->getId() );
elem2->set( (const char*)&buff2, checker.getSize( elem2 ) );
elem2->set( buff2, checker.getSize( elem2 ) );
checker.check( elem2 );
BOOST_CHECK_EQUAL( elem2->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem3( new basic_element::Element( elem2->next(), elem2, elem2 ) );
BOOST_CHECK_EQUAL( elem3->_id, node->next()->firstChild()->getId() );
elem3->set( (const char*)&buff4, checker.getSize( elem3 ) );
elem3->set( buff4, checker.getSize( elem3 ) );
checker.check( elem3 );
BOOST_CHECK_EQUAL( elem3->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem4( new basic_element::Element( elem3->next(), elem3, elem2 ) );
BOOST_CHECK_EQUAL( elem4->_id, node->next()->firstChild()->next()->getId() );
elem4->set( (const char*)&buff5, checker.getSize( elem4 ) );
elem4->set( buff5, checker.getSize( elem4 ) );
checker.check( elem4 );
BOOST_CHECK_EQUAL( elem4->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem5( new basic_element::Element( elem4->next(), elem4, elem2 ) );
BOOST_CHECK_EQUAL( elem5->_id, node->next()->firstChild()->next()->next()->getId() );
elem5->set( (const char*)&buff6, checker.getSize( elem5 ) );
elem5->set( buff6, checker.getSize( elem5 ) );
checker.check( elem5 );
BOOST_CHECK_EQUAL( elem5->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem6( new basic_element::Element( elem5->next(), elem5, elem2 ) );
BOOST_CHECK_EQUAL( elem6->_id, node->next()->firstChild()->next()->next()->next()->getId() );
elem6->set( (const char*)&buff7, checker.getSize( elem6 ) );
elem6->set( buff7, checker.getSize( elem6 ) );
checker.check( elem6 );
BOOST_CHECK_EQUAL( elem6->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem7( new basic_element::Element( elem6->next(), elem6 ) );
BOOST_CHECK_EQUAL( elem7->_id, node->next()->next()->getId() );
elem7->set( (const char*)&buff3, checker.getSize( elem7 ) );
elem7->set( buff3, checker.getSize( elem7 ) );
checker.check( elem7 );
BOOST_CHECK_EQUAL( elem7->_status, eStatusValid );

Expand Down Expand Up @@ -108,12 +108,12 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_groupSize_2 )
}
)*";

const char buff1[5] { 'W', 'A', 'V', 'E', '1' };
const char buff2[5] { 'W', 'A', 'V', 'E', '2' };
const char buff3[5] { 'W', 'A', 'V', 'E', '3' };
const char buff4[4] { 0x00, 0x00, 0x00, 0x0e };
const char buff5[5] { 'W', 'A', 'V', 'E', '5' };
const char buff6[5] { 'W', 'A', 'V', 'E', '6' };
std::vector< char > buff1 { 'W', 'A', 'V', 'E', '1' };
std::vector< char > buff2 { 'W', 'A', 'V', 'E', '2' };
std::vector< char > buff3 { 'W', 'A', 'V', 'E', '3' };
std::vector< char > buff4 { 0x00, 0x00, 0x00, 0x0e };
std::vector< char > buff5 { 'W', 'A', 'V', 'E', '5' };
std::vector< char > buff6 { 'W', 'A', 'V', 'E', '6' };
spec_reader::Specification spec;
spec.setFromString( jsonString );
std::shared_ptr< spec_reader::SpecNode > node = spec.getFirstNode();
Expand All @@ -126,39 +126,39 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_groupSize_2 )

std::shared_ptr< basic_element::Element > elem1( new basic_element::Element( node ) );
BOOST_CHECK_EQUAL( elem1->_id, node->getId() );
elem1->set( (const char*)&buff1, checker.getSize( elem1 ) );
elem1->set( buff1, checker.getSize( elem1 ) );
checker.check( elem1 );
BOOST_CHECK_EQUAL( elem1->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem2( new basic_element::Element( elem1->next(), elem1 ) );
BOOST_CHECK_EQUAL( elem2->_id, node->next()->getId() );
BOOST_CHECK_EQUAL( elem2->_groupSizeExpr, node->next()->firstChild()->getId() );
elem2->set( (const char*)&buff2, checker.getSize( elem2 ) );
elem2->set( buff2, checker.getSize( elem2 ) );
checker.check( elem2 );
BOOST_CHECK_EQUAL( elem2->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem3( new basic_element::Element( elem2->next(), elem2, elem2 ) );
BOOST_CHECK_EQUAL( elem3->_id, node->next()->firstChild()->getId() );
elem3->set( (const char*)&buff4, checker.getSize( elem3 ) );
elem3->set( buff4, checker.getSize( elem3 ) );
checker.check( elem3 );
BOOST_CHECK_EQUAL( elem3->_status, eStatusPassOver );
BOOST_CHECK_EQUAL( elem3->_dispValue, "14" );

std::shared_ptr< basic_element::Element > elem4( new basic_element::Element( elem3->next(), elem3, elem2 ) );
BOOST_CHECK_EQUAL( elem4->_id, node->next()->firstChild()->next()->getId() );
elem4->set( (const char*)&buff5, checker.getSize( elem4 ) );
elem4->set( buff5, checker.getSize( elem4 ) );
checker.check( elem4 );
BOOST_CHECK_EQUAL( elem4->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem5( new basic_element::Element( elem4->next(), elem4, elem2 ) );
BOOST_CHECK_EQUAL( elem5->_id, node->next()->firstChild()->next()->next()->getId() );
elem5->set( (const char*)&buff6, checker.getSize( elem5 ) );
elem5->set( buff6, checker.getSize( elem5 ) );
checker.check( elem5 );
BOOST_CHECK_EQUAL( elem5->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem6( new basic_element::Element( elem5->next(), elem5 ) );
BOOST_CHECK_EQUAL( elem6->_id, node->next()->next()->getId() );
elem6->set( (const char*)&buff3, checker.getSize( elem6 ) );
elem6->set( buff3, checker.getSize( elem6 ) );
checker.check( elem6 );
BOOST_CHECK_EQUAL( elem6->_status, eStatusValid );

Expand All @@ -185,10 +185,10 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_groupSize_3 )
}
)*";

const char buff1[5] { 'W', 'A', 'V', 'E', '1' };
const char buff2[5] { 'W', 'A', 'V', 'E', '2' };
const char buff3[5] { 'W', 'A', 'V', 'E', '3' };
const char buff4[4] { 0x00, 0x00, 0x00, 0x04 };
std::vector< char > buff1 { 'W', 'A', 'V', 'E', '1' };
std::vector< char > buff2 { 'W', 'A', 'V', 'E', '2' };
std::vector< char > buff3 { 'W', 'A', 'V', 'E', '3' };
std::vector< char > buff4 { 0x00, 0x00, 0x00, 0x04 };

spec_reader::Specification spec;
spec.setFromString( jsonString );
Expand All @@ -202,27 +202,27 @@ BOOST_AUTO_TEST_CASE( element_checker_checker_groupSize_3 )

std::shared_ptr< basic_element::Element > elem1( new basic_element::Element( node ) );
BOOST_CHECK_EQUAL( elem1->_id, node->getId() );
elem1->set( (const char*)&buff1, checker.getSize( elem1 ) );
elem1->set( buff1, checker.getSize( elem1 ) );
checker.check( elem1 );
BOOST_CHECK_EQUAL( elem1->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem2( new basic_element::Element( elem1->next(), elem1 ) );
BOOST_CHECK_EQUAL( elem2->_id, node->next()->getId() );
BOOST_CHECK_EQUAL( elem2->_groupSizeExpr, node->next()->firstChild()->getId() );
elem2->set( (const char*)&buff2, checker.getSize( elem2 ) );
elem2->set( buff2, checker.getSize( elem2 ) );
checker.check( elem2 );
BOOST_CHECK_EQUAL( elem2->_status, eStatusValid );

std::shared_ptr< basic_element::Element > elem3( new basic_element::Element( elem2->next(), elem2, elem2 ) );
BOOST_CHECK_EQUAL( elem3->_id, node->next()->firstChild()->getId() );
elem3->set( (const char*)&buff4, checker.getSize( elem3 ) );
elem3->set( buff4, checker.getSize( elem3 ) );
checker.check( elem3 );
BOOST_CHECK_EQUAL( elem3->_status, eStatusPassOver );
BOOST_CHECK_EQUAL( elem3->_dispValue, "4" );

std::shared_ptr< basic_element::Element > elem4( new basic_element::Element( elem3->next(), elem3 ) );
BOOST_CHECK_EQUAL( elem4->_id, node->next()->next()->getId() );
elem4->set( (const char*)&buff3, checker.getSize( elem4 ) );
elem4->set( buff3, checker.getSize( elem4 ) );
checker.check( elem4 );
BOOST_CHECK_EQUAL( elem4->_status, eStatusValid );

Expand Down
Loading

0 comments on commit eb57237

Please sign in to comment.