perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unit tests update

This commit is contained in:
Markus Gans 2018-03-30 00:12:20 +02:00
parent b2ef430954
commit dff46376bf
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -76,7 +76,7 @@ matrix:
script: script:
- ./build.sh coverage - ./build.sh coverage
after_success: after_success:
- coveralls --gcov-options '\-lp' -e debian -e doc -e icon -e logo -e m4 -e scripts - coveralls --gcov-options '\-lp' -e debian -e doc -e icon -e logo -e m4 -e scripts -e examples
# #
# macOS # macOS

8
src/fwidget.cpp
View File

@ -1766,7 +1766,9 @@ bool FWidget::focusNextChild()
FWidget* parent = getParentWidget(); FWidget* parent = getParentWidget();
if ( ! parent->hasChildren() || parent->numOfFocusableChildren() <= 1 ) if ( ! parent
|| ! parent->hasChildren()
|| parent->numOfFocusableChildren() <= 1 )
return false; return false;
FObjectIterator iter, last; FObjectIterator iter, last;
@ -1829,7 +1831,9 @@ bool FWidget::focusPrevChild()
FWidget* parent = getParentWidget(); FWidget* parent = getParentWidget();
if ( ! parent->hasChildren() || parent->numOfFocusableChildren() <= 1 ) if ( ! parent
|| ! parent->hasChildren()
|| parent->numOfFocusableChildren() <= 1 )
return false; return false;
FObjectIterator iter, first; FObjectIterator iter, first;

30
src/test/foptimove-test.cpp
View File

@ -66,6 +66,7 @@ class FOptiMoveTest : public CPPUNIT_NS::TestFixture
protected: protected:
void classNameTest(); void classNameTest();
void noArgumentTest(); void noArgumentTest();
void homeTest();
void ansiTest(); void ansiTest();
void vt100Test(); void vt100Test();
@ -78,6 +79,7 @@ class FOptiMoveTest : public CPPUNIT_NS::TestFixture
// Add a methods to the test suite // Add a methods to the test suite
CPPUNIT_TEST (classNameTest); CPPUNIT_TEST (classNameTest);
CPPUNIT_TEST (noArgumentTest); CPPUNIT_TEST (noArgumentTest);
CPPUNIT_TEST (homeTest);
CPPUNIT_TEST (ansiTest); CPPUNIT_TEST (ansiTest);
CPPUNIT_TEST (vt100Test); CPPUNIT_TEST (vt100Test);
@ -122,6 +124,30 @@ void FOptiMoveTest::noArgumentTest()
CPPUNIT_ASSERT (om.moveCursor (1, 1, 5, 5) == 0); CPPUNIT_ASSERT (om.moveCursor (1, 1, 5, 5) == 0);
} }
//----------------------------------------------------------------------
void FOptiMoveTest::homeTest()
{
int baud = 4800;
FOptiMove om(baud);
om.setTermSize (80, 24);
om.set_cursor_home (C_STR(CSI "H"));
om.set_cursor_to_ll (C_STR(CSI "X"));
om.set_carriage_return (C_STR("\r"));
om.set_cursor_up (C_STR(CSI "A"));
om.set_cursor_down (C_STR(CSI "B"));
om.set_cursor_left (C_STR(CSI "D"));
om.set_cursor_right (C_STR(CSI "C"));
om.set_parm_up_cursor (C_STR(CSI "%p1%dA"));
om.set_parm_down_cursor (C_STR(CSI "%p1%dB"));
om.set_parm_left_cursor (C_STR(CSI "%p1%dD"));
om.set_parm_right_cursor (C_STR(CSI "%p1%dC"));
// Upper home (first line, first column)
CPPUNIT_ASSERT_CSTRING (om.moveCursor (10, 10, 0, 0), C_STR(CSI "H"));
// Lower home (last line, first column)
CPPUNIT_ASSERT_CSTRING (om.moveCursor (10, 10, 0, 23), C_STR(CSI "X"));
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FOptiMoveTest::ansiTest() void FOptiMoveTest::ansiTest()
{ {
@ -201,7 +227,9 @@ void FOptiMoveTest::vt100Test()
om.set_parm_left_cursor (C_STR(CSI "%p1%dD")); om.set_parm_left_cursor (C_STR(CSI "%p1%dD"));
om.set_parm_right_cursor (C_STR(CSI "%p1%dC")); om.set_parm_right_cursor (C_STR(CSI "%p1%dC"));
//std::cout << "\nSequence: " << printSequence(om.moveCursor (53, 2, 53, -3)) << "\n"; //std::cout << "\nSequence: "
// << printSequence(om.moveCursor (53, 2, 53, -3))
// << "\n";
CPPUNIT_ASSERT_CSTRING (om.moveCursor (0, 0, 5, 5), C_STR(CSI "6;6H$<5>")); CPPUNIT_ASSERT_CSTRING (om.moveCursor (0, 0, 5, 5), C_STR(CSI "6;6H$<5>"));
CPPUNIT_ASSERT_CSTRING (om.moveCursor (5, 5, 0, 0), C_STR(CSI "H")); CPPUNIT_ASSERT_CSTRING (om.moveCursor (5, 5, 0, 0), C_STR(CSI "H"));