diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-14 15:23:54 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-14 15:23:54 +0000 |
commit | f2e87a71aed19603c7d2701f4b8a20cbf8b74ce2 (patch) | |
tree | e4b9f818b34d1c46da39d8c53e09a18435dcbb98 /NxWidgets/UnitTests/CSliderHorizonal | |
parent | b12d1dada94cd7083c2a5a023ec2e7a9a51c192a (diff) | |
download | px4-nuttx-f2e87a71aed19603c7d2701f4b8a20cbf8b74ce2.tar.gz px4-nuttx-f2e87a71aed19603c7d2701f4b8a20cbf8b74ce2.tar.bz2 px4-nuttx-f2e87a71aed19603c7d2701f4b8a20cbf8b74ce2.zip |
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
Diffstat (limited to 'NxWidgets/UnitTests/CSliderHorizonal')
-rw-r--r-- | NxWidgets/UnitTests/CSliderHorizonal/Makefile | 2 | ||||
-rw-r--r-- | NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx (renamed from NxWidgets/UnitTests/CSliderHorizonal/main.cxx) | 38 | ||||
-rw-r--r-- | NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx | 10 |
3 files changed, 20 insertions, 30 deletions
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/main.cxx b/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx index b99d1c547..a336ba94a 100644 --- a/NxWidgets/UnitTests/CSliderHorizonal/main.cxx +++ b/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// NxWidgets/UnitTests/CSliderHorizontal/main.cxx +// NxWidgets/UnitTests/CSliderHorizontal/csliderhorizontal_main.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt <gnutt@nuttx.org> @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int MAIN_NAME(int argc, char *argv[]); +extern "C" int csliderhorizontal_main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: user_start/nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int MAIN_NAME(int argc, char *argv[]) +int csliderhorizontal_main(int argc, char *argv[]) { // Initialize memory monitor logic @@ -143,50 +143,50 @@ int MAIN_NAME(int argc, char *argv[]) // Create an instance of the checkbox test - message(MAIN_STRING "Create CSliderHorizontalTest instance\n"); + message("csliderhorizontal_main: 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"); + message("csliderhorizontal_main: 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"); + message("csliderhorizontal_main: 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"); + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After connecting to the server"); // Create a window to draw into - message(MAIN_STRING "Create a Window\n"); + message("csliderhorizontal_main: Create a Window\n"); if (!test->createWindow()) { - message(MAIN_STRING "Failed to create a window\n"); + message("csliderhorizontal_main: Failed to create a window\n"); delete test; return 1; } - updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a window"); + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After creating a window"); // Create a slider - message(MAIN_STRING "Create a Slider\n"); + message("csliderhorizontal_main: Create a Slider\n"); CSliderHorizontal *slider = test->createSlider(); if (!slider) { - message(MAIN_STRING "Failed to create a slider\n"); + message("csliderhorizontal_main: Failed to create a slider\n"); delete test; return 1; } - updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a slider"); + 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(MAIN_STRING "Slider range %d->%d Initial value %d\n", + message("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", slider->getMinimumValue(), slider->getMaximumValue(), slider->getValue()); @@ -201,10 +201,10 @@ int MAIN_NAME(int argc, char *argv[]) { slider->setValue(i); test->showSlider(slider); - message(MAIN_STRING "%d. New value %d\n", i, slider->getValue()); + 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, MAIN_STRING "After moving the slider up"); + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up"); // And move the slider down @@ -212,15 +212,15 @@ int MAIN_NAME(int argc, char *argv[]) { slider->setValue(i); test->showSlider(slider); - message(MAIN_STRING "%d. New value %d\n", i, slider->getValue()); + 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, MAIN_STRING "After moving the slider down"); + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down"); sleep(1); // Clean up and exit - message(MAIN_STRING "Clean-up and exit\n"); + message("csliderhorizontal_main: Clean-up and exit\n"); delete slider; updateMemoryUsage(g_mmprevious, "After deleting the slider"); delete test; 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. |