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/CSliderHorizonal/Makefile | 2 +- .../CSliderHorizonal/csliderhorizontal_main.cxx | 231 +++++++++++++++++++++ .../CSliderHorizonal/csliderhorizontaltest.hxx | 10 - NxWidgets/UnitTests/CSliderHorizonal/main.cxx | 231 --------------------- 4 files changed, 232 insertions(+), 242 deletions(-) create mode 100644 NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx delete mode 100644 NxWidgets/UnitTests/CSliderHorizonal/main.cxx (limited to 'NxWidgets/UnitTests/CSliderHorizonal') diff --git a/NxWidgets/UnitTests/CSliderHorizonal/Makefile b/NxWidgets/UnitTests/CSliderHorizonal/Makefile index 0a86aaf5f..0578510d3 100644 --- a/NxWidgets/UnitTests/CSliderHorizonal/Makefile +++ b/NxWidgets/UnitTests/CSliderHorizonal/Makefile @@ -63,7 +63,7 @@ ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh ASRCS = CSRCS = -CXXSRCS = main.cxx csliderhorizontaltest.cxx +CXXSRCS = csliderhorizontal_main.cxx csliderhorizontaltest.cxx AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx new file mode 100644 index 000000000..a336ba94a --- /dev/null +++ b/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx @@ -0,0 +1,231 @@ +///////////////////////////////////////////////////////////////////////////// +// NxWidgets/UnitTests/CSliderHorizontal/csliderhorizontal_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 + +#include "csliderhorizontaltest.hxx" + +///////////////////////////////////////////////////////////////////////////// +// Definitions +///////////////////////////////////////////////////////////////////////////// + +#define MAX_SLIDER 50 + +///////////////////////////////////////////////////////////////////////////// +// Private Classes +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Private Data +///////////////////////////////////////////////////////////////////////////// + +static unsigned int g_mmInitial; +static unsigned int g_mmprevious; + +///////////////////////////////////////////////////////////////////////////// +// Public Function Prototypes +///////////////////////////////////////////////////////////////////////////// + +// Suppress name-mangling + +extern "C" int csliderhorizontal_main(int argc, char *argv[]); + +///////////////////////////////////////////////////////////////////////////// +// Private Functions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// 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("\n%s:\n", msg); + message(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + + /* Set up for the next test */ + + g_mmprevious = 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; +} + +///////////////////////////////////////////////////////////////////////////// +// Public Functions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Name: user_start/nxheaders_main +///////////////////////////////////////////////////////////////////////////// + +int csliderhorizontal_main(int argc, char *argv[]) +{ + // Initialize memory monitor logic + + initMemoryUsage(); + + // Create an instance of the checkbox test + + message("csliderhorizontal_main: Create CSliderHorizontalTest instance\n"); + CSliderHorizontalTest *test = new CSliderHorizontalTest(); + updateMemoryUsage(g_mmprevious, "After creating CSliderHorizontalTest"); + + // Connect the NX server + + message("csliderhorizontal_main: Connect the CSliderHorizontalTest instance to the NX server\n"); + if (!test->connect()) + { + message("csliderhorizontal_main: Failed to connect the CSliderHorizontalTest instance to the NX server\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After connecting to the server"); + + // Create a window to draw into + + message("csliderhorizontal_main: Create a Window\n"); + if (!test->createWindow()) + { + message("csliderhorizontal_main: Failed to create a window\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After creating a window"); + + // Create a slider + + message("csliderhorizontal_main: Create a Slider\n"); + CSliderHorizontal *slider = test->createSlider(); + if (!slider) + { + message("csliderhorizontal_main: Failed to create a slider\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After creating a slider"); + + // Set the slider minimum and maximum values + + slider->setMinimumValue(0); + slider->setMaximumValue(MAX_SLIDER); + slider->setValue(0); + message("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", + slider->getMinimumValue(), slider->getMaximumValue(), + slider->getValue()); + + // Show the initial state of the checkbox + + test->showSlider(slider); + sleep(1); + + // Now move the slider up + + for (int i = 0; i <= MAX_SLIDER; i++) + { + slider->setValue(i); + test->showSlider(slider); + message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); + usleep(1000); // The simulation needs this to let the X11 event loop run + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up"); + + // And move the slider down + + for (int i = MAX_SLIDER; i >= 0; i--) + { + slider->setValue(i); + test->showSlider(slider); + message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); + usleep(1000); // The simulation needs this to let the X11 event loop run + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down"); + sleep(1); + + // Clean up and exit + + message("csliderhorizontal_main: Clean-up and exit\n"); + delete slider; + updateMemoryUsage(g_mmprevious, "After deleting the slider"); + delete test; + updateMemoryUsage(g_mmprevious, "After deleting the test"); + updateMemoryUsage(g_mmInitial, "Final memory usage"); + return 0; +} + diff --git a/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx index 99d6f739e..9709a2b7c 100644 --- a/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx +++ b/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx @@ -69,16 +69,6 @@ # define CONFIG_CSLIDERHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// What is the entry point called? - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME csliderhorizontal_main -# define MAIN_STRING "csliderhorizontal_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/CSliderHorizonal/main.cxx b/NxWidgets/UnitTests/CSliderHorizonal/main.cxx deleted file mode 100644 index b99d1c547..000000000 --- a/NxWidgets/UnitTests/CSliderHorizonal/main.cxx +++ /dev/null @@ -1,231 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// NxWidgets/UnitTests/CSliderHorizontal/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 - -#include "csliderhorizontaltest.hxx" - -///////////////////////////////////////////////////////////////////////////// -// Definitions -///////////////////////////////////////////////////////////////////////////// - -#define MAX_SLIDER 50 - -///////////////////////////////////////////////////////////////////////////// -// Private Classes -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// Private Data -///////////////////////////////////////////////////////////////////////////// - -static unsigned int g_mmInitial; -static unsigned int g_mmprevious; - -///////////////////////////////////////////////////////////////////////////// -// Public Function Prototypes -///////////////////////////////////////////////////////////////////////////// - -// Suppress name-mangling - -extern "C" int MAIN_NAME(int argc, char *argv[]); - -///////////////////////////////////////////////////////////////////////////// -// Private Functions -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// 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("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); - - /* Set up for the next test */ - - g_mmprevious = 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; -} - -///////////////////////////////////////////////////////////////////////////// -// Public Functions -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// Name: user_start/nxheaders_main -///////////////////////////////////////////////////////////////////////////// - -int MAIN_NAME(int argc, char *argv[]) -{ - // Initialize memory monitor logic - - initMemoryUsage(); - - // Create an instance of the checkbox test - - message(MAIN_STRING "Create CSliderHorizontalTest instance\n"); - CSliderHorizontalTest *test = new CSliderHorizontalTest(); - updateMemoryUsage(g_mmprevious, "After creating CSliderHorizontalTest"); - - // Connect the NX server - - message(MAIN_STRING "Connect the CSliderHorizontalTest instance to the NX server\n"); - if (!test->connect()) - { - message(MAIN_STRING "Failed to connect the CSliderHorizontalTest instance to the NX server\n"); - delete test; - return 1; - } - updateMemoryUsage(g_mmprevious, MAIN_STRING "After connecting to the server"); - - // Create a window to draw into - - message(MAIN_STRING "Create a Window\n"); - if (!test->createWindow()) - { - message(MAIN_STRING "Failed to create a window\n"); - delete test; - return 1; - } - updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a window"); - - // Create a slider - - message(MAIN_STRING "Create a Slider\n"); - CSliderHorizontal *slider = test->createSlider(); - if (!slider) - { - message(MAIN_STRING "Failed to create a slider\n"); - delete test; - return 1; - } - updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a slider"); - - // Set the slider minimum and maximum values - - slider->setMinimumValue(0); - slider->setMaximumValue(MAX_SLIDER); - slider->setValue(0); - message(MAIN_STRING "Slider range %d->%d Initial value %d\n", - slider->getMinimumValue(), slider->getMaximumValue(), - slider->getValue()); - - // Show the initial state of the checkbox - - test->showSlider(slider); - sleep(1); - - // Now move the slider up - - for (int i = 0; i <= MAX_SLIDER; i++) - { - slider->setValue(i); - test->showSlider(slider); - message(MAIN_STRING "%d. New value %d\n", i, slider->getValue()); - usleep(1000); // The simulation needs this to let the X11 event loop run - } - updateMemoryUsage(g_mmprevious, MAIN_STRING "After moving the slider up"); - - // And move the slider down - - for (int i = MAX_SLIDER; i >= 0; i--) - { - slider->setValue(i); - test->showSlider(slider); - message(MAIN_STRING "%d. New value %d\n", i, slider->getValue()); - usleep(1000); // The simulation needs this to let the X11 event loop run - } - updateMemoryUsage(g_mmprevious, MAIN_STRING "After moving the slider down"); - sleep(1); - - // Clean up and exit - - message(MAIN_STRING "Clean-up and exit\n"); - delete slider; - updateMemoryUsage(g_mmprevious, "After deleting the slider"); - delete test; - updateMemoryUsage(g_mmprevious, "After deleting the test"); - updateMemoryUsage(g_mmInitial, "Final memory usage"); - return 0; -} - -- cgit v1.2.3