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/CTextBox/Makefile | 2 +- NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx | 141 +++++++++++++++++++++++++ NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx | 10 -- NxWidgets/UnitTests/CTextBox/main.cxx | 141 ------------------------- 4 files changed, 142 insertions(+), 152 deletions(-) create mode 100644 NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx delete mode 100644 NxWidgets/UnitTests/CTextBox/main.cxx (limited to 'NxWidgets/UnitTests/CTextBox') diff --git a/NxWidgets/UnitTests/CTextBox/Makefile b/NxWidgets/UnitTests/CTextBox/Makefile index bd7d98491..c368cc497 100644 --- a/NxWidgets/UnitTests/CTextBox/Makefile +++ b/NxWidgets/UnitTests/CTextBox/Makefile @@ -63,7 +63,7 @@ ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh ASRCS = CSRCS = -CXXSRCS = main.cxx ctextboxtest.cxx +CXXSRCS = ctextbox_main.cxx ctextboxtest.cxx AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx b/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx new file mode 100644 index 000000000..da76c88cf --- /dev/null +++ b/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx @@ -0,0 +1,141 @@ +///////////////////////////////////////////////////////////////////////////// +// NxWidgets/UnitTests/CTextBox/ctextbox_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 "ctextboxtest.hxx" + +///////////////////////////////////////////////////////////////////////////// +// Definitions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Private Classes +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Private Data +///////////////////////////////////////////////////////////////////////////// + +static const char string1[] = "Johhn "; +static const char string2[] = "\b\b\bn Doe\r"; + +///////////////////////////////////////////////////////////////////////////// +// Public Function Prototypes +///////////////////////////////////////////////////////////////////////////// + +// Suppress name-mangling + +extern "C" int ctextbox_main(int argc, char *argv[]); + +///////////////////////////////////////////////////////////////////////////// +// Public Functions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// user_start/nxheaders_main +///////////////////////////////////////////////////////////////////////////// + +int ctextbox_main(int argc, char *argv[]) +{ + // Create an instance of the font test + + printf("ctextbox_main: Create CTextBoxTest instance\n"); + CTextBoxTest *test = new CTextBoxTest(); + + // Connect the NX server + + printf("ctextbox_main: Connect the CTextBoxTest instance to the NX server\n"); + if (!test->connect()) + { + printf("ctextbox_main: Failed to connect the CTextBoxTest instance to the NX server\n"); + delete test; + return 1; + } + + // Create a window to draw into + + printf("ctextbox_main: Create a Window\n"); + if (!test->createWindow()) + { + printf("ctextbox_main: Failed to create a window\n"); + delete test; + return 1; + } + + // Create a CTextBox instance + + CTextBox *textbox = test->createTextBox(); + if (!textbox) + { + printf("ctextbox_main: Failed to create a text box\n"); + delete test; + return 1; + } + + // Show the text box + + test->showTextBox(textbox); + + // Wait a bit, then inject a string with a typo + + sleep(1); + test->injectChars(textbox, sizeof(string1), (FAR const uint8_t*)string1); + + // Now fix the string with backspaces and finish it correctly + + usleep(500*1000); + test->injectChars(textbox, sizeof(string2), (FAR const uint8_t*)string2); + + // Clean up and exit + + sleep(2); + printf("ctextbox_main: Clean-up and exit\n"); + delete textbox; + delete test; + return 0; +} + diff --git a/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx b/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx index 1d470a1a8..9da8ce09f 100644 --- a/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx +++ b/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx @@ -75,16 +75,6 @@ # define CONFIG_CTEXTBOXTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR #endif -// What is the entry point called? - -#ifdef CONFIG_NSH_BUILTIN_APPS -# define MAIN_NAME ctextbox_main -# define MAIN_STRING "ctextbox_main: " -#else -# define MAIN_NAME user_start -# define MAIN_STRING "user_start: " -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/NxWidgets/UnitTests/CTextBox/main.cxx b/NxWidgets/UnitTests/CTextBox/main.cxx deleted file mode 100644 index b5b8ec4d5..000000000 --- a/NxWidgets/UnitTests/CTextBox/main.cxx +++ /dev/null @@ -1,141 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// NxWidgets/UnitTests/CTextBox/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 "ctextboxtest.hxx" - -///////////////////////////////////////////////////////////////////////////// -// Definitions -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// Private Classes -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// Private Data -///////////////////////////////////////////////////////////////////////////// - -static const char string1[] = "Johhn "; -static const char string2[] = "\b\b\bn Doe\r"; - -///////////////////////////////////////////////////////////////////////////// -// Public Function Prototypes -///////////////////////////////////////////////////////////////////////////// - -// Suppress name-mangling - -extern "C" int MAIN_NAME(int argc, char *argv[]); - -///////////////////////////////////////////////////////////////////////////// -// Public Functions -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// user_start/nxheaders_main -///////////////////////////////////////////////////////////////////////////// - -int MAIN_NAME(int argc, char *argv[]) -{ - // Create an instance of the font test - - printf(MAIN_STRING "Create CTextBoxTest instance\n"); - CTextBoxTest *test = new CTextBoxTest(); - - // Connect the NX server - - printf(MAIN_STRING "Connect the CTextBoxTest instance to the NX server\n"); - if (!test->connect()) - { - printf(MAIN_STRING "Failed to connect the CTextBoxTest instance to the NX server\n"); - delete test; - return 1; - } - - // 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; - } - - // Create a CTextBox instance - - CTextBox *textbox = test->createTextBox(); - if (!textbox) - { - printf(MAIN_STRING "Failed to create a text box\n"); - delete test; - return 1; - } - - // Show the text box - - test->showTextBox(textbox); - - // Wait a bit, then inject a string with a typo - - sleep(1); - test->injectChars(textbox, sizeof(string1), (FAR const uint8_t*)string1); - - // Now fix the string with backspaces and finish it correctly - - usleep(500*1000); - test->injectChars(textbox, sizeof(string2), (FAR const uint8_t*)string2); - - // Clean up and exit - - sleep(2); - printf(MAIN_STRING "Clean-up and exit\n"); - delete textbox; - delete test; - return 0; -} - -- cgit v1.2.3