summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlefranc2009-10-28 18:03:09 +0000
committerlefranc2009-10-28 18:03:09 +0000
commit3b951263037aedd0bdd382ae069a1a36c6baa424 (patch)
tree9e30f941d086945119ba1e1dba61360571953901
parente85d51c12f6f71ccdeb2d4805887c70057da4abf (diff)
cleo/devkit/test: several fixes on plcd unit test
- adapt Makefile to precompile libmme and spidlib in utest arch - several fixes to allow event_utest.c to compile git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6252 017c9cb6-072f-447c-8318-d5b54f68fe89
-rw-r--r--cleopatre/devkit/tests/plcd/Makefile32
-rw-r--r--cleopatre/devkit/tests/plcd/src/event_utests.c47
2 files changed, 43 insertions, 36 deletions
diff --git a/cleopatre/devkit/tests/plcd/Makefile b/cleopatre/devkit/tests/plcd/Makefile
index 4dccd4e217..52b2036ab9 100644
--- a/cleopatre/devkit/tests/plcd/Makefile
+++ b/cleopatre/devkit/tests/plcd/Makefile
@@ -1,29 +1,25 @@
PRJ_BASE = ../../plcd
FILES = event
-LIBMME_DIR=../../../application/libmme
+LIBMME_DIR = ../../../application/libmme
LIBSPID_DIR=../../../application/libspid
-LINUX_DIR=../../../linux-2.6.25.10-spc300
+LIBMME_TEST_DIR = ../libmme/utests
+LIBSPID_TEST_DIR = ../libspid/utests
+LIBMME_TEST_OBJ = $(wildcard $(LIBMME_TEST_DIR)/obj/prj/*.o)
+LIBSPID_TEST_OBJ = $(wildcard $(LIBSPID_TEST_DIR)/obj/prj/*.o)
-EXTRA_CFLAGS = -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(LINUX_DIR)/include
-#EXTRA_CFLAGS_LOCAL = -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(LINUX_DIR)/include -I$(LINUX_DIR)/scripts/mksimage
-#EXTRA_LIBS_LOCAL = -L$(shell pwd) -lmme -lspid
+EXTRA_CFLAGS = -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I../../../include
+EXTRA_LIBS = $(LIBMME_TEST_OBJ) $(LIBSPID_TEST_OBJ)
-#UTEST_MAKERULES_FLAGS = EXTRA_CFLAGS="$(EXTRA_CFLAGS_LOCAL)" EXTRA_LIBS="$(EXTRA_LIBS_LOCAL)" PRJ_BASE="$(PRJ_BASE)" FILES="$(FILES)"
-
-#LIBSPID_STAT_LIB = $(shell pwd)/libspid.a
-#LIBMME_STAT_LIB = $(shell pwd)/libmme.a
-#OVERRIDE_VARS = CC=gcc AR=ar
-
-#make_libs:
-## $(MAKE) -C $(LIBSPID_DIR) $(LIBSPID_STAT_LIB) STAT_LIB=$(LIBSPID_STAT_LIB) OBJPATH=$(shell pwd)/obj/lib/libspid $(OVERRIDE_VARS)
-## $(MAKE) -C $(LIBMME_DIR) $(LIBMME_STAT_LIB) STAT_LIB=$(LIBMME_STAT_LIB) OBJPATH=$(shell pwd)/obj/lib/libmme $(OVERRIDE_VARS)
-# $(MAKE) -f ../utests_makerules $(UTEST_MAKERULES_FLAGS)
+PREBINS = make_libs
include ../../tests/utests_makerules
-#.PHONY: all clean make_libs
+make_libs:
+ $(MAKE) -C $(LIBMME_TEST_DIR)
+ $(MAKE) -C $(LIBSPID_TEST_DIR)
+
+#OVERRIDE_VARS = CC=gcc AR=ar
-#clean:
-# rm -rf obj libspid.a libmme.a
+.PHONY: all clean make_libs
diff --git a/cleopatre/devkit/tests/plcd/src/event_utests.c b/cleopatre/devkit/tests/plcd/src/event_utests.c
index 1d6c2a4515..56fbfad7f6 100644
--- a/cleopatre/devkit/tests/plcd/src/event_utests.c
+++ b/cleopatre/devkit/tests/plcd/src/event_utests.c
@@ -21,9 +21,13 @@
#include <sys/time.h> /* for select() */
#include <linux/if_ether.h> /* for ETH_ALEN */
#include <unistd.h>
+#include <setjmp.h>
+#include <assert.h>
#include <errno.h>
#include "plcd.h"
#include "stub.h"
+#include "libmme.h"
+#include "libspid.h"
#define DEBUG 1
@@ -83,8 +87,9 @@ int build_file (const char *filename, const char *content)
{
FILE *fp;
fp = fopen (filename, "w+");
- fwrite (fp, "%s", content);
+ fprintf (fp, "%s", content);
fclose (fp);
+ return 0;
}
/*
@@ -93,12 +98,13 @@ int build_file (const char *filename, const char *content)
# (redefinition of libc functions)
######################################
*/
-void assert (scalar expr)
+#undef assert
+void assert (int /*scalar*/ expr)
{
if (!expr)
{
check_ctx.assert = 1;
- longjmp (check_ctx.jmp_buf, check_ctx.assert);
+ longjmp (check_ctx.jmp_env, check_ctx.assert);
}
}
@@ -137,13 +143,17 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
return 1;
}
+int hpav_send_single_value (const plcd_ctx_t *plcd_ctx, unsigned int mmtype, const void *value, unsigned int length)
+{
+ return 0;
+}
/* fixtures - run before and after each unit test */
void setup(void)
{
- plcd_ctx->hpav_conf_path = HPAV_CONF_TMP_PATH;
- plcd_ctx->hpav_info_path = HPAV_INFO_TMP_PATH;
+ plcd_ctx.hpav_conf_path = HPAV_CONF_TMP_PATH;
+ plcd_ctx.hpav_info_path = HPAV_INFO_TMP_PATH;
mme_init (&mme_ctx, MME_TYPE_DRV_STA_STATUS | MME_TYPE_IND, mme_buffer, sizeof(mme_buffer));
is_info_manager_needed = LIBSPID_FALSE;
is_save_conf_needed = LIBSPID_FALSE;
@@ -189,7 +199,7 @@ START_TEST (test_refresh_status_param_1)
fail ("refresh_status plcd_ctx = NULL (1)");
}
fail_unless ((1 == result)
- && (check_ctx->assert != 0),
+ && (check_ctx.assert != 0),
"refresh status plcd_ctx = NULL (2)");
}
END_TEST
@@ -205,7 +215,7 @@ START_TEST (test_refresh_status_param_2)
fail ("refresh_status mme_ctx = NULL (1)");
}
fail_unless ((2 == result)
- && (check_ctx->assert != 0),
+ && (check_ctx.assert != 0),
"refresh status mme_ctx = NULL (2)");
}
END_TEST
@@ -222,7 +232,7 @@ START_TEST (test_refresh_status_param_3)
fail ("refresh_status mme_ctx.mmtype (1)");
}
fail_unless ((3 == result)
- && (check_ctx->assert != 0),
+ && (check_ctx.assert != 0),
"refresh status mme_ctx.mmtype (2)");
}
END_TEST
@@ -238,7 +248,7 @@ START_TEST (test_refresh_status_param_4)
fail ("refresh_status is_save_conf_needed (1)");
}
fail_unless ((4 == result)
- && (check_ctx->assert != 0),
+ && (check_ctx.assert != 0),
"refresh status is_save_conf_needed (2)");
}
END_TEST
@@ -254,7 +264,7 @@ START_TEST (test_refresh_status_param_5)
fail ("refresh_status is_info_manager_needed (1)");
}
fail_unless ((5 == result)
- && (check_ctx->assert != 0),
+ && (check_ctx.assert != 0),
"refresh status is_info_manager_needed (2)");
}
END_TEST
@@ -281,14 +291,14 @@ START_TEST (test_refresh_status_assoc_1)
int result, length;
char buffer[1024];
- mme_push (mme_ctx, "\x00\x00\x00\x00\x00", 5, &length);
+ mme_push (&mme_ctx, "\x00\x00\x00\x00\x00", 5, &length);
build_file (HPAV_INFO_TMP_PATH, "STATUS = associated\n");
refresh_status (&plcd_ctx, &mme_ctx, &is_save_conf_needed, &is_info_manager_needed);
libspid_config_read_item (plcd_ctx.hpav_info_path, LIBSPID_HPAV_INFO_LABEL_STATUS, buffer, sizeof(buffer));
fail_unless (!strcmp (buffer, "unassociated")
- && (SPDILIB_FALSE == is_info_manager_needed),
+ && (LIBSPID_FALSE == is_info_manager_needed),
"STATUS = unassociated");
}
END_TEST
@@ -299,14 +309,14 @@ START_TEST (test_refresh_status_assoc_2)
int result, length;
char buffer[1024];
- mme_push (mme_ctx, "\x01\x00\x00\x00\x00", 5, &length);
+ mme_push (&mme_ctx, "\x01\x00\x00\x00\x00", 5, &length);
build_file (HPAV_INFO_TMP_PATH, "STATUS = unassociated\n");
refresh_status (&plcd_ctx, &mme_ctx, &is_save_conf_needed, &is_info_manager_needed);
libspid_config_read_item (plcd_ctx.hpav_info_path, LIBSPID_HPAV_INFO_LABEL_STATUS, buffer, sizeof(buffer));
fail_unless (!strcmp (buffer, "associated")
- && (SPDILIB_FALSE == is_info_manager_needed),
+ && (LIBSPID_FALSE == is_info_manager_needed),
"STATUS = associated");
}
END_TEST
@@ -317,14 +327,14 @@ START_TEST (test_refresh_status_assoc_3)
int result, length;
char buffer[1024];
- mme_push (mme_ctx, "\x02\x00\x00\x00\x00", 5, &length);
+ mme_push (&mme_ctx, "\x02\x00\x00\x00\x00", 5, &length);
build_file (HPAV_INFO_TMP_PATH, "STATUS = unassociated\n");
refresh_status (&plcd_ctx, &mme_ctx, &is_save_conf_needed, &is_info_manager_needed);
libspid_config_read_item (plcd_ctx.hpav_info_path, LIBSPID_HPAV_INFO_LABEL_STATUS, buffer, sizeof(buffer));
fail_unless (!strcmp (buffer, "authenticated")
- && (SPDILIB_FALSE == is_info_manager_needed),
+ && (LIBSPID_FALSE == is_info_manager_needed),
"STATUS = authenticated");
}
END_TEST
@@ -335,14 +345,14 @@ START_TEST (test_refresh_status_assoc_4)
int result, length;
char buffer[1024];
- mme_push (mme_ctx, "\x03\x00\x00\x00\x00", 5, &length);
+ mme_push (&mme_ctx, "\x03\x00\x00\x00\x00", 5, &length);
build_file (HPAV_INFO_TMP_PATH, "STATUS = associated\n");
refresh_status (&plcd_ctx, &mme_ctx, &is_save_conf_needed, &is_info_manager_needed);
libspid_config_read_item (plcd_ctx.hpav_info_path, LIBSPID_HPAV_INFO_LABEL_STATUS, buffer, sizeof(buffer));
fail_unless (!strcmp (buffer, "associated")
- && (SPDILIB_FALSE == is_info_manager_needed),
+ && (LIBSPID_FALSE == is_info_manager_needed),
"wrong STATUS value");
}
END_TEST
@@ -369,6 +379,7 @@ extern Suite* event_suite(void)
int main(void)
{
+ Suite *s = event_suite;
int number_failed = 0;
SRunner *sr = srunner_create(s);
srunner_add_suite (sr, event_suite);