sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix files under NxWidgets to use the corrected syslog interfaces

Browse Source
This commit is contained in:
Gregory Nutt 2014-10-08 15:50:31 -06:00
parent 38af1a529d
commit b6c84f5b45
42 changed files with 241 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UnitTests/CButtonArray/cbuttonarray_main.cxx
View File

@ -107,7 +107,7 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("%s: Before: %8d After: %8d Change: %8d\n", printf("%s: Before: %8d After: %8d Change: %8d\n",
msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -321,7 +321,7 @@ int cbuttonarray_main(int argc, char *argv[])
delete test; delete test;
updateMemoryUsage(g_mmPrevious, "After deleting the test"); updateMemoryUsage(g_mmPrevious, "After deleting the test");
updateMemoryUsage(g_mmInitial, "Final memory usage"); updateMemoryUsage(g_mmInitial, "Final memory usage");
message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); printf("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial);
return 0; return 0;
} }

8
UnitTests/CButtonArray/cbuttonarraytest.cxx
View File

@ -103,7 +103,7 @@ bool CButtonArrayTest::connect(void)
if (!setBackgroundColor(CONFIG_CBUTTONARRAYTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CBUTTONARRAYTEST_BGCOLOR))
{ {
message("CButtonArrayTest::connect: setBackgroundColor failed\n"); printf("CButtonArrayTest::connect: setBackgroundColor failed\n");
} }
} }
@ -157,7 +157,7 @@ bool CButtonArrayTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CButtonArrayTest::createGraphics: Failed to create CBgWindow instance\n"); printf("CButtonArrayTest::createGraphics: Failed to create CBgWindow instance\n");
delete m_widgetControl; delete m_widgetControl;
return false; return false;
} }
@ -167,7 +167,7 @@ bool CButtonArrayTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CButtonArrayTest::createGraphics: Failed to open background window\n"); printf("CButtonArrayTest::createGraphics: Failed to open background window\n");
delete m_bgWindow; delete m_bgWindow;
m_bgWindow = (CBgWindow*)0; m_bgWindow = (CBgWindow*)0;
return false; return false;
@ -185,7 +185,7 @@ CButtonArray *CButtonArrayTest::createButtonArray(void)
struct nxgl_size_s windowSize; struct nxgl_size_s windowSize;
if (!m_bgWindow->getSize(&windowSize)) if (!m_bgWindow->getSize(&windowSize))
{ {
message("CButtonArrayTest::createGraphics: Failed to get window size\n"); printf("CButtonArrayTest::createGraphics: Failed to get window size\n");
return (CButtonArray *)NULL; return (CButtonArray *)NULL;
} }

9
UnitTests/CButtonArray/cbuttonarraytest.hxx
View File

@ -75,15 +75,6 @@
# define CONFIG_CBUTTONARRAYTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR # define CONFIG_CBUTTONARRAYTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
// The geometry of the button array // The geometry of the button array
#define BUTTONARRAY_NCOLUMNS 4 #define BUTTONARRAY_NCOLUMNS 4

23
UnitTests/CCheckBox/ccheckbox_main.cxx
View File

@ -98,8 +98,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -143,16 +143,16 @@ int ccheckbox_main(int argc, char *argv[])
// Create an instance of the checkbox test // Create an instance of the checkbox test
message("ccheckbox_main: Create CCheckBoxTest instance\n"); printf("ccheckbox_main: Create CCheckBoxTest instance\n");
CCheckBoxTest *test = new CCheckBoxTest(); CCheckBoxTest *test = new CCheckBoxTest();
updateMemoryUsage(g_mmprevious, "After creating CCheckBoxTest"); updateMemoryUsage(g_mmprevious, "After creating CCheckBoxTest");
// Connect the NX server // Connect the NX server
message("ccheckbox_main: Connect the CCheckBoxTest instance to the NX server\n"); printf("ccheckbox_main: Connect the CCheckBoxTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("ccheckbox_main: Failed to connect the CCheckBoxTest instance to the NX server\n"); printf("ccheckbox_main: Failed to connect the CCheckBoxTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -160,10 +160,10 @@ int ccheckbox_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("ccheckbox_main: Create a Window\n"); printf("ccheckbox_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("ccheckbox_main: Failed to create a window\n"); printf("ccheckbox_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -177,21 +177,21 @@ int ccheckbox_main(int argc, char *argv[])
// Now click the checkbox // Now click the checkbox
message("ccheckbox_main: Click 1\n"); printf("ccheckbox_main: Click 1\n");
test->clickCheckBox(); test->clickCheckBox();
usleep(500*1000); usleep(500*1000);
test->showCheckBoxState(); test->showCheckBoxState();
updateMemoryUsage(g_mmprevious, "After click 1"); updateMemoryUsage(g_mmprevious, "After click 1");
usleep(500*1000); usleep(500*1000);
message("ccheckbox_main: Click 2\n"); printf("ccheckbox_main: Click 2\n");
test->clickCheckBox(); test->clickCheckBox();
usleep(500*1000); usleep(500*1000);
test->showCheckBoxState(); test->showCheckBoxState();
updateMemoryUsage(g_mmprevious, "After click 2"); updateMemoryUsage(g_mmprevious, "After click 2");
usleep(500*1000); usleep(500*1000);
message("ccheckbox_main: Click 3\n"); printf("ccheckbox_main: Click 3\n");
test->clickCheckBox(); test->clickCheckBox();
usleep(500*1000); usleep(500*1000);
test->showCheckBoxState(); test->showCheckBoxState();
@ -200,10 +200,9 @@ int ccheckbox_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("ccheckbox_main: Clean-up and exit\n"); printf("ccheckbox_main: Clean-up and exit\n");
delete test; delete test;
updateMemoryUsage(g_mmprevious, "After deleting the test"); updateMemoryUsage(g_mmprevious, "After deleting the test");
updateMemoryUsage(g_mmInitial, "Final memory usage"); updateMemoryUsage(g_mmInitial, "Final memory usage");
return 0; return 0;
} }

12
UnitTests/CCheckBox/ccheckboxtest.cxx
View File

@ -108,7 +108,7 @@ bool CCheckBoxTest::connect(void)
if (!setBackgroundColor(CONFIG_CCHECKBOXTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CCHECKBOXTEST_BGCOLOR))
{ {
message("CCheckBoxTest::connect: setBackgroundColor failed\n"); printf("CCheckBoxTest::connect: setBackgroundColor failed\n");
} }
} }
@ -172,7 +172,7 @@ bool CCheckBoxTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CCheckBoxTest::createWindow: Failed to create CBgWindow instance\n"); printf("CCheckBoxTest::createWindow: Failed to create CBgWindow instance\n");
disconnect(); disconnect();
return false; return false;
} }
@ -182,7 +182,7 @@ bool CCheckBoxTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CCheckBoxTest::createWindow: Failed to open background window\n"); printf("CCheckBoxTest::createWindow: Failed to open background window\n");
disconnect(); disconnect();
return false; return false;
} }
@ -282,16 +282,16 @@ void CCheckBoxTest::showCheckBoxState(void)
switch (state) switch (state)
{ {
case CCheckBox::CHECK_BOX_STATE_OFF: // Checkbox is unticked case CCheckBox::CHECK_BOX_STATE_OFF: // Checkbox is unticked
message("CCheckBoxTest::showCheckBoxState Checkbox is in the unticked state\n"); printf("CCheckBoxTest::showCheckBoxState Checkbox is in the unticked state\n");
break; break;
case CCheckBox::CHECK_BOX_STATE_ON: // Checkbox is ticked case CCheckBox::CHECK_BOX_STATE_ON: // Checkbox is ticked
message("CCheckBoxTest::showCheckBoxState Check is in the ticked state\n"); printf("CCheckBoxTest::showCheckBoxState Check is in the ticked state\n");
break; break;
default: default:
case CCheckBox::CHECK_BOX_STATE_MU: // Checkbox is in the third state case CCheckBox::CHECK_BOX_STATE_MU: // Checkbox is in the third state
message("CCheckBoxTest::showCheckBoxState Checkbox is in the 3rd state\n"); printf("CCheckBoxTest::showCheckBoxState Checkbox is in the 3rd state\n");
break; break;
} }
} }

9
UnitTests/CCheckBox/ccheckboxtest.hxx
View File

@ -69,15 +69,6 @@
# define CONFIG_CCHECKBOXTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CCHECKBOXTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

26
UnitTests/CGlyphButton/cglyphbutton_main.cxx
View File

@ -97,8 +97,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -142,16 +142,16 @@ int cglyphbutton_main(int argc, char *argv[])
// Create an instance of the font test // Create an instance of the font test
message("cglyphbutton_main: Create CGlyphButtonTest instance\n"); printf("cglyphbutton_main: Create CGlyphButtonTest instance\n");
CGlyphButtonTest *test = new CGlyphButtonTest(); CGlyphButtonTest *test = new CGlyphButtonTest();
updateMemoryUsage(g_mmprevious, "After creating CGlyphButtonTest"); updateMemoryUsage(g_mmprevious, "After creating CGlyphButtonTest");
// Connect the NX server // Connect the NX server
message("cglyphbutton_main: Connect the CGlyphButtonTest instance to the NX server\n"); printf("cglyphbutton_main: Connect the CGlyphButtonTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("cglyphbutton_main: Failed to connect the CGlyphButtonTest instance to the NX server\n"); printf("cglyphbutton_main: Failed to connect the CGlyphButtonTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -159,10 +159,10 @@ int cglyphbutton_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("cglyphbutton_main: Create a Window\n"); printf("cglyphbutton_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("cglyphbutton_main: Failed to create a window\n"); printf("cglyphbutton_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -173,7 +173,7 @@ int cglyphbutton_main(int argc, char *argv[])
CGlyphButton *button = test->createButton(&g_arrowDown, &g_arrowUp); CGlyphButton *button = test->createButton(&g_arrowDown, &g_arrowUp);
if (!button) if (!button)
{ {
message("cglyphbutton_main: Failed to create a button\n"); printf("cglyphbutton_main: Failed to create a button\n");
delete test; delete test;
return 1; return 1;
} }
@ -181,21 +181,21 @@ int cglyphbutton_main(int argc, char *argv[])
// Show the button // Show the button
message("cglyphbutton_main: Show the button\n"); printf("cglyphbutton_main: Show the button\n");
test->showButton(button); test->showButton(button);
updateMemoryUsage(g_mmprevious, "After showing the glyph button"); updateMemoryUsage(g_mmprevious, "After showing the glyph button");
// Wait two seconds, then perform a simulated mouse click on the button // Wait two seconds, then perform a simulated mouse click on the button
sleep(2); sleep(2);
message("cglyphbutton_main: Click the button\n"); printf("cglyphbutton_main: Click the button\n");
test->click(); test->click();
updateMemoryUsage(g_mmprevious, "After clicking glyph button"); updateMemoryUsage(g_mmprevious, "After clicking glyph button");
// Poll for the mouse click event (of course this can hang if something fails) // Poll for the mouse click event (of course this can hang if something fails)
bool clicked = test->poll(button); bool clicked = test->poll(button);
message("cglyphbutton_main: Button is %s\n", clicked ? "clicked" : "released"); printf("cglyphbutton_main: Button is %s\n", clicked ? "clicked" : "released");
// Wait a second, then release the mouse buttone // Wait a second, then release the mouse buttone
@ -206,7 +206,7 @@ int cglyphbutton_main(int argc, char *argv[])
// Poll for the mouse release event (of course this can hang if something fails) // Poll for the mouse release event (of course this can hang if something fails)
clicked = test->poll(button); clicked = test->poll(button);
message("cglyphbutton_main: Button is %s\n", clicked ? "clicked" : "released"); printf("cglyphbutton_main: Button is %s\n", clicked ? "clicked" : "released");
// Wait a few more seconds so that the tester can ponder the result // Wait a few more seconds so that the tester can ponder the result
@ -214,7 +214,7 @@ int cglyphbutton_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("cglyphbutton_main: Clean-up and exit\n"); printf("cglyphbutton_main: Clean-up and exit\n");
delete button; delete button;
updateMemoryUsage(g_mmprevious, "After deleting the glyph button"); updateMemoryUsage(g_mmprevious, "After deleting the glyph button");
delete test; delete test;

8
UnitTests/CGlyphButton/cglyphbuttontest.cxx
View File

@ -105,7 +105,7 @@ bool CGlyphButtonTest::connect(void)
if (!setBackgroundColor(CONFIG_CGLYPHBUTTONTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CGLYPHBUTTONTEST_BGCOLOR))
{ {
message("CGlyphButtonTest::connect: setBackgroundColor failed\n"); printf("CGlyphButtonTest::connect: setBackgroundColor failed\n");
} }
} }
@ -159,7 +159,7 @@ bool CGlyphButtonTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CGlyphButtonTest::createGraphics: Failed to create CBgWindow instance\n"); printf("CGlyphButtonTest::createGraphics: Failed to create CBgWindow instance\n");
delete m_widgetControl; delete m_widgetControl;
return false; return false;
} }
@ -169,7 +169,7 @@ bool CGlyphButtonTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CGlyphButtonTest::createGraphics: Failed to open background window\n"); printf("CGlyphButtonTest::createGraphics: Failed to open background window\n");
delete m_bgWindow; delete m_bgWindow;
m_bgWindow = (CBgWindow*)0; m_bgWindow = (CBgWindow*)0;
return false; return false;
@ -188,7 +188,7 @@ CGlyphButton *CGlyphButtonTest::createButton(FAR const struct SBitmap *clickGlyp
struct nxgl_size_s windowSize; struct nxgl_size_s windowSize;
if (!m_bgWindow->getSize(&windowSize)) if (!m_bgWindow->getSize(&windowSize))
{ {
message("CGlyphButtonTest::createGraphics: Failed to get window size\n"); printf("CGlyphButtonTest::createGraphics: Failed to get window size\n");
return (CGlyphButton *)NULL; return (CGlyphButton *)NULL;
} }

9
UnitTests/CGlyphButton/cglyphbuttontest.hxx
View File

@ -76,15 +76,6 @@
# define CONFIG_CGLYPHBUTTONTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR # define CONFIG_CGLYPHBUTTONTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
// Helper macros // Helper macros
#ifndef MAX #ifndef MAX

26
UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
View File

@ -98,8 +98,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -143,16 +143,16 @@ int cglyphsliderhorizontal_main(int argc, char *argv[])
// Create an instance of the checkbox test // Create an instance of the checkbox test
message("csliderhorizontal_main: Create CGlyphSliderHorizontalTest instance\n"); printf("csliderhorizontal_main: Create CGlyphSliderHorizontalTest instance\n");
CGlyphSliderHorizontalTest *test = new CGlyphSliderHorizontalTest(); CGlyphSliderHorizontalTest *test = new CGlyphSliderHorizontalTest();
updateMemoryUsage(g_mmprevious, "After creating CGlyphSliderHorizontalTest"); updateMemoryUsage(g_mmprevious, "After creating CGlyphSliderHorizontalTest");
// Connect the NX server // Connect the NX server
message("csliderhorizontal_main: Connect the CGlyphSliderHorizontalTest instance to the NX server\n"); printf("csliderhorizontal_main: Connect the CGlyphSliderHorizontalTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("csliderhorizontal_main: Failed to connect the CGlyphSliderHorizontalTest instance to the NX server\n"); printf("csliderhorizontal_main: Failed to connect the CGlyphSliderHorizontalTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -160,10 +160,10 @@ int cglyphsliderhorizontal_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("csliderhorizontal_main: Create a Window\n"); printf("csliderhorizontal_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("csliderhorizontal_main: Failed to create a window\n"); printf("csliderhorizontal_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -171,11 +171,11 @@ int cglyphsliderhorizontal_main(int argc, char *argv[])
// Create a slider // Create a slider
message("csliderhorizontal_main: Create a Slider\n"); printf("csliderhorizontal_main: Create a Slider\n");
CGlyphSliderHorizontal *slider = test->createSlider(); CGlyphSliderHorizontal *slider = test->createSlider();
if (!slider) if (!slider)
{ {
message("csliderhorizontal_main: Failed to create a slider\n"); printf("csliderhorizontal_main: Failed to create a slider\n");
delete test; delete test;
return 1; return 1;
} }
@ -187,7 +187,7 @@ int cglyphsliderhorizontal_main(int argc, char *argv[])
slider->setMinimumValue(0); slider->setMinimumValue(0);
slider->setMaximumValue(MAX_SLIDER); slider->setMaximumValue(MAX_SLIDER);
slider->setValue(0); slider->setValue(0);
message("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", printf("csliderhorizontal_main: Slider range %d->%d Initial value %d\n",
slider->getMinimumValue(), slider->getMaximumValue(), slider->getMinimumValue(), slider->getMaximumValue(),
slider->getValue()); slider->getValue());
@ -201,7 +201,7 @@ int cglyphsliderhorizontal_main(int argc, char *argv[])
{ {
slider->setValue(i); slider->setValue(i);
test->showSlider(slider); test->showSlider(slider);
message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); printf("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue());
usleep(1000 * 50); // The simulation needs this to let the X11 event loop run usleep(1000 * 50); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up"); updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up");
@ -212,7 +212,7 @@ int cglyphsliderhorizontal_main(int argc, char *argv[])
{ {
slider->setValue(i); slider->setValue(i);
test->showSlider(slider); test->showSlider(slider);
message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); printf("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue());
usleep(1000 * 50); // The simulation needs this to let the X11 event loop run usleep(1000 * 50); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down"); updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down");
@ -220,7 +220,7 @@ int cglyphsliderhorizontal_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("csliderhorizontal_main: Clean-up and exit\n"); printf("csliderhorizontal_main: Clean-up and exit\n");
delete slider; delete slider;
updateMemoryUsage(g_mmprevious, "After deleting the slider"); updateMemoryUsage(g_mmprevious, "After deleting the slider");
delete test; delete test;

6
UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
View File

@ -151,7 +151,7 @@ bool CGlyphSliderHorizontalTest::connect(void)
if (!setBackgroundColor(CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR))
{ {
message("CGlyphSliderHorizontalTest::connect: setBackgroundColor failed\n"); printf("CGlyphSliderHorizontalTest::connect: setBackgroundColor failed\n");
} }
} }
@ -207,7 +207,7 @@ bool CGlyphSliderHorizontalTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CGlyphSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); printf("CGlyphSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n");
disconnect(); disconnect();
return false; return false;
} }
@ -217,7 +217,7 @@ bool CGlyphSliderHorizontalTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CGlyphSliderHorizontalTest::createWindow: Failed to open background window\n"); printf("CGlyphSliderHorizontalTest::createWindow: Failed to open background window\n");
disconnect(); disconnect();
return false; return false;
} }

9
UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
View File

@ -69,15 +69,6 @@
# define CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

30
UnitTests/CImage/cimage_main.cxx
View File

@ -86,13 +86,13 @@ extern "C" int cimage_main(int argc, char *argv[]);
static void showMemoryUsage(FAR struct mallinfo *mmbefore, static void showMemoryUsage(FAR struct mallinfo *mmbefore,
FAR struct mallinfo *mmafter) FAR struct mallinfo *mmafter)
{ {
message("VARIABLE BEFORE AFTER\n"); printf("VARIABLE BEFORE AFTER\n");
message("======== ======== ========\n"); printf("======== ======== ========\n");
message("arena %8d %8d\n", mmbefore->arena, mmafter->arena); printf("arena %8d %8d\n", mmbefore->arena, mmafter->arena);
message("ordblks %8d %8d\n", mmbefore->ordblks, mmafter->ordblks); printf("ordblks %8d %8d\n", mmbefore->ordblks, mmafter->ordblks);
message("mxordblk %8d %8d\n", mmbefore->mxordblk, mmafter->mxordblk); printf("mxordblk %8d %8d\n", mmbefore->mxordblk, mmafter->mxordblk);
message("uordblks %8d %8d\n", mmbefore->uordblks, mmafter->uordblks); printf("uordblks %8d %8d\n", mmbefore->uordblks, mmafter->uordblks);
message("fordblks %8d %8d\n", mmbefore->fordblks, mmafter->fordblks); printf("fordblks %8d %8d\n", mmbefore->fordblks, mmafter->fordblks);
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -114,7 +114,7 @@ static void updateMemoryUsage(FAR struct mallinfo *previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
showMemoryUsage(previous, &mmcurrent); showMemoryUsage(previous, &mmcurrent);
/* Set up for the next test */ /* Set up for the next test */
@ -157,16 +157,16 @@ int cimage_main(int argc, char *argv[])
// Create an instance of the font test // Create an instance of the font test
message("cimage_main: Create CImageTest instance\n"); printf("cimage_main: Create CImageTest instance\n");
CImageTest *test = new CImageTest(); CImageTest *test = new CImageTest();
updateMemoryUsage(&g_mmprevious, "After creating CImageTest"); updateMemoryUsage(&g_mmprevious, "After creating CImageTest");
// Connect the NX server // Connect the NX server
message("cimage_main: Connect the CImageTest instance to the NX server\n"); printf("cimage_main: Connect the CImageTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("cimage_main: Failed to connect the CImageTest instance to the NX server\n"); printf("cimage_main: Failed to connect the CImageTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -174,10 +174,10 @@ int cimage_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("cimage_main: Create a Window\n"); printf("cimage_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("cimage_main: Failed to create a window\n"); printf("cimage_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -193,7 +193,7 @@ int cimage_main(int argc, char *argv[])
CImage *image = test->createImage(static_cast<IBitmap*>(nuttxBitmap)); CImage *image = test->createImage(static_cast<IBitmap*>(nuttxBitmap));
if (!image) if (!image)
{ {
message("cimage_main: Failed to create a image\n"); printf("cimage_main: Failed to create a image\n");
delete test; delete test;
return 1; return 1;
} }
@ -207,7 +207,7 @@ int cimage_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("cimage_main: Clean-up and exit\n"); printf("cimage_main: Clean-up and exit\n");
delete image; delete image;
updateMemoryUsage(&g_mmprevious, "After deleting CImage"); updateMemoryUsage(&g_mmprevious, "After deleting CImage");

8
UnitTests/CImage/cimagetest.cxx
View File

@ -104,7 +104,7 @@ bool CImageTest::connect(void)
if (!setBackgroundColor(CONFIG_CIMAGETEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CIMAGETEST_BGCOLOR))
{ {
message("CImageTest::connect: setBackgroundColor failed\n"); printf("CImageTest::connect: setBackgroundColor failed\n");
} }
} }
@ -158,7 +158,7 @@ bool CImageTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CImageTest::createGraphics: Failed to create CBgWindow instance\n"); printf("CImageTest::createGraphics: Failed to create CBgWindow instance\n");
delete m_widgetControl; delete m_widgetControl;
return false; return false;
} }
@ -168,7 +168,7 @@ bool CImageTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CImageTest::createGraphics: Failed to open background window\n"); printf("CImageTest::createGraphics: Failed to open background window\n");
delete m_bgWindow; delete m_bgWindow;
m_bgWindow = (CBgWindow*)0; m_bgWindow = (CBgWindow*)0;
return false; return false;
@ -186,7 +186,7 @@ CImage *CImageTest::createImage(IBitmap *bitmap)
struct nxgl_size_s windowSize; struct nxgl_size_s windowSize;
if (!m_bgWindow->getSize(&windowSize)) if (!m_bgWindow->getSize(&windowSize))
{ {
message("CImageTest::createGraphics: Failed to get window size\n"); printf("CImageTest::createGraphics: Failed to get window size\n");
return (CImage *)NULL; return (CImage *)NULL;
} }

9
UnitTests/CImage/cimagetest.hxx
View File

@ -71,15 +71,6 @@
# define CONFIG_CIMAGETEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CIMAGETEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

4
UnitTests/CKeypad/ckeypad_main.cxx
View File

@ -97,7 +97,7 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("%s: Before: %8d After: %8d Change: %8d\n", printf("%s: Before: %8d After: %8d Change: %8d\n",
msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -268,7 +268,7 @@ int ckeypad_main(int argc, char *argv[])
delete test; delete test;
updateMemoryUsage(g_mmPrevious, "After deleting the test"); updateMemoryUsage(g_mmPrevious, "After deleting the test");
updateMemoryUsage(g_mmInitial, "Final memory usage"); updateMemoryUsage(g_mmInitial, "Final memory usage");
message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); printf("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial);
return 0; return 0;
} }

12
UnitTests/CKeypad/ckeypadtest.cxx
View File

@ -109,7 +109,7 @@ bool CKeypadTest::connect(void)
if (!setBackgroundColor(CONFIG_CKEYPADTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CKEYPADTEST_BGCOLOR))
{ {
message("CKeypadTest::connect: setBackgroundColor failed\n"); printf("CKeypadTest::connect: setBackgroundColor failed\n");
} }
} }
@ -170,7 +170,7 @@ bool CKeypadTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CKeypadTest::createGraphics: Failed to create CBgWindow instance\n"); printf("CKeypadTest::createGraphics: Failed to create CBgWindow instance\n");
delete m_widgetControl; delete m_widgetControl;
return false; return false;
} }
@ -180,7 +180,7 @@ bool CKeypadTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CKeypadTest::createGraphics: Failed to open background window\n"); printf("CKeypadTest::createGraphics: Failed to open background window\n");
delete m_bgWindow; delete m_bgWindow;
m_bgWindow = (CBgWindow*)0; m_bgWindow = (CBgWindow*)0;
return false; return false;
@ -201,7 +201,7 @@ void CKeypadTest::setDisplaySize(void)
struct nxgl_size_s windowSize; struct nxgl_size_s windowSize;
if (!m_bgWindow->getSize(&windowSize)) if (!m_bgWindow->getSize(&windowSize))
{ {
message("CKeypadTest::createGraphics: Failed to get window size\n"); printf("CKeypadTest::createGraphics: Failed to get window size\n");
return; return;
} }
@ -248,7 +248,7 @@ CKeypad *CKeypadTest::createKeypad(void)
struct nxgl_size_s windowSize; struct nxgl_size_s windowSize;
if (!m_bgWindow->getSize(&windowSize)) if (!m_bgWindow->getSize(&windowSize))
{ {
message("CKeypadTest::createGraphics: Failed to get window size\n"); printf("CKeypadTest::createGraphics: Failed to get window size\n");
return (CKeypad *)NULL; return (CKeypad *)NULL;
} }
@ -308,7 +308,7 @@ CTextBox *CKeypadTest::createTextBox(void)
struct nxgl_size_s windowSize; struct nxgl_size_s windowSize;
if (!m_bgWindow->getSize(&windowSize)) if (!m_bgWindow->getSize(&windowSize))
{ {
message("CKeypadTest::createGraphics: Failed to get window size\n"); printf("CKeypadTest::createGraphics: Failed to get window size\n");
return (CTextBox *)NULL; return (CTextBox *)NULL;
} }

9
UnitTests/CKeypad/ckeypadtest.hxx
View File

@ -72,15 +72,6 @@
# define CONFIG_CKEYPADTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CKEYPADTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
// This is the size of the keypad // This is the size of the keypad
#define KEYPAD_NROWS 7 #define KEYPAD_NROWS 7

4
UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
View File

@ -133,7 +133,7 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("%s: Before: %8d After: %8d Change: %8d\n", printf("%s: Before: %8d After: %8d Change: %8d\n",
msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -295,7 +295,7 @@ int clatchbuttonarray_main(int argc, char *argv[])
delete test; delete test;
updateMemoryUsage(g_mmPrevious, "After deleting the test"); updateMemoryUsage(g_mmPrevious, "After deleting the test");
updateMemoryUsage(g_mmInitial, "Final memory usage"); updateMemoryUsage(g_mmInitial, "Final memory usage");
message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); printf("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial);
return 0; return 0;
} }

8
UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
View File

@ -103,7 +103,7 @@ bool CLatchButtonArrayTest::connect(void)
if (!setBackgroundColor(CONFIG_CLATCHBUTTONARRAYTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CLATCHBUTTONARRAYTEST_BGCOLOR))
{ {
message("CLatchButtonArrayTest::connect: setBackgroundColor failed\n"); printf("CLatchButtonArrayTest::connect: setBackgroundColor failed\n");
} }
} }
@ -157,7 +157,7 @@ bool CLatchButtonArrayTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CLatchButtonArrayTest::createGraphics: Failed to create CBgWindow instance\n"); printf("CLatchButtonArrayTest::createGraphics: Failed to create CBgWindow instance\n");
delete m_widgetControl; delete m_widgetControl;
return false; return false;
} }
@ -167,7 +167,7 @@ bool CLatchButtonArrayTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CLatchButtonArrayTest::createGraphics: Failed to open background window\n"); printf("CLatchButtonArrayTest::createGraphics: Failed to open background window\n");
delete m_bgWindow; delete m_bgWindow;
m_bgWindow = (CBgWindow*)0; m_bgWindow = (CBgWindow*)0;
return false; return false;
@ -185,7 +185,7 @@ CLatchButtonArray *CLatchButtonArrayTest::createButtonArray(void)
struct nxgl_size_s windowSize; struct nxgl_size_s windowSize;
if (!m_bgWindow->getSize(&windowSize)) if (!m_bgWindow->getSize(&windowSize))
{ {
message("CLatchButtonArrayTest::createGraphics: Failed to get window size\n"); printf("CLatchButtonArrayTest::createGraphics: Failed to get window size\n");
return (CLatchButtonArray *)NULL; return (CLatchButtonArray *)NULL;
} }

9
UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
View File

@ -75,15 +75,6 @@
# define CONFIG_CLATCHBUTTONARRAYTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR # define CONFIG_CLATCHBUTTONARRAYTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
// The geometry of the button array // The geometry of the button array
#define BUTTONARRAY_NCOLUMNS 4 #define BUTTONARRAY_NCOLUMNS 4

46
UnitTests/CListBox/clistbox_main.cxx
View File

@ -133,7 +133,7 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("%s: Before: %8d After: %8d Change: %8d\n", printf("%s: Before: %8d After: %8d Change: %8d\n",
msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -182,16 +182,16 @@ int clistbox_main(int argc, char *argv[])
// Create an instance of the listbox test // Create an instance of the listbox test
message("clistbox_main: Create CListBoxTest instance\n"); printf("clistbox_main: Create CListBoxTest instance\n");
CListBoxTest *test = new CListBoxTest(); CListBoxTest *test = new CListBoxTest();
updateMemoryUsage(g_mmPrevious, "After creating CListBoxTest"); updateMemoryUsage(g_mmPrevious, "After creating CListBoxTest");
// Connect the NX server // Connect the NX server
message("clistbox_main: Connect the CListBoxTest instance to the NX server\n"); printf("clistbox_main: Connect the CListBoxTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("clistbox_main: Failed to connect the CListBoxTest instance to the NX server\n"); printf("clistbox_main: Failed to connect the CListBoxTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -199,10 +199,10 @@ int clistbox_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("clistbox_main: Create a Window\n"); printf("clistbox_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("clistbox_main: Failed to create a window\n"); printf("clistbox_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -210,11 +210,11 @@ int clistbox_main(int argc, char *argv[])
// Create a listbox // Create a listbox
message("clistbox_main: Create a ListBox\n"); printf("clistbox_main: Create a ListBox\n");
CListBox *listbox = test->createListBox(); CListBox *listbox = test->createListBox();
if (!listbox) if (!listbox)
{ {
message("clistbox_main: Failed to create a listbox\n"); printf("clistbox_main: Failed to create a listbox\n");
delete test; delete test;
return 1; return 1;
} }
@ -228,12 +228,12 @@ int clistbox_main(int argc, char *argv[])
// Now add items to the list box (in reverse alphabetical order) // Now add items to the list box (in reverse alphabetical order)
message("clistbox_main: Add options to the ListBox\n"); printf("clistbox_main: Add options to the ListBox\n");
for (int i = NOPTIONS - 1; i >= 0; i--) for (int i = NOPTIONS - 1; i >= 0; i--)
{ {
listbox->addOption(g_options[i],i); listbox->addOption(g_options[i],i);
test->showListBox(listbox); test->showListBox(listbox);
message("clistbox_main: %d. New option %s\n", i, g_options[i]); printf("clistbox_main: %d. New option %s\n", i, g_options[i]);
usleep(500000); // The simulation needs this to let the X11 event loop run usleep(500000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmPrevious, "clistbox_main: After adding the listbox items"); updateMemoryUsage(g_mmPrevious, "clistbox_main: After adding the listbox items");
@ -241,7 +241,7 @@ int clistbox_main(int argc, char *argv[])
// Sort the list box // Sort the list box
message("clistbox_main: Sort the ListBox\n"); printf("clistbox_main: Sort the ListBox\n");
listbox->sort(); listbox->sort();
test->showListBox(listbox); test->showListBox(listbox);
updateMemoryUsage(g_mmPrevious, "clistbox_main: After sorting the listbox"); updateMemoryUsage(g_mmPrevious, "clistbox_main: After sorting the listbox");
@ -253,16 +253,16 @@ int clistbox_main(int argc, char *argv[])
int nOptions; int nOptions;
while ((nOptions = listbox->getOptionCount()) > 0) while ((nOptions = listbox->getOptionCount()) > 0)
{ {
message("clistbox_main: Option count: %d\n", nOptions); printf("clistbox_main: Option count: %d\n", nOptions);
if (nOptions <= 5) if (nOptions <= 5)
{ {
message("clistbox_main: Selecting all remaining options\n"); printf("clistbox_main: Selecting all remaining options\n");
listbox->selectAllOptions(); listbox->selectAllOptions();
test->showListBox(listbox); test->showListBox(listbox);
updateMemoryUsage(g_mmPrevious, "clistbox_main: After selecting all options"); updateMemoryUsage(g_mmPrevious, "clistbox_main: After selecting all options");
sleep(1); sleep(1);
message("clistbox_main: Removing all remaining options\n"); printf("clistbox_main: Removing all remaining options\n");
listbox->removeAllOptions(); listbox->removeAllOptions();
updateMemoryUsage(g_mmPrevious, "clistbox_main: After removing all options"); updateMemoryUsage(g_mmPrevious, "clistbox_main: After removing all options");
test->showListBox(listbox); test->showListBox(listbox);
@ -271,37 +271,37 @@ int clistbox_main(int argc, char *argv[])
{ {
int selected[5]; int selected[5];
message("clistbox_main: Selecting five options\n"); printf("clistbox_main: Selecting five options\n");
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
selected[i] = ((nOptions - 1) * rand()) / MAX_RAND; selected[i] = ((nOptions - 1) * rand()) / MAX_RAND;
message("clistbox_main: Selecting option %d\n", selected[i]); printf("clistbox_main: Selecting option %d\n", selected[i]);
listbox->removeOption(selected[i]); listbox->removeOption(selected[i]);
test->showListBox(listbox); test->showListBox(listbox);
usleep(500000); usleep(500000);
} }
updateMemoryUsage(g_mmPrevious, "clistbox_main: After selecting five options"); updateMemoryUsage(g_mmPrevious, "clistbox_main: After selecting five options");
message("clistbox_main: De-selecting options\n"); printf("clistbox_main: De-selecting options\n");
int index; int index;
int count = 0; int count = 0;
while ((index = listbox->getSelectedIndex()) >= 0) while ((index = listbox->getSelectedIndex()) >= 0)
{ {
message("clistbox_main: De-selecting option %d\n", index); printf("clistbox_main: De-selecting option %d\n", index);
listbox->deselectOption(index); listbox->deselectOption(index);
test->showListBox(listbox); test->showListBox(listbox);
count++; count++;
usleep(500000); usleep(500000);
} }
message("clistbox_main: %s: %d options de-selected\n", printf("clistbox_main: %s: %d options de-selected\n",
count == 5 ? "OK" : "ERROR", count); count == 5 ? "OK" : "ERROR", count);
updateMemoryUsage(g_mmPrevious, "clistbox_main: After de-selecting options"); updateMemoryUsage(g_mmPrevious, "clistbox_main: After de-selecting options");
message("clistbox_main: Removing the selected options\n"); printf("clistbox_main: Removing the selected options\n");
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
message("clistbox_main: Removing option %d\n", selected[i]); printf("clistbox_main: Removing option %d\n", selected[i]);
listbox->removeOption(selected[i]); listbox->removeOption(selected[i]);
test->showListBox(listbox); test->showListBox(listbox);
usleep(500000); usleep(500000);
@ -315,13 +315,13 @@ int clistbox_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("clistbox_main: Clean-up and exit\n"); printf("clistbox_main: Clean-up and exit\n");
delete listbox; delete listbox;
updateMemoryUsage(g_mmPrevious, "After deleting the listbox"); updateMemoryUsage(g_mmPrevious, "After deleting the listbox");
delete test; delete test;
updateMemoryUsage(g_mmPrevious, "After deleting the test"); updateMemoryUsage(g_mmPrevious, "After deleting the test");
updateMemoryUsage(g_mmInitial, "Final memory usage"); updateMemoryUsage(g_mmInitial, "Final memory usage");
message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); printf("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial);
return 0; return 0;
} }

6
UnitTests/CListBox/clistboxtest.cxx
View File

@ -105,7 +105,7 @@ bool CListBoxTest::connect(void)
if (!setBackgroundColor(CONFIG_CLISTBOXTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CLISTBOXTEST_BGCOLOR))
{ {
message("CListBoxTest::connect: setBackgroundColor failed\n"); printf("CListBoxTest::connect: setBackgroundColor failed\n");
} }
} }
@ -161,7 +161,7 @@ bool CListBoxTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CListBoxTest::createWindow: Failed to create CBgWindow instance\n"); printf("CListBoxTest::createWindow: Failed to create CBgWindow instance\n");
disconnect(); disconnect();
return false; return false;
} }
@ -171,7 +171,7 @@ bool CListBoxTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CListBoxTest::createWindow: Failed to open background window\n"); printf("CListBoxTest::createWindow: Failed to open background window\n");
disconnect(); disconnect();
return false; return false;
} }

9
UnitTests/CListBox/clistboxtest.hxx
View File

@ -69,15 +69,6 @@
# define CONFIG_CLISTBOXTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CLISTBOXTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

26
UnitTests/CProgressBar/cprogressbar_main.cxx
View File

@ -98,8 +98,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -143,16 +143,16 @@ int cprogressbar_main(int argc, char *argv[])
// Create an instance of the checkbox test // Create an instance of the checkbox test
message("cprogressbar_main: Create CProgressBarTest instance\n"); printf("cprogressbar_main: Create CProgressBarTest instance\n");
CProgressBarTest *test = new CProgressBarTest(); CProgressBarTest *test = new CProgressBarTest();
updateMemoryUsage(g_mmprevious, "After creating CProgressBarTest"); updateMemoryUsage(g_mmprevious, "After creating CProgressBarTest");
// Connect the NX server // Connect the NX server
message("cprogressbar_main: Connect the CProgressBarTest instance to the NX server\n"); printf("cprogressbar_main: Connect the CProgressBarTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("cprogressbar_main: Failed to connect the CProgressBarTest instance to the NX server\n"); printf("cprogressbar_main: Failed to connect the CProgressBarTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -160,10 +160,10 @@ int cprogressbar_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("cprogressbar_main: Create a Window\n"); printf("cprogressbar_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("cprogressbar_main: Failed to create a window\n"); printf("cprogressbar_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -171,11 +171,11 @@ int cprogressbar_main(int argc, char *argv[])
// Create a progress bar // Create a progress bar
message("cprogressbar_main: Create a ProgressBar\n"); printf("cprogressbar_main: Create a ProgressBar\n");
CProgressBar *bar = test->createProgressBar(); CProgressBar *bar = test->createProgressBar();
if (!bar) if (!bar)
{ {
message("cprogressbar_main: Failed to create a progress bar\n"); printf("cprogressbar_main: Failed to create a progress bar\n");
delete test; delete test;
return 1; return 1;
} }
@ -187,7 +187,7 @@ int cprogressbar_main(int argc, char *argv[])
bar->setMaximumValue(MAX_PROGRESSBAR); bar->setMaximumValue(MAX_PROGRESSBAR);
bar->setValue(0); bar->setValue(0);
bar->hidePercentageText(); bar->hidePercentageText();
message("cprogressbar_main: ProgressBar range %d->%d Initial value %d\n", printf("cprogressbar_main: ProgressBar range %d->%d Initial value %d\n",
bar->getMinimumValue(), bar->getMaximumValue(), bar->getMinimumValue(), bar->getMaximumValue(),
bar->getValue()); bar->getValue());
@ -202,7 +202,7 @@ int cprogressbar_main(int argc, char *argv[])
{ {
bar->setValue(i); bar->setValue(i);
test->showProgressBar(bar); test->showProgressBar(bar);
message("cprogressbar_main: %d. New value %d\n", i, bar->getValue()); printf("cprogressbar_main: %d. New value %d\n", i, bar->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "cprogressbar_main: After moving the progress bar up #1"); updateMemoryUsage(g_mmprevious, "cprogressbar_main: After moving the progress bar up #1");
@ -219,7 +219,7 @@ int cprogressbar_main(int argc, char *argv[])
{ {
bar->setValue(i); bar->setValue(i);
test->showProgressBar(bar); test->showProgressBar(bar);
message("cprogressbar_main: %d. New value %d\n", i, bar->getValue()); printf("cprogressbar_main: %d. New value %d\n", i, bar->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "cprogressbar_main: After moving the progress bar up #2"); updateMemoryUsage(g_mmprevious, "cprogressbar_main: After moving the progress bar up #2");
@ -227,7 +227,7 @@ int cprogressbar_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("cprogressbar_main: Clean-up and exit\n"); printf("cprogressbar_main: Clean-up and exit\n");
delete bar; delete bar;
updateMemoryUsage(g_mmprevious, "After deleting the progress bar"); updateMemoryUsage(g_mmprevious, "After deleting the progress bar");
delete test; delete test;

6
UnitTests/CProgressBar/cprogressbartest.cxx
View File

@ -105,7 +105,7 @@ bool CProgressBarTest::connect(void)
if (!setBackgroundColor(CONFIG_CPROGRESSBARTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CPROGRESSBARTEST_BGCOLOR))
{ {
message("CProgressBarTest::connect: setBackgroundColor failed\n"); printf("CProgressBarTest::connect: setBackgroundColor failed\n");
} }
} }
@ -161,7 +161,7 @@ bool CProgressBarTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CProgressBarTest::createWindow: Failed to create CBgWindow instance\n"); printf("CProgressBarTest::createWindow: Failed to create CBgWindow instance\n");
disconnect(); disconnect();
return false; return false;
} }
@ -171,7 +171,7 @@ bool CProgressBarTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CProgressBarTest::createWindow: Failed to open background window\n"); printf("CProgressBarTest::createWindow: Failed to open background window\n");
disconnect(); disconnect();
return false; return false;
} }

9
UnitTests/CProgressBar/cprogressbartest.hxx
View File

@ -69,15 +69,6 @@
# define CONFIG_CPROGRESSBARTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CPROGRESSBARTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

28
UnitTests/CRadioButton/cradiobutton_main.cxx
View File

@ -98,8 +98,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -143,16 +143,16 @@ int cradiobutton_main(int argc, char *argv[])
// Create an instance of the radio button test // Create an instance of the radio button test
message("cradiobutton_main: Create CRadioButtonTest instance\n"); printf("cradiobutton_main: Create CRadioButtonTest instance\n");
CRadioButtonTest *test = new CRadioButtonTest(); CRadioButtonTest *test = new CRadioButtonTest();
updateMemoryUsage(g_mmprevious, "After creating CRadioButtonTest"); updateMemoryUsage(g_mmprevious, "After creating CRadioButtonTest");
// Connect the NX server // Connect the NX server
message("cradiobutton_main: Connect the CRadioButtonTest instance to the NX server\n"); printf("cradiobutton_main: Connect the CRadioButtonTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("cradiobutton_main: Failed to connect the CRadioButtonTest instance to the NX server\n"); printf("cradiobutton_main: Failed to connect the CRadioButtonTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -160,10 +160,10 @@ int cradiobutton_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("cradiobutton_main: Create a Window\n"); printf("cradiobutton_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("cradiobutton_main: Failed to create a window\n"); printf("cradiobutton_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -174,7 +174,7 @@ int cradiobutton_main(int argc, char *argv[])
CRadioButton *button1 = test->newRadioButton(); CRadioButton *button1 = test->newRadioButton();
if (!button1) if (!button1)
{ {
message("cradiobutton_main: Failed to create radio button 1\n"); printf("cradiobutton_main: Failed to create radio button 1\n");
delete test; delete test;
return 1; return 1;
} }
@ -183,7 +183,7 @@ int cradiobutton_main(int argc, char *argv[])
CRadioButton *button2 = test->newRadioButton(); CRadioButton *button2 = test->newRadioButton();
if (!button2) if (!button2)
{ {
message("cradiobutton_main: Failed to create radio button 2\n"); printf("cradiobutton_main: Failed to create radio button 2\n");
delete test; delete test;
return 1; return 1;
} }
@ -192,7 +192,7 @@ int cradiobutton_main(int argc, char *argv[])
CRadioButton *button3 = test->newRadioButton(); CRadioButton *button3 = test->newRadioButton();
if (!button3) if (!button3)
{ {
message("cradiobutton_main: Failed to create radio button 3\n"); printf("cradiobutton_main: Failed to create radio button 3\n");
delete test; delete test;
return 1; return 1;
} }
@ -206,21 +206,21 @@ int cradiobutton_main(int argc, char *argv[])
// Now push some buttons // Now push some buttons
message("cradiobutton_main: Pushing button 1\n"); printf("cradiobutton_main: Pushing button 1\n");
test->pushButton(button1); test->pushButton(button1);
usleep(500*1000); usleep(500*1000);
test->showButtonState(); test->showButtonState();
updateMemoryUsage(g_mmprevious, "After pushing button 1"); updateMemoryUsage(g_mmprevious, "After pushing button 1");
usleep(500*1000); usleep(500*1000);
message("cradiobutton_main: Pushing button 2\n"); printf("cradiobutton_main: Pushing button 2\n");
test->pushButton(button2); test->pushButton(button2);
usleep(500*1000); usleep(500*1000);
test->showButtonState(); test->showButtonState();
updateMemoryUsage(g_mmprevious, "After pushing button 2"); updateMemoryUsage(g_mmprevious, "After pushing button 2");
usleep(500*1000); usleep(500*1000);
message("cradiobutton_main: Pushing button 3\n"); printf("cradiobutton_main: Pushing button 3\n");
test->pushButton(button3); test->pushButton(button3);
usleep(500*1000); usleep(500*1000);
test->showButtonState(); test->showButtonState();
@ -229,7 +229,7 @@ int cradiobutton_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("cradiobutton_main: Clean-up and exit\n"); printf("cradiobutton_main: Clean-up and exit\n");
delete test; delete test;
updateMemoryUsage(g_mmprevious, "After deleting the test"); updateMemoryUsage(g_mmprevious, "After deleting the test");
updateMemoryUsage(g_mmInitial, "Final memory usage"); updateMemoryUsage(g_mmInitial, "Final memory usage");

14
UnitTests/CRadioButton/cradiobuttontest.cxx
View File

@ -112,7 +112,7 @@ bool CRadioButtonTest::connect(void)
if (!setBackgroundColor(CONFIG_CRADIOBUTTONTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CRADIOBUTTONTEST_BGCOLOR))
{ {
message("CRadioButtonTest::connect: setBackgroundColor failed\n"); printf("CRadioButtonTest::connect: setBackgroundColor failed\n");
} }
} }
@ -174,7 +174,7 @@ bool CRadioButtonTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CRadioButtonTest::createGraphics: Failed to create CBgWindow instance\n"); printf("CRadioButtonTest::createGraphics: Failed to create CBgWindow instance\n");
delete m_widgetControl; delete m_widgetControl;
return false; return false;
} }
@ -184,7 +184,7 @@ bool CRadioButtonTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CRadioButtonTest::createGraphics: Failed to open background window\n"); printf("CRadioButtonTest::createGraphics: Failed to open background window\n");
delete m_bgWindow; delete m_bgWindow;
m_bgWindow = (CBgWindow*)0; m_bgWindow = (CBgWindow*)0;
return false; return false;
@ -202,7 +202,7 @@ CRadioButton *CRadioButtonTest::newRadioButton(void)
struct nxgl_size_s windowSize; struct nxgl_size_s windowSize;
if (!m_bgWindow->getSize(&windowSize)) if (!m_bgWindow->getSize(&windowSize))
{ {
message("CRadioButtonTest::newRadioButton: Failed to get window size\n"); printf("CRadioButtonTest::newRadioButton: Failed to get window size\n");
return (CRadioButton *)NULL; return (CRadioButton *)NULL;
} }
@ -219,7 +219,7 @@ CRadioButton *CRadioButtonTest::newRadioButton(void)
m_radioButtonGroup = new CRadioButtonGroup(m_widgetControl, groupX, groupY); m_radioButtonGroup = new CRadioButtonGroup(m_widgetControl, groupX, groupY);
if (!m_radioButtonGroup) if (!m_radioButtonGroup)
{ {
message("CRadioButtonTest::newRadioButton: Failed to create the radio button group\n"); printf("CRadioButtonTest::newRadioButton: Failed to create the radio button group\n");
return (CRadioButton *)NULL; return (CRadioButton *)NULL;
} }
} }
@ -296,10 +296,10 @@ void CRadioButtonTest::showButtonState(void)
int index = m_radioButtonGroup->getSelectedIndex(); int index = m_radioButtonGroup->getSelectedIndex();
if (index < 0) if (index < 0)
{ {
message("CRadioButtonTest::showButtonState No button is pressed\n"); printf("CRadioButtonTest::showButtonState No button is pressed\n");
} }
else else
{ {
message("CRadioButtonTest::showButtonState button%d is selected\n", index+1); printf("CRadioButtonTest::showButtonState button%d is selected\n", index+1);
} }
} }

9
UnitTests/CRadioButton/cradiobuttontest.hxx
View File

@ -70,15 +70,6 @@
# define CONFIG_CRADIOBUTTONTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CRADIOBUTTONTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

26
UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
View File

@ -98,8 +98,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -143,16 +143,16 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
// Create an instance of the checkbox test // Create an instance of the checkbox test
message("cscrollbarhorizontal_main: Create CScrollbarHorizontalTest instance\n"); printf("cscrollbarhorizontal_main: Create CScrollbarHorizontalTest instance\n");
CScrollbarHorizontalTest *test = new CScrollbarHorizontalTest(); CScrollbarHorizontalTest *test = new CScrollbarHorizontalTest();
updateMemoryUsage(g_mmprevious, "After creating CScrollbarHorizontalTest"); updateMemoryUsage(g_mmprevious, "After creating CScrollbarHorizontalTest");
// Connect the NX server // Connect the NX server
message("cscrollbarhorizontal_main: Connect the CScrollbarHorizontalTest instance to the NX server\n"); printf("cscrollbarhorizontal_main: Connect the CScrollbarHorizontalTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("cscrollbarhorizontal_main: Failed to connect the CScrollbarHorizontalTest instance to the NX server\n"); printf("cscrollbarhorizontal_main: Failed to connect the CScrollbarHorizontalTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -160,10 +160,10 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("cscrollbarhorizontal_main: Create a Window\n"); printf("cscrollbarhorizontal_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("cscrollbarhorizontal_main: Failed to create a window\n"); printf("cscrollbarhorizontal_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -171,11 +171,11 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
// Create a scrollbar // Create a scrollbar
message("cscrollbarhorizontal_main: Create a Scrollbar\n"); printf("cscrollbarhorizontal_main: Create a Scrollbar\n");
CScrollbarHorizontal *scrollbar = test->createScrollbar(); CScrollbarHorizontal *scrollbar = test->createScrollbar();
if (!scrollbar) if (!scrollbar)
{ {
message("cscrollbarhorizontal_main: Failed to create a scrollbar\n"); printf("cscrollbarhorizontal_main: Failed to create a scrollbar\n");
delete test; delete test;
return 1; return 1;
} }
@ -186,7 +186,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
scrollbar->setMinimumValue(0); scrollbar->setMinimumValue(0);
scrollbar->setMaximumValue(MAX_SCROLLBAR); scrollbar->setMaximumValue(MAX_SCROLLBAR);
scrollbar->setValue(0); scrollbar->setValue(0);
message("cscrollbarhorizontal_main: Scrollbar range %d->%d Initial value %d\n", printf("cscrollbarhorizontal_main: Scrollbar range %d->%d Initial value %d\n",
scrollbar->getMinimumValue(), scrollbar->getMaximumValue(), scrollbar->getMinimumValue(), scrollbar->getMaximumValue(),
scrollbar->getValue()); scrollbar->getValue());
@ -201,7 +201,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
{ {
scrollbar->setValue(i); scrollbar->setValue(i);
test->showScrollbar(scrollbar); test->showScrollbar(scrollbar);
message("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue()); printf("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar up"); updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar up");
@ -212,7 +212,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
{ {
scrollbar->setValue(i); scrollbar->setValue(i);
test->showScrollbar(scrollbar); test->showScrollbar(scrollbar);
message("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue()); printf("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar down"); updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar down");
@ -220,7 +220,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("cscrollbarhorizontal_main: Clean-up and exit\n"); printf("cscrollbarhorizontal_main: Clean-up and exit\n");
delete scrollbar; delete scrollbar;
updateMemoryUsage(g_mmprevious, "After deleting the scrollbar"); updateMemoryUsage(g_mmprevious, "After deleting the scrollbar");
delete test; delete test;

6
UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
View File

@ -105,7 +105,7 @@ bool CScrollbarHorizontalTest::connect(void)
if (!setBackgroundColor(CONFIG_CSCROLLBARHORIZONTALTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CSCROLLBARHORIZONTALTEST_BGCOLOR))
{ {
message("CScrollbarHorizontalTest::connect: setBackgroundColor failed\n"); printf("CScrollbarHorizontalTest::connect: setBackgroundColor failed\n");
} }
} }
@ -161,7 +161,7 @@ bool CScrollbarHorizontalTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CScrollbarHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); printf("CScrollbarHorizontalTest::createWindow: Failed to create CBgWindow instance\n");
disconnect(); disconnect();
return false; return false;
} }
@ -171,7 +171,7 @@ bool CScrollbarHorizontalTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CScrollbarHorizontalTest::createWindow: Failed to open background window\n"); printf("CScrollbarHorizontalTest::createWindow: Failed to open background window\n");
disconnect(); disconnect();
return false; return false;
} }

9
UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
View File

@ -69,15 +69,6 @@
# define CONFIG_CSCROLLBARHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CSCROLLBARHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

26
UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
View File

@ -98,8 +98,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -143,16 +143,16 @@ int cscrollbarvertical_main(int argc, char *argv[])
// Create an instance of the checkbox test // Create an instance of the checkbox test
message("cscrollbarvertical_main: Create CScrollbarVerticalTest instance\n"); printf("cscrollbarvertical_main: Create CScrollbarVerticalTest instance\n");
CScrollbarVerticalTest *test = new CScrollbarVerticalTest(); CScrollbarVerticalTest *test = new CScrollbarVerticalTest();
updateMemoryUsage(g_mmprevious, "After creating CScrollbarVerticalTest"); updateMemoryUsage(g_mmprevious, "After creating CScrollbarVerticalTest");
// Connect the NX server // Connect the NX server
message("cscrollbarvertical_main: Connect the CScrollbarVerticalTest instance to the NX server\n"); printf("cscrollbarvertical_main: Connect the CScrollbarVerticalTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("cscrollbarvertical_main: Failed to connect the CScrollbarVerticalTest instance to the NX server\n"); printf("cscrollbarvertical_main: Failed to connect the CScrollbarVerticalTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -160,10 +160,10 @@ int cscrollbarvertical_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("cscrollbarvertical_main: Create a Window\n"); printf("cscrollbarvertical_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("cscrollbarvertical_main: Failed to create a window\n"); printf("cscrollbarvertical_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -171,11 +171,11 @@ int cscrollbarvertical_main(int argc, char *argv[])
// Create a scrollbar // Create a scrollbar
message("cscrollbarvertical_main: Create a Scrollbar\n"); printf("cscrollbarvertical_main: Create a Scrollbar\n");
CScrollbarVertical *scrollbar = test->createScrollbar(); CScrollbarVertical *scrollbar = test->createScrollbar();
if (!scrollbar) if (!scrollbar)
{ {
message("cscrollbarvertical_main: Failed to create a scrollbar\n"); printf("cscrollbarvertical_main: Failed to create a scrollbar\n");
delete test; delete test;
return 1; return 1;
} }
@ -186,7 +186,7 @@ int cscrollbarvertical_main(int argc, char *argv[])
scrollbar->setMinimumValue(0); scrollbar->setMinimumValue(0);
scrollbar->setMaximumValue(MAX_SCROLLBAR); scrollbar->setMaximumValue(MAX_SCROLLBAR);
scrollbar->setValue(0); scrollbar->setValue(0);
message("cscrollbarvertical_main: Scrollbar range %d->%d Initial value %d\n", printf("cscrollbarvertical_main: Scrollbar range %d->%d Initial value %d\n",
scrollbar->getMinimumValue(), scrollbar->getMaximumValue(), scrollbar->getMinimumValue(), scrollbar->getMaximumValue(),
scrollbar->getValue()); scrollbar->getValue());
@ -201,7 +201,7 @@ int cscrollbarvertical_main(int argc, char *argv[])
{ {
scrollbar->setValue(i); scrollbar->setValue(i);
test->showScrollbar(scrollbar); test->showScrollbar(scrollbar);
message("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue()); printf("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After moving the scrollbar up"); updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After moving the scrollbar up");
@ -212,7 +212,7 @@ int cscrollbarvertical_main(int argc, char *argv[])
{ {
scrollbar->setValue(i); scrollbar->setValue(i);
test->showScrollbar(scrollbar); test->showScrollbar(scrollbar);
message("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue()); printf("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue());
usleep(5000); // The simulation needs this to let the X11 event loop run usleep(5000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After moving the scrollbar down"); updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After moving the scrollbar down");
@ -220,7 +220,7 @@ int cscrollbarvertical_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("cscrollbarvertical_main: Clean-up and exit\n"); printf("cscrollbarvertical_main: Clean-up and exit\n");
delete scrollbar; delete scrollbar;
updateMemoryUsage(g_mmprevious, "After deleting the scrollbar"); updateMemoryUsage(g_mmprevious, "After deleting the scrollbar");
delete test; delete test;

6
UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
View File

@ -105,7 +105,7 @@ bool CScrollbarVerticalTest::connect(void)
if (!setBackgroundColor(CONFIG_CSCROLLBARVERTICALTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CSCROLLBARVERTICALTEST_BGCOLOR))
{ {
message("CScrollbarVerticalTest::connect: setBackgroundColor failed\n"); printf("CScrollbarVerticalTest::connect: setBackgroundColor failed\n");
} }
} }
@ -161,7 +161,7 @@ bool CScrollbarVerticalTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CScrollbarVerticalTest::createWindow: Failed to create CBgWindow instance\n"); printf("CScrollbarVerticalTest::createWindow: Failed to create CBgWindow instance\n");
disconnect(); disconnect();
return false; return false;
} }
@ -171,7 +171,7 @@ bool CScrollbarVerticalTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CScrollbarVerticalTest::createWindow: Failed to open background window\n"); printf("CScrollbarVerticalTest::createWindow: Failed to open background window\n");
disconnect(); disconnect();
return false; return false;
} }

9
UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
View File

@ -69,15 +69,6 @@
# define CONFIG_CSCROLLBARVERTICALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CSCROLLBARVERTICALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

26
UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
View File

@ -98,8 +98,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -143,16 +143,16 @@ int csliderhorizontal_main(int argc, char *argv[])
// Create an instance of the checkbox test // Create an instance of the checkbox test
message("csliderhorizontal_main: Create CSliderHorizontalTest instance\n"); printf("csliderhorizontal_main: Create CSliderHorizontalTest instance\n");
CSliderHorizontalTest *test = new CSliderHorizontalTest(); CSliderHorizontalTest *test = new CSliderHorizontalTest();
updateMemoryUsage(g_mmprevious, "After creating CSliderHorizontalTest"); updateMemoryUsage(g_mmprevious, "After creating CSliderHorizontalTest");
// Connect the NX server // Connect the NX server
message("csliderhorizontal_main: Connect the CSliderHorizontalTest instance to the NX server\n"); printf("csliderhorizontal_main: Connect the CSliderHorizontalTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("csliderhorizontal_main: Failed to connect the CSliderHorizontalTest instance to the NX server\n"); printf("csliderhorizontal_main: Failed to connect the CSliderHorizontalTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -160,10 +160,10 @@ int csliderhorizontal_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("csliderhorizontal_main: Create a Window\n"); printf("csliderhorizontal_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("csliderhorizontal_main: Failed to create a window\n"); printf("csliderhorizontal_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -171,11 +171,11 @@ int csliderhorizontal_main(int argc, char *argv[])
// Create a slider // Create a slider
message("csliderhorizontal_main: Create a Slider\n"); printf("csliderhorizontal_main: Create a Slider\n");
CSliderHorizontal *slider = test->createSlider(); CSliderHorizontal *slider = test->createSlider();
if (!slider) if (!slider)
{ {
message("csliderhorizontal_main: Failed to create a slider\n"); printf("csliderhorizontal_main: Failed to create a slider\n");
delete test; delete test;
return 1; return 1;
} }
@ -186,7 +186,7 @@ int csliderhorizontal_main(int argc, char *argv[])
slider->setMinimumValue(0); slider->setMinimumValue(0);
slider->setMaximumValue(MAX_SLIDER); slider->setMaximumValue(MAX_SLIDER);
slider->setValue(0); slider->setValue(0);
message("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", printf("csliderhorizontal_main: Slider range %d->%d Initial value %d\n",
slider->getMinimumValue(), slider->getMaximumValue(), slider->getMinimumValue(), slider->getMaximumValue(),
slider->getValue()); slider->getValue());
@ -201,7 +201,7 @@ int csliderhorizontal_main(int argc, char *argv[])
{ {
slider->setValue(i); slider->setValue(i);
test->showSlider(slider); test->showSlider(slider);
message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); printf("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up"); updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up");
@ -212,7 +212,7 @@ int csliderhorizontal_main(int argc, char *argv[])
{ {
slider->setValue(i); slider->setValue(i);
test->showSlider(slider); test->showSlider(slider);
message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); printf("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down"); updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down");
@ -220,7 +220,7 @@ int csliderhorizontal_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("csliderhorizontal_main: Clean-up and exit\n"); printf("csliderhorizontal_main: Clean-up and exit\n");
delete slider; delete slider;
updateMemoryUsage(g_mmprevious, "After deleting the slider"); updateMemoryUsage(g_mmprevious, "After deleting the slider");
delete test; delete test;

6
UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
View File

@ -105,7 +105,7 @@ bool CSliderHorizontalTest::connect(void)
if (!setBackgroundColor(CONFIG_CSLIDERHORIZONTALTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CSLIDERHORIZONTALTEST_BGCOLOR))
{ {
message("CSliderHorizontalTest::connect: setBackgroundColor failed\n"); printf("CSliderHorizontalTest::connect: setBackgroundColor failed\n");
} }
} }
@ -161,7 +161,7 @@ bool CSliderHorizontalTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); printf("CSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n");
disconnect(); disconnect();
return false; return false;
} }
@ -171,7 +171,7 @@ bool CSliderHorizontalTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CSliderHorizontalTest::createWindow: Failed to open background window\n"); printf("CSliderHorizontalTest::createWindow: Failed to open background window\n");
disconnect(); disconnect();
return false; return false;
} }

9
UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
View File

@ -69,15 +69,6 @@
# define CONFIG_CSLIDERHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CSLIDERHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

26
UnitTests/CSliderVertical/cslidervertical_main.cxx
View File

@ -98,8 +98,8 @@ static void updateMemoryUsage(unsigned int previous,
/* Show the change from the previous time */ /* Show the change from the previous time */
message("\n%s:\n", msg); printf("\n%s:\n", msg);
message(" Before: %8d After: %8d Change: %8d\n\n", printf(" Before: %8d After: %8d Change: %8d\n\n",
previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
/* Set up for the next test */ /* Set up for the next test */
@ -143,16 +143,16 @@ int cslidervertical_main(int argc, char *argv[])
// Create an instance of the checkbox test // Create an instance of the checkbox test
message("cslidervertical_main: Create CSliderVerticalTest instance\n"); printf("cslidervertical_main: Create CSliderVerticalTest instance\n");
CSliderVerticalTest *test = new CSliderVerticalTest(); CSliderVerticalTest *test = new CSliderVerticalTest();
updateMemoryUsage(g_mmprevious, "After creating CSliderVerticalTest"); updateMemoryUsage(g_mmprevious, "After creating CSliderVerticalTest");
// Connect the NX server // Connect the NX server
message("cslidervertical_main: Connect the CSliderVerticalTest instance to the NX server\n"); printf("cslidervertical_main: Connect the CSliderVerticalTest instance to the NX server\n");
if (!test->connect()) if (!test->connect())
{ {
message("cslidervertical_main: Failed to connect the CSliderVerticalTest instance to the NX server\n"); printf("cslidervertical_main: Failed to connect the CSliderVerticalTest instance to the NX server\n");
delete test; delete test;
return 1; return 1;
} }
@ -160,10 +160,10 @@ int cslidervertical_main(int argc, char *argv[])
// Create a window to draw into // Create a window to draw into
message("cslidervertical_main: Create a Window\n"); printf("cslidervertical_main: Create a Window\n");
if (!test->createWindow()) if (!test->createWindow())
{ {
message("cslidervertical_main: Failed to create a window\n"); printf("cslidervertical_main: Failed to create a window\n");
delete test; delete test;
return 1; return 1;
} }
@ -171,11 +171,11 @@ int cslidervertical_main(int argc, char *argv[])
// Create a slider // Create a slider
message("cslidervertical_main: Create a Slider\n"); printf("cslidervertical_main: Create a Slider\n");
CSliderVertical *slider = test->createSlider(); CSliderVertical *slider = test->createSlider();
if (!slider) if (!slider)
{ {
message("cslidervertical_main: Failed to create a slider\n"); printf("cslidervertical_main: Failed to create a slider\n");
delete test; delete test;
return 1; return 1;
} }
@ -186,7 +186,7 @@ int cslidervertical_main(int argc, char *argv[])
slider->setMinimumValue(0); slider->setMinimumValue(0);
slider->setMaximumValue(MAX_SLIDER); slider->setMaximumValue(MAX_SLIDER);
slider->setValue(0); slider->setValue(0);
message("cslidervertical_main: Slider range %d->%d Initial value %d\n", printf("cslidervertical_main: Slider range %d->%d Initial value %d\n",
slider->getMinimumValue(), slider->getMaximumValue(), slider->getMinimumValue(), slider->getMaximumValue(),
slider->getValue()); slider->getValue());
@ -201,7 +201,7 @@ int cslidervertical_main(int argc, char *argv[])
{ {
slider->setValue(i); slider->setValue(i);
test->showSlider(slider); test->showSlider(slider);
message("cslidervertical_main: %d. New value %d\n", i, slider->getValue()); printf("cslidervertical_main: %d. New value %d\n", i, slider->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "cslidervertical_main: After moving the slider up"); updateMemoryUsage(g_mmprevious, "cslidervertical_main: After moving the slider up");
@ -212,7 +212,7 @@ int cslidervertical_main(int argc, char *argv[])
{ {
slider->setValue(i); slider->setValue(i);
test->showSlider(slider); test->showSlider(slider);
message("cslidervertical_main: %d. New value %d\n", i, slider->getValue()); printf("cslidervertical_main: %d. New value %d\n", i, slider->getValue());
usleep(1000); // The simulation needs this to let the X11 event loop run usleep(1000); // The simulation needs this to let the X11 event loop run
} }
updateMemoryUsage(g_mmprevious, "cslidervertical_main: After moving the slider down"); updateMemoryUsage(g_mmprevious, "cslidervertical_main: After moving the slider down");
@ -220,7 +220,7 @@ int cslidervertical_main(int argc, char *argv[])
// Clean up and exit // Clean up and exit
message("cslidervertical_main: Clean-up and exit\n"); printf("cslidervertical_main: Clean-up and exit\n");
delete slider; delete slider;
updateMemoryUsage(g_mmprevious, "After deleting the slider"); updateMemoryUsage(g_mmprevious, "After deleting the slider");
delete test; delete test;

6
UnitTests/CSliderVertical/csliderverticaltest.cxx
View File

@ -106,7 +106,7 @@ bool CSliderVerticalTest::connect(void)
if (!setBackgroundColor(CONFIG_CSLIDERVERTICALTEST_BGCOLOR)) if (!setBackgroundColor(CONFIG_CSLIDERVERTICALTEST_BGCOLOR))
{ {
message("CSliderVerticalTest::connect: setBackgroundColor failed\n"); printf("CSliderVerticalTest::connect: setBackgroundColor failed\n");
} }
} }
@ -162,7 +162,7 @@ bool CSliderVerticalTest::createWindow(void)
m_bgWindow = getBgWindow(m_widgetControl); m_bgWindow = getBgWindow(m_widgetControl);
if (!m_bgWindow) if (!m_bgWindow)
{ {
message("CSliderVerticalTest::createWindow: Failed to create CBgWindow instance\n"); printf("CSliderVerticalTest::createWindow: Failed to create CBgWindow instance\n");
disconnect(); disconnect();
return false; return false;
} }
@ -172,7 +172,7 @@ bool CSliderVerticalTest::createWindow(void)
bool success = m_bgWindow->open(); bool success = m_bgWindow->open();
if (!success) if (!success)
{ {
message("CSliderVerticalTest::createWindow: Failed to open background window\n"); printf("CSliderVerticalTest::createWindow: Failed to open background window\n");
disconnect(); disconnect();
return false; return false;
} }

9
UnitTests/CSliderVertical/csliderverticaltest.hxx
View File

@ -69,15 +69,6 @@
# define CONFIG_CSLIDERVERTICALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR # define CONFIG_CSLIDERVERTICALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif #endif
// If debug is enabled, use the debug function, syslog() instead
// of printf() so that the output is synchronized.
#ifdef CONFIG_DEBUG
# define message lowsyslog
#else
# define message printf
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Public Classes // Public Classes
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////