summaryrefslogtreecommitdiff
path: root/src/tests/eo/function_overrides
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-03-18 15:33:54 +0000
committerTom Hacohen <tom@stosb.com>2013-03-18 16:14:18 +0000
commita1706833346739fd409a61b315b0100e880b3c62 (patch)
treea6e6d273ed9ef713fffba59f51c6f3f7e0538d59 /src/tests/eo/function_overrides
parent83180acf2668d1992941a83329547e662b0369ba (diff)
Change usage of eo_do_super to the new prototype.
Diffstat (limited to 'src/tests/eo/function_overrides')
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c10
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c4
4 files changed, 10 insertions, 12 deletions
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 1386759bc6..f06791b91c 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -20,16 +20,16 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list)
20 a = va_arg(*list, int); 20 a = va_arg(*list, int);
21 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 21 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
22 eo_do(obj, simple_a_print()); 22 eo_do(obj, simple_a_print());
23 eo_do_super(obj, simple_a_set(a + 1)); 23 eo_do_super(obj, MY_CLASS, simple_a_set(a + 1));
24 24
25 fail_if(!eo_do_super(obj, simple_a_print())); 25 fail_if(!eo_do_super(obj, MY_CLASS, simple_a_print()));
26} 26}
27 27
28static void 28static void
29_print(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 29_print(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
30{ 30{
31 printf("Hey\n"); 31 printf("Hey\n");
32 fail_if(eo_do_super(obj, inherit2_print())); 32 fail_if(eo_do_super(obj, MY_CLASS, inherit2_print()));
33} 33}
34 34
35static void 35static void
@@ -43,8 +43,8 @@ _class_print(const Eo_Class *klass, va_list *list)
43{ 43{
44 (void) list; 44 (void) list;
45 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 45 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
46 fail_if(!eo_class_do_super(klass, simple_class_print())); 46 fail_if(!eo_class_do_super(klass, MY_CLASS, simple_class_print()));
47 fail_if(!eo_class_do_super(klass, simple_class_print2())); 47 fail_if(!eo_class_do_super(klass, MY_CLASS, simple_class_print2()));
48} 48}
49 49
50static void 50static void
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 186291328a..ba6f84a229 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -15,7 +15,7 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list)
15 int a; 15 int a;
16 a = va_arg(*list, int); 16 a = va_arg(*list, int);
17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
18 eo_do_super(obj, simple_a_set(a + 1)); 18 eo_do_super(obj, MY_CLASS, simple_a_set(a + 1));
19} 19}
20 20
21static void 21static void
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index 49a450edf8..48ab4bd1ab 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -41,8 +41,6 @@ main(int argc, char *argv[])
41 obj = eo_add(SIMPLE_CLASS, NULL); 41 obj = eo_add(SIMPLE_CLASS, NULL);
42 fail_if(eo_do(obj, inherit2_print2())); 42 fail_if(eo_do(obj, inherit2_print2()));
43 43
44 fail_if(eo_do_super(obj, simple_a_print()));
45
46#ifdef EO_DEBUG 44#ifdef EO_DEBUG
47 fail_if(eo_do(obj, simple_class_print())); 45 fail_if(eo_do(obj, simple_class_print()));
48#endif 46#endif
@@ -56,8 +54,8 @@ main(int argc, char *argv[])
56 fail_if(eo_class_do(SIMPLE_CLASS, simple_a_print())); 54 fail_if(eo_class_do(SIMPLE_CLASS, simple_a_print()));
57#endif 55#endif
58 56
59 eo_do_super(obj, eo_constructor()); 57 eo_do_super(obj, SIMPLE_CLASS, eo_constructor());
60 eo_do_super(obj, eo_destructor()); 58 eo_do_super(obj, SIMPLE_CLASS, eo_destructor());
61 59
62 eo_unref(obj); 60 eo_unref(obj);
63 61
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 1672943939..22e6063310 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -34,8 +34,8 @@ _class_print(const Eo_Class *klass, va_list *list)
34{ 34{
35 (void) list; 35 (void) list;
36 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 36 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
37 fail_if(eo_class_do_super(klass, simple_class_print())); 37 fail_if(eo_class_do_super(klass, MY_CLASS, simple_class_print()));
38 fail_if(eo_class_do_super(klass, simple_class_print2())); 38 fail_if(eo_class_do_super(klass, MY_CLASS, simple_class_print2()));
39} 39}
40 40
41static void 41static void