felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e6a52ef371430c69da7ce3e7b22f1455a64f1637
commit e6a52ef371430c69da7ce3e7b22f1455a64f1637
Author: Vitor Sousa <vitorso...@expertisesolutions.com.br>
Date: Mon Aug 5 18:47:14 2019 -0300
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
---
src/tests/efl_mono/EinaTestData.cs | 2 --
src/tests/efl_mono/Events.cs | 2 --
src/tests/efl_mono/StructHelpers.cs | 2 --
src/tests/efl_mono/Structs.cs | 4 ---
src/tests/efl_mono/dummy_test_object.eo | 48 ++++++++++++++++-----------------
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
// //
//
-#if EFL_BETA
override public bool EinaBinbufIn(Eina.Binbuf binbuf)
{
binbuf_in_flag = true;
@@ -281,7 +280,6 @@ class NativeInheritImpl : Dummy.TestObject
binbuf_return_own_binbuf = null;
return r;
}
-#endif
}
} // 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
Test.AssertEquals(sent_struct.Fstring, received_struct.Fstring);
}
-#if EFL_BETA
public static void event_with_struct_complex_payload()
{
var obj = new Dummy.TestObject();
@@ -192,7 +191,6 @@ class TestEoEvents
Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj);
}
-#endif
public static void event_with_array_payload()
{
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
Test.Assert(simple.Fstringshare == null);
}
-#if EFL_BETA
internal static Dummy.StructComplex structComplexWithValues()
{
var complex = new Dummy.StructComplex();
@@ -210,7 +209,6 @@ internal class StructHelpers
Test.Assert(complex.Fobj == null);
}
-#endif
}
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
checkZeroedStructSimple(simple);
}
-#if EFL_BETA
private static void complex_default_instantiation()
{
var complex = new Dummy.StructComplex();
checkZeroedStructComplex(complex);
}
-#endif
public static void parameter_initialization()
{
@@ -303,7 +301,6 @@ internal class TestStructs
*/
// Complex Structs
-#if EFL_BETA
public static void complex_in()
{
var complex = structComplexWithValues();
@@ -351,7 +348,6 @@ internal class TestStructs
// public static void complex_ptr_return_own()
// {
// }
-#endif
}
}
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
fmyint: Dummy.MyInt;
}
-struct @beta @free(free) Dummy.StructComplex {
+struct @free(free) Dummy.StructComplex {
farray: array<string>;
flist: list<string>;
fhash: hash<string, string>;
@@ -297,28 +297,28 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
}
*/
- eina_binbuf_in @beta {
+ eina_binbuf_in {
params {
@in binbuf: binbuf;
}
return: bool;
}
- call_eina_binbuf_in @beta {
+ call_eina_binbuf_in {
params {
@in binbuf: binbuf;
}
return: bool;
}
- eina_binbuf_in_own @beta {
+ eina_binbuf_in_own {
params {
@in binbuf: binbuf @owned;
}
return: bool;
}
- call_eina_binbuf_in_own @beta {
+ call_eina_binbuf_in_own {
params {
@in str: binbuf @owned;
}
@@ -329,14 +329,14 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
return: bool;
}
- eina_binbuf_out @beta {
+ eina_binbuf_out {
params {
@out binbuf: binbuf;
}
return: bool;
}
- call_eina_binbuf_out @beta {
+ call_eina_binbuf_out {
return: binbuf;
}
@@ -344,22 +344,22 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
return: bool;
}
- eina_binbuf_out_own @beta {
+ eina_binbuf_out_own {
params {
@out binbuf: binbuf @owned;
}
return: bool;
}
- call_eina_binbuf_out_own @beta {
+ call_eina_binbuf_out_own {
return: binbuf @owned;
}
- eina_binbuf_return @beta {
+ eina_binbuf_return {
return: binbuf;
}
- call_eina_binbuf_return @beta {
+ call_eina_binbuf_return {
return: binbuf;
}
@@ -367,11 +367,11 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
return: bool;
}
- eina_binbuf_return_own @beta {
+ eina_binbuf_return_own {
return: binbuf @owned;
}
- call_eina_binbuf_return_own @beta {
+ call_eina_binbuf_return_own {
return: binbuf @owned;
}
@@ -1431,7 +1431,7 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
}
*/
- struct_complex_in @beta {
+ struct_complex_in {
params {
@in complex: Dummy.StructComplex;
}
@@ -1439,14 +1439,14 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
}
/*
- struct_complex_ptr_in @beta {
+ struct_complex_ptr_in {
params {
@in complex: ptr(Dummy.StructComplex);
}
return: bool;
}
- struct_complex_ptr_in_own @beta {
+ struct_complex_ptr_in_own {
params {
@in complex: ptr(Dummy.StructComplex) @owned;
}
@@ -1454,36 +1454,36 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
}
*/
- struct_complex_out @beta {
+ struct_complex_out {
params {
@out complex: Dummy.StructComplex;
}
return: bool;
}
- // struct_complex_ptr_out @beta {
+ // struct_complex_ptr_out {
// params {
// @out complex: ptr(Dummy.StructComplex);
// }
// return: bool;
// }
//
- // struct_complex_ptr_out_own @beta {
+ // struct_complex_ptr_out_own {
// params {
// @out complex: ptr(Dummy.StructComplex) @owned;
// }
// return: bool;
// }
- struct_complex_return @beta {
+ struct_complex_return {
return: Dummy.StructComplex;
}
- // struct_complex_ptr_return @beta {
+ // struct_complex_ptr_return {
// return: ptr(Dummy.StructComplex);
// }
//
- // struct_complex_ptr_return_own @beta {
+ // struct_complex_ptr_return_own {
// return: ptr(Dummy.StructComplex) @owned;
// }
@@ -1535,7 +1535,7 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
}
}
- emit_event_with_struct_complex @beta {
+ emit_event_with_struct_complex {
params {
@in data: Dummy.StructComplex;
}
@@ -1667,7 +1667,7 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
evt,with,obj @hot: Dummy.Test_Object;
evt,with,error @hot: Eina.Error;
evt,with,struct @hot: Dummy.StructSimple;
- evt,with,struct,complex @beta @hot: Dummy.StructComplex;
+ evt,with,struct,complex @hot: Dummy.StructComplex;
evt,with,array @hot: const(array<string>);
evt_with,under @hot: void;
--
