diff options
author | Lauro Moura <lauromoura@expertisesolutions.com.br> | 2019-09-20 19:22:22 -0300 |
---|---|---|
committer | Lauro Moura <lauromoura@expertisesolutions.com.br> | 2019-09-20 19:29:20 -0300 |
commit | 9e92b3d123b12e5637fa010eccd47785cf0f4cbe (patch) | |
tree | 27623c73b43fed2a78937d8aaafd7e9dfaa95c3d | |
parent | 01875756ebacc3e4578106f638ca7e57cdcd21f0 (diff) | |
download | efl-9e92b3d123b12e5637fa010eccd47785cf0f4cbe.tar.gz |
csharp: Guard hash usage behind EFL_BETA.
Summary: After 718f3cd49586, hashes are currently beta-only.
Reviewers: zmike, brunobelo
Reviewed By: brunobelo
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10060
-rw-r--r-- | src/tests/efl_mono/Eina.cs | 3 | ||||
-rw-r--r-- | src/tests/efl_mono/Events.cs | 2 | ||||
-rw-r--r-- | src/tests/efl_mono/StructHelpers.cs | 3 | ||||
-rw-r--r-- | src/tests/efl_mono/Structs.cs | 5 | ||||
-rw-r--r-- | src/tests/efl_mono/dummy_test_object.eo | 102 |
5 files changed, 63 insertions, 52 deletions
diff --git a/src/tests/efl_mono/Eina.cs b/src/tests/efl_mono/Eina.cs index 0f6d9774bc..c432033e52 100644 --- a/src/tests/efl_mono/Eina.cs +++ b/src/tests/efl_mono/Eina.cs @@ -2442,6 +2442,7 @@ class TestEinaInlist } // < TestEinaInlist +#if EFL_BETA class TestEinaHash { @@ -3038,6 +3039,8 @@ class TestEinaHash } } +#endif // EFL_BETA + class TestEinaIterator { diff --git a/src/tests/efl_mono/Events.cs b/src/tests/efl_mono/Events.cs index 77a6dbfd60..6cf9efcbfa 100644 --- a/src/tests/efl_mono/Events.cs +++ b/src/tests/efl_mono/Events.cs @@ -178,6 +178,7 @@ 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(); @@ -193,6 +194,7 @@ 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 d07c6c0487..34d1024022 100644 --- a/src/tests/efl_mono/StructHelpers.cs +++ b/src/tests/efl_mono/StructHelpers.cs @@ -117,6 +117,7 @@ internal class StructHelpers Test.Assert(simple.Fstringshare == null); } +#if EFL_BETA internal static Dummy.StructComplex structComplexWithValues() { var complex = new Dummy.StructComplex(); @@ -210,6 +211,8 @@ 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 970fc97696..e5640abd65 100644 --- a/src/tests/efl_mono/Structs.cs +++ b/src/tests/efl_mono/Structs.cs @@ -20,11 +20,13 @@ 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() { @@ -300,6 +302,7 @@ internal class TestStructs } */ +#if EFL_BETA // Complex Structs public static void complex_in() { @@ -340,7 +343,7 @@ internal class TestStructs var complex = t.StructComplexReturn(); checkStructComplex(complex); } - +#endif // public static void complex_ptr_return() // { // } diff --git a/src/tests/efl_mono/dummy_test_object.eo b/src/tests/efl_mono/dummy_test_object.eo index c8f4b1ee0c..a63c822375 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 @free(free) Dummy.StructComplex { +struct @beta @free(free) Dummy.StructComplex { farray: array<string>; flist: list<string>; fhash: hash<string, string>; @@ -764,7 +764,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { // Eina Hash // // Integer // - eina_hash_int_in { + eina_hash_int_in @beta { params { @in hsh: hash<int, int>; } @@ -772,7 +772,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } /* - eina_hash_int_in_own { + eina_hash_int_in_own @beta { params { @in hsh: hash<int, int> @move; // <, int @move> } @@ -783,150 +783,150 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } */ - eina_hash_int_out { + eina_hash_int_out @beta { params { @out hsh: hash<int, int>; } return: bool; } - check_eina_hash_int_out { + check_eina_hash_int_out @beta { return: bool; } /* - eina_hash_int_out_own { + eina_hash_int_out_own @beta { params { @out hsh: hash<int, int> @move; // <, int @move> } return: bool; } - check_eina_hash_int_out_own { + check_eina_hash_int_out_own @beta { return: bool; } */ - eina_hash_int_return { + eina_hash_int_return @beta { return: hash<int, int>; } - check_eina_hash_int_return { + check_eina_hash_int_return @beta { return: bool; } /* - eina_hash_int_return_own { + eina_hash_int_return_own @beta { return: hash<int, int> @move; // <, int @move> } - check_eina_hash_int_return_own { + check_eina_hash_int_return_own @beta { return: bool; } */ // String // - eina_hash_str_in { + eina_hash_str_in @beta { params { @in hsh: hash<string, string>; } return: bool; } - eina_hash_str_in_own { + eina_hash_str_in_own @beta { params { @in hsh: hash<string, mstring @move> @move; } return: bool; } - check_eina_hash_str_in_own { + check_eina_hash_str_in_own @beta { return: bool; } - eina_hash_str_out { + eina_hash_str_out @beta { params { @out hsh: hash<string, string>; } return: bool; } - check_eina_hash_str_out { + check_eina_hash_str_out @beta { return: bool; } - eina_hash_str_out_own { + eina_hash_str_out_own @beta { params { @out hsh: hash<string, mstring @move> @move; } return: bool; } - check_eina_hash_str_out_own { + check_eina_hash_str_out_own @beta { return: bool; } - eina_hash_str_return { + eina_hash_str_return @beta { return: hash<string, string>; } - check_eina_hash_str_return { + check_eina_hash_str_return @beta { return: bool; } - eina_hash_str_return_own { + eina_hash_str_return_own @beta { return: hash<string, mstring @move> @move; } - check_eina_hash_str_return_own { + check_eina_hash_str_return_own @beta { return: bool; } // Eina_Stringshare // - eina_hash_strshare_in { + eina_hash_strshare_in @beta { params { @in hsh: hash<stringshare, stringshare>; } return: bool; } - eina_hash_strshare_in_own { + eina_hash_strshare_in_own @beta { params { @in hsh: hash<stringshare, stringshare @move> @move; } return: bool; } - check_eina_hash_strshare_in_own { + check_eina_hash_strshare_in_own @beta { return: bool; } - eina_hash_strshare_out { + eina_hash_strshare_out @beta { params { @out hsh: hash<stringshare, stringshare>; } return: bool; } - check_eina_hash_strshare_out { + check_eina_hash_strshare_out @beta { return: bool; } - eina_hash_strshare_out_own { + eina_hash_strshare_out_own @beta { params { @out hsh: hash<stringshare, stringshare @move> @move; } return: bool; } - check_eina_hash_strshare_out_own { + check_eina_hash_strshare_out_own @beta { return: bool; } - eina_hash_strshare_return { + eina_hash_strshare_return @beta { return: hash<stringshare, stringshare>; } - check_eina_hash_strshare_return { + check_eina_hash_strshare_return @beta { return: bool; } - eina_hash_strshare_return_own { + eina_hash_strshare_return_own @beta { return: hash<stringshare, stringshare @move> @move; } - check_eina_hash_strshare_return_own { + check_eina_hash_strshare_return_own @beta { return: bool; } // Object // - eina_hash_obj_in { + eina_hash_obj_in @beta { params { @in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; @in nwk1: Dummy.Numberwrapper; @@ -937,7 +937,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { return: bool; } - eina_hash_obj_in_own { + eina_hash_obj_in_own @beta { params { @in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; @in nwk1: Dummy.Numberwrapper; @@ -947,7 +947,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } return: bool; } - check_eina_hash_obj_in_own { + check_eina_hash_obj_in_own @beta { params { @in nwk1: Dummy.Numberwrapper; @in nwv1: Dummy.Numberwrapper; @@ -957,7 +957,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { return: bool; } - eina_hash_obj_out { + eina_hash_obj_out @beta { params { @out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; @out nwk: Dummy.Numberwrapper; @@ -965,7 +965,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } return: bool; } - check_eina_hash_obj_out { + check_eina_hash_obj_out @beta { params { @in nwk1: Dummy.Numberwrapper; @in nwv1: Dummy.Numberwrapper; @@ -975,7 +975,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { return: bool; } - eina_hash_obj_out_own { + eina_hash_obj_out_own @beta { params { @out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; @out nwk: Dummy.Numberwrapper; @@ -983,18 +983,18 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } return: bool; } - check_eina_hash_obj_out_own { + check_eina_hash_obj_out_own @beta { return: bool; } - eina_hash_obj_return { + eina_hash_obj_return @beta { params { @out nwk: Dummy.Numberwrapper; @out nwv: Dummy.Numberwrapper; } return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; } - check_eina_hash_obj_return { + check_eina_hash_obj_return @beta { params { @in nwk1: Dummy.Numberwrapper; @in nwv1: Dummy.Numberwrapper; @@ -1004,14 +1004,14 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { return: bool; } - eina_hash_obj_return_own { + eina_hash_obj_return_own @beta { params { @out nwk: Dummy.Numberwrapper; @out nwv: Dummy.Numberwrapper; } return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; } - check_eina_hash_obj_return_own { + check_eina_hash_obj_return_own @beta { return: bool; } @@ -1419,7 +1419,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } */ - struct_complex_in { + struct_complex_in @beta { params { @in complex: Dummy.StructComplex; } @@ -1427,14 +1427,14 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } /* - struct_complex_ptr_in { + struct_complex_ptr_in @beta { params { @in complex: ptr(Dummy.StructComplex); } return: bool; } - struct_complex_ptr_in_own { + struct_complex_ptr_in_own @beta { params { @in complex: ptr(Dummy.StructComplex) @move; } @@ -1442,7 +1442,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } */ - struct_complex_out { + struct_complex_out @beta { params { @out complex: Dummy.StructComplex; } @@ -1463,7 +1463,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { // return: bool; // } - struct_complex_return { + struct_complex_return @beta { return: Dummy.StructComplex; } @@ -1523,7 +1523,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { } } - emit_event_with_struct_complex { + emit_event_with_struct_complex @beta { params { @in data: Dummy.StructComplex; } @@ -1669,7 +1669,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 @hot: Dummy.StructComplex; + evt,with,struct,complex @beta @hot: Dummy.StructComplex; evt,with,array @hot: const(array<string>); evt_with,under @hot: void; |