summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitor Sousa <vitorsousa@expertisesolutions.com.br>2019-08-05 18:47:14 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2019-08-05 18:55:20 -0300
commite6a52ef371430c69da7ce3e7b22f1455a64f1637 (patch)
treebbf69ac7bd2cf2604e98d68d37669afee1428f51
parent21efff6d3eded1dc3e6c46ac6e7ce7b89f227940 (diff)
csharp: re-enable binbuf tests with -Dmono-beta=false
Summary: Since the introduction of the `binbuf` keyword in eolian, `Eina_Binbuf` is no longer a beta only type. Hence, we enable EFL# binbuf unit tests in non-beta compilation too. Reviewers: lauromoura, felipealmeida Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9467
-rw-r--r--src/tests/efl_mono/EinaTestData.cs2
-rw-r--r--src/tests/efl_mono/Events.cs2
-rw-r--r--src/tests/efl_mono/StructHelpers.cs2
-rw-r--r--src/tests/efl_mono/Structs.cs4
-rw-r--r--src/tests/efl_mono/dummy_test_object.eo48
5 files changed, 24 insertions, 34 deletions
diff --git a/src/tests/efl_mono/EinaTestData.cs b/src/tests/efl_mono/EinaTestData.cs
index 81b318ffae..b64040d5eb 100644
--- a/src/tests/efl_mono/EinaTestData.cs
+++ b/src/tests/efl_mono/EinaTestData.cs
@@ -152,7 +152,6 @@ class NativeInheritImpl : Dummy.TestObject
152 152
153 // // 153 // //
154 // 154 //
155#if EFL_BETA
156 override public bool EinaBinbufIn(Eina.Binbuf binbuf) 155 override public bool EinaBinbufIn(Eina.Binbuf binbuf)
157 { 156 {
158 binbuf_in_flag = true; 157 binbuf_in_flag = true;
@@ -281,7 +280,6 @@ class NativeInheritImpl : Dummy.TestObject
281 binbuf_return_own_binbuf = null; 280 binbuf_return_own_binbuf = null;
282 return r; 281 return r;
283 } 282 }
284#endif
285} 283}
286 284
287} // EinaTestData 285} // EinaTestData
diff --git a/src/tests/efl_mono/Events.cs b/src/tests/efl_mono/Events.cs
index 9e37649df1..b664e2bbbd 100644
--- a/src/tests/efl_mono/Events.cs
+++ b/src/tests/efl_mono/Events.cs
@@ -176,7 +176,6 @@ class TestEoEvents
176 Test.AssertEquals(sent_struct.Fstring, received_struct.Fstring); 176 Test.AssertEquals(sent_struct.Fstring, received_struct.Fstring);
177 } 177 }
178 178
179#if EFL_BETA
180 public static void event_with_struct_complex_payload() 179 public static void event_with_struct_complex_payload()
181 { 180 {
182 var obj = new Dummy.TestObject(); 181 var obj = new Dummy.TestObject();
@@ -192,7 +191,6 @@ class TestEoEvents
192 191
193 Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj); 192 Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj);
194 } 193 }
195#endif
196 194
197 public static void event_with_array_payload() 195 public static void event_with_array_payload()
198 { 196 {
diff --git a/src/tests/efl_mono/StructHelpers.cs b/src/tests/efl_mono/StructHelpers.cs
index 7af3529055..aeafe9e6d7 100644
--- a/src/tests/efl_mono/StructHelpers.cs
+++ b/src/tests/efl_mono/StructHelpers.cs
@@ -117,7 +117,6 @@ internal class StructHelpers
117 Test.Assert(simple.Fstringshare == null); 117 Test.Assert(simple.Fstringshare == null);
118 } 118 }
119 119
120#if EFL_BETA
121 internal static Dummy.StructComplex structComplexWithValues() 120 internal static Dummy.StructComplex structComplexWithValues()
122 { 121 {
123 var complex = new Dummy.StructComplex(); 122 var complex = new Dummy.StructComplex();
@@ -210,7 +209,6 @@ internal class StructHelpers
210 209
211 Test.Assert(complex.Fobj == null); 210 Test.Assert(complex.Fobj == null);
212 } 211 }
213#endif
214 212
215} 213}
216 214
diff --git a/src/tests/efl_mono/Structs.cs b/src/tests/efl_mono/Structs.cs
index 96728adf4b..970fc97696 100644
--- a/src/tests/efl_mono/Structs.cs
+++ b/src/tests/efl_mono/Structs.cs
@@ -20,13 +20,11 @@ internal class TestStructs
20 checkZeroedStructSimple(simple); 20 checkZeroedStructSimple(simple);
21 } 21 }
22 22
23#if EFL_BETA
24 private static void complex_default_instantiation() 23 private static void complex_default_instantiation()
25 { 24 {
26 var complex = new Dummy.StructComplex(); 25 var complex = new Dummy.StructComplex();
27 checkZeroedStructComplex(complex); 26 checkZeroedStructComplex(complex);
28 } 27 }
29#endif
30 28
31 public static void parameter_initialization() 29 public static void parameter_initialization()
32 { 30 {
@@ -303,7 +301,6 @@ internal class TestStructs
303 */ 301 */
304 302
305 // Complex Structs 303 // Complex Structs
306#if EFL_BETA
307 public static void complex_in() 304 public static void complex_in()
308 { 305 {
309 var complex = structComplexWithValues(); 306 var complex = structComplexWithValues();
@@ -351,7 +348,6 @@ internal class TestStructs
351 // public static void complex_ptr_return_own() 348 // public static void complex_ptr_return_own()
352 // { 349 // {
353 // } 350 // }
354#endif
355} 351}
356 352
357} 353}
diff --git a/src/tests/efl_mono/dummy_test_object.eo b/src/tests/efl_mono/dummy_test_object.eo
index 4f26beba0a..47ec4c6b27 100644
--- a/src/tests/efl_mono/dummy_test_object.eo
+++ b/src/tests/efl_mono/dummy_test_object.eo
@@ -73,7 +73,7 @@ struct @free(free) Dummy.StructSimple
73 fmyint: Dummy.MyInt; 73 fmyint: Dummy.MyInt;
74} 74}
75 75
76struct @beta @free(free) Dummy.StructComplex { 76struct @free(free) Dummy.StructComplex {
77 farray: array<string>; 77 farray: array<string>;
78 flist: list<string>; 78 flist: list<string>;
79 fhash: hash<string, string>; 79 fhash: hash<string, string>;
@@ -297,28 +297,28 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
297 } 297 }
298 */ 298 */
299 299
300 eina_binbuf_in @beta { 300 eina_binbuf_in {
301 params { 301 params {
302 @in binbuf: binbuf; 302 @in binbuf: binbuf;
303 } 303 }
304 return: bool; 304 return: bool;
305 } 305 }
306 306
307 call_eina_binbuf_in @beta { 307 call_eina_binbuf_in {
308 params { 308 params {
309 @in binbuf: binbuf; 309 @in binbuf: binbuf;
310 } 310 }
311 return: bool; 311 return: bool;
312 } 312 }
313 313
314 eina_binbuf_in_own @beta { 314 eina_binbuf_in_own {
315 params { 315 params {
316 @in binbuf: binbuf @owned; 316 @in binbuf: binbuf @owned;
317 } 317 }
318 return: bool; 318 return: bool;
319 } 319 }
320 320
321 call_eina_binbuf_in_own @beta { 321 call_eina_binbuf_in_own {
322 params { 322 params {
323 @in str: binbuf @owned; 323 @in str: binbuf @owned;
324 } 324 }
@@ -329,14 +329,14 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
329 return: bool; 329 return: bool;
330 } 330 }
331 331
332 eina_binbuf_out @beta { 332 eina_binbuf_out {
333 params { 333 params {
334 @out binbuf: binbuf; 334 @out binbuf: binbuf;
335 } 335 }
336 return: bool; 336 return: bool;
337 } 337 }
338 338
339 call_eina_binbuf_out @beta { 339 call_eina_binbuf_out {
340 return: binbuf; 340 return: binbuf;
341 } 341 }
342 342
@@ -344,22 +344,22 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
344 return: bool; 344 return: bool;
345 } 345 }
346 346
347 eina_binbuf_out_own @beta { 347 eina_binbuf_out_own {
348 params { 348 params {
349 @out binbuf: binbuf @owned; 349 @out binbuf: binbuf @owned;
350 } 350 }
351 return: bool; 351 return: bool;
352 } 352 }
353 353
354 call_eina_binbuf_out_own @beta { 354 call_eina_binbuf_out_own {
355 return: binbuf @owned; 355 return: binbuf @owned;
356 } 356 }
357 357
358 eina_binbuf_return @beta { 358 eina_binbuf_return {
359 return: binbuf; 359 return: binbuf;
360 } 360 }
361 361
362 call_eina_binbuf_return @beta { 362 call_eina_binbuf_return {
363 return: binbuf; 363 return: binbuf;
364 } 364 }
365 365
@@ -367,11 +367,11 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
367 return: bool; 367 return: bool;
368 } 368 }
369 369
370 eina_binbuf_return_own @beta { 370 eina_binbuf_return_own {
371 return: binbuf @owned; 371 return: binbuf @owned;
372 } 372 }
373 373
374 call_eina_binbuf_return_own @beta { 374 call_eina_binbuf_return_own {
375 return: binbuf @owned; 375 return: binbuf @owned;
376 } 376 }
377 377
@@ -1431,7 +1431,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1431 } 1431 }
1432 */ 1432 */
1433 1433
1434 struct_complex_in @beta { 1434 struct_complex_in {
1435 params { 1435 params {
1436 @in complex: Dummy.StructComplex; 1436 @in complex: Dummy.StructComplex;
1437 } 1437 }
@@ -1439,14 +1439,14 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1439 } 1439 }
1440 1440
1441 /* 1441 /*
1442 struct_complex_ptr_in @beta { 1442 struct_complex_ptr_in {
1443 params { 1443 params {
1444 @in complex: ptr(Dummy.StructComplex); 1444 @in complex: ptr(Dummy.StructComplex);
1445 } 1445 }
1446 return: bool; 1446 return: bool;
1447 } 1447 }
1448 1448
1449 struct_complex_ptr_in_own @beta { 1449 struct_complex_ptr_in_own {
1450 params { 1450 params {
1451 @in complex: ptr(Dummy.StructComplex) @owned; 1451 @in complex: ptr(Dummy.StructComplex) @owned;
1452 } 1452 }
@@ -1454,36 +1454,36 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1454 } 1454 }
1455 */ 1455 */
1456 1456
1457 struct_complex_out @beta { 1457 struct_complex_out {
1458 params { 1458 params {
1459 @out complex: Dummy.StructComplex; 1459 @out complex: Dummy.StructComplex;
1460 } 1460 }
1461 return: bool; 1461 return: bool;
1462 } 1462 }
1463 1463
1464 // struct_complex_ptr_out @beta { 1464 // struct_complex_ptr_out {
1465 // params { 1465 // params {
1466 // @out complex: ptr(Dummy.StructComplex); 1466 // @out complex: ptr(Dummy.StructComplex);
1467 // } 1467 // }
1468 // return: bool; 1468 // return: bool;
1469 // } 1469 // }
1470 // 1470 //
1471 // struct_complex_ptr_out_own @beta { 1471 // struct_complex_ptr_out_own {
1472 // params { 1472 // params {
1473 // @out complex: ptr(Dummy.StructComplex) @owned; 1473 // @out complex: ptr(Dummy.StructComplex) @owned;
1474 // } 1474 // }
1475 // return: bool; 1475 // return: bool;
1476 // } 1476 // }
1477 1477
1478 struct_complex_return @beta { 1478 struct_complex_return {
1479 return: Dummy.StructComplex; 1479 return: Dummy.StructComplex;
1480 } 1480 }
1481 1481
1482 // struct_complex_ptr_return @beta { 1482 // struct_complex_ptr_return {
1483 // return: ptr(Dummy.StructComplex); 1483 // return: ptr(Dummy.StructComplex);
1484 // } 1484 // }
1485 // 1485 //
1486 // struct_complex_ptr_return_own @beta { 1486 // struct_complex_ptr_return_own {
1487 // return: ptr(Dummy.StructComplex) @owned; 1487 // return: ptr(Dummy.StructComplex) @owned;
1488 // } 1488 // }
1489 1489
@@ -1535,7 +1535,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1535 } 1535 }
1536 } 1536 }
1537 1537
1538 emit_event_with_struct_complex @beta { 1538 emit_event_with_struct_complex {
1539 params { 1539 params {
1540 @in data: Dummy.StructComplex; 1540 @in data: Dummy.StructComplex;
1541 } 1541 }
@@ -1667,7 +1667,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1667 evt,with,obj @hot: Dummy.Test_Object; 1667 evt,with,obj @hot: Dummy.Test_Object;
1668 evt,with,error @hot: Eina.Error; 1668 evt,with,error @hot: Eina.Error;
1669 evt,with,struct @hot: Dummy.StructSimple; 1669 evt,with,struct @hot: Dummy.StructSimple;
1670 evt,with,struct,complex @beta @hot: Dummy.StructComplex; 1670 evt,with,struct,complex @hot: Dummy.StructComplex;
1671 evt,with,array @hot: const(array<string>); 1671 evt,with,array @hot: const(array<string>);
1672 evt_with,under @hot: void; 1672 evt_with,under @hot: void;
1673 1673