summaryrefslogtreecommitdiff
path: root/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c')
-rw-r--r--src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c333
1 files changed, 124 insertions, 209 deletions
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index 563af26c60..11ed3d7c97 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -128,51 +128,38 @@ _timeout(void *data,
struct resolve_ctx {
- Eina_Array *results;
+ Eina_Value *results;
Eina_Stringshare *canonical_name;
Eina_Stringshare *request_address;
- Efl_Future *future;
+ Eina_Future *future;
Eina_Error err;
};
static void
_resolve_cleanup(struct resolve_ctx *ctx)
{
- Eina_Array_Iterator it;
- unsigned int i;
- const Efl_Net_Ip_Address *o;
-
mark_point();
- if (ctx->results)
- {
- EINA_ARRAY_ITER_NEXT(ctx->results, i, o, it)
- efl_unref(o);
- eina_array_free(ctx->results);
- ctx->results = NULL;
- }
+ if (ctx->results) eina_value_free(ctx->results);
+ ctx->results = NULL;
ctx->err = 0;
eina_stringshare_replace(&ctx->canonical_name, NULL);
eina_stringshare_replace(&ctx->request_address, NULL);
- if (ctx->future)
- {
- efl_future_cancel(ctx->future);
- ctx->future = NULL;
- }
+ if (ctx->future) eina_future_cancel(ctx->future);
+ ctx->future = NULL;
}
static Eina_Bool
_resolve_found(const struct resolve_ctx *ctx, const char *string)
{
- Eina_Array_Iterator it;
- unsigned int i;
const Efl_Net_Ip_Address *o;
+ unsigned int i, len;
ck_assert_ptr_ne(ctx->results, NULL);
- EINA_ARRAY_ITER_NEXT(ctx->results, i, o, it)
+ EINA_VALUE_ARRAY_FOREACH(ctx->results, len, i, o)
{
if (strcmp(string, efl_net_ip_address_string_get(o)) == 0)
return EINA_TRUE;
@@ -186,8 +173,7 @@ static void
_assert_found_internal(const char *file, int line, const struct resolve_ctx *ctx, const char *string, Eina_Bool expected, Eina_Error err)
{
Eina_Bool found;
- Eina_Array_Iterator it;
- unsigned int i;
+ unsigned int i, len;
const Efl_Net_Ip_Address *o;
if (ctx->err != err)
@@ -206,7 +192,7 @@ _assert_found_internal(const char *file, int line, const struct resolve_ctx *ctx
fprintf(stderr, "ERROR: did%s expect '%s' in results:\n",
expected ? "" : " NOT", string);
- EINA_ARRAY_ITER_NEXT(ctx->results, i, o, it)
+ EINA_VALUE_ARRAY_FOREACH(ctx->results, len, i, o)
fprintf(stderr, "result %u: %s\n", i, efl_net_ip_address_string_get(o));
_ck_assert_failed(file, line, "Failed",
@@ -216,44 +202,35 @@ _assert_found_internal(const char *file, int line, const struct resolve_ctx *ctx
NULL);
}
-static void
-_resolve_done(void *data, const Efl_Event *event)
+static Eina_Value
+_resolve_done(void *data, const Eina_Value v, const Eina_Future *dead_future EINA_UNUSED)
{
struct resolve_ctx *ctx = data;
- Efl_Future_Event_Success *f = event->info;
- Efl_Net_Ip_Address_Resolve_Results *r = f->value;
- Eina_Array_Iterator it;
- unsigned int i;
- Efl_Net_Ip_Address *o;
-
- ck_assert_ptr_eq(ctx->results, NULL);
- ctx->results = eina_array_new(32);
+ Eina_Value_Array desc = { 0 };
- ctx->canonical_name = eina_stringshare_ref(r->canonical_name);
- ctx->request_address = eina_stringshare_ref(r->request_address);
-
- EINA_ARRAY_ITER_NEXT(r->results, i, o, it)
- eina_array_push(ctx->results, efl_ref(o));
+ mark_point();
- ctx->future = NULL;
- ecore_main_loop_quit();
+ if (eina_value_type_get(&v) == EINA_VALUE_TYPE_ERROR)
+ {
+ eina_value_error_get(&v, &ctx->err);
+ goto end;
+ }
- mark_point();
-}
+ eina_value_struct_get(&v, "canonical_name", &ctx->canonical_name);
+ eina_value_struct_get(&v, "request_address", &ctx->request_address);
+ eina_value_struct_get(&v, "results", &desc);
-static void
-_resolve_failed(void *data, const Efl_Event *event)
-{
- struct resolve_ctx *ctx = data;
- Efl_Future_Event_Failure *f = event->info;
+ ctx->results = eina_value_new(EINA_VALUE_TYPE_ARRAY);
+ eina_value_pset(ctx->results, &desc);
- mark_point();
+ end:
+ ecore_main_loop_quit();
- ctx->err = f->error;
ctx->future = NULL;
- ecore_main_loop_quit();
mark_point();
+
+ return v;
}
static void
@@ -262,7 +239,7 @@ _resolve(struct resolve_ctx *ctx, const char *address, int family, int flags)
ctx->future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS,
address, family, flags);
ck_assert_ptr_ne(ctx->future, NULL);
- efl_future_then(ctx->future, _resolve_done, _resolve_failed, NULL, ctx);
+ ctx->future = eina_future_then(ctx->future, _resolve_done, ctx);
LOOP_WITH_TIMEOUT(10);
}
@@ -295,7 +272,7 @@ _ipv4_check(Eo *o, const struct sockaddr_in *addr)
ck_assert_str_eq(efl_net_ip_address_string_get(o), buf);
}
-START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok)
{
struct sockaddr_in addr = {
.sin_family = AF_INET,
@@ -303,39 +280,35 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok)
Eina_Slice slice = { .mem = &addr.sin_addr, .len = sizeof(addr.sin_addr) };
Eo *o;
- ecore_con_init();
-
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
efl_net_ip_address_set(efl_added, slice));
_ipv4_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin_port = htons(8081);
addr.sin_addr.s_addr = htonl(0);
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
efl_net_ip_address_set(efl_added, slice));
_ipv4_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin_port = htons(0);
addr.sin_addr.s_addr = htonl(0x12345678);
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_set(efl_added, slice));
_ipv4_check(o, &addr);
- efl_del(o);
-
- ecore_con_shutdown();
+ efl_unref(o);
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
{
uint8_t c = 123;
Eina_Slice wrong_slice = { .mem = &c, .len = 1 };
@@ -345,49 +318,47 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
Eina_Slice slice = { .mem = &addr.sin_addr, .len = sizeof(addr.sin_addr) };
Eo *o;
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL);
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL);
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(1);
TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, 12345));
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(2);
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_set(efl_added, wrong_slice));
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(2);
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_port_set(efl_added, 1234));
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(2);
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_port_set(efl_added, 1234),
efl_net_ip_address_set(efl_added, wrong_slice));
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(3);
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true");
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_set(efl_added, wrong_slice));
_ipv4_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
TRAP_ERRORS_FINISH(1);
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
efl_net_ip_address_set(efl_added, slice));
@@ -417,13 +388,11 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
efl_net_ip_address_set(o, slice);
TRAP_ERRORS_FINISH(1);
- efl_del(o);
-
- ecore_con_shutdown();
+ efl_unref(o);
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
{
struct sockaddr_in addr = {
.sin_family = AF_INET,
@@ -431,15 +400,13 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
Eina_Slice slice = { .mem = &addr.sin_addr, .len = sizeof(addr.sin_addr) };
Eo *o;
- ecore_con_init();
-
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS,
ntohs(addr.sin_port),
slice);
_ipv4_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin_port = htons(8081);
addr.sin_addr.s_addr = htonl(0);
@@ -447,7 +414,7 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
ntohs(addr.sin_port),
slice);
_ipv4_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin_port = htons(0);
addr.sin_addr.s_addr = htonl(0x12345678);
@@ -455,20 +422,17 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
ntohs(addr.sin_port),
slice);
_ipv4_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail)
{
uint8_t c = 123;
Eina_Slice wrong_slice = { .mem = &c, .len = 1 };
Eo *o;
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: address.len != 4 && address.len != 16 is true");
o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS,
1234,
@@ -476,46 +440,40 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail)
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(1);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_ok)
{
struct sockaddr_in addr = {
.sin_family = AF_INET,
};
Eo *o;
- ecore_con_init();
-
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr);
ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o));
_ipv4_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin_port = htons(0);
addr.sin_addr.s_addr = htonl(0);
o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr);
ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o));
_ipv4_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail)
{
struct sockaddr_in addr = {
.sin_family = AF_UNSPEC,
};
Eo *o;
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: sockaddr == NULL");
o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, NULL);
ck_assert_ptr_eq(o, NULL);
@@ -526,46 +484,40 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail)
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(1);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_ok)
{
Eo *o;
- ecore_con_init();
-
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0.1:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1:12345");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0.1:0");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0.1");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "192.168.0.123:80");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "192.168.0.123:80");
- efl_del(o);
+ efl_unref(o);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail)
{
Eo *o;
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: numeric_address == NULL");
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, NULL);
ck_assert_ptr_eq(o, NULL);
@@ -594,16 +546,13 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail)
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(0); /* no error messages! */
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_ok)
{
struct resolve_ctx ctx = { };
- ecore_con_init();
-
_resolve(&ctx, "localhost:http", 0, 0);
_assert_found(&ctx, "127.0.0.1:80", EINA_TRUE, 0);
_resolve_cleanup(&ctx);
@@ -632,16 +581,13 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_ok)
_assert_found(&ctx, "[::1]:80", EINA_FALSE, 0);
_resolve_cleanup(&ctx);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail)
{
struct resolve_ctx ctx = { };
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: address == NULL");
ctx.future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS,
NULL, 0, 0);
@@ -662,11 +608,10 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail)
_assert_found(&ctx, "[::1]:http", EINA_FALSE, EFL_NET_ERROR_COULDNT_RESOLVE_HOST);
_resolve_cleanup(&ctx);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
{
const struct test {
uint32_t addr;
@@ -691,8 +636,6 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
#undef TEST
};
- ecore_con_init();
-
for (itr = tests; itr < tests + sizeof(tests)/sizeof(tests[0]); itr++)
{
struct sockaddr_in a = {
@@ -716,12 +659,11 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
ck_assert_int_eq(efl_net_ip_address_ipv6_local_link_check(o), EINA_FALSE);
ck_assert_int_eq(efl_net_ip_address_ipv6_local_site_check(o), EINA_FALSE);
- efl_del(o);
+ efl_unref(o);
}
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
/* IPv6 *****************************************************************/
@@ -761,7 +703,7 @@ _ipv6_set(struct sockaddr_in6 *addr, uint16_t s1, uint16_t s2, uint16_t s3, uint
memcpy(&addr->sin6_addr, s, 16);
}
-START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok)
{
struct sockaddr_in6 addr = {
.sin6_family = AF_INET6,
@@ -769,31 +711,28 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok)
Eina_Slice slice = { .mem = &addr.sin6_addr, .len = sizeof(addr.sin6_addr) };
Eo *o;
- ecore_con_init();
-
addr.sin6_port = htons(12345);
_ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET6),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
efl_net_ip_address_set(efl_added, slice));
_ipv6_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin6_port = htons(8081);
_ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0);
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET6),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
efl_net_ip_address_set(efl_added, slice));
_ipv6_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
{
uint8_t c = 123;
Eina_Slice wrong_slice = { .mem = &c, .len = 1 };
@@ -803,21 +742,19 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
Eina_Slice slice = { .mem = &addr.sin6_addr, .len = sizeof(addr.sin6_addr) };
Eo *o;
- ecore_con_init();
-
/* generic errors checked at ecore_test_efl_net_ip_address_ipv4_manual_fail */
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true");
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET6),
efl_net_ip_address_set(efl_added, wrong_slice));
_ipv6_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
TRAP_ERRORS_FINISH(1);
addr.sin6_port = htons(12345);
_ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 1);
- o = efl_add(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
efl_net_ip_address_family_set(efl_added, AF_INET6),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
efl_net_ip_address_set(efl_added, slice));
@@ -847,13 +784,12 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
efl_net_ip_address_set(o, slice);
TRAP_ERRORS_FINISH(1);
- efl_del(o);
+ efl_unref(o);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
{
struct sockaddr_in6 addr = {
.sin6_family = AF_INET6,
@@ -861,15 +797,13 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
Eina_Slice slice = { .mem = &addr.sin6_addr, .len = sizeof(addr.sin6_addr) };
Eo *o;
- ecore_con_init();
-
addr.sin6_port = htons(12365);
_ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS,
ntohs(addr.sin6_port),
slice);
_ipv6_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin6_port = htons(8081);
_ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0);
@@ -877,7 +811,7 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
ntohs(addr.sin6_port),
slice);
_ipv6_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin6_port = htons(0);
_ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 1);
@@ -885,139 +819,130 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
ntohs(addr.sin6_port),
slice);
_ipv6_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv6_create_sockaddr_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_sockaddr_ok)
{
struct sockaddr_in6 addr = {
.sin6_family = AF_INET6,
};
Eo *o;
- ecore_con_init();
-
addr.sin6_port = htons(12345);
_ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr);
ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o));
_ipv6_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
addr.sin6_port = htons(0);
_ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0);
o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr);
ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o));
_ipv6_check(o, &addr);
- efl_del(o);
+ efl_unref(o);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_ok)
{
Eo *o;
- ecore_con_init();
-
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::1]:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]:12345");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::1]:0");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::1]");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "::1");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::]:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]:12345");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::]:0");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::]");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "::");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]");
- efl_del(o);
+ efl_unref(o);
/* IPv4 Mapped */
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::ffff:192.168.0.1]:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::ffff:192.168.0.1]:12345");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::ffff:192.168.0.1]");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::ffff:192.168.0.1]");
- efl_del(o);
+ efl_unref(o);
/* IPv4 Compatible */
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::192.168.0.1]:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::192.168.0.1]:12345");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::192.168.0.1]");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::192.168.0.1]");
- efl_del(o);
+ efl_unref(o);
/* Link Local */
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[fe80::1]:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fe80::1]:12345");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[fe80::1]");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fe80::1]");
- efl_del(o);
+ efl_unref(o);
/* Site Local */
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[fc00::1]:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fc00::1]:12345");
- efl_del(o);
+ efl_unref(o);
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[fc00::1]");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fc00::1]");
- efl_del(o);
+ efl_unref(o);
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail)
{
Eo *o;
- ecore_con_init();
-
/* generic error (null ptr) checked in ipv4_parse_fail */
/* incomplete numbers */
@@ -1037,9 +962,8 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail)
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(0); /* no error messages! */
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
static const char *
_ipv6_localhost_check(void)
@@ -1130,14 +1054,12 @@ _ipv6_localhost_check(void)
return found;
}
-START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_ok)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_ok)
{
struct resolve_ctx ctx = { };
char buf[4096];
const char *localhost_str;
- ecore_con_init();
-
localhost_str = _ipv6_localhost_check();
if (localhost_str)
@@ -1183,16 +1105,13 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_ok)
_resolve_cleanup(&ctx);
}
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_fail)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_fail)
{
struct resolve_ctx ctx = { };
- ecore_con_init();
-
/* generic checks at ipv4_resolve_fail */
#if defined(AI_V4MAPPED) && (AI_V4MAPPED > 0)
@@ -1201,11 +1120,10 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_fail)
_resolve_cleanup(&ctx);
#endif
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
-START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
+EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
{
const struct test {
const char *str;
@@ -1221,8 +1139,6 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
#undef TEST
};
- ecore_con_init();
-
for (itr = tests; itr < tests + sizeof(tests)/sizeof(tests[0]); itr++)
{
struct sockaddr_in6 a = {
@@ -1253,12 +1169,11 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
ck_assert_int_eq(efl_net_ip_address_ipv6_local_link_check(o), IN6_IS_ADDR_LINKLOCAL(ia));
ck_assert_int_eq(efl_net_ip_address_ipv6_local_site_check(o), IN6_IS_ADDR_SITELOCAL(ia));
- efl_del(o);
+ efl_unref(o);
}
- ecore_con_shutdown();
}
-END_TEST
+EFL_END_TEST
void ecore_con_test_efl_net_ip_address(TCase *tc)
{
View Lorry Controller Status