eina: try slight improvement of eina tests suite.

Still need to go through individual test to improve them.
This commit is contained in:
Cedric BAIL 2016-12-21 16:38:16 -08:00
parent a5a587510e
commit 18f41e12bc
5 changed files with 76 additions and 78 deletions

View File

@ -300,7 +300,6 @@ tests/eina/eina_suite.c \
tests/eina/eina_suite.h \
tests/eina/eina_test_abi.c \
tests/eina/eina_test_fp.c \
tests/eina/eina_test_stringshare.c \
tests/eina/eina_test_ustringshare.c \
tests/eina/eina_test_ustr.c \
tests/eina/eina_test_binshare.c \
@ -384,5 +383,6 @@ lib/eina/eina_strbuf_template_c.x \
lib/eina/eina_binbuf_template_c.x \
lib/eina/eina_inline_private.h \
tests/eina/sample.gpx \
tests/eina/eina_suite.x \
lib/eina/eina_config.h.in \
$(bin_SCRIPTS)

View File

@ -20,9 +20,15 @@
# include "config.h"
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <Eina.h>
#include "eina_suite.h"
#include "eina_suite.x"
#include "../efl_check.h"
static const Efl_Test_Case etc[] = {

View File

@ -21,7 +21,6 @@
#include <check.h>
void eina_test_stringshare(TCase *tc);
void eina_test_ustringshare(TCase *tc);
void eina_test_binshare(TCase *tc);
void eina_test_inarray(TCase *tc);

View File

@ -0,0 +1,40 @@
#ifndef EINA_SUITE_X
#define EINA_SUITE_X
#define EINA_TEST_START(Func) \
START_TEST(Func) \
{ \
eina_init(); \
do \
{
#define EINA_TEST_END \
} while(0); \
eina_shutdown(); \
} \
END_TEST
#define EINA_TEST_CODE
#include "eina_test_stringshare.c"
#undef EINA_TEST_START
#undef EINA_TEST_END
#undef EINA_TEST_CODE
#define EINA_TEST_START(Func) \
tcase_add_test(tc, Func); \
while (0) \
{
#define EINA_TEST_END \
}
static void
eina_test_stringshare(TCase *tc)
{
#include "eina_test_stringshare.c"
}
#endif

View File

@ -16,30 +16,30 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#include <Eina.h>
#include "eina_suite.h"
#define TEST0 "test/0"
#define TEST1 "test/1"
START_TEST(eina_stringshare_simple)
#ifdef EINA_TEST_CODE
static const char*
my_vprintf(const char *fmt, ...)
{
const char *ret;
va_list ap;
va_start(ap, fmt);
ret = eina_stringshare_vprintf(fmt, ap);
va_end(ap);
return ret;
}
#endif
EINA_TEST_START(eina_stringshare_simple)
{
const char *t0;
const char *t1;
Eina_Slice slice;
eina_init();
t0 = eina_stringshare_add(TEST0);
t1 = eina_stringshare_add(TEST1);
@ -61,19 +61,15 @@ START_TEST(eina_stringshare_simple)
eina_stringshare_del(t0);
eina_stringshare_del(t0);
eina_stringshare_del(t1);
eina_shutdown();
}
END_TEST
EINA_TEST_END
START_TEST(eina_stringshare_simple_refplace)
EINA_TEST_START(eina_stringshare_simple_refplace)
{
const char *t0;
const char *t1;
Eina_Slice slice;
eina_init();
t0 = eina_stringshare_add(TEST0);
t1 = eina_stringshare_add(TEST1);
@ -96,18 +92,14 @@ START_TEST(eina_stringshare_simple_refplace)
eina_stringshare_del(t0);
eina_stringshare_del(t1);
eina_shutdown();
}
END_TEST
EINA_TEST_END
START_TEST(eina_stringshare_small)
EINA_TEST_START(eina_stringshare_small)
{
char buf[4];
int i;
eina_init();
for (i = 0; i < 3; i++)
{
const char *t0, *t1;
@ -135,19 +127,15 @@ START_TEST(eina_stringshare_small)
eina_stringshare_del(t0);
eina_stringshare_del(t1);
}
eina_shutdown();
}
END_TEST
EINA_TEST_END
START_TEST(eina_stringshare_test_share)
EINA_TEST_START(eina_stringshare_test_share)
{
const char *t0;
const char *t1;
eina_init();
t0 = eina_stringshare_add(TEST0);
t1 = eina_stringshare_add(TEST0);
@ -160,18 +148,14 @@ START_TEST(eina_stringshare_test_share)
eina_stringshare_del(t0);
eina_stringshare_del(t1);
eina_shutdown();
}
END_TEST
EINA_TEST_END
START_TEST(eina_stringshare_putstuff)
EINA_TEST_START(eina_stringshare_putstuff)
{
const char *tmp;
int i;
eina_init();
for (i = 10000; i > 0; --i)
{
char build[64] = "string_";
@ -180,12 +164,10 @@ START_TEST(eina_stringshare_putstuff)
tmp = eina_stringshare_add(build);
fail_if(tmp != eina_stringshare_add(build));
}
eina_shutdown();
}
END_TEST
EINA_TEST_END
START_TEST(eina_stringshare_collision)
EINA_TEST_START(eina_stringshare_collision)
{
Eina_Array *ea;
char buffer[50];
@ -193,8 +175,6 @@ START_TEST(eina_stringshare_collision)
srand(time(NULL));
eina_init();
ea = eina_array_new(256);
fail_if(!ea);
@ -227,24 +207,11 @@ START_TEST(eina_stringshare_collision)
for (i = 0; i < 1000; ++i)
eina_stringshare_del(eina_array_pop(ea));
eina_shutdown();
eina_array_free(ea);
}
END_TEST
EINA_TEST_END
static const char*
my_vprintf(const char *fmt, ...)
{
const char *ret;
va_list ap;
va_start(ap, fmt);
ret = eina_stringshare_vprintf(fmt, ap);
va_end(ap);
return ret;
}
START_TEST(eina_stringshare_print)
EINA_TEST_START(eina_stringshare_print)
{
const char *t1;
const char *t2;
@ -271,19 +238,5 @@ START_TEST(eina_stringshare_print)
eina_stringshare_del(t1);
eina_stringshare_del(t2);
eina_stringshare_del(t3);
}
END_TEST
void
eina_test_stringshare(TCase *tc)
{
tcase_add_test(tc, eina_stringshare_simple);
tcase_add_test(tc, eina_stringshare_simple_refplace);
tcase_add_test(tc, eina_stringshare_small);
tcase_add_test(tc, eina_stringshare_test_share);
tcase_add_test(tc, eina_stringshare_collision);
tcase_add_test(tc, eina_stringshare_putstuff);
tcase_add_test(tc, eina_stringshare_print);
}
EINA_TEST_END