From f2e87a71aed19603c7d2701f4b8a20cbf8b74ce2 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 14 Sep 2012 15:23:54 +0000 Subject: Update all unit tests to conform to recent naming convention changes in NuttX git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5151 42af7a65-404d-4744-a932-0658087f49c3 --- NxWidgets/UnitTests/CLatchButtonArray/Makefile | 2 +- .../CLatchButtonArray/clatchbuttonarray_main.cxx | 301 +++++++++++++++++++++ .../CLatchButtonArray/clatchbuttonarraytest.hxx | 10 - NxWidgets/UnitTests/CLatchButtonArray/main.cxx | 301 --------------------- 4 files changed, 302 insertions(+), 312 deletions(-) create mode 100644 NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx delete mode 100644 NxWidgets/UnitTests/CLatchButtonArray/main.cxx (limited to 'NxWidgets/UnitTests/CLatchButtonArray') diff --git a/NxWidgets/UnitTests/CLatchButtonArray/Makefile b/NxWidgets/UnitTests/CLatchButtonArray/Makefile index ddd44f8b3..a6ac9118b 100644 --- a/NxWidgets/UnitTests/CLatchButtonArray/Makefile +++ b/NxWidgets/UnitTests/CLatchButtonArray/Makefile @@ -63,7 +63,7 @@ ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh ASRCS = CSRCS = -CXXSRCS = main.cxx clatchbuttonarraytest.cxx +CXXSRCS = clatchbuttonarray_main.cxx clatchbuttonarraytest.cxx AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx new file mode 100644 index 000000000..ad7646560 --- /dev/null +++ b/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx @@ -0,0 +1,301 @@ +///////////////////////////////////////////////////////////////////////////// +// NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarry_main.cxx +// +// Copyright (C) 2012 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// 3. Neither the name NuttX, NxWidgets, nor the names of its contributors +// me be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +////////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Included Files +///////////////////////////////////////////////////////////////////////////// + +#include + +#include +#include +#include +#include +#include + +#include + +#include "cnxstring.hxx" +#include "clatchbuttonarraytest.hxx" + +///////////////////////////////////////////////////////////////////////////// +// Definitions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Private Classes +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Private Data +///////////////////////////////////////////////////////////////////////////// + +static unsigned int g_mmInitial; +static unsigned int g_mmPrevious; +static unsigned int g_mmPeak; + +static FAR const char *g_buttonLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = { + "=>", "A", "B", "isThisButtonClicked(i,j); + bool nowLatched = buttonArray->isThisButtonLatched(i,j); + + printf("showButtonState: Button(%d,%d) state: %s and %s\n", + i, j, + nowClicked ? "clicked" : "released", + nowLatched ? "latched" : "unlatched"); + + if (clicked != nowClicked || latched != nowLatched) + { + printf("showButtonState: ERROR: Expected %s and %s\n", + clicked ? "clicked" : "released", + latched ? "latched" : "unlatched"); + + clicked = nowClicked; + latched = nowLatched; + } +} + +///////////////////////////////////////////////////////////////////////////// +// Name: updateMemoryUsage +///////////////////////////////////////////////////////////////////////////// + +static void updateMemoryUsage(unsigned int previous, + FAR const char *msg) +{ + struct mallinfo mmcurrent; + + /* Get the current memory usage */ + +#ifdef CONFIG_CAN_PASS_STRUCTS + mmcurrent = mallinfo(); +#else + (void)mallinfo(&mmcurrent); +#endif + + /* Show the change from the previous time */ + + message("%s: Before: %8d After: %8d Change: %8d\n", + msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + + /* Set up for the next test */ + + g_mmPrevious = mmcurrent.uordblks; + if ((unsigned int)mmcurrent.uordblks > g_mmPeak) + { + g_mmPeak = mmcurrent.uordblks; + } +} + +///////////////////////////////////////////////////////////////////////////// +// Name: initMemoryUsage +///////////////////////////////////////////////////////////////////////////// + +static void initMemoryUsage(void) +{ + struct mallinfo mmcurrent; + + /* Get the current memory usage */ + +#ifdef CONFIG_CAN_PASS_STRUCTS + mmcurrent = mallinfo(); +#else + (void)mallinfo(&mmcurrent); +#endif + + g_mmInitial = mmcurrent.uordblks; + g_mmPrevious = mmcurrent.uordblks; + g_mmPeak = mmcurrent.uordblks; +} + +///////////////////////////////////////////////////////////////////////////// +// Public Functions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// user_start/nxheaders_main +///////////////////////////////////////////////////////////////////////////// + +int clatchbuttonarray_main(int argc, char *argv[]) +{ + // Initialize memory monitor logic + + initMemoryUsage(); + + // Create an instance of the button array test + + printf("clatchbuttonarray_main: Create CLatchButtonArrayTest instance\n"); + CLatchButtonArrayTest *test = new CLatchButtonArrayTest(); + updateMemoryUsage(g_mmPrevious, "After creating CLatchButtonArrayTest"); + + // Connect the NX server + + printf("clatchbuttonarray_main: Connect the CLatchButtonArrayTest instance to the NX server\n"); + if (!test->connect()) + { + printf("clatchbuttonarray_main: Failed to connect the CLatchButtonArrayTest instance to the NX server\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmPrevious, "After connecting to the server"); + + // Create a window to draw into + + printf("clatchbuttonarray_main: Create a Window\n"); + if (!test->createWindow()) + { + printf("clatchbuttonarray_main: Failed to create a window\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmPrevious, "After creating a window"); + + // Create a CLatchButtonArray instance + + CLatchButtonArray *buttonArray = test->createButtonArray(); + if (!buttonArray) + { + printf("clatchbuttonarray_main: Failed to create a button array\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmPrevious, "After creating CLatchButtonArray"); + + // Add the labels to each button + + FAR const char **ptr = g_buttonLabels; + for (int j = 0; j < BUTTONARRAY_NROWS; j++) + { + for (int i = 0; i < BUTTONARRAY_NCOLUMNS; i++) + { + printf("clatchbuttonarray_main: Label (%d,%d): %s\n", i, j, *ptr); + CNxString string = *ptr++; + buttonArray->setText(i, j, string); + } + } + updateMemoryUsage(g_mmPrevious, "After adding labels to the buttons"); + + // Show the button array + + printf("clatchbuttonarray_main: Show the button array\n"); + test->showButton(buttonArray); + sleep(1); + + // Then perform a simulated mouse click on a button in the array + + bool clicked = false; + bool latched = false; + + for (int j = 0; j < BUTTONARRAY_NROWS; j++) + { + for (int i = 0; i < BUTTONARRAY_NCOLUMNS; i++) + { + // Initially, this button should be neither clicked nor latched + + clicked = false; + latched = false; + showButtonState(buttonArray, i, j, clicked, latched); + + printf("clatchbuttonarray_main: Click the button (%d,%d)\n", i, j); + test->click(buttonArray, i, j); + + // Poll for the mouse click event + + test->poll(buttonArray); + + // Now it should be clicked and latched + + clicked = true; + latched = true; + showButtonState(buttonArray, i, j, clicked, latched); + + // Wait a bit, then release the mouse button + + usleep(200*1000); + test->release(buttonArray, i, j); + + // Poll for the mouse release event (of course this can hang if something fails) + + test->poll(buttonArray); + + // Now it should be un-clicked and latched + + clicked = false; + latched = true; + showButtonState(buttonArray, i, j, clicked, latched); + + usleep(300*1000); + } + } + updateMemoryUsage(g_mmPrevious, "After pushing buttons"); + + // Clean up and exit + + printf("clatchbuttonarray_main: Clean-up and exit\n"); + delete buttonArray; + updateMemoryUsage(g_mmPrevious, "After deleting the button array"); + delete test; + updateMemoryUsage(g_mmPrevious, "After deleting the test"); + updateMemoryUsage(g_mmInitial, "Final memory usage"); + message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); + return 0; +} + diff --git a/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx index f8642f089..98c0a3bb3 100644 --- a/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx +++ b/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx @@ -75,16 +75,6 @@ # define CONFIG_CLATCHBUTTONARRAYTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR #endif -// What is the entry point called? - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME clatchbuttonarray_main -# define MAIN_STRING "clatchbuttonarray_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - // If debug is enabled, use the debug function, lib_rawprintf() instead // of printf() so that the output is synchronized. diff --git a/NxWidgets/UnitTests/CLatchButtonArray/main.cxx b/NxWidgets/UnitTests/CLatchButtonArray/main.cxx deleted file mode 100644 index d38651ae9..000000000 --- a/NxWidgets/UnitTests/CLatchButtonArray/main.cxx +++ /dev/null @@ -1,301 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// NxWidgets/UnitTests/CLatchButtonArray/main.cxx -// -// Copyright (C) 2012 Gregory Nutt. All rights reserved. -// Author: Gregory Nutt -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in -// the documentation and/or other materials provided with the -// distribution. -// 3. Neither the name NuttX, NxWidgets, nor the names of its contributors -// me be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. -// -////////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// Included Files -///////////////////////////////////////////////////////////////////////////// - -#include - -#include -#include -#include -#include -#include - -#include - -#include "cnxstring.hxx" -#include "clatchbuttonarraytest.hxx" - -///////////////////////////////////////////////////////////////////////////// -// Definitions -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// Private Classes -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// Private Data -///////////////////////////////////////////////////////////////////////////// - -static unsigned int g_mmInitial; -static unsigned int g_mmPrevious; -static unsigned int g_mmPeak; - -static FAR const char *g_buttonLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = { - "=>", "A", "B", "isThisButtonClicked(i,j); - bool nowLatched = buttonArray->isThisButtonLatched(i,j); - - printf(MAIN_STRING "Button(%d,%d) state: %s and %s\n", - i, j, - nowClicked ? "clicked" : "released", - nowLatched ? "latched" : "unlatched"); - - if (clicked != nowClicked || latched != nowLatched) - { - printf(MAIN_STRING "ERROR: Expected %s and %s\n", - clicked ? "clicked" : "released", - latched ? "latched" : "unlatched"); - - clicked = nowClicked; - latched = nowLatched; - } -} - -///////////////////////////////////////////////////////////////////////////// -// Name: updateMemoryUsage -///////////////////////////////////////////////////////////////////////////// - -static void updateMemoryUsage(unsigned int previous, - FAR const char *msg) -{ - struct mallinfo mmcurrent; - - /* Get the current memory usage */ - -#ifdef CONFIG_CAN_PASS_STRUCTS - mmcurrent = mallinfo(); -#else - (void)mallinfo(&mmcurrent); -#endif - - /* Show the change from the previous time */ - - message("%s: Before: %8d After: %8d Change: %8d\n", - msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); - - /* Set up for the next test */ - - g_mmPrevious = mmcurrent.uordblks; - if ((unsigned int)mmcurrent.uordblks > g_mmPeak) - { - g_mmPeak = mmcurrent.uordblks; - } -} - -///////////////////////////////////////////////////////////////////////////// -// Name: initMemoryUsage -///////////////////////////////////////////////////////////////////////////// - -static void initMemoryUsage(void) -{ - struct mallinfo mmcurrent; - - /* Get the current memory usage */ - -#ifdef CONFIG_CAN_PASS_STRUCTS - mmcurrent = mallinfo(); -#else - (void)mallinfo(&mmcurrent); -#endif - - g_mmInitial = mmcurrent.uordblks; - g_mmPrevious = mmcurrent.uordblks; - g_mmPeak = mmcurrent.uordblks; -} - -///////////////////////////////////////////////////////////////////////////// -// Public Functions -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// user_start/nxheaders_main -///////////////////////////////////////////////////////////////////////////// - -int MAIN_NAME(int argc, char *argv[]) -{ - // Initialize memory monitor logic - - initMemoryUsage(); - - // Create an instance of the button array test - - printf(MAIN_STRING "Create CLatchButtonArrayTest instance\n"); - CLatchButtonArrayTest *test = new CLatchButtonArrayTest(); - updateMemoryUsage(g_mmPrevious, "After creating CLatchButtonArrayTest"); - - // Connect the NX server - - printf(MAIN_STRING "Connect the CLatchButtonArrayTest instance to the NX server\n"); - if (!test->connect()) - { - printf(MAIN_STRING "Failed to connect the CLatchButtonArrayTest instance to the NX server\n"); - delete test; - return 1; - } - updateMemoryUsage(g_mmPrevious, "After connecting to the server"); - - // Create a window to draw into - - printf(MAIN_STRING "Create a Window\n"); - if (!test->createWindow()) - { - printf(MAIN_STRING "Failed to create a window\n"); - delete test; - return 1; - } - updateMemoryUsage(g_mmPrevious, "After creating a window"); - - // Create a CLatchButtonArray instance - - CLatchButtonArray *buttonArray = test->createButtonArray(); - if (!buttonArray) - { - printf(MAIN_STRING "Failed to create a button array\n"); - delete test; - return 1; - } - updateMemoryUsage(g_mmPrevious, "After creating CLatchButtonArray"); - - // Add the labels to each button - - FAR const char **ptr = g_buttonLabels; - for (int j = 0; j < BUTTONARRAY_NROWS; j++) - { - for (int i = 0; i < BUTTONARRAY_NCOLUMNS; i++) - { - printf(MAIN_STRING "Label (%d,%d): %s\n", i, j, *ptr); - CNxString string = *ptr++; - buttonArray->setText(i, j, string); - } - } - updateMemoryUsage(g_mmPrevious, "After adding labels to the buttons"); - - // Show the button array - - printf(MAIN_STRING "Show the button array\n"); - test->showButton(buttonArray); - sleep(1); - - // Then perform a simulated mouse click on a button in the array - - bool clicked = false; - bool latched = false; - - for (int j = 0; j < BUTTONARRAY_NROWS; j++) - { - for (int i = 0; i < BUTTONARRAY_NCOLUMNS; i++) - { - // Initially, this button should be neither clicked nor latched - - clicked = false; - latched = false; - showButtonState(buttonArray, i, j, clicked, latched); - - printf(MAIN_STRING "Click the button (%d,%d)\n", i, j); - test->click(buttonArray, i, j); - - // Poll for the mouse click event - - test->poll(buttonArray); - - // Now it should be clicked and latched - - clicked = true; - latched = true; - showButtonState(buttonArray, i, j, clicked, latched); - - // Wait a bit, then release the mouse button - - usleep(200*1000); - test->release(buttonArray, i, j); - - // Poll for the mouse release event (of course this can hang if something fails) - - test->poll(buttonArray); - - // Now it should be un-clicked and latched - - clicked = false; - latched = true; - showButtonState(buttonArray, i, j, clicked, latched); - - usleep(300*1000); - } - } - updateMemoryUsage(g_mmPrevious, "After pushing buttons"); - - // Clean up and exit - - printf(MAIN_STRING "Clean-up and exit\n"); - delete buttonArray; - updateMemoryUsage(g_mmPrevious, "After deleting the button array"); - delete test; - updateMemoryUsage(g_mmPrevious, "After deleting the test"); - updateMemoryUsage(g_mmInitial, "Final memory usage"); - message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); - return 0; -} - -- cgit v1.2.3