summaryrefslogtreecommitdiff
path: root/src/tests/eo/suite
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-09-05 12:31:55 +0100
committerTom Hacohen <tom@stosb.com>2016-09-05 16:03:17 +0100
commita8ccb191c6cc9d1191306449b20aba1c8eee965a (patch)
treed7f8a5182ea6388d9afb3baa80eaef37caca4fcb /src/tests/eo/suite
parent4aae224ef5af35e920e0c5a2c23df9afbb33bb84 (diff)
Adjust the EFL to the Eo class_initilizer changes.
Diffstat (limited to 'src/tests/eo/suite')
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c18
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c80
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c56
-rw-r--r--src/tests/eo/suite/eo_test_class_singleton.c14
-rw-r--r--src/tests/eo/suite/eo_test_general.c58
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c18
6 files changed, 163 insertions, 81 deletions
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 678cce638d..fc443fbe8b 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -22,21 +22,27 @@ static void _destructor_unref(Eo *obj, void *class_data EINA_UNUSED)
22 efl_unref(obj); 22 efl_unref(obj);
23} 23}
24 24
25static Eina_Bool
26_destructor_unref_class_initializer(Efl_Class *klass2)
27{
28 EFL_OPS_DEFINE(ops,
29 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor_unref),
30 );
31
32 return efl_class_functions_set(klass2, &ops);
33}
34
25START_TEST(efl_destructor_unref) 35START_TEST(efl_destructor_unref)
26{ 36{
27 efl_object_init(); 37 efl_object_init();
28 eina_log_print_cb_set(eo_test_print_cb, &ctx); 38 eina_log_print_cb_set(eo_test_print_cb, &ctx);
29 39
30 static Efl_Op_Description op_descs [] = {
31 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor_unref),
32 };
33
34 static Efl_Class_Description class_desc = { 40 static Efl_Class_Description class_desc = {
35 EO_VERSION, 41 EO_VERSION,
36 "Simple", 42 "Simple",
37 EFL_CLASS_TYPE_REGULAR, 43 EFL_CLASS_TYPE_REGULAR,
38 EFL_CLASS_DESCRIPTION_OPS(op_descs),
39 0, 44 0,
45 _destructor_unref_class_initializer,
40 NULL, 46 NULL,
41 NULL 47 NULL
42 }; 48 };
@@ -65,9 +71,9 @@ START_TEST(efl_destructor_double_del)
65 EO_VERSION, 71 EO_VERSION,
66 "Simple", 72 "Simple",
67 EFL_CLASS_TYPE_REGULAR, 73 EFL_CLASS_TYPE_REGULAR,
68 EFL_CLASS_DESCRIPTION_NOOPS(),
69 0, 74 0,
70 NULL, 75 NULL,
76 NULL,
71 NULL 77 NULL
72 }; 78 };
73 79
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index a63d9f5f5a..89ad49be23 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -25,9 +25,9 @@ START_TEST(eo_inherit_errors)
25 EO_VERSION, 25 EO_VERSION,
26 "Simple", 26 "Simple",
27 EFL_CLASS_TYPE_REGULAR, 27 EFL_CLASS_TYPE_REGULAR,
28 EFL_CLASS_DESCRIPTION_NOOPS(),
29 0, 28 0,
30 NULL, 29 NULL,
30 NULL,
31 NULL 31 NULL
32 }; 32 };
33 33
@@ -35,9 +35,9 @@ START_TEST(eo_inherit_errors)
35 EO_VERSION, 35 EO_VERSION,
36 "Mixin", 36 "Mixin",
37 EFL_CLASS_TYPE_MIXIN, 37 EFL_CLASS_TYPE_MIXIN,
38 EFL_CLASS_DESCRIPTION_NOOPS(),
39 0, 38 0,
40 NULL, 39 NULL,
40 NULL,
41 NULL 41 NULL
42 }; 42 };
43 43
@@ -45,9 +45,9 @@ START_TEST(eo_inherit_errors)
45 EO_VERSION, 45 EO_VERSION,
46 "General", 46 "General",
47 EFL_CLASS_TYPE_MIXIN, 47 EFL_CLASS_TYPE_MIXIN,
48 EFL_CLASS_DESCRIPTION_NOOPS(),
49 0, 48 0,
50 NULL, 49 NULL,
50 NULL,
51 NULL 51 NULL
52 }; 52 };
53 53
@@ -90,9 +90,9 @@ START_TEST(eo_inconsistent_mro)
90 EO_VERSION, 90 EO_VERSION,
91 "Simple", 91 "Simple",
92 EFL_CLASS_TYPE_REGULAR, 92 EFL_CLASS_TYPE_REGULAR,
93 EFL_CLASS_DESCRIPTION_NOOPS(),
94 0, 93 0,
95 NULL, 94 NULL,
95 NULL,
96 NULL 96 NULL
97 }; 97 };
98 98
@@ -100,9 +100,9 @@ START_TEST(eo_inconsistent_mro)
100 EO_VERSION, 100 EO_VERSION,
101 "Mixin", 101 "Mixin",
102 EFL_CLASS_TYPE_MIXIN, 102 EFL_CLASS_TYPE_MIXIN,
103 EFL_CLASS_DESCRIPTION_NOOPS(),
104 0, 103 0,
105 NULL, 104 NULL,
105 NULL,
106 NULL 106 NULL
107 }; 107 };
108 108
@@ -110,9 +110,9 @@ START_TEST(eo_inconsistent_mro)
110 EO_VERSION, 110 EO_VERSION,
111 "Mixin2", 111 "Mixin2",
112 EFL_CLASS_TYPE_MIXIN, 112 EFL_CLASS_TYPE_MIXIN,
113 EFL_CLASS_DESCRIPTION_NOOPS(),
114 0, 113 0,
115 NULL, 114 NULL,
115 NULL,
116 NULL 116 NULL
117 }; 117 };
118 118
@@ -120,9 +120,9 @@ START_TEST(eo_inconsistent_mro)
120 EO_VERSION, 120 EO_VERSION,
121 "Mixin3", 121 "Mixin3",
122 EFL_CLASS_TYPE_MIXIN, 122 EFL_CLASS_TYPE_MIXIN,
123 EFL_CLASS_DESCRIPTION_NOOPS(),
124 0, 123 0,
125 NULL, 124 NULL,
125 NULL,
126 NULL 126 NULL
127 }; 127 };
128 128
@@ -165,9 +165,9 @@ START_TEST(eo_bad_interface)
165 EO_VERSION, 165 EO_VERSION,
166 "Interface", 166 "Interface",
167 EFL_CLASS_TYPE_INTERFACE, 167 EFL_CLASS_TYPE_INTERFACE,
168 EFL_CLASS_DESCRIPTION_NOOPS(),
169 10, 168 10,
170 NULL, 169 NULL,
170 NULL,
171 NULL 171 NULL
172 }; 172 };
173 173
@@ -202,6 +202,16 @@ END_TEST
202static void _null_fct(Eo *eo_obj EINA_UNUSED, void *d EINA_UNUSED) { } 202static void _null_fct(Eo *eo_obj EINA_UNUSED, void *d EINA_UNUSED) { }
203void null_fct (void) {} 203void null_fct (void) {}
204 204
205static Eina_Bool
206_null_class_initializer(Efl_Class *klass)
207{
208 EFL_OPS_DEFINE(ops,
209 EFL_OBJECT_OP_FUNC(NULL, _null_fct),
210 );
211
212 return efl_class_functions_set(klass, &ops);
213}
214
205START_TEST(eo_null_api) 215START_TEST(eo_null_api)
206{ 216{
207 efl_object_init(); 217 efl_object_init();
@@ -209,15 +219,12 @@ START_TEST(eo_null_api)
209 219
210 const Efl_Class *klass; 220 const Efl_Class *klass;
211 221
212 static Efl_Op_Description op_descs[] = {
213 EFL_OBJECT_OP_FUNC(NULL, _null_fct),
214 };
215 static Efl_Class_Description class_desc = { 222 static Efl_Class_Description class_desc = {
216 EO_VERSION, 223 EO_VERSION,
217 "Simple", 224 "Simple",
218 EFL_CLASS_TYPE_REGULAR, 225 EFL_CLASS_TYPE_REGULAR,
219 EFL_CLASS_DESCRIPTION_OPS(op_descs),
220 0, 226 0,
227 _null_class_initializer,
221 NULL, 228 NULL,
222 NULL 229 NULL
223 }; 230 };
@@ -233,21 +240,28 @@ START_TEST(eo_null_api)
233} 240}
234END_TEST 241END_TEST
235 242
243static Eina_Bool
244_wrong_override_class_initializer(Efl_Class *klass)
245{
246 EFL_OPS_DEFINE(ops,
247 EFL_OBJECT_OP_FUNC_OVERRIDE(null_fct, _null_fct),
248 );
249
250 return efl_class_functions_set(klass, &ops);
251}
252
236START_TEST(eo_wrong_override) 253START_TEST(eo_wrong_override)
237{ 254{
238 efl_object_init(); 255 efl_object_init();
239 256
240 const Efl_Class *klass; 257 const Efl_Class *klass;
241 258
242 static Efl_Op_Description op_descs[] = {
243 EFL_OBJECT_OP_FUNC_OVERRIDE(null_fct, _null_fct),
244 };
245 static Efl_Class_Description class_desc = { 259 static Efl_Class_Description class_desc = {
246 EO_VERSION, 260 EO_VERSION,
247 "Simple", 261 "Simple",
248 EFL_CLASS_TYPE_REGULAR, 262 EFL_CLASS_TYPE_REGULAR,
249 EFL_CLASS_DESCRIPTION_OPS(op_descs),
250 0, 263 0,
264 _wrong_override_class_initializer,
251 NULL, 265 NULL,
252 NULL 266 NULL
253 }; 267 };
@@ -259,6 +273,17 @@ START_TEST(eo_wrong_override)
259} 273}
260END_TEST 274END_TEST
261 275
276static Eina_Bool
277_redefined_class_initializer(Efl_Class *klass)
278{
279 EFL_OPS_DEFINE(ops,
280 EFL_OBJECT_OP_FUNC(null_fct, _null_fct),
281 EFL_OBJECT_OP_FUNC(null_fct, NULL),
282 );
283
284 return efl_class_functions_set(klass, &ops);
285}
286
262START_TEST(eo_api_redefined) 287START_TEST(eo_api_redefined)
263{ 288{
264 efl_object_init(); 289 efl_object_init();
@@ -266,16 +291,12 @@ START_TEST(eo_api_redefined)
266 291
267 const Efl_Class *klass; 292 const Efl_Class *klass;
268 293
269 static Efl_Op_Description op_descs[] = {
270 EFL_OBJECT_OP_FUNC(null_fct, _null_fct),
271 EFL_OBJECT_OP_FUNC(null_fct, NULL),
272 };
273 static Efl_Class_Description class_desc = { 294 static Efl_Class_Description class_desc = {
274 EO_VERSION, 295 EO_VERSION,
275 "Simple", 296 "Simple",
276 EFL_CLASS_TYPE_REGULAR, 297 EFL_CLASS_TYPE_REGULAR,
277 EFL_CLASS_DESCRIPTION_OPS(op_descs),
278 0, 298 0,
299 _redefined_class_initializer,
279 NULL, 300 NULL,
280 NULL 301 NULL
281 }; 302 };
@@ -291,6 +312,17 @@ START_TEST(eo_api_redefined)
291} 312}
292END_TEST 313END_TEST
293 314
315static Eina_Bool
316_dich_func_class_initializer(Efl_Class *klass)
317{
318 EFL_OPS_DEFINE(ops,
319 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _null_fct),
320 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, NULL),
321 );
322
323 return efl_class_functions_set(klass, &ops);
324}
325
294START_TEST(eo_dich_func_override) 326START_TEST(eo_dich_func_override)
295{ 327{
296 efl_object_init(); 328 efl_object_init();
@@ -298,16 +330,12 @@ START_TEST(eo_dich_func_override)
298 330
299 const Efl_Class *klass; 331 const Efl_Class *klass;
300 332
301 static Efl_Op_Description op_descs[] = {
302 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _null_fct),
303 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, NULL),
304 };
305 static Efl_Class_Description class_desc = { 333 static Efl_Class_Description class_desc = {
306 EO_VERSION, 334 EO_VERSION,
307 "Simple", 335 "Simple",
308 EFL_CLASS_TYPE_REGULAR, 336 EFL_CLASS_TYPE_REGULAR,
309 EFL_CLASS_DESCRIPTION_OPS(op_descs),
310 0, 337 0,
338 _dich_func_class_initializer,
311 NULL, 339 NULL,
312 NULL 340 NULL
313 }; 341 };
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 6bbeda587e..56d424c183 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -88,23 +88,29 @@ EFL_FUNC_BODY_CONST(simple_class_hi_print, Eina_Bool, EINA_FALSE);
88EFL_VOID_FUNC_BODY(simple_pure_virtual); 88EFL_VOID_FUNC_BODY(simple_pure_virtual);
89EFL_VOID_FUNC_BODY(simple_no_implementation); 89EFL_VOID_FUNC_BODY(simple_no_implementation);
90 90
91static Efl_Op_Description op_descs[] = { 91static Eina_Bool
92 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 92_class_initializer(Efl_Class *klass)
93 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 93{
94 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print), 94 EFL_OPS_DEFINE(ops,
95 EFL_OBJECT_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print), 95 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
96 EFL_OBJECT_OP_FUNC(simple_recursive, _recursive), 96 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
97 EFL_OBJECT_OP_FUNC(simple_part_get, _part_get), 97 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print),
98 EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL), 98 EFL_OBJECT_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print),
99 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_dbg_info_get, _dbg_info_get), 99 EFL_OBJECT_OP_FUNC(simple_recursive, _recursive),
100}; 100 EFL_OBJECT_OP_FUNC(simple_part_get, _part_get),
101 EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL),
102 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_dbg_info_get, _dbg_info_get),
103 );
104
105 return efl_class_functions_set(klass, &ops);
106}
101 107
102static const Efl_Class_Description class_desc = { 108static const Efl_Class_Description class_desc = {
103 EO_VERSION, 109 EO_VERSION,
104 "Simple", 110 "Simple",
105 EFL_CLASS_TYPE_REGULAR, 111 EFL_CLASS_TYPE_REGULAR,
106 EFL_CLASS_DESCRIPTION_OPS(op_descs),
107 sizeof(Simple_Public_Data), 112 sizeof(Simple_Public_Data),
113 _class_initializer,
108 NULL, 114 NULL,
109 NULL 115 NULL
110}; 116};
@@ -120,16 +126,22 @@ _beef_get(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
120 126
121EFL_FUNC_BODY_CONST(simple2_class_beef_get, int, 0); 127EFL_FUNC_BODY_CONST(simple2_class_beef_get, int, 0);
122 128
123static Efl_Op_Description op_descs2[] = { 129static Eina_Bool
124 EFL_OBJECT_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get), 130_class_initializer2(Efl_Class *klass)
125}; 131{
132 EFL_OPS_DEFINE(ops,
133 EFL_OBJECT_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get),
134 );
135
136 return efl_class_functions_set(klass, &ops);
137}
126 138
127static const Efl_Class_Description class_desc2 = { 139static const Efl_Class_Description class_desc2 = {
128 EO_VERSION, 140 EO_VERSION,
129 "Simple2", 141 "Simple2",
130 EFL_CLASS_TYPE_REGULAR, 142 EFL_CLASS_TYPE_REGULAR,
131 EFL_CLASS_DESCRIPTION_OPS(op_descs2),
132 0, 143 0,
144 _class_initializer2,
133 NULL, 145 NULL,
134 NULL 146 NULL
135}; 147};
@@ -144,16 +156,22 @@ _interface_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const Efl_Object *klas
144 return efl_provider_find(efl_super(obj, SEARCHABLE_CLASS), klass); 156 return efl_provider_find(efl_super(obj, SEARCHABLE_CLASS), klass);
145} 157}
146 158
147static Efl_Op_Description op_descs_searchable[] = { 159static Eina_Bool
148 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_provider_find, _interface_get) 160_searchable_class_initializer(Efl_Class *klass)
149}; 161{
162 EFL_OPS_DEFINE(ops,
163 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_provider_find, _interface_get)
164 );
165
166 return efl_class_functions_set(klass, &ops);
167}
150 168
151static const Efl_Class_Description class_desc_searchable = { 169static const Efl_Class_Description class_desc_searchable = {
152 EO_VERSION, 170 EO_VERSION,
153 "Searchable", 171 "Searchable",
154 EFL_CLASS_TYPE_REGULAR, 172 EFL_CLASS_TYPE_REGULAR,
155 EFL_CLASS_DESCRIPTION_OPS(op_descs_searchable),
156 0, 173 0,
174 _searchable_class_initializer,
157 NULL, 175 NULL,
158 NULL 176 NULL
159}; 177};
diff --git a/src/tests/eo/suite/eo_test_class_singleton.c b/src/tests/eo/suite/eo_test_class_singleton.c
index b0a2304b40..2702d68a0a 100644
--- a/src/tests/eo/suite/eo_test_class_singleton.c
+++ b/src/tests/eo/suite/eo_test_class_singleton.c
@@ -25,16 +25,22 @@ _singleton_efl_constructor(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED)
25 return singleton_obj; 25 return singleton_obj;
26} 26}
27 27
28static Efl_Op_Description op_descs[] = { 28static Eina_Bool
29 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _singleton_efl_constructor), 29_class_initializer(Efl_Class *klass)
30}; 30{
31 EFL_OPS_DEFINE(ops,
32 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _singleton_efl_constructor),
33 );
34
35 return efl_class_functions_set(klass, &ops);
36}
31 37
32static const Efl_Class_Description class_desc = { 38static const Efl_Class_Description class_desc = {
33 EO_VERSION, 39 EO_VERSION,
34 "Singleton", 40 "Singleton",
35 EFL_CLASS_TYPE_REGULAR, 41 EFL_CLASS_TYPE_REGULAR,
36 EFL_CLASS_DESCRIPTION_OPS(op_descs),
37 0, 42 0,
43 _class_initializer,
38 NULL, 44 NULL,
39 NULL 45 NULL
40}; 46};
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index e40ad8978e..9d072dc055 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -268,9 +268,9 @@ START_TEST(efl_data_fetch)
268 EO_VERSION, 268 EO_VERSION,
269 "Simple2", 269 "Simple2",
270 EFL_CLASS_TYPE_REGULAR, 270 EFL_CLASS_TYPE_REGULAR,
271 EFL_CLASS_DESCRIPTION_NOOPS(),
272 10, 271 10,
273 NULL, 272 NULL,
273 NULL,
274 NULL 274 NULL
275 }; 275 };
276 276
@@ -310,9 +310,9 @@ START_TEST(efl_isa_tests)
310 EO_VERSION, 310 EO_VERSION,
311 "Iface", 311 "Iface",
312 EFL_CLASS_TYPE_INTERFACE, 312 EFL_CLASS_TYPE_INTERFACE,
313 EFL_CLASS_DESCRIPTION_NOOPS(),
314 0, 313 0,
315 NULL, 314 NULL,
315 NULL,
316 NULL 316 NULL
317 }; 317 };
318 318
@@ -326,9 +326,9 @@ START_TEST(efl_isa_tests)
326 EO_VERSION, 326 EO_VERSION,
327 "Mixin", 327 "Mixin",
328 EFL_CLASS_TYPE_MIXIN, 328 EFL_CLASS_TYPE_MIXIN,
329 EFL_CLASS_DESCRIPTION_NOOPS(),
330 0, 329 0,
331 NULL, 330 NULL,
331 NULL,
332 NULL 332 NULL
333 }; 333 };
334 334
@@ -342,9 +342,9 @@ START_TEST(efl_isa_tests)
342 EO_VERSION, 342 EO_VERSION,
343 "Simple2", 343 "Simple2",
344 EFL_CLASS_TYPE_REGULAR, 344 EFL_CLASS_TYPE_REGULAR,
345 EFL_CLASS_DESCRIPTION_NOOPS(),
346 10, 345 10,
347 NULL, 346 NULL,
347 NULL,
348 NULL 348 NULL
349 }; 349 };
350 350
@@ -427,10 +427,16 @@ _man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
427 efl_manual_free_set(obj, EINA_FALSE); 427 efl_manual_free_set(obj, EINA_FALSE);
428} 428}
429 429
430static Efl_Op_Description op_descs[] = { 430static Eina_Bool
431 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _man_con), 431_class_initializer(Efl_Class *klass)
432 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _man_des), 432{
433}; 433 EFL_OPS_DEFINE(ops,
434 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _man_con),
435 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _man_des),
436 );
437
438 return efl_class_functions_set(klass, &ops);
439}
434 440
435START_TEST(eo_man_free) 441START_TEST(eo_man_free)
436{ 442{
@@ -441,8 +447,8 @@ START_TEST(eo_man_free)
441 EO_VERSION, 447 EO_VERSION,
442 "Simple2", 448 "Simple2",
443 EFL_CLASS_TYPE_REGULAR, 449 EFL_CLASS_TYPE_REGULAR,
444 EFL_CLASS_DESCRIPTION_OPS(op_descs),
445 10, 450 10,
451 _class_initializer,
446 NULL, 452 NULL,
447 NULL 453 NULL
448 }; 454 };
@@ -975,10 +981,16 @@ _class_hi_print(Efl_Class *klass EINA_UNUSED, void *class_data EINA_UNUSED)
975EFL_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE); 981EFL_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
976EFL_FUNC_BODY_CONST(multi_class_hi_print, Eina_Bool, EINA_FALSE); 982EFL_FUNC_BODY_CONST(multi_class_hi_print, Eina_Bool, EINA_FALSE);
977 983
978static Efl_Op_Description _multi_do_op_descs[] = { 984static Eina_Bool
979 EFL_OBJECT_OP_FUNC(multi_a_print, _a_print), 985_multi_class_initializer(Efl_Class *klass)
980 EFL_OBJECT_OP_FUNC(multi_class_hi_print, _class_hi_print), 986{
981}; 987 EFL_OPS_DEFINE(ops,
988 EFL_OBJECT_OP_FUNC(multi_a_print, _a_print),
989 EFL_OBJECT_OP_FUNC(multi_class_hi_print, _class_hi_print),
990 );
991
992 return efl_class_functions_set(klass, &ops);
993}
982 994
983START_TEST(eo_multiple_do) 995START_TEST(eo_multiple_do)
984{ 996{
@@ -989,8 +1001,8 @@ START_TEST(eo_multiple_do)
989 EO_VERSION, 1001 EO_VERSION,
990 "Inherit", 1002 "Inherit",
991 EFL_CLASS_TYPE_REGULAR, 1003 EFL_CLASS_TYPE_REGULAR,
992 EFL_CLASS_DESCRIPTION_OPS(_multi_do_op_descs),
993 0, 1004 0,
1005 _multi_class_initializer,
994 NULL, 1006 NULL,
995 NULL 1007 NULL
996 }; 1008 };
@@ -1064,9 +1076,9 @@ START_TEST(eo_pointers_indirection)
1064 EO_VERSION, 1076 EO_VERSION,
1065 "Simple", 1077 "Simple",
1066 EFL_CLASS_TYPE_REGULAR, 1078 EFL_CLASS_TYPE_REGULAR,
1067 EFL_CLASS_DESCRIPTION_NOOPS(),
1068 0, 1079 0,
1069 NULL, 1080 NULL,
1081 NULL,
1070 NULL 1082 NULL
1071 }; 1083 };
1072 1084
@@ -1149,9 +1161,15 @@ _efl_add_failures_finalize(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
1149 return NULL; 1161 return NULL;
1150} 1162}
1151 1163
1152static Efl_Op_Description _efl_add_failures_op_descs[] = { 1164static Eina_Bool
1153 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_finalize, _efl_add_failures_finalize), 1165_add_failures_class_initializer(Efl_Class *klass)
1154}; 1166{
1167 EFL_OPS_DEFINE(ops,
1168 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_finalize, _efl_add_failures_finalize),
1169 );
1170
1171 return efl_class_functions_set(klass, &ops);
1172}
1155 1173
1156START_TEST(efl_add_failures) 1174START_TEST(efl_add_failures)
1157{ 1175{
@@ -1161,8 +1179,8 @@ START_TEST(efl_add_failures)
1161 EO_VERSION, 1179 EO_VERSION,
1162 "Simple2", 1180 "Simple2",
1163 EFL_CLASS_TYPE_REGULAR, 1181 EFL_CLASS_TYPE_REGULAR,
1164 EFL_CLASS_DESCRIPTION_OPS(_efl_add_failures_op_descs),
1165 0, 1182 0,
1183 _add_failures_class_initializer,
1166 NULL, 1184 NULL,
1167 NULL 1185 NULL
1168 }; 1186 };
@@ -1198,9 +1216,9 @@ START_TEST(efl_del_intercept)
1198 EO_VERSION, 1216 EO_VERSION,
1199 "Simple", 1217 "Simple",
1200 EFL_CLASS_TYPE_REGULAR, 1218 EFL_CLASS_TYPE_REGULAR,
1201 EFL_CLASS_DESCRIPTION_NOOPS(),
1202 0, 1219 0,
1203 NULL, 1220 NULL,
1221 NULL,
1204 NULL 1222 NULL
1205 }; 1223 };
1206 1224
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 935a3164fc..31b31027fd 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -60,18 +60,24 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, int v)
60 return obj; 60 return obj;
61} 61}
62 62
63static Efl_Op_Description op_descs[] = { 63static Eina_Bool
64 EFL_OBJECT_OP_FUNC(thread_test_constructor, _constructor), 64_class_initializer(Efl_Class *klass)
65 EFL_OBJECT_OP_FUNC(thread_test_v_get, _v_get), 65{
66 EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack), 66 EFL_OPS_DEFINE(ops,
67}; 67 EFL_OBJECT_OP_FUNC(thread_test_constructor, _constructor),
68 EFL_OBJECT_OP_FUNC(thread_test_v_get, _v_get),
69 EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
70 );
71
72 return efl_class_functions_set(klass, &ops);
73}
68 74
69static const Efl_Class_Description class_desc = { 75static const Efl_Class_Description class_desc = {
70 EO_VERSION, 76 EO_VERSION,
71 "Thread Test", 77 "Thread Test",
72 EFL_CLASS_TYPE_REGULAR, 78 EFL_CLASS_TYPE_REGULAR,
73 EFL_CLASS_DESCRIPTION_OPS(op_descs),
74 sizeof(Thread_Test_Public_Data), 79 sizeof(Thread_Test_Public_Data),
80 _class_initializer,
75 NULL, 81 NULL,
76 NULL 82 NULL
77}; 83};