summaryrefslogtreecommitdiff
path: root/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
diff options
context:
space:
mode:
authorCyril Jourdan2011-09-06 12:05:06 +0200
committerNicolas Schodet2011-12-20 15:42:44 +0100
commit5c48394204579eaa9378336e6794a63fb9ae18e7 (patch)
tree1bded50d6833fc0012eea211c8e175eeb538b8ef /cleopatre/devkit/tests/libspid/utests/src/system_utests.c
parent758a970aefb99a4e5d64a099e837b9445c61f59f (diff)
cleopatre/devkit/test/libspid: fix tests
Diffstat (limited to 'cleopatre/devkit/tests/libspid/utests/src/system_utests.c')
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/system_utests.c71
1 files changed, 14 insertions, 57 deletions
diff --git a/cleopatre/devkit/tests/libspid/utests/src/system_utests.c b/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
index b0a7cd6a72..8d6fddc40f 100644
--- a/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
@@ -349,66 +349,23 @@ START_TEST (test_libspid_system_factory)
char tst_file[128] = {0};
struct stat st;
-#ifdef DEBUG
- struct dirent *d;
- DIR *dir;
-#endif /* DEBUG */
-
- sprintf(tst_file, "%s/test_F1", LIBSPID_FACTORY_PATH);
- mknod(tst_file, 0770, S_IFREG);
- sprintf(tst_file, "%s/test_F2", LIBSPID_FACTORY_PATH);
- mknod(tst_file, 0770, S_IFREG);
- sprintf(tst_file, "%s/test_F3.conf", LIBSPID_FACTORY_PATH);
- mknod(tst_file, 0770, S_IFREG);
+ sprintf(tst_file, "%s/test1", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "missing file before test" );
+ sprintf(tst_file, "%s/test2", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "missing file before test" );
+ sprintf(tst_file, "%s/test3.conf", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) != 0, "missing file before test" );
ret = libspid_system_factory();
- fail_if(ret != LIBSPID_SUCCESS, "libspid_system_get_meminfo fail");
-
- /* test if files have been well copied */
- sprintf(tst_file, "%s/test_F1", LIBSPID_CONF_ROOT_PATH);
- fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F1", LIBSPID_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F2", LIBSPID_CONF_ROOT_PATH);
- fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F2", LIBSPID_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F3.conf", LIBSPID_CONF_ROOT_PATH);
- fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
- sprintf(tst_file, "%s/test_F3.conf", LIBSPID_SAVE_DIR_PATH);
- fail_if ( stat(tst_file,&st) != 0, "libspid_system_factory does not backup files well" );
-
-#ifdef DEBUG
- /* print contents for debug */
- dir = opendir(LIBSPID_SAVE_DIR_PATH);
- if (dir == NULL)
- {
- perror("opendir()");
- exit(1);
- }
- TRACE("Listing LIBSPID_SAVE_DIR_PATH, %s:\n", LIBSPID_SAVE_DIR_PATH);
- while( (d = readdir(dir)) != NULL )
- {
- TRACE("%s\n",d->d_name);
- }
-
- sprintf(tst_file, "%s/test_F1", LIBSPID_SAVE_DIR_PATH);
- if ( stat(tst_file,&st) == 0 )
- {
- printf("%s is present\n", tst_file);
- }
+ fail_if(ret != LIBSPID_SUCCESS, "libspid_system_factory fail");
- sprintf(tst_file, "%s/test_NON_EXISTANT", LIBSPID_SAVE_DIR_PATH);
- if ( stat(tst_file,&st) == 0 )
- {
- printf("%s is present\n", tst_file);
- }
- else
- {
- printf("%s is *NOT* present\n", tst_file);
- }
-#endif /* DEBUG */
+ sprintf(tst_file, "%s/test1", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) == 0, "file not removed" );
+ sprintf(tst_file, "%s/test2", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) == 0, "file not removed" );
+ sprintf(tst_file, "%s/test3.conf", LIBSPID_SAVE_DIR_PATH);
+ fail_if ( stat(tst_file,&st) == 0, "file not removed" );
}
END_TEST
@@ -485,7 +442,7 @@ START_TEST (test_libspid_system_file_update_register)
unsigned int elt_number = LIBSPID_CONFIG_ELT_MAX_NB;
char *elt[LIBSPID_CONFIG_ELT_MAX_NB] = { NULL };
char buffer[LIBSPID_CONFIG_LINE_MAX_LEN] = {0};
- char key[LIBSPID_CONFIG_KEY_MAX_LEN];
+ char key[LIBSPID_CONFIG_KEY_MAX_LEN + 1];
memset (filename, 'f', LIBSPID_CONFIG_KEY_MAX_LEN);
filename[LIBSPID_CONFIG_KEY_MAX_LEN] = '\0';
memset (filename_too_long, 'l', LIBSPID_CONFIG_KEY_MAX_LEN + 1);