summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 13:26:15 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 14:35:19 +0900
commit7bf8da2baa243b972dd33d11ba873f6165e18fbf (patch)
tree91e8d9be8b6d16cd684178afbe081266fa1921fb /src/tests
parent2f0b9edbb4b5e47d2d4a1380edc6ad1828134c41 (diff)
evas: Rename Evas.Object to Efl.Canvas.Object
One step closer to make the EO inheritance tree look like it's all Efl.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/edje/edje_test_edje.c12
-rw-r--r--src/tests/eolian/data/class_simple.eo2
-rw-r--r--src/tests/eolian/data/class_simple_ref.c16
-rw-r--r--src/tests/eolian/data/class_simple_ref_eo.h10
-rw-r--r--src/tests/eolian/eolian_parsing.c2
-rw-r--r--src/tests/evas/evas_test_mask.c2
6 files changed, 22 insertions, 22 deletions
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 09e41873f7..e3dfd65489 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -181,15 +181,15 @@ START_TEST(edje_test_masking)
181 181
182 /* check value of no_render flag as seen from evas land */ 182 /* check value of no_render flag as seen from evas land */
183 sub = edje_object_part_object_get(obj, "mask"); 183 sub = edje_object_part_object_get(obj, "mask");
184 fail_if(!evas_obj_no_render_get(sub)); 184 fail_if(!efl_canvas_object_no_render_get(sub));
185 185
186 /* check that text has a clip (based on description.clip_to) */ 186 /* check that text has a clip (based on description.clip_to) */
187 sub = edje_object_part_object_get(obj, "text"); 187 sub = edje_object_part_object_get(obj, "text");
188 fail_if(!evas_obj_clip_get(sub)); 188 fail_if(!efl_canvas_object_clip_get(sub));
189 189
190 /* test description.clip_to override */ 190 /* test description.clip_to override */
191 sub = edje_object_part_object_get(obj, "noclip"); 191 sub = edje_object_part_object_get(obj, "noclip");
192 clip2 = evas_obj_clip_get(sub); 192 clip2 = efl_canvas_object_clip_get(sub);
193 fail_if(clip != clip2); 193 fail_if(clip != clip2);
194 194
195 EDJE_TEST_FREE_EVAS(); 195 EDJE_TEST_FREE_EVAS();
@@ -212,13 +212,13 @@ START_TEST(edje_test_filters)
212 212
213 /* check value of no_render flag as seen from evas land */ 213 /* check value of no_render flag as seen from evas land */
214 sub = edje_object_part_object_get(obj, "mask"); 214 sub = edje_object_part_object_get(obj, "mask");
215 fail_if(!evas_obj_no_render_get(sub)); 215 fail_if(!efl_canvas_object_no_render_get(sub));
216 216
217 /* check no_render inheritance */ 217 /* check no_render inheritance */
218 sub = edje_object_part_object_get(obj, "mask2"); 218 sub = edje_object_part_object_get(obj, "mask2");
219 fail_if(evas_obj_no_render_get(sub)); 219 fail_if(efl_canvas_object_no_render_get(sub));
220 sub = edje_object_part_object_get(obj, "mask3"); 220 sub = edje_object_part_object_get(obj, "mask3");
221 fail_if(!evas_obj_no_render_get(sub)); 221 fail_if(!efl_canvas_object_no_render_get(sub));
222 222
223 /* text part: check filter status */ 223 /* text part: check filter status */
224 text = edje_object_part_object_get(obj, "text"); 224 text = edje_object_part_object_get(obj, "text");
diff --git a/src/tests/eolian/data/class_simple.eo b/src/tests/eolian/data/class_simple.eo
index 8a64b92a77..335daf8ba3 100644
--- a/src/tests/eolian/data/class_simple.eo
+++ b/src/tests/eolian/data/class_simple.eo
@@ -1,7 +1,7 @@
1class Class_Simple { 1class Class_Simple {
2 [[Class Desc Simple]] 2 [[Class Desc Simple]]
3 legacy_prefix: evas_object_simple; 3 legacy_prefix: evas_object_simple;
4 eo_prefix: evas_obj_simple; 4 eo_prefix: efl_canvas_object_simple;
5 data: Evas_Simple_Data; 5 data: Evas_Simple_Data;
6 methods { 6 methods {
7 @property a @beta { 7 @property a @beta {
diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c
index 5bcbd33e0c..16a799c311 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -1,15 +1,15 @@
1 1
2Eina_Bool _class_simple_a_set(Eo *obj, Evas_Simple_Data *pd, int value); 2Eina_Bool _class_simple_a_set(Eo *obj, Evas_Simple_Data *pd, int value);
3 3
4EOAPI EO_FUNC_BODYV(evas_obj_simple_a_set, Eina_Bool, EINA_TRUE, EO_FUNC_CALL(value), int value); 4EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_a_set, Eina_Bool, EINA_TRUE, EO_FUNC_CALL(value), int value);
5 5
6int _class_simple_a_get(Eo *obj, Evas_Simple_Data *pd); 6int _class_simple_a_get(Eo *obj, Evas_Simple_Data *pd);
7 7
8EOAPI EO_FUNC_BODY_CONST(evas_obj_simple_a_get, int, 100); 8EOAPI EO_FUNC_BODY_CONST(efl_canvas_object_simple_a_get, int, 100);
9 9
10void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd); 10void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd);
11 11
12EOAPI EO_VOID_FUNC_BODY(evas_obj_simple_b_set); 12EOAPI EO_VOID_FUNC_BODY(efl_canvas_object_simple_b_set);
13 13
14char * _class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c, int *d); 14char * _class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c, int *d);
15 15
@@ -19,16 +19,16 @@ static char * __eolian_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, ch
19 return _class_simple_foo(obj, pd, a, b, c, d); 19 return _class_simple_foo(obj, pd, a, b, c, d);
20} 20}
21 21
22EOAPI EO_FUNC_BODYV(evas_obj_simple_foo, char *, NULL, EO_FUNC_CALL(a, b, c, d), int a, char *b, double *c, int *d); 22EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_foo, char *, NULL, EO_FUNC_CALL(a, b, c, d), int a, char *b, double *c, int *d);
23 23
24int * _class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int x); 24int * _class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int x);
25 25
26EOAPI EO_FUNC_BODYV(evas_obj_simple_bar, int *, 0, EO_FUNC_CALL(x), int x); 26EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_bar, int *, 0, EO_FUNC_CALL(x), int x);
27 27
28static const Eo_Op_Description _class_simple_op_desc[] = { 28static const Eo_Op_Description _class_simple_op_desc[] = {
29 EO_OP_FUNC(evas_obj_simple_a_set, _class_simple_a_set), 29 EO_OP_FUNC(efl_canvas_object_simple_a_set, _class_simple_a_set),
30 EO_OP_FUNC(evas_obj_simple_a_get, _class_simple_a_get), 30 EO_OP_FUNC(efl_canvas_object_simple_a_get, _class_simple_a_get),
31 EO_OP_FUNC(evas_obj_simple_foo, __eolian_class_simple_foo), 31 EO_OP_FUNC(efl_canvas_object_simple_foo, __eolian_class_simple_foo),
32}; 32};
33 33
34static const Eo_Class_Description _class_simple_class_desc = { 34static const Eo_Class_Description _class_simple_class_desc = {
diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h
index 43e96fcabb..934f0903a2 100644
--- a/src/tests/eolian/data/class_simple_ref_eo.h
+++ b/src/tests/eolian/data/class_simple_ref_eo.h
@@ -33,7 +33,7 @@ EWAPI const Eo_Class *class_simple_class_get(void);
33 * 33 *
34 * @ingroup Class_Simple 34 * @ingroup Class_Simple
35 */ 35 */
36EOAPI Eina_Bool evas_obj_simple_a_set(Eo *obj, int value); 36EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value);
37#endif 37#endif
38 38
39#ifdef CLASS_SIMPLE_BETA 39#ifdef CLASS_SIMPLE_BETA
@@ -44,10 +44,10 @@ EOAPI Eina_Bool evas_obj_simple_a_set(Eo *obj, int value);
44 * 44 *
45 * @ingroup Class_Simple 45 * @ingroup Class_Simple
46 */ 46 */
47EOAPI int evas_obj_simple_a_get(const Eo *obj); 47EOAPI int efl_canvas_object_simple_a_get(const Eo *obj);
48#endif 48#endif
49 49
50EOAPI void evas_obj_simple_b_set(Eo *obj); 50EOAPI void efl_canvas_object_simple_b_set(Eo *obj);
51 51
52#ifdef CLASS_SIMPLE_BETA 52#ifdef CLASS_SIMPLE_BETA
53/** 53/**
@@ -62,10 +62,10 @@ EOAPI void evas_obj_simple_b_set(Eo *obj);
62 * 62 *
63 * @ingroup Class_Simple 63 * @ingroup Class_Simple
64 */ 64 */
65EOAPI char *evas_obj_simple_foo(Eo *obj, int a, char *b, double *c, int *d); 65EOAPI char *efl_canvas_object_simple_foo(Eo *obj, int a, char *b, double *c, int *d);
66#endif 66#endif
67 67
68EOAPI int *evas_obj_simple_bar(Eo *obj, int x); 68EOAPI int *efl_canvas_object_simple_bar(Eo *obj, int x);
69 69
70 70
71#endif 71#endif
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index 02232f3045..607849307b 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -553,7 +553,7 @@ START_TEST(eolian_simple_parsing)
553 fail_if(eolian_class_type_get(class) != EOLIAN_CLASS_REGULAR); 553 fail_if(eolian_class_type_get(class) != EOLIAN_CLASS_REGULAR);
554 fail_if(eolian_class_inherits_get(class) != NULL); 554 fail_if(eolian_class_inherits_get(class) != NULL);
555 fail_if(strcmp(eolian_class_legacy_prefix_get(class), "evas_object_simple")); 555 fail_if(strcmp(eolian_class_legacy_prefix_get(class), "evas_object_simple"));
556 fail_if(strcmp(eolian_class_eo_prefix_get(class), "evas_obj_simple")); 556 fail_if(strcmp(eolian_class_eo_prefix_get(class), "efl_canvas_object_simple"));
557 fail_if(strcmp(eolian_class_data_type_get(class), "Evas_Simple_Data")); 557 fail_if(strcmp(eolian_class_data_type_get(class), "Evas_Simple_Data"));
558 558
559 /* c get func */ 559 /* c get func */
diff --git a/src/tests/evas/evas_test_mask.c b/src/tests/evas/evas_test_mask.c
index 033ffb4aed..d8b64d341a 100644
--- a/src/tests/evas/evas_test_mask.c
+++ b/src/tests/evas/evas_test_mask.c
@@ -84,7 +84,7 @@ START_TEST(evas_mask_test_setget)
84 } 84 }
85 fail_if(i != 1); 85 fail_if(i != 1);
86 86
87 it = evas_obj_clipees_get(mask); 87 it = efl_canvas_object_clipees_get(mask);
88 i = 0; 88 i = 0;
89 EINA_ITERATOR_FOREACH(it, o) 89 EINA_ITERATOR_FOREACH(it, o)
90 { 90 {