enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

csharp: Guard hash usage behind EFL_BETA. 

Summary: After 718f3cd495, hashes are currently beta-only.

Reviewers: zmike, brunobelo

Reviewed By: brunobelo

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D10060
This commit is contained in:
Lauro Moura 2019-09-20 19:22:22 -03:00
parent 01875756eb
commit 9e92b3d123
5 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tests/efl_mono/Eina.cs
View File

@ -2442,6 +2442,7 @@ class TestEinaInlist
} // < TestEinaInlist } // < TestEinaInlist
#if EFL_BETA
class TestEinaHash class TestEinaHash
{ {
@ -3038,6 +3039,8 @@ class TestEinaHash
} }
} }
#endif // EFL_BETA
class TestEinaIterator class TestEinaIterator
{ {

2
src/tests/efl_mono/Events.cs
View File

@ -178,6 +178,7 @@ class TestEoEvents
Test.AssertEquals(sent_struct.Fstring, received_struct.Fstring); Test.AssertEquals(sent_struct.Fstring, received_struct.Fstring);
} }
#if EFL_BETA
public static void event_with_struct_complex_payload() public static void event_with_struct_complex_payload()
{ {
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
@ -193,6 +194,7 @@ class TestEoEvents
Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj); Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj);
} }
#endif
public static void event_with_array_payload() public static void event_with_array_payload()
{ {

3
src/tests/efl_mono/StructHelpers.cs
View File

@ -117,6 +117,7 @@ internal class StructHelpers
Test.Assert(simple.Fstringshare == null); Test.Assert(simple.Fstringshare == null);
} }
#if EFL_BETA
internal static Dummy.StructComplex structComplexWithValues() internal static Dummy.StructComplex structComplexWithValues()
{ {
var complex = new Dummy.StructComplex(); var complex = new Dummy.StructComplex();
@ -210,6 +211,8 @@ internal class StructHelpers
Test.Assert(complex.Fobj == null); Test.Assert(complex.Fobj == null);
} }
#endif
} }
} }

5
src/tests/efl_mono/Structs.cs
View File

@ -20,11 +20,13 @@ internal class TestStructs
checkZeroedStructSimple(simple); checkZeroedStructSimple(simple);
} }
#if EFL_BETA
private static void complex_default_instantiation() private static void complex_default_instantiation()
{ {
var complex = new Dummy.StructComplex(); var complex = new Dummy.StructComplex();
checkZeroedStructComplex(complex); checkZeroedStructComplex(complex);
} }
#endif
public static void parameter_initialization() public static void parameter_initialization()
{ {
@ -300,6 +302,7 @@ internal class TestStructs
} }
*/ */
#if EFL_BETA
// Complex Structs // Complex Structs
public static void complex_in() public static void complex_in()
{ {
@ -340,7 +343,7 @@ internal class TestStructs
var complex = t.StructComplexReturn(); var complex = t.StructComplexReturn();
checkStructComplex(complex); checkStructComplex(complex);
} }
#endif
// public static void complex_ptr_return() // public static void complex_ptr_return()
// { // {
// } // }

102
src/tests/efl_mono/dummy_test_object.eo
View File

@ -73,7 +73,7 @@ struct @free(free) Dummy.StructSimple
fmyint: Dummy.MyInt; fmyint: Dummy.MyInt;
} }
struct @free(free) Dummy.StructComplex { struct @beta @free(free) Dummy.StructComplex {
farray: array<string>; farray: array<string>;
flist: list<string>; flist: list<string>;
fhash: hash<string, string>; fhash: hash<string, string>;
@ -764,7 +764,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
// Eina Hash // // Eina Hash //
// Integer // // Integer //
eina_hash_int_in { eina_hash_int_in @beta {
params { params {
@in hsh: hash<int, int>; @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 { params {
@in hsh: hash<int, int> @move; // <, int @move> @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 { params {
@out hsh: hash<int, int>; @out hsh: hash<int, int>;
} }
return: bool; return: bool;
} }
check_eina_hash_int_out { check_eina_hash_int_out @beta {
return: bool; return: bool;
} }
/* /*
eina_hash_int_out_own { eina_hash_int_out_own @beta {
params { params {
@out hsh: hash<int, int> @move; // <, int @move> @out hsh: hash<int, int> @move; // <, int @move>
} }
return: bool; return: bool;
} }
check_eina_hash_int_out_own { check_eina_hash_int_out_own @beta {
return: bool; return: bool;
} }
*/ */
eina_hash_int_return { eina_hash_int_return @beta {
return: hash<int, int>; return: hash<int, int>;
} }
check_eina_hash_int_return { check_eina_hash_int_return @beta {
return: bool; return: bool;
} }
/* /*
eina_hash_int_return_own { eina_hash_int_return_own @beta {
return: hash<int, int> @move; // <, int @move> return: hash<int, int> @move; // <, int @move>
} }
check_eina_hash_int_return_own { check_eina_hash_int_return_own @beta {
return: bool; return: bool;
} }
*/ */
// String // // String //
eina_hash_str_in { eina_hash_str_in @beta {
params { params {
@in hsh: hash<string, string>; @in hsh: hash<string, string>;
} }
return: bool; return: bool;
} }
eina_hash_str_in_own { eina_hash_str_in_own @beta {
params { params {
@in hsh: hash<string, mstring @move> @move; @in hsh: hash<string, mstring @move> @move;
} }
return: bool; return: bool;
} }
check_eina_hash_str_in_own { check_eina_hash_str_in_own @beta {
return: bool; return: bool;
} }
eina_hash_str_out { eina_hash_str_out @beta {
params { params {
@out hsh: hash<string, string>; @out hsh: hash<string, string>;
} }
return: bool; return: bool;
} }
check_eina_hash_str_out { check_eina_hash_str_out @beta {
return: bool; return: bool;
} }
eina_hash_str_out_own { eina_hash_str_out_own @beta {
params { params {
@out hsh: hash<string, mstring @move> @move; @out hsh: hash<string, mstring @move> @move;
} }
return: bool; return: bool;
} }
check_eina_hash_str_out_own { check_eina_hash_str_out_own @beta {
return: bool; return: bool;
} }
eina_hash_str_return { eina_hash_str_return @beta {
return: hash<string, string>; return: hash<string, string>;
} }
check_eina_hash_str_return { check_eina_hash_str_return @beta {
return: bool; return: bool;
} }
eina_hash_str_return_own { eina_hash_str_return_own @beta {
return: hash<string, mstring @move> @move; return: hash<string, mstring @move> @move;
} }
check_eina_hash_str_return_own { check_eina_hash_str_return_own @beta {
return: bool; return: bool;
} }
// Eina_Stringshare // // Eina_Stringshare //
eina_hash_strshare_in { eina_hash_strshare_in @beta {
params { params {
@in hsh: hash<stringshare, stringshare>; @in hsh: hash<stringshare, stringshare>;
} }
return: bool; return: bool;
} }
eina_hash_strshare_in_own { eina_hash_strshare_in_own @beta {
params { params {
@in hsh: hash<stringshare, stringshare @move> @move; @in hsh: hash<stringshare, stringshare @move> @move;
} }
return: bool; return: bool;
} }
check_eina_hash_strshare_in_own { check_eina_hash_strshare_in_own @beta {
return: bool; return: bool;
} }
eina_hash_strshare_out { eina_hash_strshare_out @beta {
params { params {
@out hsh: hash<stringshare, stringshare>; @out hsh: hash<stringshare, stringshare>;
} }
return: bool; return: bool;
} }
check_eina_hash_strshare_out { check_eina_hash_strshare_out @beta {
return: bool; return: bool;
} }
eina_hash_strshare_out_own { eina_hash_strshare_out_own @beta {
params { params {
@out hsh: hash<stringshare, stringshare @move> @move; @out hsh: hash<stringshare, stringshare @move> @move;
} }
return: bool; return: bool;
} }
check_eina_hash_strshare_out_own { check_eina_hash_strshare_out_own @beta {
return: bool; return: bool;
} }
eina_hash_strshare_return { eina_hash_strshare_return @beta {
return: hash<stringshare, stringshare>; return: hash<stringshare, stringshare>;
} }
check_eina_hash_strshare_return { check_eina_hash_strshare_return @beta {
return: bool; return: bool;
} }
eina_hash_strshare_return_own { eina_hash_strshare_return_own @beta {
return: hash<stringshare, stringshare @move> @move; return: hash<stringshare, stringshare @move> @move;
} }
check_eina_hash_strshare_return_own { check_eina_hash_strshare_return_own @beta {
return: bool; return: bool;
} }
// Object // // Object //
eina_hash_obj_in { eina_hash_obj_in @beta {
params { params {
@in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; @in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>;
@in nwk1: Dummy.Numberwrapper; @in nwk1: Dummy.Numberwrapper;
@ -937,7 +937,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
return: bool; return: bool;
} }
eina_hash_obj_in_own { eina_hash_obj_in_own @beta {
params { params {
@in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; @in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move;
@in nwk1: Dummy.Numberwrapper; @in nwk1: Dummy.Numberwrapper;
@ -947,7 +947,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
} }
return: bool; return: bool;
} }
check_eina_hash_obj_in_own { check_eina_hash_obj_in_own @beta {
params { params {
@in nwk1: Dummy.Numberwrapper; @in nwk1: Dummy.Numberwrapper;
@in nwv1: Dummy.Numberwrapper; @in nwv1: Dummy.Numberwrapper;
@ -957,7 +957,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
return: bool; return: bool;
} }
eina_hash_obj_out { eina_hash_obj_out @beta {
params { params {
@out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; @out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>;
@out nwk: Dummy.Numberwrapper; @out nwk: Dummy.Numberwrapper;
@ -965,7 +965,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
} }
return: bool; return: bool;
} }
check_eina_hash_obj_out { check_eina_hash_obj_out @beta {
params { params {
@in nwk1: Dummy.Numberwrapper; @in nwk1: Dummy.Numberwrapper;
@in nwv1: Dummy.Numberwrapper; @in nwv1: Dummy.Numberwrapper;
@ -975,7 +975,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
return: bool; return: bool;
} }
eina_hash_obj_out_own { eina_hash_obj_out_own @beta {
params { params {
@out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; @out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move;
@out nwk: Dummy.Numberwrapper; @out nwk: Dummy.Numberwrapper;
@ -983,18 +983,18 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
} }
return: bool; return: bool;
} }
check_eina_hash_obj_out_own { check_eina_hash_obj_out_own @beta {
return: bool; return: bool;
} }
eina_hash_obj_return { eina_hash_obj_return @beta {
params { params {
@out nwk: Dummy.Numberwrapper; @out nwk: Dummy.Numberwrapper;
@out nwv: Dummy.Numberwrapper; @out nwv: Dummy.Numberwrapper;
} }
return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>;
} }
check_eina_hash_obj_return { check_eina_hash_obj_return @beta {
params { params {
@in nwk1: Dummy.Numberwrapper; @in nwk1: Dummy.Numberwrapper;
@in nwv1: Dummy.Numberwrapper; @in nwv1: Dummy.Numberwrapper;
@ -1004,14 +1004,14 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
return: bool; return: bool;
} }
eina_hash_obj_return_own { eina_hash_obj_return_own @beta {
params { params {
@out nwk: Dummy.Numberwrapper; @out nwk: Dummy.Numberwrapper;
@out nwv: Dummy.Numberwrapper; @out nwv: Dummy.Numberwrapper;
} }
return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move;
} }
check_eina_hash_obj_return_own { check_eina_hash_obj_return_own @beta {
return: bool; 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 { params {
@in complex: Dummy.StructComplex; @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 { params {
@in complex: ptr(Dummy.StructComplex); @in complex: ptr(Dummy.StructComplex);
} }
return: bool; return: bool;
} }
struct_complex_ptr_in_own { struct_complex_ptr_in_own @beta {
params { params {
@in complex: ptr(Dummy.StructComplex) @move; @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 { params {
@out complex: Dummy.StructComplex; @out complex: Dummy.StructComplex;
} }
@ -1463,7 +1463,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
// return: bool; // return: bool;
// } // }
struct_complex_return { struct_complex_return @beta {
return: Dummy.StructComplex; 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 { params {
@in data: Dummy.StructComplex; @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,obj @hot: Dummy.Test_Object;
evt,with,error @hot: Eina.Error; evt,with,error @hot: Eina.Error;
evt,with,struct @hot: Dummy.StructSimple; 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,array @hot: const(array<string>);
evt_with,under @hot: void; evt_with,under @hot: void;