Unit tests update

2018-03-29 01:27:57 +02:00 · 2018-03-29 01:27:57 +02:00 · b2ef430954
parent 75e7fb05c2
commit b2ef430954
5 changed files with 180 additions and 65 deletions
--- a/3
+++ b/3
@ -1,3 +1,6 @@
+2017-03-28  Markus Gans  <guru.mail@muenster.de>
+	* Add boundary check to FOptiMove
+
 2017-03-25  Markus Gans  <guru.mail@muenster.de>
 	* Added unit test for the mouse classes
 	* Fixed small parsing errors with mouse events
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@ -2,6 +2,8 @@
 # Makefile.am  -  The Final Cut example programs
 #----------------------------------------------------------------------

+if ! CPPUNIT_TEST
+
 AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal
 AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror

@ -52,5 +54,7 @@ windows_SOURCES = windows.cpp
 menu_SOURCES = menu.cpp
 ui_SOURCES = ui.cpp

+endif
+
 clean-local:
 	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@ -82,14 +82,18 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = hello$(EXEEXT) dialog$(EXEEXT) input-dialog$(EXEEXT) \
-	choice$(EXEEXT) listbox$(EXEEXT) listview$(EXEEXT) \
-	treeview$(EXEEXT) opti-move$(EXEEXT) termcap$(EXEEXT) \
-	string-operations$(EXEEXT) mandelbrot$(EXEEXT) \
-	calculator$(EXEEXT) watch$(EXEEXT) term-attributes$(EXEEXT) \
-	transparent$(EXEEXT) keyboard$(EXEEXT) mouse$(EXEEXT) \
-	timer$(EXEEXT) scrollview$(EXEEXT) windows$(EXEEXT) \
-	menu$(EXEEXT) ui$(EXEEXT)
+@CPPUNIT_TEST_FALSE@noinst_PROGRAMS = hello$(EXEEXT) dialog$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	input-dialog$(EXEEXT) choice$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	listbox$(EXEEXT) listview$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	treeview$(EXEEXT) opti-move$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	termcap$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	string-operations$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	mandelbrot$(EXEEXT) calculator$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	watch$(EXEEXT) term-attributes$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	transparent$(EXEEXT) keyboard$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	mouse$(EXEEXT) timer$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	scrollview$(EXEEXT) windows$(EXEEXT) \
+@CPPUNIT_TEST_FALSE@	menu$(EXEEXT) ui$(EXEEXT)
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp
@ -106,74 +110,98 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_calculator_OBJECTS = calculator.$(OBJEXT)
+am__calculator_SOURCES_DIST = calculator.cpp
+@CPPUNIT_TEST_FALSE@am_calculator_OBJECTS = calculator.$(OBJEXT)
 calculator_OBJECTS = $(am_calculator_OBJECTS)
 calculator_LDADD = $(LDADD)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-am_choice_OBJECTS = choice.$(OBJEXT)
+am__choice_SOURCES_DIST = choice.cpp
+@CPPUNIT_TEST_FALSE@am_choice_OBJECTS = choice.$(OBJEXT)
 choice_OBJECTS = $(am_choice_OBJECTS)
 choice_LDADD = $(LDADD)
-am_dialog_OBJECTS = dialog.$(OBJEXT)
+am__dialog_SOURCES_DIST = dialog.cpp
+@CPPUNIT_TEST_FALSE@am_dialog_OBJECTS = dialog.$(OBJEXT)
 dialog_OBJECTS = $(am_dialog_OBJECTS)
 dialog_LDADD = $(LDADD)
-am_hello_OBJECTS = hello.$(OBJEXT)
+am__hello_SOURCES_DIST = hello.cpp
+@CPPUNIT_TEST_FALSE@am_hello_OBJECTS = hello.$(OBJEXT)
 hello_OBJECTS = $(am_hello_OBJECTS)
 hello_LDADD = $(LDADD)
-am_input_dialog_OBJECTS = input-dialog.$(OBJEXT)
+am__input_dialog_SOURCES_DIST = input-dialog.cpp
+@CPPUNIT_TEST_FALSE@am_input_dialog_OBJECTS = input-dialog.$(OBJEXT)
 input_dialog_OBJECTS = $(am_input_dialog_OBJECTS)
 input_dialog_LDADD = $(LDADD)
-am_keyboard_OBJECTS = keyboard.$(OBJEXT)
+am__keyboard_SOURCES_DIST = keyboard.cpp
+@CPPUNIT_TEST_FALSE@am_keyboard_OBJECTS = keyboard.$(OBJEXT)
 keyboard_OBJECTS = $(am_keyboard_OBJECTS)
 keyboard_LDADD = $(LDADD)
-am_listbox_OBJECTS = listbox.$(OBJEXT)
+am__listbox_SOURCES_DIST = listbox.cpp
+@CPPUNIT_TEST_FALSE@am_listbox_OBJECTS = listbox.$(OBJEXT)
 listbox_OBJECTS = $(am_listbox_OBJECTS)
 listbox_LDADD = $(LDADD)
-am_listview_OBJECTS = listview.$(OBJEXT)
+am__listview_SOURCES_DIST = listview.cpp
+@CPPUNIT_TEST_FALSE@am_listview_OBJECTS = listview.$(OBJEXT)
 listview_OBJECTS = $(am_listview_OBJECTS)
 listview_LDADD = $(LDADD)
-am_mandelbrot_OBJECTS = mandelbrot.$(OBJEXT)
+am__mandelbrot_SOURCES_DIST = mandelbrot.cpp
+@CPPUNIT_TEST_FALSE@am_mandelbrot_OBJECTS = mandelbrot.$(OBJEXT)
 mandelbrot_OBJECTS = $(am_mandelbrot_OBJECTS)
 mandelbrot_LDADD = $(LDADD)
-am_menu_OBJECTS = menu.$(OBJEXT)
+am__menu_SOURCES_DIST = menu.cpp
+@CPPUNIT_TEST_FALSE@am_menu_OBJECTS = menu.$(OBJEXT)
 menu_OBJECTS = $(am_menu_OBJECTS)
 menu_LDADD = $(LDADD)
-am_mouse_OBJECTS = mouse.$(OBJEXT)
+am__mouse_SOURCES_DIST = mouse.cpp
+@CPPUNIT_TEST_FALSE@am_mouse_OBJECTS = mouse.$(OBJEXT)
 mouse_OBJECTS = $(am_mouse_OBJECTS)
 mouse_LDADD = $(LDADD)
-am_opti_move_OBJECTS = opti-move.$(OBJEXT)
+am__opti_move_SOURCES_DIST = opti-move.cpp
+@CPPUNIT_TEST_FALSE@am_opti_move_OBJECTS = opti-move.$(OBJEXT)
 opti_move_OBJECTS = $(am_opti_move_OBJECTS)
 opti_move_LDADD = $(LDADD)
-am_scrollview_OBJECTS = scrollview.$(OBJEXT)
+am__scrollview_SOURCES_DIST = scrollview.cpp
+@CPPUNIT_TEST_FALSE@am_scrollview_OBJECTS = scrollview.$(OBJEXT)
 scrollview_OBJECTS = $(am_scrollview_OBJECTS)
 scrollview_LDADD = $(LDADD)
-am_string_operations_OBJECTS = string-operations.$(OBJEXT)
+am__string_operations_SOURCES_DIST = string-operations.cpp
+@CPPUNIT_TEST_FALSE@am_string_operations_OBJECTS =  \
+@CPPUNIT_TEST_FALSE@	string-operations.$(OBJEXT)
 string_operations_OBJECTS = $(am_string_operations_OBJECTS)
 string_operations_LDADD = $(LDADD)
-am_term_attributes_OBJECTS = term-attributes.$(OBJEXT)
+am__term_attributes_SOURCES_DIST = term-attributes.cpp
+@CPPUNIT_TEST_FALSE@am_term_attributes_OBJECTS =  \
+@CPPUNIT_TEST_FALSE@	term-attributes.$(OBJEXT)
 term_attributes_OBJECTS = $(am_term_attributes_OBJECTS)
 term_attributes_LDADD = $(LDADD)
-am_termcap_OBJECTS = termcap.$(OBJEXT)
+am__termcap_SOURCES_DIST = termcap.cpp
+@CPPUNIT_TEST_FALSE@am_termcap_OBJECTS = termcap.$(OBJEXT)
 termcap_OBJECTS = $(am_termcap_OBJECTS)
 termcap_LDADD = $(LDADD)
-am_timer_OBJECTS = timer.$(OBJEXT)
+am__timer_SOURCES_DIST = timer.cpp
+@CPPUNIT_TEST_FALSE@am_timer_OBJECTS = timer.$(OBJEXT)
 timer_OBJECTS = $(am_timer_OBJECTS)
 timer_LDADD = $(LDADD)
-am_transparent_OBJECTS = transparent.$(OBJEXT)
+am__transparent_SOURCES_DIST = transparent.cpp
+@CPPUNIT_TEST_FALSE@am_transparent_OBJECTS = transparent.$(OBJEXT)
 transparent_OBJECTS = $(am_transparent_OBJECTS)
 transparent_LDADD = $(LDADD)
-am_treeview_OBJECTS = treeview.$(OBJEXT)
+am__treeview_SOURCES_DIST = treeview.cpp
+@CPPUNIT_TEST_FALSE@am_treeview_OBJECTS = treeview.$(OBJEXT)
 treeview_OBJECTS = $(am_treeview_OBJECTS)
 treeview_LDADD = $(LDADD)
-am_ui_OBJECTS = ui.$(OBJEXT)
+am__ui_SOURCES_DIST = ui.cpp
+@CPPUNIT_TEST_FALSE@am_ui_OBJECTS = ui.$(OBJEXT)
 ui_OBJECTS = $(am_ui_OBJECTS)
 ui_LDADD = $(LDADD)
-am_watch_OBJECTS = watch.$(OBJEXT)
+am__watch_SOURCES_DIST = watch.cpp
+@CPPUNIT_TEST_FALSE@am_watch_OBJECTS = watch.$(OBJEXT)
 watch_OBJECTS = $(am_watch_OBJECTS)
 watch_LDADD = $(LDADD)
-am_windows_OBJECTS = windows.$(OBJEXT)
+am__windows_SOURCES_DIST = windows.cpp
+@CPPUNIT_TEST_FALSE@am_windows_OBJECTS = windows.$(OBJEXT)
 windows_OBJECTS = $(am_windows_OBJECTS)
 windows_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
@ -218,15 +246,19 @@ SOURCES = $(calculator_SOURCES) $(choice_SOURCES) $(dialog_SOURCES) \
 	$(term_attributes_SOURCES) $(termcap_SOURCES) $(timer_SOURCES) \
 	$(transparent_SOURCES) $(treeview_SOURCES) $(ui_SOURCES) \
 	$(watch_SOURCES) $(windows_SOURCES)
-DIST_SOURCES = $(calculator_SOURCES) $(choice_SOURCES) \
-	$(dialog_SOURCES) $(hello_SOURCES) $(input_dialog_SOURCES) \
-	$(keyboard_SOURCES) $(listbox_SOURCES) $(listview_SOURCES) \
-	$(mandelbrot_SOURCES) $(menu_SOURCES) $(mouse_SOURCES) \
-	$(opti_move_SOURCES) $(scrollview_SOURCES) \
-	$(string_operations_SOURCES) $(term_attributes_SOURCES) \
-	$(termcap_SOURCES) $(timer_SOURCES) $(transparent_SOURCES) \
-	$(treeview_SOURCES) $(ui_SOURCES) $(watch_SOURCES) \
-	$(windows_SOURCES)
+DIST_SOURCES = $(am__calculator_SOURCES_DIST) \
+	$(am__choice_SOURCES_DIST) $(am__dialog_SOURCES_DIST) \
+	$(am__hello_SOURCES_DIST) $(am__input_dialog_SOURCES_DIST) \
+	$(am__keyboard_SOURCES_DIST) $(am__listbox_SOURCES_DIST) \
+	$(am__listview_SOURCES_DIST) $(am__mandelbrot_SOURCES_DIST) \
+	$(am__menu_SOURCES_DIST) $(am__mouse_SOURCES_DIST) \
+	$(am__opti_move_SOURCES_DIST) $(am__scrollview_SOURCES_DIST) \
+	$(am__string_operations_SOURCES_DIST) \
+	$(am__term_attributes_SOURCES_DIST) \
+	$(am__termcap_SOURCES_DIST) $(am__timer_SOURCES_DIST) \
+	$(am__transparent_SOURCES_DIST) $(am__treeview_SOURCES_DIST) \
+	$(am__ui_SOURCES_DIST) $(am__watch_SOURCES_DIST) \
+	$(am__windows_SOURCES_DIST)
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
@ -378,30 +410,30 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
-hello_SOURCES = hello.cpp
-dialog_SOURCES = dialog.cpp
-input_dialog_SOURCES = input-dialog.cpp
-choice_SOURCES = choice.cpp
-listbox_SOURCES = listbox.cpp
-listview_SOURCES = listview.cpp
-treeview_SOURCES = treeview.cpp
-opti_move_SOURCES = opti-move.cpp
-string_operations_SOURCES = string-operations.cpp
-mandelbrot_SOURCES = mandelbrot.cpp
-calculator_SOURCES = calculator.cpp
-watch_SOURCES = watch.cpp
-term_attributes_SOURCES = term-attributes.cpp
-termcap_SOURCES = termcap.cpp
-transparent_SOURCES = transparent.cpp
-keyboard_SOURCES = keyboard.cpp
-mouse_SOURCES = mouse.cpp
-timer_SOURCES = timer.cpp
-scrollview_SOURCES = scrollview.cpp
-windows_SOURCES = windows.cpp
-menu_SOURCES = menu.cpp
-ui_SOURCES = ui.cpp
+@CPPUNIT_TEST_FALSE@AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal
+@CPPUNIT_TEST_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
+@CPPUNIT_TEST_FALSE@hello_SOURCES = hello.cpp
+@CPPUNIT_TEST_FALSE@dialog_SOURCES = dialog.cpp
+@CPPUNIT_TEST_FALSE@input_dialog_SOURCES = input-dialog.cpp
+@CPPUNIT_TEST_FALSE@choice_SOURCES = choice.cpp
+@CPPUNIT_TEST_FALSE@listbox_SOURCES = listbox.cpp
+@CPPUNIT_TEST_FALSE@listview_SOURCES = listview.cpp
+@CPPUNIT_TEST_FALSE@treeview_SOURCES = treeview.cpp
+@CPPUNIT_TEST_FALSE@opti_move_SOURCES = opti-move.cpp
+@CPPUNIT_TEST_FALSE@string_operations_SOURCES = string-operations.cpp
+@CPPUNIT_TEST_FALSE@mandelbrot_SOURCES = mandelbrot.cpp
+@CPPUNIT_TEST_FALSE@calculator_SOURCES = calculator.cpp
+@CPPUNIT_TEST_FALSE@watch_SOURCES = watch.cpp
+@CPPUNIT_TEST_FALSE@term_attributes_SOURCES = term-attributes.cpp
+@CPPUNIT_TEST_FALSE@termcap_SOURCES = termcap.cpp
+@CPPUNIT_TEST_FALSE@transparent_SOURCES = transparent.cpp
+@CPPUNIT_TEST_FALSE@keyboard_SOURCES = keyboard.cpp
+@CPPUNIT_TEST_FALSE@mouse_SOURCES = mouse.cpp
+@CPPUNIT_TEST_FALSE@timer_SOURCES = timer.cpp
+@CPPUNIT_TEST_FALSE@scrollview_SOURCES = scrollview.cpp
+@CPPUNIT_TEST_FALSE@windows_SOURCES = windows.cpp
+@CPPUNIT_TEST_FALSE@menu_SOURCES = menu.cpp
+@CPPUNIT_TEST_FALSE@ui_SOURCES = ui.cpp
 all: all-am

 .SUFFIXES:
--- a/src/foptimove.cpp
+++ b/src/foptimove.cpp
@ -69,6 +69,8 @@ FOptiMove::FOptiMove (int baud)
  set_cursor_address (C_STR(CSI "%i%p1%d;%p2%dH"));
  // Set carriage return preset
  set_carriage_return (C_STR("\r"));
+  // Set cursor down preset
+  set_cursor_down (C_STR("\n"));
 }

 //----------------------------------------------------------------------
--- a/src/test/foptimove-test.cpp
+++ b/src/test/foptimove-test.cpp
@ -67,6 +67,7 @@ class FOptiMoveTest : public CPPUNIT_NS::TestFixture
    void classNameTest();
    void noArgumentTest();
    void ansiTest();
+    void vt100Test();

  private:
    std::string printSequence (const std::string&);
@ -78,6 +79,7 @@ class FOptiMoveTest : public CPPUNIT_NS::TestFixture
    CPPUNIT_TEST (classNameTest);
    CPPUNIT_TEST (noArgumentTest);
    CPPUNIT_TEST (ansiTest);
+    CPPUNIT_TEST (vt100Test);

    // End of test suite definition
    CPPUNIT_TEST_SUITE_END();
@ -100,8 +102,23 @@ void FOptiMoveTest::noArgumentTest()
  CPPUNIT_ASSERT_CSTRING (om.moveCursor (1, 1, 5, 5), C_STR(CSI "6;6H"));
  CPPUNIT_ASSERT_CSTRING (om.moveCursor (5, 5, 9, 9), C_STR(CSI "10;10H"));

-  // No set cursor address preset
+  // Delete all presets
+  om.set_tabular (0);
+  om.set_back_tab (0);
+  om.set_cursor_home (0);
+  om.set_carriage_return (0);
+  om.set_cursor_up (0);
+  om.set_cursor_down (0);
+  om.set_cursor_left (0);
+  om.set_cursor_right (0);
  om.set_cursor_address (0);
+  om.set_column_address (0);
+  om.set_row_address (0);
+  om.set_parm_up_cursor (0);
+  om.set_parm_down_cursor (0);
+  om.set_parm_left_cursor (0);
+  om.set_parm_right_cursor (0);
+
  CPPUNIT_ASSERT (om.moveCursor (1, 1, 5, 5) == 0);
 }

@ -161,8 +178,65 @@ void FOptiMoveTest::ansiTest()
  // ynew is outside screen
  CPPUNIT_ASSERT_CSTRING (om.moveCursor (53, 22, 53, 40), C_STR(CSI "25d"));
  CPPUNIT_ASSERT_CSTRING (om.moveCursor (53, 2, 53, -3), C_STR(CSI "1d"));
+}
+
+//----------------------------------------------------------------------
+void FOptiMoveTest::vt100Test()
+{
+  FOptiMove om;
+  om.setTermSize (80, 24);
+  om.setBaudRate (1200);
+  om.setTabStop (8);
+  om.set_eat_newline_glitch (true);
+  om.set_tabular (C_STR("\t"));
+  om.set_cursor_home (C_STR(CSI "H"));
+  om.set_carriage_return (C_STR("\r"));
+  om.set_cursor_up (C_STR(CSI "A$<2>"));
+  om.set_cursor_down (C_STR("\n"));
+  om.set_cursor_left (C_STR("\b"));
+  om.set_cursor_right (C_STR(CSI "C$<2>"));
+  om.set_cursor_address (C_STR(CSI "%i%p1%d;%p2%dH$<5>"));
+  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"));
+
+  //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 (5, 5, 0, 0), C_STR(CSI "H"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (79, 1, 0, 1), C_STR("\r"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (79, 1, 0, 2), C_STR("\r\n"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (9, 4, 10, 4), C_STR(CSI "C$<2>"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (10, 4, 9, 4), C_STR("\b"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (9, 4, 11, 4), C_STR(CSI "2C"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (11, 4, 9, 4), C_STR("\b\b"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (1, 0, 8, 0), C_STR("\t"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (16, 0, 16, 1), C_STR("\n"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (16, 1, 16, 0), C_STR(CSI "A$<2>"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (16, 0, 16, 2), C_STR("\n\n"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (16, 2, 16, 0), C_STR(CSI "2A"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (3, 2, 79, 2), C_STR(CSI "76C"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (5, 5, 75, 20), C_STR(CSI "21;76H$<5>"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (39, 0, 32, 0), C_STR(CSI "7D"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (10, 0, 8, 0), C_STR("\b\b"));
+
+  // xold is outside screen
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (99, 10, 79, 10), C_STR(CSI "11;80H$<5>"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (-3, 33, 50, 10), C_STR(CSI "11;51H$<5>"));
+
+  // ynew is outside screen
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (23, 33, 23, 10), C_STR(CSI "11;24H$<5>"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (23, -3, 12, 10), C_STR(CSI "11;13H$<5>"));
+
+  // xnew is outside screen
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (53, 22, 100, 22), C_STR(CSI "26C"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (3, 22, -5, 22), C_STR("\r"));
+
+  // ynew is outside screen
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (53, 22, 53, 40), C_STR("\n"));
+  CPPUNIT_ASSERT_CSTRING (om.moveCursor (53, 2, 53, -3), C_STR(CSI "2A"));

-  //om.printDurations();S
 /*
  om.set_cursor_to_ll (TCAP(fc::t_cursor_to_ll));
  om.set_auto_left_margin (FTermcap::automatic_left_margin);