X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftests%2Feet_suite.c;h=9c4d5f0a1c946f1e29ce7e5ec1be8c658bdb5d94;hb=c975e2f91b30344e78b41e16f0807843e40f0c00;hp=d138e259ce7a9a229da90758874c05cfba101545;hpb=5c64543e176e05480593a366735f7586934aeb5d;p=framework%2Fuifw%2Feet.git diff --git a/src/tests/eet_suite.c b/src/tests/eet_suite.c index d138e25..9c4d5f0 100644 --- a/src/tests/eet_suite.c +++ b/src/tests/eet_suite.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +# include +#endif /* ifdef HAVE_CONFIG_H */ + #include #include #include @@ -6,13 +10,12 @@ #include #include #include -#include -#include +#ifdef EFL_HAVE_POSIX_THREADS +# include +#endif /* ifdef EFL_HAVE_POSIX_THREADS */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include @@ -30,83 +33,99 @@ START_TEST(eet_test_init) } END_TEST -typedef struct _Eet_Test_Basic_Type Eet_Test_Basic_Type; +typedef struct _Eet_Test_Basic_Type Eet_Test_Basic_Type; struct _Eet_Test_Basic_Type { - char c; - short s; - int i; - long long l; - char *str; - char *istr; - float f1; - float f2; - double d; - unsigned char uc; - unsigned short us; - unsigned int ui; - unsigned long long ul; - Eet_Test_Basic_Type *empty; - Eet_Test_Basic_Type *with; + char c; + short s; + int i; + long long l; + char * str; + char * istr; + float f1; + float f2; + double d; + unsigned char uc; + unsigned short us; + unsigned int ui; + unsigned long long ul; + Eet_Test_Basic_Type * empty; + Eet_Test_Basic_Type * with; }; -#define EET_TEST_CHAR 0x42 -#define EET_TEST_SHORT 0x4224 -#define EET_TEST_INT 0x42211224 -#define EET_TEST_LONG_LONG 0x84CB42211224BC48 -#define EET_TEST_STRING "my little test with escape \\\"" -#define EET_TEST_KEY1 "key1" -#define EET_TEST_KEY2 "key2" -#define EET_TEST_FLOAT 123.45689 -#define EET_TEST_FLOAT2 1.0 -#define EET_TEST_FLOAT3 0.25 -#define EET_TEST_FLOAT4 0.0001234 -#define EET_TEST_DOUBLE 123456789.9876543210 -#define EET_TEST_DOUBLE2 1.0 -#define EET_TEST_DOUBLE3 0.25 -#define EET_TEST_FILE_KEY1 "keys/data/1" -#define EET_TEST_FILE_KEY2 "keys/data/2" +#define EET_TEST_CHAR 0x42 +#define EET_TEST_SHORT 0x4224 +#define EET_TEST_INT 0x42211224 +#define EET_TEST_LONG_LONG 0x84CB42211224BC48 +#define EET_TEST_STRING "my little test with escape \\\"" +#define EET_TEST_KEY1 "key1" +#define EET_TEST_KEY2 "key2" +#define EET_TEST_FLOAT 123.45689 +#define EET_TEST_FLOAT2 1.0 +#define EET_TEST_FLOAT3 0.25 +#define EET_TEST_FLOAT4 0.0001234 +#define EET_TEST_DOUBLE 123456789.9876543210 +#define EET_TEST_DOUBLE2 1.0 +#define EET_TEST_DOUBLE3 0.25 +#define EET_TEST_FILE_KEY1 "keys/data/1" +#define EET_TEST_FILE_KEY2 "keys/data/2" #define EET_TEST_FILE_IMAGE "keys/images/" -typedef struct _Eet_Test_Image Eet_Test_Image; +typedef struct _Eet_Test_Image Eet_Test_Image; struct _Eet_Test_Image { unsigned int w; unsigned int h; - int alpha; + int alpha; unsigned int color[64]; }; static const Eet_Test_Image test_noalpha = { - 8, 8, 0, - { - 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, - 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, - 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, - 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, - 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, - 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, - 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, - 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA - } + 8, 8, 0, + { + 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, + 0x000000AA, 0x00110000, + 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, + 0x00110000, 0x00AA0000, + 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, + 0x00AA0000, 0x0000AA00, + 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, + 0x0000AA00, 0x000000AA, + 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, + 0x000000AA, 0x00110000, + 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, + 0x00110000, 0x00AA0000, + 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, + 0x00AA0000, 0x0000AA00, + 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, + 0x0000AA00, 0x000000AA + } }; static const Eet_Test_Image test_alpha = { - 8, 8, 1, - { - 0x0FAA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x0F110000, - 0x0000AA00, 0x0F0000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x0F110000, 0x00AA0000, - 0x000000AA, 0x00110000, 0x0FAA0000, 0x0000AA00, 0x000000AA, 0x0F110000, 0x00AA0000, 0x0000AA00, - 0x00110000, 0x00AA0000, 0x0000AA00, 0x0F0000AA, 0x0F110000, 0x00AA0000, 0x0000AA00, 0x000000AA, - 0x00AA0000, 0x0000AA00, 0x000000AA, 0x0F110000, 0x0FAA0000, 0x0000AA00, 0x000000AA, 0x00110000, - 0x0000AA00, 0x000000AA, 0x0F110000, 0x00AA0000, 0x0000AA00, 0x0F0000AA, 0x00110000, 0x00AA0000, - 0x000000AA, 0x0F110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x0FAA0000, 0x0000AA00, - 0x0F110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x0F0000AA - } + 8, 8, 1, + { + 0x0FAA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, 0x0000AA00, + 0x000000AA, 0x0F110000, + 0x0000AA00, 0x0F0000AA, 0x00110000, 0x00AA0000, 0x0000AA00, 0x000000AA, + 0x0F110000, 0x00AA0000, + 0x000000AA, 0x00110000, 0x0FAA0000, 0x0000AA00, 0x000000AA, 0x0F110000, + 0x00AA0000, 0x0000AA00, + 0x00110000, 0x00AA0000, 0x0000AA00, 0x0F0000AA, 0x0F110000, 0x00AA0000, + 0x0000AA00, 0x000000AA, + 0x00AA0000, 0x0000AA00, 0x000000AA, 0x0F110000, 0x0FAA0000, 0x0000AA00, + 0x000000AA, 0x00110000, + 0x0000AA00, 0x000000AA, 0x0F110000, 0x00AA0000, 0x0000AA00, 0x0F0000AA, + 0x00110000, 0x00AA0000, + 0x000000AA, 0x0F110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, + 0x0FAA0000, 0x0000AA00, + 0x0F110000, 0x00AA0000, 0x0000AA00, 0x000000AA, 0x00110000, 0x00AA0000, + 0x0000AA00, 0x0F0000AA + } }; static void -_eet_test_basic_set(Eet_Test_Basic_Type *res, int i) +_eet_test_basic_set(Eet_Test_Basic_Type * res, int i) { res->c = EET_TEST_CHAR; res->s = EET_TEST_SHORT; @@ -114,8 +133,8 @@ _eet_test_basic_set(Eet_Test_Basic_Type *res, int i) res->l = EET_TEST_LONG_LONG; res->str = EET_TEST_STRING; res->istr = EET_TEST_STRING; - res->f1 = - EET_TEST_FLOAT; - res->d = - EET_TEST_DOUBLE; + res->f1 = -EET_TEST_FLOAT; + res->d = -EET_TEST_DOUBLE; res->f2 = EET_TEST_FLOAT4; res->uc = EET_TEST_CHAR; res->us = EET_TEST_SHORT; @@ -126,39 +145,39 @@ _eet_test_basic_set(Eet_Test_Basic_Type *res, int i) if (i == 0) { - Eet_Test_Basic_Type *tmp; - - tmp = malloc(sizeof (Eet_Test_Basic_Type)); - fail_if(!tmp); - - res->with = tmp; - tmp->c = EET_TEST_CHAR; - tmp->s = EET_TEST_SHORT; - tmp->i = EET_TEST_INT + i + 1; - tmp->l = EET_TEST_LONG_LONG; - tmp->str = EET_TEST_STRING; - tmp->istr = EET_TEST_STRING; - tmp->f1 = - EET_TEST_FLOAT; - tmp->d = - EET_TEST_DOUBLE; - tmp->f2 = EET_TEST_FLOAT4; - tmp->uc = EET_TEST_CHAR; - tmp->us = EET_TEST_SHORT; - tmp->ui = EET_TEST_INT; - tmp->ul = EET_TEST_LONG_LONG; - tmp->empty = NULL; - tmp->with = NULL; + Eet_Test_Basic_Type * tmp; + + tmp = malloc(sizeof (Eet_Test_Basic_Type)); + fail_if(!tmp); + + res->with = tmp; + tmp->c = EET_TEST_CHAR; + tmp->s = EET_TEST_SHORT; + tmp->i = EET_TEST_INT + i + 1; + tmp->l = EET_TEST_LONG_LONG; + tmp->str = EET_TEST_STRING; + tmp->istr = EET_TEST_STRING; + tmp->f1 = -EET_TEST_FLOAT; + tmp->d = -EET_TEST_DOUBLE; + tmp->f2 = EET_TEST_FLOAT4; + tmp->uc = EET_TEST_CHAR; + tmp->us = EET_TEST_SHORT; + tmp->ui = EET_TEST_INT; + tmp->ul = EET_TEST_LONG_LONG; + tmp->empty = NULL; + tmp->with = NULL; } -} +} /* _eet_test_basic_set */ static void -_eet_test_basic_check(Eet_Test_Basic_Type *result, int i) +_eet_test_basic_check(Eet_Test_Basic_Type * result, int i) { float tmp; fail_if(result->c != EET_TEST_CHAR); fail_if(result->s != EET_TEST_SHORT); fail_if(result->i != EET_TEST_INT + i); - fail_if(result->l != (long long) EET_TEST_LONG_LONG); + fail_if(result->l != (long long)EET_TEST_LONG_LONG); fail_if(strcmp(result->str, EET_TEST_STRING) != 0); fail_if(strcmp(result->istr, EET_TEST_STRING) != 0); fail_if(result->uc != EET_TEST_CHAR); @@ -167,68 +186,126 @@ _eet_test_basic_check(Eet_Test_Basic_Type *result, int i) fail_if(result->ul != EET_TEST_LONG_LONG); tmp = (result->f1 + EET_TEST_FLOAT); - if (tmp < 0) tmp = -tmp; + if (tmp < 0) + tmp = -tmp; + fail_if(tmp > 0.005); tmp = (result->f2 - EET_TEST_FLOAT4); - if (tmp < 0) tmp = -tmp; + if (tmp < 0) + tmp = -tmp; + fail_if(tmp > 0.005); tmp = (result->d + EET_TEST_DOUBLE); - if (tmp < 0) tmp = -tmp; + if (tmp < 0) + tmp = -tmp; + fail_if(tmp > 0.00005); fail_if(result->empty != NULL); if (i == 0) { - Eet_Test_Basic_Type *tmp; - - tmp = result->with; - fail_if(tmp == NULL); - - fail_if(tmp->c != EET_TEST_CHAR); - fail_if(tmp->s != EET_TEST_SHORT); - fail_if(tmp->i != EET_TEST_INT + i + 1); - fail_if(tmp->l != (long long) EET_TEST_LONG_LONG); - fail_if(strcmp(tmp->str, EET_TEST_STRING) != 0); - fail_if(strcmp(tmp->istr, EET_TEST_STRING) != 0); - fail_if(tmp->uc != EET_TEST_CHAR); - fail_if(tmp->us != EET_TEST_SHORT); - fail_if(tmp->ui != EET_TEST_INT); - fail_if(tmp->ul != EET_TEST_LONG_LONG); + Eet_Test_Basic_Type * tmp; + + tmp = result->with; + fail_if(tmp == NULL); + + fail_if(tmp->c != EET_TEST_CHAR); + fail_if(tmp->s != EET_TEST_SHORT); + fail_if(tmp->i != EET_TEST_INT + i + 1); + fail_if(tmp->l != (long long)EET_TEST_LONG_LONG); + fail_if(strcmp(tmp->str, EET_TEST_STRING) != 0); + fail_if(strcmp(tmp->istr, EET_TEST_STRING) != 0); + fail_if(tmp->uc != EET_TEST_CHAR); + fail_if(tmp->us != EET_TEST_SHORT); + fail_if(tmp->ui != EET_TEST_INT); + fail_if(tmp->ul != EET_TEST_LONG_LONG); } else - fail_if(result->with != NULL); -} + fail_if(result->with != NULL); +} /* _eet_test_basic_check */ static void -_eet_build_basic_descriptor(Eet_Data_Descriptor *edd) -{ - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "c", c, EET_T_CHAR); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "s", s, EET_T_SHORT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "i", i, EET_T_INT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "l", l, EET_T_LONG_LONG); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "str", str, EET_T_STRING); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "istr", istr, EET_T_INLINED_STRING); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "f1", f1, EET_T_FLOAT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "f2", f2, EET_T_FLOAT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "d", d, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "uc", uc, EET_T_UCHAR); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "us", us, EET_T_USHORT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "ui", ui, EET_T_UINT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Basic_Type, "ul", ul, EET_T_ULONG_LONG); +_eet_build_basic_descriptor(Eet_Data_Descriptor * edd) +{ + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "c", + c, + EET_T_CHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "s", + s, + EET_T_SHORT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "i", + i, + EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "l", + l, + EET_T_LONG_LONG); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "str", + str, + EET_T_STRING); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "istr", + istr, + EET_T_INLINED_STRING); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "f1", + f1, + EET_T_FLOAT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "f2", + f2, + EET_T_FLOAT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "d", + d, + EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "uc", + uc, + EET_T_UCHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "us", + us, + EET_T_USHORT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "ui", + ui, + EET_T_UINT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Basic_Type, + "ul", + ul, + EET_T_ULONG_LONG); EET_DATA_DESCRIPTOR_ADD_SUB(edd, Eet_Test_Basic_Type, "empty", empty, edd); - EET_DATA_DESCRIPTOR_ADD_SUB(edd, Eet_Test_Basic_Type, "with", with, edd); -} + EET_DATA_DESCRIPTOR_ADD_SUB(edd, Eet_Test_Basic_Type, "with", with, edd); +} /* _eet_build_basic_descriptor */ START_TEST(eet_test_basic_data_type_encoding_decoding) { - Eet_Data_Descriptor *edd; - Eet_Test_Basic_Type *result; + Eet_Data_Descriptor * edd; + Eet_Test_Basic_Type * result; Eet_Data_Descriptor_Class eddc; Eet_Test_Basic_Type etbt; - void *transfert; + void * transfert; int size; eet_init(); @@ -261,52 +338,51 @@ START_TEST(eet_test_basic_data_type_encoding_decoding) } END_TEST -typedef struct _Eet_Test_Ex_Type Eet_Test_Ex_Type; +typedef struct _Eet_Test_Ex_Type Eet_Test_Ex_Type; struct _Eet_Test_Ex_Type { - char c; - short s; - int i; - unsigned long long l; - char *str; - char *istr; - float f1; - float f2; - float f3; - float f4; - double d1; - double d2; - double d3; - double d4; - Eina_List *list; - Eina_Hash *hash; - Eina_List *ilist; - Eina_List *slist; - Eina_Hash *ihash; - Eina_Hash *shash; - Eet_Test_Basic_Type sarray1[10]; - unsigned int sarray2[5]; - unsigned int varray1_count; - unsigned int *varray1; - unsigned int varray2_count; - Eet_Test_Basic_Type *varray2; - unsigned char uc; - unsigned short us; - unsigned int ui; - unsigned long long ul; - char *charray[10]; + char c; + short s; + int i; + unsigned long long l; + char * str; + char * istr; + float f1; + float f2; + float f3; + float f4; + double d1; + double d2; + double d3; + double d4; + Eina_List * list; + Eina_Hash * hash; + Eina_List * ilist; + Eina_List * slist; + Eina_Hash * ihash; + Eina_Hash * shash; + Eet_Test_Basic_Type sarray1[10]; + unsigned int sarray2[5]; + unsigned int varray1_count; + unsigned int * varray1; + unsigned int varray2_count; + Eet_Test_Basic_Type * varray2; + unsigned char uc; + unsigned short us; + unsigned int ui; + unsigned long long ul; + char * charray[10]; }; static int i42 = 42; static int i7 = 7; - static void -_eet_build_ex_descriptor(Eet_Data_Descriptor *edd) +_eet_build_ex_descriptor(Eet_Data_Descriptor * edd) { Eet_Data_Descriptor_Class eddc; Eet_Test_Ex_Type etbt; - Eet_Data_Descriptor *eddb; + Eet_Data_Descriptor * eddb; eet_test_setup_eddc(&eddc); eddc.name = "Eet_Test_Basic_Type"; @@ -316,58 +392,145 @@ _eet_build_ex_descriptor(Eet_Data_Descriptor *edd) _eet_build_basic_descriptor(eddb); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "c", c, EET_T_CHAR); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "s", s, EET_T_SHORT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "c", + c, + EET_T_CHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "s", + s, + EET_T_SHORT); EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "i", i, EET_T_INT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "l", l, EET_T_LONG_LONG); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "str", str, EET_T_STRING); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "istr", istr, EET_T_INLINED_STRING); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "f1", f1, EET_T_FLOAT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "f2", f2, EET_T_FLOAT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "f3", f3, EET_T_FLOAT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "f4", f4, EET_T_FLOAT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "d1", d1, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "d2", d2, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "d3", d3, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "d4", d4, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "uc", uc, EET_T_UCHAR); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "us", us, EET_T_USHORT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "ui", ui, EET_T_UINT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Eet_Test_Ex_Type, "ul", ul, EET_T_ULONG_LONG); - EET_DATA_DESCRIPTOR_ADD_ARRAY(edd, Eet_Test_Ex_Type, "sarray1", sarray1, eddb); - EET_DATA_DESCRIPTOR_ADD_VAR_ARRAY(edd, Eet_Test_Ex_Type, "varray2", varray2, eddb); - eet_data_descriptor_element_add(edd, "varray1", EET_T_INT, EET_G_VAR_ARRAY, - (char *)(&(etbt.varray1)) - (char *)(&(etbt)), - (char *)(&(etbt.varray1_count)) - (char *)(&(etbt)), /* 0, */NULL, NULL); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "l", + l, + EET_T_LONG_LONG); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "str", + str, + EET_T_STRING); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "istr", + istr, + EET_T_INLINED_STRING); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "f1", + f1, + EET_T_FLOAT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "f2", + f2, + EET_T_FLOAT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "f3", + f3, + EET_T_FLOAT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "f4", + f4, + EET_T_FLOAT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "d1", + d1, + EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "d2", + d2, + EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "d3", + d3, + EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "d4", + d4, + EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "uc", + uc, + EET_T_UCHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "us", + us, + EET_T_USHORT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "ui", + ui, + EET_T_UINT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, + Eet_Test_Ex_Type, + "ul", + ul, + EET_T_ULONG_LONG); + EET_DATA_DESCRIPTOR_ADD_ARRAY(edd, + Eet_Test_Ex_Type, + "sarray1", + sarray1, + eddb); + EET_DATA_DESCRIPTOR_ADD_VAR_ARRAY(edd, + Eet_Test_Ex_Type, + "varray2", + varray2, + eddb); + eet_data_descriptor_element_add(edd, + "varray1", + EET_T_INT, + EET_G_VAR_ARRAY, + (char *)(&(etbt.varray1)) - (char *)(&(etbt)), + (char *)(&(etbt.varray1_count)) - + (char *)(&(etbt)), + /* 0, */ NULL, + NULL); eet_data_descriptor_element_add(edd, "sarray2", EET_T_INT, EET_G_ARRAY, - (char *)(&(etbt.sarray2)) - (char *)(&(etbt)), - /* 0, */sizeof(etbt.sarray2)/sizeof(etbt.sarray2[0]), NULL, NULL); + (char *)(&(etbt.sarray2)) - (char *)(&(etbt)), + /* 0, */ sizeof(etbt.sarray2) / + sizeof(etbt.sarray2[0]), NULL, NULL); eet_data_descriptor_element_add(edd, "charray", EET_T_STRING, EET_G_ARRAY, - (char *)(&(etbt.charray)) - (char *)(&(etbt)), - /* 0, */sizeof(etbt.charray)/sizeof(etbt.charray[0]), NULL, NULL); + (char *)(&(etbt.charray)) - (char *)(&(etbt)), + /* 0, */ sizeof(etbt.charray) / + sizeof(etbt.charray[0]), NULL, NULL); EET_DATA_DESCRIPTOR_ADD_LIST(edd, Eet_Test_Ex_Type, "list", list, edd); EET_DATA_DESCRIPTOR_ADD_HASH(edd, Eet_Test_Ex_Type, "hash", hash, edd); - eet_data_descriptor_element_add(edd, "ilist", EET_T_INT, EET_G_LIST, - (char *)(&(etbt.ilist)) - (char *)(&(etbt)), - 0, /* 0, */NULL, NULL); - eet_data_descriptor_element_add(edd, "ihash", EET_T_INT, EET_G_HASH, - (char *)(&(etbt.ihash)) - (char *)(&(etbt)), - 0, /* 0, */NULL, NULL); + eet_data_descriptor_element_add(edd, "ilist", EET_T_INT, EET_G_LIST, + (char *)(&(etbt.ilist)) - (char *)(&(etbt)), + 0, /* 0, */ NULL, NULL); + eet_data_descriptor_element_add(edd, "ihash", EET_T_INT, EET_G_HASH, + (char *)(&(etbt.ihash)) - (char *)(&(etbt)), + 0, /* 0, */ NULL, NULL); eet_data_descriptor_element_add(edd, "slist", EET_T_STRING, EET_G_LIST, - (char *)(&(etbt.slist)) - (char *)(&(etbt)), - 0, /* 0, */NULL, NULL); + (char *)(&(etbt.slist)) - (char *)(&(etbt)), + 0, /* 0, */ NULL, NULL); eet_data_descriptor_element_add(edd, "shash", EET_T_STRING, EET_G_HASH, - (char *)(&(etbt.shash)) - (char *)(&(etbt)), - 0, /* 0, */NULL, NULL); -} + (char *)(&(etbt.shash)) - (char *)(&(etbt)), + 0, /* 0, */ NULL, NULL); +} /* _eet_build_ex_descriptor */ -static Eet_Test_Ex_Type* -_eet_test_ex_set(Eet_Test_Ex_Type *res, int offset) +static Eet_Test_Ex_Type * +_eet_test_ex_set(Eet_Test_Ex_Type * res, int offset) { - int i; + unsigned int i; - if (!res) res = malloc( sizeof(Eet_Test_Ex_Type)); - if (!res) return NULL; + if (!res) + res = malloc( sizeof(Eet_Test_Ex_Type)); + + if (!res) + return NULL; res->c = EET_TEST_CHAR + offset; res->s = EET_TEST_SHORT + offset; @@ -389,22 +552,22 @@ _eet_test_ex_set(Eet_Test_Ex_Type *res, int offset) res->ihash = NULL; res->slist = NULL; res->shash = NULL; - for (i = 0; i < sizeof(res->charray)/sizeof(res->charray[0]); ++i) - res->charray[i] = NULL; + for (i = 0; i < sizeof(res->charray) / sizeof(res->charray[0]); ++i) + res->charray[i] = NULL; res->varray2 = malloc(sizeof (Eet_Test_Basic_Type) * 10); res->varray1 = malloc(sizeof (int) * 5); fail_if(!res->varray1 || !res->varray2); for (i = 0; i < 10; ++i) { - _eet_test_basic_set(res->sarray1 + i, i); - _eet_test_basic_set(res->varray2 + i, i); + _eet_test_basic_set(res->sarray1 + i, i); + _eet_test_basic_set(res->varray2 + i, i); } res->varray2_count = 10; for (i = 0; i < 5; ++i) { - res->sarray2[i] = i * 42 + 1; - res->varray1[i] = i * 42 + 1; + res->sarray2[i] = i * 42 + 1; + res->varray1[i] = i * 42 + 1; } res->varray1_count = 5; @@ -414,91 +577,137 @@ _eet_test_ex_set(Eet_Test_Ex_Type *res, int offset) res->ul = EET_TEST_LONG_LONG + offset; return res; -} +} /* _eet_test_ex_set */ static int -_eet_test_ex_check(Eet_Test_Ex_Type *stuff, int offset) +_eet_test_ex_check(Eet_Test_Ex_Type * stuff, int offset) { double tmp; unsigned int i; - if (!stuff) return 1; + if (!stuff) + return 1; + + if (stuff->c != EET_TEST_CHAR + offset) + return 1; + + if (stuff->s != EET_TEST_SHORT + offset) + return 1; - if (stuff->c != EET_TEST_CHAR + offset) return 1; - if (stuff->s != EET_TEST_SHORT + offset) return 1; - if (stuff->i != EET_TEST_INT + offset) return 1; - if (stuff->l != EET_TEST_LONG_LONG + offset) return 1; - if (strcmp(stuff->str, EET_TEST_STRING) != 0) return 1; - if (strcmp(stuff->istr, EET_TEST_STRING) != 0) return 1; + if (stuff->i != EET_TEST_INT + offset) + return 1; + + if (stuff->l != EET_TEST_LONG_LONG + offset) + return 1; + + if (strcmp(stuff->str, EET_TEST_STRING) != 0) + return 1; + + if (strcmp(stuff->istr, EET_TEST_STRING) != 0) + return 1; tmp = stuff->f1 - (EET_TEST_FLOAT + offset); - if (tmp < 0) tmp = -tmp; - if (tmp > 0.005) return 1; + if (tmp < 0) + tmp = -tmp; + + if (tmp > 0.005) + return 1; tmp = stuff->d1 - (EET_TEST_DOUBLE + offset); - if (tmp < 0) tmp = -tmp; - if (tmp > 0.00005) return 1; + if (tmp < 0) + tmp = -tmp; + + if (tmp > 0.00005) + return 1; + + if (stuff->f2 != -(EET_TEST_FLOAT2 + offset)) + return 1; + + if (stuff->d2 != -(EET_TEST_DOUBLE2 + offset)) + return 1; + + if (stuff->f3 != EET_TEST_FLOAT3 + offset) + return 1; - if (stuff->f2 != - (EET_TEST_FLOAT2 + offset)) return 1; - if (stuff->d2 != - (EET_TEST_DOUBLE2 + offset)) return 1; + if (stuff->d3 != EET_TEST_DOUBLE3 + offset) + return 1; - if (stuff->f3 != EET_TEST_FLOAT3 + offset) return 1; - if (stuff->d3 != EET_TEST_DOUBLE3 + offset) return 1; + if (stuff->f4 != EET_TEST_FLOAT2 + offset) + return 1; - if (stuff->f4 != EET_TEST_FLOAT2 + offset) return 1; - if (stuff->d4 != EET_TEST_DOUBLE2 + offset) return 1; + if (stuff->d4 != EET_TEST_DOUBLE2 + offset) + return 1; - if (stuff->uc != EET_TEST_CHAR + offset) return 1; - if (stuff->us != EET_TEST_SHORT + offset) return 1; - if (stuff->ui != (unsigned int) EET_TEST_INT + offset) return 1; - if (stuff->ul != EET_TEST_LONG_LONG + offset) return 1; + if (stuff->uc != EET_TEST_CHAR + offset) + return 1; - if (stuff->varray1_count != 5) return 1; - if (stuff->varray2_count != 10) return 1; + if (stuff->us != EET_TEST_SHORT + offset) + return 1; + + if (stuff->ui != (unsigned int)EET_TEST_INT + offset) + return 1; + + if (stuff->ul != EET_TEST_LONG_LONG + offset) + return 1; + + if (stuff->varray1_count != 5) + return 1; + + if (stuff->varray2_count != 10) + return 1; for (i = 0; i < 5; ++i) - if (stuff->sarray2[i] != i * 42 + 1 && stuff->varray1[i] != i * 42 + 1) - return 1; + if (stuff->sarray2[i] != i * 42 + 1 && stuff->varray1[i] != i * 42 + 1) + return 1; for (i = 0; i < 10; ++i) { - _eet_test_basic_check(stuff->sarray1 + i, i); - _eet_test_basic_check(stuff->varray2 + i, i); + _eet_test_basic_check(stuff->sarray1 + i, i); + _eet_test_basic_check(stuff->varray2 + i, i); } return 0; -} +} /* _eet_test_ex_check */ static Eina_Bool -func(__UNUSED__ const Eina_Hash *hash, const void *key, void *data, void *fdata) +func(__UNUSED__ const Eina_Hash * hash, const void * key, void * data, void * fdata) { - int *res = fdata; + int * res = fdata; if (strcmp(key, EET_TEST_KEY1) != 0 - && strcmp(key, EET_TEST_KEY2) != 0) *res = 1; - if (_eet_test_ex_check(data, 2)) *res = 1; + && strcmp(key, EET_TEST_KEY2) != 0) + *res = 1; + + if (_eet_test_ex_check(data, 2)) + *res = 1; return EINA_TRUE; -} +} /* func */ static Eina_Bool -func7(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata) +func7(__UNUSED__ const Eina_Hash * hash, + __UNUSED__ const void * key, + void * data, + void * fdata) { - int *res = fdata; - int *val; + int * res = fdata; + int * val; val = data; - if (!val) *res = 1; - if (*val != 7) *res = 1; + if (!val) + *res = 1; + + if (*val != 7) + *res = 1; return EINA_TRUE; -} +} /* func7 */ START_TEST(eet_test_data_type_encoding_decoding) { - Eet_Data_Descriptor *edd; - Eet_Test_Ex_Type *result; - void *transfert; + Eet_Data_Descriptor * edd; + Eet_Test_Ex_Type * result; + void * transfert; Eet_Data_Descriptor_Class eddc; Eet_Test_Ex_Type etbt; int size; @@ -509,7 +718,7 @@ START_TEST(eet_test_data_type_encoding_decoding) _eet_test_ex_set(&etbt, 0); etbt.list = eina_list_prepend(etbt.list, _eet_test_ex_set(NULL, 1)); etbt.hash = eina_hash_string_superfast_new(NULL); - eina_hash_add(etbt.hash, EET_TEST_KEY1, _eet_test_ex_set(NULL, 2)); + eina_hash_add(etbt.hash, EET_TEST_KEY1, _eet_test_ex_set(NULL, 2)); etbt.ilist = eina_list_prepend(etbt.ilist, &i42); etbt.ihash = eina_hash_string_superfast_new(NULL); eina_hash_add(etbt.ihash, EET_TEST_KEY1, &i7); @@ -538,7 +747,7 @@ START_TEST(eet_test_data_type_encoding_decoding) fail_if(_eet_test_ex_check(result, 0) != 0); fail_if(_eet_test_ex_check(eina_list_data_get(result->list), 1) != 0); fail_if(eina_list_data_get(result->ilist) == NULL); - fail_if(*((int*)eina_list_data_get(result->ilist)) != 42); + fail_if(*((int *)eina_list_data_get(result->ilist)) != 42); fail_if(eina_list_data_get(result->slist) == NULL); fail_if(strcmp(eina_list_data_get(result->slist), "test") != 0); fail_if(eina_hash_find(result->shash, EET_TEST_KEY1) == NULL); @@ -547,9 +756,13 @@ START_TEST(eet_test_data_type_encoding_decoding) fail_if(strcmp(result->charray[5], "plouf") != 0); test = 0; - if (result->hash) eina_hash_foreach(result->hash, func, &test); + if (result->hash) + eina_hash_foreach(result->hash, func, &test); + fail_if(test != 0); - if (result->ihash) eina_hash_foreach(result->ihash, func7, &test); + if (result->ihash) + eina_hash_foreach(result->ihash, func7, &test); + fail_if(test != 0); eet_shutdown(); @@ -557,29 +770,30 @@ START_TEST(eet_test_data_type_encoding_decoding) END_TEST static void -append_string(void *data, const char *str) +append_string(void * data, const char * str) { - char **string = data; + char ** string = data; int length; - if (!data) return ; + if (!data) + return; length = *string ? strlen(*string) : 0; *string = realloc(*string, strlen(str) + length + 1); memcpy((*string) + length, str, strlen(str) + 1); -} +} /* append_string */ START_TEST(eet_test_data_type_dump_undump) { - Eet_Data_Descriptor *edd; - Eet_Test_Ex_Type *result; + Eet_Data_Descriptor * edd; + Eet_Test_Ex_Type * result; Eet_Data_Descriptor_Class eddc; Eet_Test_Ex_Type etbt; - char *transfert1; - char *transfert2; - char *string1; - char *string2; + char * transfert1; + char * transfert2; + char * string1; + char * string2; int size1; int size2; int test; @@ -621,7 +835,8 @@ START_TEST(eet_test_data_type_dump_undump) eet_data_text_dump(transfert1, size1, append_string, &string1); fail_if(!string1); - transfert2 = eet_data_text_undump(string1, string1 ? strlen(string1) : 0, &size2); + transfert2 = eet_data_text_undump(string1, string1 ? strlen( + string1) : 0, &size2); fail_if(!transfert2 && size2 <= 0); string2 = NULL; @@ -636,7 +851,7 @@ START_TEST(eet_test_data_type_dump_undump) fail_if(_eet_test_ex_check(result, 0) != 0); fail_if(_eet_test_ex_check(eina_list_data_get(result->list), 1) != 0); fail_if(eina_list_data_get(result->ilist) == NULL); - fail_if(*((int*)eina_list_data_get(result->ilist)) != 42); + fail_if(*((int *)eina_list_data_get(result->ilist)) != 42); fail_if(eina_list_data_get(result->slist) == NULL); fail_if(strcmp(eina_list_data_get(result->slist), "test") != 0); fail_if(eina_hash_find(result->shash, EET_TEST_KEY1) == NULL); @@ -644,9 +859,13 @@ START_TEST(eet_test_data_type_dump_undump) fail_if(strcmp(result->charray[0], "test") != 0); test = 0; - if (result->hash) eina_hash_foreach(result->hash, func, &test); + if (result->hash) + eina_hash_foreach(result->hash, func, &test); + fail_if(test != 0); - if (result->ihash) eina_hash_foreach(result->ihash, func7, &test); + if (result->ihash) + eina_hash_foreach(result->ihash, func7, &test); + fail_if(test != 0); eet_shutdown(); @@ -655,10 +874,10 @@ END_TEST START_TEST(eet_file_simple_write) { - const char *buffer = "Here is a string of data to save !"; - Eet_File *ef; - char *test; - char *file = strdup("/tmp/eet_suite_testXXXXXX"); + const char * buffer = "Here is a string of data to save !"; + Eet_File * ef; + char * test; + char * file = strdup("/tmp/eet_suite_testXXXXXX"); int size; eet_init(); @@ -671,6 +890,8 @@ START_TEST(eet_file_simple_write) fail_if(!ef); fail_if(!eet_write(ef, "keys/tests", buffer, strlen(buffer) + 1, 1)); + fail_if(!eet_alias(ef, "keys/alias", "keys/tests", 0)); + fail_if(!eet_alias(ef, "keys/alias2", "keys/alias", 1)); fail_if(eet_mode_get(ef) != EET_FILE_MODE_WRITE); @@ -685,12 +906,18 @@ START_TEST(eet_file_simple_write) test = eet_read(ef, "keys/tests", &size); fail_if(!test); - fail_if(size != (int) strlen(buffer) + 1); + fail_if(size != (int)strlen(buffer) + 1); fail_if(memcmp(test, buffer, strlen(buffer) + 1) != 0); + test = eet_read(ef, "keys/alias2", &size); + fail_if(!test); + fail_if(size != (int)strlen(buffer) + 1); + + fail_if(eet_read_direct(ef, "key/alias2", &size)); + fail_if(eet_mode_get(ef) != EET_FILE_MODE_READ); - fail_if(eet_num_entries(ef) != 1); + fail_if(eet_num_entries(ef) != 3); eet_close(ef); @@ -700,7 +927,7 @@ START_TEST(eet_file_simple_write) test = eet_read(ef, "keys/tests", &size); fail_if(!test); - fail_if(size != (int) strlen(buffer) + 1); + fail_if(size != (int)strlen(buffer) + 1); fail_if(memcmp(test, buffer, strlen(buffer) + 1) != 0); @@ -709,17 +936,18 @@ START_TEST(eet_file_simple_write) fail_if(unlink(file) != 0); eet_shutdown(); -} +} /* START_TEST */ + END_TEST START_TEST(eet_file_data_test) { - Eet_Data_Descriptor *edd; - Eet_Test_Ex_Type *result; - Eet_Dictionary *ed; - Eet_File *ef; - char **list; - char *file = strdup("/tmp/eet_suite_testXXXXXX"); + Eet_Data_Descriptor * edd; + Eet_Test_Ex_Type * result; + Eet_Dictionary * ed; + Eet_File * ef; + char ** list; + char * file = strdup("/tmp/eet_suite_testXXXXXX"); Eet_Data_Descriptor_Class eddc; Eet_Test_Ex_Type etbt; int size; @@ -809,7 +1037,7 @@ START_TEST(eet_file_data_test) fail_if(_eet_test_ex_check(result, 0) != 0); fail_if(_eet_test_ex_check(eina_list_data_get(result->list), 1) != 0); fail_if(eina_list_data_get(result->ilist) == NULL); - fail_if(*((int*)eina_list_data_get(result->ilist)) != 42); + fail_if(*((int *)eina_list_data_get(result->ilist)) != 42); fail_if(eina_list_data_get(result->slist) == NULL); fail_if(strcmp(eina_list_data_get(result->slist), "test") != 0); fail_if(eina_hash_find(result->shash, EET_TEST_KEY1) == NULL); @@ -817,16 +1045,24 @@ START_TEST(eet_file_data_test) fail_if(strcmp(result->charray[0], "test") != 0); test = 0; - if (result->hash) eina_hash_foreach(result->hash, func, &test); + if (result->hash) + eina_hash_foreach(result->hash, func, &test); + fail_if(test != 0); - if (result->ihash) eina_hash_foreach(result->ihash, func7, &test); + if (result->ihash) + eina_hash_foreach(result->ihash, func7, &test); + fail_if(test != 0); list = eet_list(ef, "keys/*", &size); fail_if(eet_num_entries(ef) != 2); fail_if(size != 2); - fail_if(!(strcmp(list[0], EET_TEST_FILE_KEY1) == 0 && strcmp(list[1], EET_TEST_FILE_KEY2) == 0) - && !(strcmp(list[0], EET_TEST_FILE_KEY2) == 0 && strcmp(list[1], EET_TEST_FILE_KEY1) == 0)); + fail_if(!(strcmp(list[0], + EET_TEST_FILE_KEY1) == 0 && + strcmp(list[1], EET_TEST_FILE_KEY2) == 0) + && !(strcmp(list[0], + EET_TEST_FILE_KEY2) == 0 && + strcmp(list[1], EET_TEST_FILE_KEY1) == 0)); free(list); fail_if(eet_delete(ef, NULL) != 0); @@ -851,18 +1087,19 @@ START_TEST(eet_file_data_test) fail_if(unlink(file) != 0); eet_shutdown(); -} +} /* START_TEST */ + END_TEST START_TEST(eet_file_data_dump_test) { - Eet_Data_Descriptor *edd; - Eet_Test_Ex_Type *result; + Eet_Data_Descriptor * edd; + Eet_Test_Ex_Type * result; Eet_Data_Descriptor_Class eddc; Eet_Test_Ex_Type etbt; - Eet_File *ef; - char *string1; - char *file = strdup("/tmp/eet_suite_testXXXXXX"); + Eet_File * ef; + char * string1; + char * file = strdup("/tmp/eet_suite_testXXXXXX"); int test; eet_init(); @@ -884,7 +1121,9 @@ START_TEST(eet_file_data_dump_test) memset(&etbt.charray, 0, sizeof(etbt.charray)); etbt.charray[0] = "test"; - eet_eina_file_data_descriptor_class_set(&eddc, "Eet_Test_Ex_Type", sizeof(Eet_Test_Ex_Type)); + eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), + "Eet_Test_Ex_Type", + sizeof(Eet_Test_Ex_Type)); edd = eet_data_descriptor_file_new(&eddc); fail_if(!edd); @@ -925,7 +1164,7 @@ START_TEST(eet_file_data_dump_test) fail_if(_eet_test_ex_check(result, 0) != 0); fail_if(_eet_test_ex_check(eina_list_data_get(result->list), 1) != 0); fail_if(eina_list_data_get(result->ilist) == NULL); - fail_if(*((int*)eina_list_data_get(result->ilist)) != 42); + fail_if(*((int *)eina_list_data_get(result->ilist)) != 42); fail_if(eina_list_data_get(result->slist) == NULL); fail_if(strcmp(eina_list_data_get(result->slist), "test") != 0); fail_if(eina_hash_find(result->shash, EET_TEST_KEY1) == NULL); @@ -933,22 +1172,27 @@ START_TEST(eet_file_data_dump_test) fail_if(strcmp(result->charray[0], "test") != 0); test = 0; - if (result->hash) eina_hash_foreach(result->hash, func, &test); + if (result->hash) + eina_hash_foreach(result->hash, func, &test); + fail_if(test != 0); - if (result->ihash) eina_hash_foreach(result->ihash, func7, &test); + if (result->ihash) + eina_hash_foreach(result->ihash, func7, &test); + fail_if(test != 0); fail_if(unlink(file) != 0); eet_shutdown(); -} +} /* START_TEST */ + END_TEST START_TEST(eet_image) { - Eet_File *ef; - char *file = strdup("/tmp/eet_suite_testXXXXXX"); - unsigned int *data; + Eet_File * ef; + char * file = strdup("/tmp/eet_suite_testXXXXXX"); + unsigned int * data; int compress; int quality; int result; @@ -963,57 +1207,106 @@ START_TEST(eet_image) ef = eet_open(file, EET_FILE_MODE_READ_WRITE); fail_if(!ef); - result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "0", test_noalpha.color, - test_noalpha.w, test_noalpha.h, test_noalpha.alpha, - 0, 100, 0); + result = eet_data_image_write(ef, + EET_TEST_FILE_IMAGE "0", + test_noalpha.color, + test_noalpha.w, + test_noalpha.h, + test_noalpha.alpha, + 0, + 100, + 0); fail_if(result == 0); - result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "1", test_noalpha.color, - test_noalpha.w, test_noalpha.h, test_noalpha.alpha, - 5, 100, 0); + result = eet_data_image_write(ef, + EET_TEST_FILE_IMAGE "1", + test_noalpha.color, + test_noalpha.w, + test_noalpha.h, + test_noalpha.alpha, + 5, + 100, + 0); fail_if(result == 0); - result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "2", test_noalpha.color, - test_noalpha.w, test_noalpha.h, test_noalpha.alpha, - 9, 100, 0); + result = eet_data_image_write(ef, + EET_TEST_FILE_IMAGE "2", + test_noalpha.color, + test_noalpha.w, + test_noalpha.h, + test_noalpha.alpha, + 9, + 100, + 0); fail_if(result == 0); - result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "3", test_noalpha.color, - test_noalpha.w, test_noalpha.h, test_noalpha.alpha, - 0, 100, 1); + result = eet_data_image_write(ef, + EET_TEST_FILE_IMAGE "3", + test_noalpha.color, + test_noalpha.w, + test_noalpha.h, + test_noalpha.alpha, + 0, + 100, + 1); fail_if(result == 0); - result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "4", test_noalpha.color, - test_noalpha.w, test_noalpha.h, test_noalpha.alpha, - 0, 60, 1); + result = eet_data_image_write(ef, + EET_TEST_FILE_IMAGE "4", + test_noalpha.color, + test_noalpha.w, + test_noalpha.h, + test_noalpha.alpha, + 0, + 60, + 1); fail_if(result == 0); - result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "5", test_noalpha.color, - test_noalpha.w, test_noalpha.h, test_noalpha.alpha, - 0, 10, 1); + result = eet_data_image_write(ef, + EET_TEST_FILE_IMAGE "5", + test_noalpha.color, + test_noalpha.w, + test_noalpha.h, + test_noalpha.alpha, + 0, + 10, + 1); fail_if(result == 0); - result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "6", test_noalpha.color, - test_noalpha.w, test_noalpha.h, test_noalpha.alpha, - 0, 0, 1); + result = eet_data_image_write(ef, + EET_TEST_FILE_IMAGE "6", + test_noalpha.color, + test_noalpha.w, + test_noalpha.h, + test_noalpha.alpha, + 0, + 0, + 1); fail_if(result == 0); result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "7", test_alpha.color, - test_alpha.w, test_alpha.h, test_alpha.alpha, - 9, 100, 0); + test_alpha.w, test_alpha.h, test_alpha.alpha, + 9, 100, 0); fail_if(result == 0); result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "8", test_alpha.color, - test_alpha.w, test_alpha.h, test_alpha.alpha, - 0, 80, 1); + test_alpha.w, test_alpha.h, test_alpha.alpha, + 0, 80, 1); fail_if(result == 0); result = eet_data_image_write(ef, EET_TEST_FILE_IMAGE "9", test_alpha.color, - test_alpha.w, test_alpha.h, test_alpha.alpha, - 0, 100, 1); + test_alpha.w, test_alpha.h, test_alpha.alpha, + 0, 100, 1); fail_if(result == 0); - data = eet_data_image_read(ef, EET_TEST_FILE_IMAGE "2", &w, &h, &alpha, &compress, &quality, &lossy); + data = eet_data_image_read(ef, + EET_TEST_FILE_IMAGE "2", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(data == NULL); fail_if(w != test_noalpha.w); fail_if(h != test_noalpha.h); @@ -1023,7 +1316,14 @@ START_TEST(eet_image) fail_if(data[0] != test_noalpha.color[0]); free(data); - result = eet_data_image_header_read(ef, EET_TEST_FILE_IMAGE "2", &w, &h, &alpha, &compress, &quality, &lossy); + result = eet_data_image_header_read(ef, + EET_TEST_FILE_IMAGE "2", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(result == 0); fail_if(w != test_noalpha.w); fail_if(h != test_noalpha.h); @@ -1037,7 +1337,14 @@ START_TEST(eet_image) ef = eet_open(file, EET_FILE_MODE_READ); fail_if(!ef); - result = eet_data_image_header_read(ef, EET_TEST_FILE_IMAGE "0", &w, &h, &alpha, &compress, &quality, &lossy); + result = eet_data_image_header_read(ef, + EET_TEST_FILE_IMAGE "0", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(result == 0); fail_if(w != test_noalpha.w); fail_if(h != test_noalpha.h); @@ -1047,7 +1354,18 @@ START_TEST(eet_image) data = malloc(w * h * 4); fail_if(data == NULL); - result = eet_data_image_read_to_surface(ef, EET_TEST_FILE_IMAGE "0", 4, 4, data, 2, 2, w * 4, &alpha, &compress, &quality, &lossy); + result = eet_data_image_read_to_surface(ef, + EET_TEST_FILE_IMAGE "0", + 4, + 4, + data, + 2, + 2, + w * 4, + &alpha, + &compress, + &quality, + &lossy); fail_if(result != 1); fail_if(alpha != test_noalpha.alpha); fail_if(compress != 0); @@ -1058,7 +1376,18 @@ START_TEST(eet_image) data = malloc(w * h * 4); fail_if(data == NULL); - result = eet_data_image_read_to_surface(ef, EET_TEST_FILE_IMAGE "0", 0, 0, data, w, h, w * 4, &alpha, &compress, &quality, &lossy); + result = eet_data_image_read_to_surface(ef, + EET_TEST_FILE_IMAGE "0", + 0, + 0, + data, + w, + h, + w * 4, + &alpha, + &compress, + &quality, + &lossy); fail_if(result != 1); fail_if(alpha != test_noalpha.alpha); fail_if(compress != 0); @@ -1067,7 +1396,14 @@ START_TEST(eet_image) fail_if(data[0] != test_noalpha.color[0]); free(data); - data = eet_data_image_read(ef, EET_TEST_FILE_IMAGE "1", &w, &h, &alpha, &compress, &quality, &lossy); + data = eet_data_image_read(ef, + EET_TEST_FILE_IMAGE "1", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(data == NULL); fail_if(w != test_noalpha.w); fail_if(h != test_noalpha.h); @@ -1078,7 +1414,14 @@ START_TEST(eet_image) fail_if(data[0] != test_noalpha.color[0]); free(data); - data = eet_data_image_read(ef, EET_TEST_FILE_IMAGE "2", &w, &h, &alpha, &compress, &quality, &lossy); + data = eet_data_image_read(ef, + EET_TEST_FILE_IMAGE "2", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(data == NULL); fail_if(w != test_noalpha.w); fail_if(h != test_noalpha.h); @@ -1088,7 +1431,14 @@ START_TEST(eet_image) fail_if(data[0] != test_noalpha.color[0]); free(data); - data = eet_data_image_read(ef, EET_TEST_FILE_IMAGE "3", &w, &h, &alpha, &compress, &quality, &lossy); + data = eet_data_image_read(ef, + EET_TEST_FILE_IMAGE "3", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(data == NULL); fail_if(w != test_noalpha.w); fail_if(h != test_noalpha.h); @@ -1096,7 +1446,14 @@ START_TEST(eet_image) fail_if(lossy != 1); free(data); - data = eet_data_image_read(ef, EET_TEST_FILE_IMAGE "5", &w, &h, &alpha, &compress, &quality, &lossy); + data = eet_data_image_read(ef, + EET_TEST_FILE_IMAGE "5", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(data == NULL); fail_if(w != test_noalpha.w); fail_if(h != test_noalpha.h); @@ -1104,7 +1461,14 @@ START_TEST(eet_image) fail_if(lossy != 1); free(data); - data = eet_data_image_read(ef, EET_TEST_FILE_IMAGE "6", &w, &h, &alpha, &compress, &quality, &lossy); + data = eet_data_image_read(ef, + EET_TEST_FILE_IMAGE "6", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(data == NULL); fail_if(w != test_noalpha.w); fail_if(h != test_noalpha.h); @@ -1112,7 +1476,14 @@ START_TEST(eet_image) fail_if(lossy != 1); free(data); - result = eet_data_image_header_read(ef, EET_TEST_FILE_IMAGE "7", &w, &h, &alpha, &compress, &quality, &lossy); + result = eet_data_image_header_read(ef, + EET_TEST_FILE_IMAGE "7", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(result == 0); fail_if(w != test_alpha.w); fail_if(h != test_alpha.h); @@ -1120,7 +1491,14 @@ START_TEST(eet_image) fail_if(compress != 9); fail_if(lossy != 0); - data = eet_data_image_read(ef, EET_TEST_FILE_IMAGE "7", &w, &h, &alpha, &compress, &quality, &lossy); + data = eet_data_image_read(ef, + EET_TEST_FILE_IMAGE "7", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(data == NULL); fail_if(w != test_alpha.w); fail_if(h != test_alpha.h); @@ -1130,14 +1508,28 @@ START_TEST(eet_image) fail_if(data[0] != test_alpha.color[0]); free(data); - result = eet_data_image_header_read(ef, EET_TEST_FILE_IMAGE "9", &w, &h, &alpha, &compress, &quality, &lossy); + result = eet_data_image_header_read(ef, + EET_TEST_FILE_IMAGE "9", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(result == 0); fail_if(w != test_alpha.w); fail_if(h != test_alpha.h); fail_if(alpha != test_alpha.alpha); fail_if(lossy != 1); - data = eet_data_image_read(ef, EET_TEST_FILE_IMAGE "9", &w, &h, &alpha, &compress, &quality, &lossy); + data = eet_data_image_read(ef, + EET_TEST_FILE_IMAGE "9", + &w, + &h, + &alpha, + &compress, + &quality, + &lossy); fail_if(data == NULL); fail_if(w != test_alpha.w); fail_if(h != test_alpha.h); @@ -1150,7 +1542,8 @@ START_TEST(eet_image) fail_if(unlink(file) != 0); eet_shutdown(); -} +} /* START_TEST */ + END_TEST #define IM0 0x00112233 @@ -1160,10 +1553,10 @@ END_TEST START_TEST(eet_small_image) { - char *file = strdup("/tmp/eet_suite_testXXXXXX"); + char * file = strdup("/tmp/eet_suite_testXXXXXX"); unsigned int image[4]; - unsigned int *data; - Eet_File *ef; + unsigned int * data; + Eet_File * ef; unsigned int w; unsigned int h; int alpha; @@ -1192,7 +1585,14 @@ START_TEST(eet_small_image) ef = eet_open(file, EET_FILE_MODE_READ); fail_if(!ef); - data = (unsigned int*) eet_data_image_read(ef, "/images/test", &w, &h, &alpha, &compression, &quality, &lossy); + data = (unsigned int *)eet_data_image_read(ef, + "/images/test", + &w, + &h, + &alpha, + &compression, + &quality, + &lossy); fail_if(data == NULL); eet_close(ef); @@ -1207,18 +1607,19 @@ START_TEST(eet_small_image) free(data); eet_shutdown(); -} +} /* START_TEST */ + END_TEST START_TEST(eet_identity_simple) { - const char *buffer = "Here is a string of data to save !"; - const void *tmp; - Eet_File *ef; - Eet_Key *k; - FILE *noread; - char *test; - char *file = strdup("/tmp/eet_suite_testXXXXXX"); + const char * buffer = "Here is a string of data to save !"; + const void * tmp; + Eet_File * ef; + Eet_Key * k; + FILE * noread; + char * test; + char * file = strdup("/tmp/eet_suite_testXXXXXX"); int size; int fd; @@ -1248,7 +1649,7 @@ START_TEST(eet_identity_simple) test = eet_read(ef, "keys/tests", &size); fail_if(!test); - fail_if(size != (int) strlen(buffer) + 1); + fail_if(size != (int)strlen(buffer) + 1); fail_if(memcmp(test, buffer, strlen(buffer) + 1) != 0); @@ -1283,12 +1684,13 @@ START_TEST(eet_identity_simple) fail_if(unlink(file) != 0); eet_shutdown(); -} +} /* START_TEST */ + END_TEST START_TEST(eet_identity_open_simple) { - Eet_Key *k = NULL; + Eet_Key * k = NULL; eet_init(); @@ -1297,15 +1699,17 @@ START_TEST(eet_identity_open_simple) k = eet_identity_open("cert.pem", "key.pem", NULL); fail_if(!k); - if (k) eet_identity_close(k); + if (k) + eet_identity_close(k); eet_shutdown(); -} +} /* START_TEST */ + END_TEST START_TEST(eet_identity_open_pkcs8) { - Eet_Key *k = NULL; + Eet_Key * k = NULL; eet_init(); @@ -1314,36 +1718,45 @@ START_TEST(eet_identity_open_pkcs8) k = eet_identity_open("cert.pem", "key_enc_none.pem", NULL); fail_if(!k); - if (k) eet_identity_close(k); + if (k) + eet_identity_close(k); eet_shutdown(); -} +} /* START_TEST */ + END_TEST -static int pass_get(char *pass, int size, __UNUSED__ int rwflags, __UNUSED__ void *u) +static int pass_get(char * pass, + int size, + __UNUSED__ int rwflags, + __UNUSED__ void * u) { memset(pass, 0, size); - if (strlen("password") > size) - return 0; + if ((int)strlen("password") > size) + return 0; + snprintf(pass, size, "%s", "password"); return strlen(pass); -} +} /* pass_get */ -static int badpass_get(char *pass, int size, __UNUSED__ int rwflags, __UNUSED__ void *u) +static int badpass_get(char * pass, + int size, + __UNUSED__ int rwflags, + __UNUSED__ void * u) { memset(pass, 0, size); - if (strlen("bad password") > size) - return 0; + if ((int)strlen("bad password") > size) + return 0; + snprintf(pass, size, "%s", "bad password"); return strlen(pass); -} - +} /* badpass_get */ START_TEST(eet_identity_open_pkcs8_enc) { - Eet_Key *k = NULL; + Eet_Key * k = NULL; eet_init(); @@ -1352,17 +1765,20 @@ START_TEST(eet_identity_open_pkcs8_enc) k = eet_identity_open("cert.pem", "key_enc.pem", NULL); fail_if(k); - if (k) eet_identity_close(k); + if (k) + eet_identity_close(k); k = eet_identity_open("cert.pem", "key_enc.pem", &badpass_get); fail_if(k); - if (k) eet_identity_close(k); + if (k) + eet_identity_close(k); k = eet_identity_open("cert.pem", "key_enc.pem", &pass_get); fail_if(!k); - if (k) eet_identity_close(k); + if (k) + eet_identity_close(k); eet_shutdown(); } @@ -1370,12 +1786,12 @@ END_TEST START_TEST(eet_cipher_decipher_simple) { - const char *buffer = "Here is a string of data to save !"; - const char *key = "This is a crypto key"; - const char *key_bad = "This is another crypto key"; - Eet_File *ef; - char *test; - char *file = strdup("/tmp/eet_suite_testXXXXXX"); + const char * buffer = "Here is a string of data to save !"; + const char * key = "This is a crypto key"; + const char * key_bad = "This is another crypto key"; + Eet_File * ef; + char * test; + char * file = strdup("/tmp/eet_suite_testXXXXXX"); int size; eet_init(); @@ -1387,7 +1803,8 @@ START_TEST(eet_cipher_decipher_simple) ef = eet_open(file, EET_FILE_MODE_WRITE); fail_if(!ef); - fail_if(!eet_write_cipher(ef, "keys/tests", buffer, strlen(buffer) + 1, 0, key)); + fail_if(!eet_write_cipher(ef, "keys/tests", buffer, strlen(buffer) + 1, 0, + key)); eet_close(ef); @@ -1397,7 +1814,7 @@ START_TEST(eet_cipher_decipher_simple) test = eet_read_cipher(ef, "keys/tests", &size, key); fail_if(!test); - fail_if(size != (int) strlen(buffer) + 1); + fail_if(size != (int)strlen(buffer) + 1); fail_if(memcmp(test, buffer, strlen(buffer) + 1) != 0); @@ -1409,46 +1826,80 @@ START_TEST(eet_cipher_decipher_simple) test = eet_read_cipher(ef, "keys/tests", &size, key_bad); - if (size == (int) strlen(buffer) + 1) - fail_if(memcmp(test, buffer, strlen(buffer) + 1) == 0); + if (size == (int)strlen(buffer) + 1) + fail_if(memcmp(test, buffer, strlen(buffer) + 1) == 0); eet_close(ef); fail_if(unlink(file) != 0); eet_shutdown(); -} +} /* START_TEST */ + END_TEST +#ifdef EFL_HAVE_THREADS + static Eina_Bool open_worker_stop; -static void* -open_close_worker(void* path) + +# ifdef EFL_HAVE_POSIX_THREADS + +static void * +open_close_worker(void * path) { while (!open_worker_stop) { - Eet_File* ef = eet_open((char const*)path, EET_FILE_MODE_READ); - if (ef == NULL) - { - pthread_exit("eet_open() failed"); - } - else - { - Eet_Error err_code = eet_close(ef); - if (err_code != EET_ERROR_NONE) - pthread_exit("eet_close() failed"); - } + Eet_File * ef = eet_open((char const *)path, EET_FILE_MODE_READ); + if (ef == NULL) + pthread_exit("eet_open() failed"); + else + { + Eet_Error err_code = eet_close(ef); + if (err_code != EET_ERROR_NONE) + pthread_exit("eet_close() failed"); + } } pthread_exit(NULL); -} +} /* open_close_worker */ + +# else /* ifdef EFL_HAVE_POSIX_THREADS */ + +static unsigned int __stdcall +open_close_worker(void * path) +{ + while (!open_worker_stop) + { + Eet_File * ef = eet_open((char const *)path, EET_FILE_MODE_READ); + if (ef == NULL) + _endthreadex(-1); + else + { + Eet_Error err_code = eet_close(ef); + if (err_code != EET_ERROR_NONE) + _endthreadex(-2); + } + } + + _endthreadex(0); +} /* open_close_worker */ + +# endif /* ifdef EFL_HAVE_POSIX_THREADS */ START_TEST(eet_cache_concurrency) { - char *file = strdup("/tmp/eet_suite_testXXXXXX"); - const char *buffer = "test data"; - Eet_File *ef; - void *thread_ret; + char * file = strdup("/tmp/eet_suite_testXXXXXX"); + const char * buffer = "test data"; + Eet_File * ef; + void * thread_ret; unsigned int n; +# ifdef EFL_HAVE_POSIX_THREADS + pthread_t thread; +# else /* ifdef EFL_HAVE_POSIX_THREADS */ + uintptr_t thread; + unsigned int thread_id; + DWORD ret; +# endif /* ifdef EFL_HAVE_POSIX_THREADS */ eet_init(); @@ -1460,39 +1911,50 @@ START_TEST(eet_cache_concurrency) /* start a thread that repeatedly opens and closes a file */ open_worker_stop = 0; - pthread_t thread; +# ifdef EFL_HAVE_POSIX_THREADS pthread_create(&thread, NULL, open_close_worker, file); - +# else /* ifdef EFL_HAVE_POSIX_THREADS */ + thread = _beginthreadex(NULL, 0, open_close_worker, file, 0, &thread_id); +# endif /* ifdef EFL_HAVE_POSIX_THREADS */ /* clear the cache repeatedly in this thread */ for (n = 0; n < 50000; ++n) { - eet_clearcache(); + eet_clearcache(); } /* join the other thread, and fail if it returned an error message */ open_worker_stop = 1; +# ifdef EFL_HAVE_POSIX_THREADS fail_if(pthread_join(thread, &thread_ret) != 0); - fail_unless(thread_ret == NULL, (char const*)thread_ret); + fail_unless(thread_ret == NULL, (char const *)thread_ret); +# else /* ifdef EFL_HAVE_POSIX_THREADS */ + ret = WaitForSingleObject((HANDLE)thread, INFINITE); + fail_if(ret != WAIT_OBJECT_0); + fail_if(GetExitCodeThread((HANDLE)thread, &ret) == FALSE); + fail_if(ret != 0); +# endif /* ifdef EFL_HAVE_POSIX_THREADS */ fail_if(unlink(file) != 0); eet_shutdown(); } END_TEST -typedef struct _Eet_Connection_Data Eet_Connection_Data; +#endif /* EFL_HAVE_THREADS */ + +typedef struct _Eet_Connection_Data Eet_Connection_Data; struct _Eet_Connection_Data { - Eet_Connection *conn; - Eet_Data_Descriptor *edd; - Eina_Bool test; + Eet_Connection * conn; + Eet_Data_Descriptor * edd; + Eina_Bool test; }; static Eina_Bool -_eet_connection_read(const void *eet_data, size_t size, void *user_data) +_eet_connection_read(const void * eet_data, size_t size, void * user_data) { - Eet_Connection_Data *dt = user_data; - Eet_Test_Ex_Type *result; - Eet_Node *node; + Eet_Connection_Data * dt = user_data; + Eet_Test_Ex_Type * result; + Eet_Node * node; int test; result = eet_data_descriptor_decode(dt->edd, eet_data, size); @@ -1503,7 +1965,7 @@ _eet_connection_read(const void *eet_data, size_t size, void *user_data) fail_if(_eet_test_ex_check(result, 0) != 0); fail_if(_eet_test_ex_check(eina_list_data_get(result->list), 1) != 0); fail_if(eina_list_data_get(result->ilist) == NULL); - fail_if(*((int*)eina_list_data_get(result->ilist)) != 42); + fail_if(*((int *)eina_list_data_get(result->ilist)) != 42); fail_if(eina_list_data_get(result->slist) == NULL); fail_if(strcmp(eina_list_data_get(result->slist), "test") != 0); fail_if(eina_hash_find(result->shash, EET_TEST_KEY1) == NULL); @@ -1511,46 +1973,51 @@ _eet_connection_read(const void *eet_data, size_t size, void *user_data) fail_if(strcmp(result->charray[0], "test") != 0); test = 0; - if (result->hash) eina_hash_foreach(result->hash, func, &test); + if (result->hash) + eina_hash_foreach(result->hash, func, &test); + fail_if(test != 0); - if (result->ihash) eina_hash_foreach(result->ihash, func7, &test); + if (result->ihash) + eina_hash_foreach(result->ihash, func7, &test); + fail_if(test != 0); if (!dt->test) { - dt->test = EINA_TRUE; - fail_if(!eet_connection_node_send(dt->conn, node, NULL)); + dt->test = EINA_TRUE; + fail_if(!eet_connection_node_send(dt->conn, node, NULL)); } return EINA_TRUE; -} +} /* _eet_connection_read */ static Eina_Bool -_eet_connection_write(const void *data, size_t size, void *user_data) +_eet_connection_write(const void * data, size_t size, void * user_data) { - Eet_Connection_Data *dt = user_data; + Eet_Connection_Data * dt = user_data; int still; if (!dt->test) { - int step = size / 3; + int step = size / 3; - eet_connection_received(dt->conn, data, step); - eet_connection_received(dt->conn, (char*) data + step, step); - size -= 2 * step; - still = eet_connection_received(dt->conn, (char*) data + 2 * step, size); + eet_connection_received(dt->conn, data, step); + eet_connection_received(dt->conn, (char *)data + step, step); + size -= 2 * step; + still = eet_connection_received(dt->conn, (char *)data + 2 * step, size); } else - still = eet_connection_received(dt->conn, data, size); + still = eet_connection_received(dt->conn, data, size); + fail_if(still); return EINA_TRUE; -} +} /* _eet_connection_write */ START_TEST(eet_connection_check) { - Eet_Connection *conn; - Eet_Data_Descriptor *edd; + Eet_Connection * conn; + Eet_Data_Descriptor * edd; Eet_Data_Descriptor_Class eddc; Eet_Connection_Data ecd; Eet_Test_Ex_Type etbt; @@ -1575,7 +2042,9 @@ START_TEST(eet_connection_check) memset(&etbt.charray, 0, sizeof(etbt.charray)); etbt.charray[0] = "test"; - eet_eina_file_data_descriptor_class_set(&eddc, "Eet_Test_Ex_Type", sizeof(Eet_Test_Ex_Type)); + eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), + "Eet_Test_Ex_Type", + sizeof(Eet_Test_Ex_Type)); edd = eet_data_descriptor_file_new(&eddc); fail_if(!edd); @@ -1612,7 +2081,7 @@ struct _Eet_5FP Eina_F32p32 f1; Eina_F32p32 f0; }; -typedef struct _Eet_5FP Eet_5FP; +typedef struct _Eet_5FP Eet_5FP; struct _Eet_5DBL { @@ -1622,17 +2091,17 @@ struct _Eet_5DBL double f1; double f0; }; -typedef struct _Eet_5DBL Eet_5DBL; +typedef struct _Eet_5DBL Eet_5DBL; START_TEST(eet_fp) { Eet_Data_Descriptor_Class eddc; - Eet_Data_Descriptor *edd_5FP; - Eet_Data_Descriptor *edd_5DBL; + Eet_Data_Descriptor * edd_5FP; + Eet_Data_Descriptor * edd_5DBL; Eet_5FP origin; - Eet_5DBL *convert; - Eet_5FP *build; - void *blob; + Eet_5DBL * convert; + Eet_5FP * build; + void * blob; int size; eet_init(); @@ -1642,18 +2111,18 @@ START_TEST(eet_fp) EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "fp32", fp32, EET_T_F32P32); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "fp16", fp16, EET_T_F16P16); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "fp8", fp8, EET_T_F8P24); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f1", f1, EET_T_F32P32); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f0", f0, EET_T_F32P32); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "fp8", fp8, EET_T_F8P24); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f1", f1, EET_T_F32P32); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f0", f0, EET_T_F32P32); - eet_eina_stream_data_descriptor_class_set(&eddc, "Eet_5FP", sizeof (Eet_5DBL)); + eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "Eet_5FP", sizeof (Eet_5DBL)); edd_5DBL = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp32", fp32, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp16", fp16, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp8", fp8, EET_T_FLOAT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "f1", f1, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "f0", f0, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp8", fp8, EET_T_FLOAT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "f1", f1, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "f0", f0, EET_T_DOUBLE); origin.fp32 = eina_f32p32_double_from(1.125); origin.fp16 = eina_f16p16_int_from(2000); @@ -1688,14 +2157,14 @@ END_TEST START_TEST(eet_file_fp) { - char *file = strdup("/tmp/eet_suite_testXXXXXX"); + char * file = strdup("/tmp/eet_suite_testXXXXXX"); Eet_Data_Descriptor_Class eddc; - Eet_Data_Descriptor *edd_5FP; - Eet_Data_Descriptor *edd_5DBL; - Eet_File *ef; + Eet_Data_Descriptor * edd_5FP; + Eet_Data_Descriptor * edd_5DBL; + Eet_File * ef; Eet_5FP origin; - Eet_5DBL *convert; - Eet_5FP *build; + Eet_5DBL * convert; + Eet_5FP * build; eet_init(); @@ -1704,18 +2173,18 @@ START_TEST(eet_file_fp) EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "fp32", fp32, EET_T_F32P32); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "fp16", fp16, EET_T_F16P16); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "fp8", fp8, EET_T_F8P24); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f1", f1, EET_T_F32P32); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f0", f0, EET_T_F32P32); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "fp8", fp8, EET_T_F8P24); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f1", f1, EET_T_F32P32); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5FP, Eet_5FP, "f0", f0, EET_T_F32P32); - eet_eina_file_data_descriptor_class_set(&eddc, "Eet_5FP", sizeof (Eet_5DBL)); + eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), "Eet_5FP", sizeof (Eet_5DBL)); edd_5DBL = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp32", fp32, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp16", fp16, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp8", fp8, EET_T_FLOAT); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "f1", f1, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "f0", f0, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "fp8", fp8, EET_T_FLOAT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "f1", f1, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_5DBL, Eet_5DBL, "f0", f0, EET_T_DOUBLE); origin.fp32 = eina_f32p32_double_from(1.125); origin.fp16 = eina_f16p16_int_from(2000); @@ -1753,48 +2222,50 @@ START_TEST(eet_file_fp) fail_if(unlink(file) != 0); eet_shutdown(); -} +} /* START_TEST */ + END_TEST -typedef struct _Eet_Union_Test Eet_Union_Test; -typedef struct _Eet_Variant_Test Eet_Variant_Test; -typedef struct _Eet_Variant_Type Eet_Variant_Type; -typedef struct _Eet_Inherit_Test1 Eet_Inherit_Test1; -typedef struct _Eet_Inherit_Test2 Eet_Inherit_Test2; -typedef struct _Eet_Inherit_Test3 Eet_Inherit_Test3; -typedef struct _Eet_St1 Eet_St1; -typedef struct _Eet_St2 Eet_St2; -typedef struct _Eet_St3 Eet_St3; -typedef struct _Eet_List Eet_List; +typedef struct _Eet_Union_Test Eet_Union_Test; +typedef struct _Eet_Variant_Test Eet_Variant_Test; +typedef struct _Eet_Variant_Type Eet_Variant_Type; +typedef struct _Eet_Inherit_Test1 Eet_Inherit_Test1; +typedef struct _Eet_Inherit_Test2 Eet_Inherit_Test2; +typedef struct _Eet_Inherit_Test3 Eet_Inherit_Test3; +typedef struct _Eet_St1 Eet_St1; +typedef struct _Eet_St2 Eet_St2; +typedef struct _Eet_St3 Eet_St3; +typedef struct _Eet_List Eet_List; typedef enum _Eet_Union { - EET_UNKNOWN, - EET_ST1, - EET_ST2, - EET_ST3 + EET_UNKNOWN, + EET_ST1, + EET_ST2, + EET_ST3 } Eet_Union; -struct { - Eet_Union u; - const char *name; +struct +{ + Eet_Union u; + const char * name; } eet_mapping[] = { - { EET_ST1, "ST1" }, - { EET_ST2, "ST2" }, - { EET_ST3, "ST3" }, - { EET_UNKNOWN, NULL } + { EET_ST1, "ST1" }, + { EET_ST2, "ST2" }, + { EET_ST3, "ST3" }, + { EET_UNKNOWN, NULL } }; struct _Eet_St1 { double val1; - int stuff; - char *s1; + int stuff; + char * s1; }; struct _Eet_St2 { - Eina_Bool b1; + Eina_Bool b1; unsigned long long v1; }; @@ -1816,139 +2287,150 @@ struct _Eet_Union_Test struct _Eet_Variant_Type { - const char *type; - Eina_Bool unknow : 1; + const char * type; + Eina_Bool unknow : 1; }; struct _Eet_Variant_Test { Eet_Variant_Type t; - void *data; - Eina_List *data_list; + void * data; + Eina_List * data_list; }; struct _Eet_Inherit_Test1 { Eet_Union type; - Eet_St1 st1; + Eet_St1 st1; }; struct _Eet_Inherit_Test2 { Eet_Union type; - Eet_St2 st2; + Eet_St2 st2; }; struct _Eet_Inherit_Test3 { Eet_Union type; - Eet_St3 st3; + Eet_St3 st3; }; struct _Eet_List { - Eina_List *list; + Eina_List * list; }; static const char * -_eet_union_type_get(const void *data, Eina_Bool *unknow) +_eet_union_type_get(const void * data, Eina_Bool * unknow) { - const Eet_Union *u = data; + const Eet_Union * u = data; int i; - if (unknow) *unknow = EINA_FALSE; + if (unknow) + *unknow = EINA_FALSE; + for (i = 0; eet_mapping[i].name != NULL; ++i) - if (*u == eet_mapping[i].u) - return eet_mapping[i].name; + if (*u == eet_mapping[i].u) + return eet_mapping[i].name; + + if (unknow) + *unknow = EINA_TRUE; - if (unknow) *unknow = EINA_TRUE; return NULL; -} +} /* _eet_union_type_get */ static Eina_Bool -_eet_union_type_set(const char *type, void *data, Eina_Bool unknow) +_eet_union_type_set(const char * type, void * data, Eina_Bool unknow) { - Eet_Union *u = data; + Eet_Union * u = data; int i; - if (unknow) return EINA_FALSE; + if (unknow) + return EINA_FALSE; for (i = 0; eet_mapping[i].name != NULL; ++i) - if (strcmp(eet_mapping[i].name, type) == 0) - { - *u = eet_mapping[i].u; - return EINA_TRUE; - } + if (strcmp(eet_mapping[i].name, type) == 0) + { + *u = eet_mapping[i].u; + return EINA_TRUE; + } return EINA_FALSE; -} +} /* _eet_union_type_set */ static const char * -_eet_variant_type_get(const void *data, Eina_Bool *unknow) +_eet_variant_type_get(const void * data, Eina_Bool * unknow) { - const Eet_Variant_Type *type = data; + const Eet_Variant_Type * type = data; int i; - if (unknow) *unknow = type->unknow; + if (unknow) + *unknow = type->unknow; + for (i = 0; eet_mapping[i].name != NULL; ++i) - if (strcmp(type->type, eet_mapping[i].name) == 0) - return eet_mapping[i].name; + if (strcmp(type->type, eet_mapping[i].name) == 0) + return eet_mapping[i].name; + + if (unknow) + *unknow = EINA_FALSE; - if (unknow) *unknow = EINA_FALSE; return type->type; -} +} /* _eet_variant_type_get */ static Eina_Bool -_eet_variant_type_set(const char *type, void *data, Eina_Bool unknow) +_eet_variant_type_set(const char * type, void * data, Eina_Bool unknow) { - Eet_Variant_Type *vt = data; + Eet_Variant_Type * vt = data; vt->type = type; vt->unknow = unknow; return EINA_TRUE; -} +} /* _eet_variant_type_set */ -static Eet_Data_Descriptor* +static Eet_Data_Descriptor * _eet_st1_dd(void) { Eet_Data_Descriptor_Class eddc; - Eet_Data_Descriptor *res; + Eet_Data_Descriptor * res; EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Eet_St1); res = eet_data_descriptor_stream_new(&eddc); - EET_DATA_DESCRIPTOR_ADD_BASIC(res, Eet_St1, "val1", val1, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(res, Eet_St1, "val1", val1, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(res, Eet_St1, "stuff", stuff, EET_T_INT); - EET_DATA_DESCRIPTOR_ADD_BASIC(res, Eet_St1, "s1", s1, EET_T_STRING); + EET_DATA_DESCRIPTOR_ADD_BASIC(res, Eet_St1, "s1", s1, EET_T_STRING); return res; -} +} /* _eet_st1_dd */ static void -_eet_st1_set(Eet_St1 *st1, int i) +_eet_st1_set(Eet_St1 * st1, int i) { st1->val1 = EET_TEST_DOUBLE; st1->stuff = EET_TEST_INT + i; st1->s1 = EET_TEST_STRING; -} +} /* _eet_st1_set */ static void -_eet_st1_cmp(Eet_St1 *st1, int i) +_eet_st1_cmp(Eet_St1 * st1, int i) { double tmp; fail_if(!st1); tmp = st1->val1 - EET_TEST_DOUBLE; - if (tmp < 0) tmp = -tmp; + if (tmp < 0) + tmp = -tmp; + fail_if(tmp > 0.005); fail_if(st1->stuff != EET_TEST_INT + i); fail_if(strcmp(st1->s1, EET_TEST_STRING)); -} +} /* _eet_st1_cmp */ -static Eet_Data_Descriptor* +static Eet_Data_Descriptor * _eet_st2_dd(void) { Eet_Data_Descriptor_Class eddc; - Eet_Data_Descriptor *res; + Eet_Data_Descriptor * res; EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Eet_St2); res = eet_data_descriptor_stream_new(&eddc); @@ -1956,56 +2438,56 @@ _eet_st2_dd(void) EET_DATA_DESCRIPTOR_ADD_BASIC(res, Eet_St2, "v1", v1, EET_T_ULONG_LONG); return res; -} +} /* _eet_st2_dd */ static void -_eet_st2_set(Eet_St2 *st2, int i) +_eet_st2_set(Eet_St2 * st2, int i) { st2->b1 = EINA_TRUE; st2->v1 = EET_TEST_LONG_LONG + i; -} +} /* _eet_st2_set */ static void -_eet_st2_cmp(Eet_St2 *st2, int i) +_eet_st2_cmp(Eet_St2 * st2, int i) { fail_if(!st2->b1); fail_if(st2->v1 != EET_TEST_LONG_LONG + i); -} +} /* _eet_st2_cmp */ -static Eet_Data_Descriptor* +static Eet_Data_Descriptor * _eet_st3_dd(void) { Eet_Data_Descriptor_Class eddc; - Eet_Data_Descriptor *res; + Eet_Data_Descriptor * res; EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Eet_St3); res = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(res, Eet_St3, "boby", boby, EET_T_INT); return res; -} +} /* _eet_st3_dd */ static void -_eet_st3_set(Eet_St3 *st3, int i) +_eet_st3_set(Eet_St3 * st3, int i) { st3->boby = EET_TEST_INT + i; -} +} /* _eet_st3_set */ static void -_eet_st3_cmp(Eet_St3 *st3, int i) +_eet_st3_cmp(Eet_St3 * st3, int i) { fail_if(st3->boby != EET_TEST_INT + i); -} +} /* _eet_st3_cmp */ START_TEST(eet_test_union) { - Eet_Union_Test *eut; - Eet_List *l; + Eet_Union_Test * eut; + Eet_List * l; Eet_Data_Descriptor_Class eddc; - Eet_Data_Descriptor *edd; - Eet_Data_Descriptor *unified; - Eet_Data_Descriptor *m; - void *blob; + Eet_Data_Descriptor * edd; + Eet_Data_Descriptor * unified; + Eet_Data_Descriptor * m; + void * blob; int size; int i; @@ -2033,21 +2515,21 @@ START_TEST(eet_test_union) l = calloc(1, sizeof (Eet_List)); -#define EUT_NEW(Type_Index) \ - eut = calloc(1, sizeof (Eet_Union_Test)); \ - eut->type = EET_ST##Type_Index; \ - _eet_st##Type_Index##_set(&(eut->u.st##Type_Index), i); +#define EUT_NEW(Type_Index)\ + eut = calloc(1, sizeof (Eet_Union_Test));\ + eut->type = EET_ST ## Type_Index;\ + _eet_st ## Type_Index ## _set(&(eut->u.st ## Type_Index), i); for (i = 0; i < 3; ++i) { - EUT_NEW(1); - l->list = eina_list_append(l->list, eut); + EUT_NEW(1); + l->list = eina_list_append(l->list, eut); - EUT_NEW(2); - l->list = eina_list_append(l->list, eut); + EUT_NEW(2); + l->list = eina_list_append(l->list, eut); - EUT_NEW(3); - l->list = eina_list_append(l->list, eut); + EUT_NEW(3); + l->list = eina_list_append(l->list, eut); } blob = eet_data_descriptor_encode(m, l, &size); @@ -2058,16 +2540,16 @@ START_TEST(eet_test_union) fail_if(eina_list_count(l->list) != 9); -#define EUT_CMP(Type_Index) \ - eut = eina_list_nth(l->list, i * 3 + Type_Index - 1); \ - fail_if(eut->type != EET_ST##Type_Index); \ - _eet_st##Type_Index##_cmp(&(eut->u.st##Type_Index), i); +#define EUT_CMP(Type_Index)\ + eut = eina_list_nth(l->list, i * 3 + Type_Index - 1);\ + fail_if(eut->type != EET_ST ## Type_Index);\ + _eet_st ## Type_Index ## _cmp(&(eut->u.st ## Type_Index), i); for (i = 0; i < 3; ++i) { - EUT_CMP(1); - EUT_CMP(2); - EUT_CMP(3); + EUT_CMP(1); + EUT_CMP(2); + EUT_CMP(3); } eet_shutdown(); @@ -2077,16 +2559,16 @@ END_TEST START_TEST(eet_test_variant) { - Eet_Variant_Test *evt; - Eet_List *l; - Eet_St1 *st1; - Eet_St2 *st2; - Eet_St3 *st3; + Eet_Variant_Test * evt; + Eet_List * l; + Eet_St1 * st1; + Eet_St2 * st2; + Eet_St3 * st3; Eet_Data_Descriptor_Class eddc; - Eet_Data_Descriptor *edd; - Eet_Data_Descriptor *unified; - Eet_Data_Descriptor *m; - void *blob; + Eet_Data_Descriptor * edd; + Eet_Data_Descriptor * unified; + Eet_Data_Descriptor * m; + void * blob; int size; int i; @@ -2108,44 +2590,49 @@ START_TEST(eet_test_variant) EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "ST2", _eet_st2_dd()); EET_DATA_DESCRIPTOR_ADD_MAPPING(unified, "ST3", _eet_st3_dd()); - EET_DATA_DESCRIPTOR_ADD_VARIANT(edd, Eet_Variant_Test, "data", data, t, unified); + EET_DATA_DESCRIPTOR_ADD_VARIANT(edd, + Eet_Variant_Test, + "data", + data, + t, + unified); unified = eet_data_descriptor_stream_new(&eddc); eet_data_descriptor_element_add(unified, "ST1", - EET_T_UNKNOW, EET_G_LIST, - 0, 0, NULL, _eet_st1_dd()); + EET_T_UNKNOW, EET_G_LIST, + 0, 0, NULL, _eet_st1_dd()); eet_data_descriptor_element_add(unified, "ST2", - EET_T_UNKNOW, EET_G_LIST, - 0, 0, NULL, _eet_st2_dd()); + EET_T_UNKNOW, EET_G_LIST, + 0, 0, NULL, _eet_st2_dd()); EET_DATA_DESCRIPTOR_ADD_VARIANT(edd, Eet_Variant_Test, - "data_list", data_list, t, unified); + "data_list", data_list, t, unified); EET_DATA_DESCRIPTOR_ADD_LIST(m, Eet_List, "list", list, edd); l = calloc(1, sizeof (Eet_List)); -#define EVT_NEW(Type_Index) \ - evt = calloc(1, sizeof (Eet_Variant_Test)); \ - evt->t.type = eet_mapping[Type_Index - 1].name; \ - st##Type_Index = calloc(1, sizeof (Eet_St##Type_Index)); \ - _eet_st##Type_Index##_set(st##Type_Index, i); \ - evt->data = st##Type_Index; +#define EVT_NEW(Type_Index)\ + evt = calloc(1, sizeof (Eet_Variant_Test));\ + evt->t.type = eet_mapping[Type_Index - 1].name;\ + st ## Type_Index = calloc(1, sizeof (Eet_St ## Type_Index));\ + _eet_st ## Type_Index ## _set(st ## Type_Index, i);\ + evt->data = st ## Type_Index; for (i = 0; i < 3; ++i) { - EVT_NEW(1); - l->list = eina_list_append(l->list, evt); + EVT_NEW(1); + l->list = eina_list_append(l->list, evt); - st1 = calloc(1, sizeof (Eet_St1)); - _eet_st1_set(st1, i); - evt->data_list = eina_list_append(evt->data_list, st1); + st1 = calloc(1, sizeof (Eet_St1)); + _eet_st1_set(st1, i); + evt->data_list = eina_list_append(evt->data_list, st1); - EVT_NEW(2); - l->list = eina_list_append(l->list, evt); + EVT_NEW(2); + l->list = eina_list_append(l->list, evt); - EVT_NEW(3); - l->list = eina_list_append(l->list, evt); + EVT_NEW(3); + l->list = eina_list_append(l->list, evt); } blob = eet_data_descriptor_encode(m, l, &size); @@ -2156,35 +2643,36 @@ START_TEST(eet_test_variant) fail_if(eina_list_count(l->list) != 9); -#define EVT_CMP(Type_Index) \ - evt = eina_list_nth(l->list, i * 3 + Type_Index - 1); \ - fail_if(strcmp(evt->t.type, eet_mapping[Type_Index - 1].name) != 0); \ - _eet_st##Type_Index##_cmp(evt->data, i); +#define EVT_CMP(Type_Index)\ + evt = eina_list_nth(l->list, i * 3 + Type_Index - 1);\ + fail_if(strcmp(evt->t.type, eet_mapping[Type_Index - 1].name) != 0);\ + _eet_st ## Type_Index ## _cmp(evt->data, i); for (i = 0; i < 3; ++i) { - EVT_CMP(1); + EVT_CMP(1); - fail_if(!evt->data_list); - fail_if(eina_list_count(evt->data_list) != 1); + fail_if(!evt->data_list); + fail_if(eina_list_count(evt->data_list) != 1); - st1 = eina_list_data_get(evt->data_list); - _eet_st1_cmp(st1, i); + st1 = eina_list_data_get(evt->data_list); + _eet_st1_cmp(st1, i); - EVT_CMP(2); - EVT_CMP(3); + EVT_CMP(2); + EVT_CMP(3); } eet_shutdown(); eina_shutdown(); -} +} /* START_TEST */ + END_TEST Suite * eet_suite(void) { - Suite *s; - TCase *tc; + Suite * s; + TCase * tc; s = suite_create("Eet"); @@ -2220,31 +2708,33 @@ eet_suite(void) tcase_add_test(tc, eet_identity_open_pkcs8); tcase_add_test(tc, eet_identity_open_pkcs8_enc); suite_add_tcase(s, tc); -#endif +#endif /* ifdef HAVE_SIGNATURE */ #ifdef HAVE_CIPHER tc = tcase_create("Eet Cipher"); tcase_add_test(tc, eet_cipher_decipher_simple); suite_add_tcase(s, tc); -#endif +#endif /* ifdef HAVE_CIPHER */ +#ifdef EFL_HAVE_THREADS tc = tcase_create("Eet Cache"); tcase_add_test(tc, eet_cache_concurrency); suite_add_tcase(s, tc); +#endif /* ifdef EFL_HAVE_THREADS */ tc = tcase_create("Eet Connection"); tcase_add_test(tc, eet_connection_check); suite_add_tcase(s, tc); return s; -} +} /* eet_suite */ int main(void) { - Suite *s; - SRunner *sr; - int failed_count; + Suite * s; + SRunner * sr; + int failed_count; s = eet_suite(); sr = srunner_create(s); @@ -2253,4 +2743,5 @@ main(void) srunner_free(sr); return (failed_count == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} +} /* main */ +