Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-27 12:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update all unit tests to conform to recent naming convention changes in NuttX

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5151 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-14 15:23:54 +00:00
parent 8038b6c441
commit 66f26d33fc
53 changed files with 308 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UnitTests/CLatchButtonArray/Makefile
View file

@ -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))

30
UnitTests/CLatchButtonArray/main.cxx → UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
View file

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// NxWidgets/UnitTests/CLatchButtonArray/main.cxx
// NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarry_main.cxx
//
// Copyright (C) 2012 Gregory Nutt. All rights reserved.
// Author: Gregory Nutt <gnutt@nuttx.org>
@ -82,7 +82,7 @@ static FAR const char *g_buttonLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] =
// Suppress name-mangling
extern "C" int MAIN_NAME(int argc, char *argv[]);
extern "C" int clatchbuttonarray_main(int argc, char *argv[]);
/////////////////////////////////////////////////////////////////////////////
// Private Functions
@ -98,14 +98,14 @@ static void showButtonState(CLatchButtonArray *buttonArray, int i, int j,
bool nowClicked = buttonArray->isThisButtonClicked(i,j);
bool nowLatched = buttonArray->isThisButtonLatched(i,j);
printf(MAIN_STRING "Button(%d,%d) state: %s and %s\n",
printf("showButtonState: 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",
printf("showButtonState: ERROR: Expected %s and %s\n",
clicked ? "clicked" : "released",
latched ? "latched" : "unlatched");
@ -174,7 +174,7 @@ static void initMemoryUsage(void)
// user_start/nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int MAIN_NAME(int argc, char *argv[])
int clatchbuttonarray_main(int argc, char *argv[])
{
// Initialize memory monitor logic
@ -182,16 +182,16 @@ int MAIN_NAME(int argc, char *argv[])
// Create an instance of the button array test
printf(MAIN_STRING "Create CLatchButtonArrayTest instance\n");
printf("clatchbuttonarray_main: 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");
printf("clatchbuttonarray_main: 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");
printf("clatchbuttonarray_main: Failed to connect the CLatchButtonArrayTest instance to the NX server\n");
delete test;
return 1;
}
@ -199,10 +199,10 @@ int MAIN_NAME(int argc, char *argv[])
// Create a window to draw into
printf(MAIN_STRING "Create a Window\n");
printf("clatchbuttonarray_main: Create a Window\n");
if (!test->createWindow())
{
printf(MAIN_STRING "Failed to create a window\n");
printf("clatchbuttonarray_main: Failed to create a window\n");
delete test;
return 1;
}
@ -213,7 +213,7 @@ int MAIN_NAME(int argc, char *argv[])
CLatchButtonArray *buttonArray = test->createButtonArray();
if (!buttonArray)
{
printf(MAIN_STRING "Failed to create a button array\n");
printf("clatchbuttonarray_main: Failed to create a button array\n");
delete test;
return 1;
}
@ -226,7 +226,7 @@ int MAIN_NAME(int argc, char *argv[])
{
for (int i = 0; i < BUTTONARRAY_NCOLUMNS; i++)
{
printf(MAIN_STRING "Label (%d,%d): %s\n", i, j, *ptr);
printf("clatchbuttonarray_main: Label (%d,%d): %s\n", i, j, *ptr);
CNxString string = *ptr++;
buttonArray->setText(i, j, string);
}
@ -235,7 +235,7 @@ int MAIN_NAME(int argc, char *argv[])
// Show the button array
printf(MAIN_STRING "Show the button array\n");
printf("clatchbuttonarray_main: Show the button array\n");
test->showButton(buttonArray);
sleep(1);
@ -254,7 +254,7 @@ int MAIN_NAME(int argc, char *argv[])
latched = false;
showButtonState(buttonArray, i, j, clicked, latched);
printf(MAIN_STRING "Click the button (%d,%d)\n", i, j);
printf("clatchbuttonarray_main: Click the button (%d,%d)\n", i, j);
test->click(buttonArray, i, j);
// Poll for the mouse click event
@ -289,7 +289,7 @@ int MAIN_NAME(int argc, char *argv[])
// Clean up and exit
printf(MAIN_STRING "Clean-up and exit\n");
printf("clatchbuttonarray_main: Clean-up and exit\n");
delete buttonArray;
updateMemoryUsage(g_mmPrevious, "After deleting the button array");
delete test;

10
UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
View file

@ -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.