fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 12:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5151 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-09-14 15:23:54 +00:00
parent cc0c42dd31
commit 857d2a770b
56 changed files with 311 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NxWidgets/UnitTests/CButtonArray/Makefile
+1 -1
View File
@@ -63,7 +63,7 @@ ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
ASRCS =
CSRCS =
CXXSRCS = main.cxx cbuttonarraytest.cxx
CXXSRCS = cbuttonarray_main.cxx cbuttonarraytest.cxx
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
NxWidgets/UnitTests/CButtonArray/main.cxx → NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
+16 -16
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// NxWidgets/UnitTests/CButtonArray/main.cxx
// NxWidgets/UnitTests/CButtonArray/cbuttonarray_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 cbuttonarray_main(int argc, char *argv[]);
/////////////////////////////////////////////////////////////////////////////
// Private Functions
@@ -196,7 +196,7 @@ static void checkHighlighting(CButtonArray *buttonArray)
// user_start/nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int MAIN_NAME(int argc, char *argv[])
int cbuttonarray_main(int argc, char *argv[])
{
// Initialize memory monitor logic
@@ -204,16 +204,16 @@ int MAIN_NAME(int argc, char *argv[])
// Create an instance of the button array test
printf(MAIN_STRING "Create CButtonArrayTest instance\n");
printf("cbuttonarray_main: Create CButtonArrayTest instance\n");
CButtonArrayTest *test = new CButtonArrayTest();
updateMemoryUsage(g_mmPrevious, "After creating CButtonArrayTest");
// Connect the NX server
printf(MAIN_STRING "Connect the CButtonArrayTest instance to the NX server\n");
printf("cbuttonarray_main: Connect the CButtonArrayTest instance to the NX server\n");
if (!test->connect())
{
printf(MAIN_STRING "Failed to connect the CButtonArrayTest instance to the NX server\n");
printf("cbuttonarray_main: Failed to connect the CButtonArrayTest instance to the NX server\n");
delete test;
return 1;
}
@@ -221,10 +221,10 @@ int MAIN_NAME(int argc, char *argv[])
// Create a window to draw into
printf(MAIN_STRING "Create a Window\n");
printf("cbuttonarray_main: Create a Window\n");
if (!test->createWindow())
{
printf(MAIN_STRING "Failed to create a window\n");
printf("cbuttonarray_main: Failed to create a window\n");
delete test;
return 1;
}
@@ -235,7 +235,7 @@ int MAIN_NAME(int argc, char *argv[])
CButtonArray *buttonArray = test->createButtonArray();
if (!buttonArray)
{
printf(MAIN_STRING "Failed to create a button array\n");
printf("cbuttonarray_main: Failed to create a button array\n");
delete test;
return 1;
}
@@ -248,7 +248,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("cbuttonarray_main: Label (%d,%d): %s\n", i, j, *ptr);
CNxString string = *ptr++;
buttonArray->setText(i, j, string);
}
@@ -257,7 +257,7 @@ int MAIN_NAME(int argc, char *argv[])
// Show the button array
printf(MAIN_STRING "Show the button array\n");
printf("cbuttonarray_main: Show the button array\n");
test->showButton(buttonArray);
sleep(1);
@@ -272,7 +272,7 @@ int MAIN_NAME(int argc, char *argv[])
{
for (int i = 0; i < BUTTONARRAY_NCOLUMNS; i++)
{
printf(MAIN_STRING "Click the button (%d,%d)\n", i, j);
printf("cbuttonarray_main: Click the button (%d,%d)\n", i, j);
test->click(buttonArray, i, j);
// Poll for the mouse click event
@@ -285,13 +285,13 @@ int MAIN_NAME(int argc, char *argv[])
int clickRow;
if (buttonArray->isButtonClicked(clickColumn, clickRow))
{
printf(MAIN_STRING "%s: Button (%d, %d) is clicked\n",
printf("cbuttonarray_main: %s: Button (%d, %d) is clicked\n",
clickColumn == i && clickRow == j ? "OK" : "ERROR",
clickColumn, clickRow);
}
else
{
printf(MAIN_STRING "ERROR: No button is clicked\n");
printf("cbuttonarray_main: ERROR: No button is clicked\n");
}
// Wait a bit, then release the mouse button
@@ -304,7 +304,7 @@ int MAIN_NAME(int argc, char *argv[])
test->poll(buttonArray);
if (buttonArray->isButtonClicked(clickColumn, clickRow))
{
printf(MAIN_STRING "ERROR: Button (%d, %d) is clicked\n",
printf("cbuttonarray_main: ERROR: Button (%d, %d) is clicked\n",
clickColumn, clickRow);
}
@@ -315,7 +315,7 @@ int MAIN_NAME(int argc, char *argv[])
// Clean up and exit
printf(MAIN_STRING "Clean-up and exit\n");
printf("cbuttonarray_main: Clean-up and exit\n");
delete buttonArray;
updateMemoryUsage(g_mmPrevious, "After deleting the button array");
delete test;
NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
-10
View File
@@ -75,16 +75,6 @@
# define CONFIG_CBUTTONARRAYTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR
#endif
// What is the entry point called?
#ifdef CONFIG_NSH_BUILTIN_APPS
# define MAIN_NAME cbuttonarray_main
# define MAIN_STRING "cbuttonarray_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.