q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7e95079f0fb8affae694d2855c01fbaec35e0806
commit 7e95079f0fb8affae694d2855c01fbaec35e0806
Author: Daniel Kolesa <d.kol...@samsung.com>
Date: Wed Aug 27 15:19:50 2014 +0100
eolian: fix tests
---
src/tests/eolian/data/object_impl_ref.c | 13 ++++++-------
src/tests/eolian/eolian_parsing.c | 9 ++++++---
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/tests/eolian/data/object_impl_ref.c
b/src/tests/eolian/data/object_impl_ref.c
index 0f1a87e..a3f1bcb 100644
--- a/src/tests/eolian/data/object_impl_ref.c
+++ b/src/tests/eolian/data/object_impl_ref.c
@@ -25,26 +25,26 @@ _object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_List
*value)
}
-EOLIAN static char *
-_object_impl_foo1(Eo *obj, Object_Impl_Data *pd, int a, char *b, double *c)
+EOLIAN static void
+_object_impl_constructor_1(Eo *obj, Object_Impl_Data *pd, int a, char b)
{
}
EOLIAN static void
-_object_impl_foo2(const Eo *obj, Object_Impl_Data *pd, int a, const char *b)
+_object_impl_constructor_2(Eo *obj, Object_Impl_Data *pd)
{
}
-EOLIAN static void
-_object_impl_constructor_1(Eo *obj, Object_Impl_Data *pd, int a, char b)
+EOLIAN static char *
+_object_impl_foo1(Eo *obj, Object_Impl_Data *pd, int a, char *b, double *c)
{
}
EOLIAN static void
-_object_impl_constructor_2(Eo *obj, Object_Impl_Data *pd)
+_object_impl_foo2(const Eo *obj, Object_Impl_Data *pd, int a, const char *b)
{
}
@@ -52,7 +52,6 @@ _object_impl_constructor_2(Eo *obj, Object_Impl_Data *pd)
EOLIAN static void
_object_impl_base_constructor(Eo *obj, Object_Impl_Data *pd)
{
- eo_do_super(obj, OBJECT_IMPL_CLASS, base_constructor());
}
diff --git a/src/tests/eolian/eolian_parsing.c
b/src/tests/eolian/eolian_parsing.c
index 8e5ba2e..a90395a 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -237,10 +237,13 @@ START_TEST(eolian_ctor_dtor)
eina_iterator_free(iter);
/* Custom ctors/dtors */
- fail_if(!eolian_class_function_get_by_name(base, "constructor",
EOLIAN_CTOR));
+ fail_if(!(impl_func = eolian_class_function_get_by_name(base,
"constructor", EOLIAN_METHOD)));
+ fail_if(!eolian_function_is_constructing(impl_func));
fail_if(!eolian_class_function_get_by_name(base, "destructor",
EOLIAN_METHOD));
- fail_if(!eolian_class_function_get_by_name(class, "custom_constructor_1",
EOLIAN_CTOR));
- fail_if(!eolian_class_function_get_by_name(class, "custom_constructor_2",
EOLIAN_CTOR));
+ fail_if(!(impl_func = eolian_class_function_get_by_name(class,
"custom_constructor_1", EOLIAN_METHOD)));
+ fail_if(!eolian_function_is_constructing(impl_func));
+ fail_if(!(impl_func = eolian_class_function_get_by_name(class,
"custom_constructor_2", EOLIAN_METHOD)));
+ fail_if(!eolian_function_is_constructing(impl_func));
eolian_shutdown();
}
--
