summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-09-20 19:22:22 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2019-09-20 19:29:20 -0300
commit9e92b3d123b12e5637fa010eccd47785cf0f4cbe (patch)
tree27623c73b43fed2a78937d8aaafd7e9dfaa95c3d /src/tests
parent01875756ebacc3e4578106f638ca7e57cdcd21f0 (diff)
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
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/efl_mono/Eina.cs3
-rw-r--r--src/tests/efl_mono/Events.cs2
-rw-r--r--src/tests/efl_mono/StructHelpers.cs3
-rw-r--r--src/tests/efl_mono/Structs.cs5
-rw-r--r--src/tests/efl_mono/dummy_test_object.eo102
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
2442 2442
2443} // < TestEinaInlist 2443} // < TestEinaInlist
2444 2444
2445#if EFL_BETA
2445 2446
2446class TestEinaHash 2447class TestEinaHash
2447{ 2448{
@@ -3038,6 +3039,8 @@ class TestEinaHash
3038 } 3039 }
3039} 3040}
3040 3041
3042#endif // EFL_BETA
3043
3041 3044
3042class TestEinaIterator 3045class TestEinaIterator
3043{ 3046{
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
178 Test.AssertEquals(sent_struct.Fstring, received_struct.Fstring); 178 Test.AssertEquals(sent_struct.Fstring, received_struct.Fstring);
179 } 179 }
180 180
181#if EFL_BETA
181 public static void event_with_struct_complex_payload() 182 public static void event_with_struct_complex_payload()
182 { 183 {
183 var obj = new Dummy.TestObject(); 184 var obj = new Dummy.TestObject();
@@ -193,6 +194,7 @@ class TestEoEvents
193 194
194 Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj); 195 Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj);
195 } 196 }
197#endif
196 198
197 public static void event_with_array_payload() 199 public static void event_with_array_payload()
198 { 200 {
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
117 Test.Assert(simple.Fstringshare == null); 117 Test.Assert(simple.Fstringshare == null);
118 } 118 }
119 119
120#if EFL_BETA
120 internal static Dummy.StructComplex structComplexWithValues() 121 internal static Dummy.StructComplex structComplexWithValues()
121 { 122 {
122 var complex = new Dummy.StructComplex(); 123 var complex = new Dummy.StructComplex();
@@ -210,6 +211,8 @@ internal class StructHelpers
210 Test.Assert(complex.Fobj == null); 211 Test.Assert(complex.Fobj == null);
211 } 212 }
212 213
214#endif
215
213} 216}
214 217
215} 218}
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
20 checkZeroedStructSimple(simple); 20 checkZeroedStructSimple(simple);
21 } 21 }
22 22
23#if EFL_BETA
23 private static void complex_default_instantiation() 24 private static void complex_default_instantiation()
24 { 25 {
25 var complex = new Dummy.StructComplex(); 26 var complex = new Dummy.StructComplex();
26 checkZeroedStructComplex(complex); 27 checkZeroedStructComplex(complex);
27 } 28 }
29#endif
28 30
29 public static void parameter_initialization() 31 public static void parameter_initialization()
30 { 32 {
@@ -300,6 +302,7 @@ internal class TestStructs
300 } 302 }
301 */ 303 */
302 304
305#if EFL_BETA
303 // Complex Structs 306 // Complex Structs
304 public static void complex_in() 307 public static void complex_in()
305 { 308 {
@@ -340,7 +343,7 @@ internal class TestStructs
340 var complex = t.StructComplexReturn(); 343 var complex = t.StructComplexReturn();
341 checkStructComplex(complex); 344 checkStructComplex(complex);
342 } 345 }
343 346#endif
344 // public static void complex_ptr_return() 347 // public static void complex_ptr_return()
345 // { 348 // {
346 // } 349 // }
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
73 fmyint: Dummy.MyInt; 73 fmyint: Dummy.MyInt;
74} 74}
75 75
76struct @free(free) Dummy.StructComplex { 76struct @beta @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>;
@@ -764,7 +764,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
764 // Eina Hash // 764 // Eina Hash //
765 765
766 // Integer // 766 // Integer //
767 eina_hash_int_in { 767 eina_hash_int_in @beta {
768 params { 768 params {
769 @in hsh: hash<int, int>; 769 @in hsh: hash<int, int>;
770 } 770 }
@@ -772,7 +772,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
772 } 772 }
773 773
774 /* 774 /*
775 eina_hash_int_in_own { 775 eina_hash_int_in_own @beta {
776 params { 776 params {
777 @in hsh: hash<int, int> @move; // <, int @move> 777 @in hsh: hash<int, int> @move; // <, int @move>
778 } 778 }
@@ -783,150 +783,150 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
783 } 783 }
784 */ 784 */
785 785
786 eina_hash_int_out { 786 eina_hash_int_out @beta {
787 params { 787 params {
788 @out hsh: hash<int, int>; 788 @out hsh: hash<int, int>;
789 } 789 }
790 return: bool; 790 return: bool;
791 } 791 }
792 check_eina_hash_int_out { 792 check_eina_hash_int_out @beta {
793 return: bool; 793 return: bool;
794 } 794 }
795 795
796 /* 796 /*
797 eina_hash_int_out_own { 797 eina_hash_int_out_own @beta {
798 params { 798 params {
799 @out hsh: hash<int, int> @move; // <, int @move> 799 @out hsh: hash<int, int> @move; // <, int @move>
800 } 800 }
801 return: bool; 801 return: bool;
802 } 802 }
803 check_eina_hash_int_out_own { 803 check_eina_hash_int_out_own @beta {
804 return: bool; 804 return: bool;
805 } 805 }
806 */ 806 */
807 807
808 eina_hash_int_return { 808 eina_hash_int_return @beta {
809 return: hash<int, int>; 809 return: hash<int, int>;
810 } 810 }
811 check_eina_hash_int_return { 811 check_eina_hash_int_return @beta {
812 return: bool; 812 return: bool;
813 } 813 }
814 814
815 /* 815 /*
816 eina_hash_int_return_own { 816 eina_hash_int_return_own @beta {
817 return: hash<int, int> @move; // <, int @move> 817 return: hash<int, int> @move; // <, int @move>
818 } 818 }
819 check_eina_hash_int_return_own { 819 check_eina_hash_int_return_own @beta {
820 return: bool; 820 return: bool;
821 } 821 }
822 */ 822 */
823 823
824 // String // 824 // String //
825 eina_hash_str_in { 825 eina_hash_str_in @beta {
826 params { 826 params {
827 @in hsh: hash<string, string>; 827 @in hsh: hash<string, string>;
828 } 828 }
829 return: bool; 829 return: bool;
830 } 830 }
831 831
832 eina_hash_str_in_own { 832 eina_hash_str_in_own @beta {
833 params { 833 params {
834 @in hsh: hash<string, mstring @move> @move; 834 @in hsh: hash<string, mstring @move> @move;
835 } 835 }
836 return: bool; 836 return: bool;
837 } 837 }
838 check_eina_hash_str_in_own { 838 check_eina_hash_str_in_own @beta {
839 return: bool; 839 return: bool;
840 } 840 }
841 841
842 eina_hash_str_out { 842 eina_hash_str_out @beta {
843 params { 843 params {
844 @out hsh: hash<string, string>; 844 @out hsh: hash<string, string>;
845 } 845 }
846 return: bool; 846 return: bool;
847 } 847 }
848 check_eina_hash_str_out { 848 check_eina_hash_str_out @beta {
849 return: bool; 849 return: bool;
850 } 850 }
851 851
852 eina_hash_str_out_own { 852 eina_hash_str_out_own @beta {
853 params { 853 params {
854 @out hsh: hash<string, mstring @move> @move; 854 @out hsh: hash<string, mstring @move> @move;
855 } 855 }
856 return: bool; 856 return: bool;
857 } 857 }
858 check_eina_hash_str_out_own { 858 check_eina_hash_str_out_own @beta {
859 return: bool; 859 return: bool;
860 } 860 }
861 861
862 eina_hash_str_return { 862 eina_hash_str_return @beta {
863 return: hash<string, string>; 863 return: hash<string, string>;
864 } 864 }
865 check_eina_hash_str_return { 865 check_eina_hash_str_return @beta {
866 return: bool; 866 return: bool;
867 } 867 }
868 868
869 eina_hash_str_return_own { 869 eina_hash_str_return_own @beta {
870 return: hash<string, mstring @move> @move; 870 return: hash<string, mstring @move> @move;
871 } 871 }
872 check_eina_hash_str_return_own { 872 check_eina_hash_str_return_own @beta {
873 return: bool; 873 return: bool;
874 } 874 }
875 875
876 // Eina_Stringshare // 876 // Eina_Stringshare //
877 eina_hash_strshare_in { 877 eina_hash_strshare_in @beta {
878 params { 878 params {
879 @in hsh: hash<stringshare, stringshare>; 879 @in hsh: hash<stringshare, stringshare>;
880 } 880 }
881 return: bool; 881 return: bool;
882 } 882 }
883 883
884 eina_hash_strshare_in_own { 884 eina_hash_strshare_in_own @beta {
885 params { 885 params {
886 @in hsh: hash<stringshare, stringshare @move> @move; 886 @in hsh: hash<stringshare, stringshare @move> @move;
887 } 887 }
888 return: bool; 888 return: bool;
889 } 889 }
890 check_eina_hash_strshare_in_own { 890 check_eina_hash_strshare_in_own @beta {
891 return: bool; 891 return: bool;
892 } 892 }
893 893
894 eina_hash_strshare_out { 894 eina_hash_strshare_out @beta {
895 params { 895 params {
896 @out hsh: hash<stringshare, stringshare>; 896 @out hsh: hash<stringshare, stringshare>;
897 } 897 }
898 return: bool; 898 return: bool;
899 } 899 }
900 check_eina_hash_strshare_out { 900 check_eina_hash_strshare_out @beta {
901 return: bool; 901 return: bool;
902 } 902 }
903 903
904 eina_hash_strshare_out_own { 904 eina_hash_strshare_out_own @beta {
905 params { 905 params {
906 @out hsh: hash<stringshare, stringshare @move> @move; 906 @out hsh: hash<stringshare, stringshare @move> @move;
907 } 907 }
908 return: bool; 908 return: bool;
909 } 909 }
910 check_eina_hash_strshare_out_own { 910 check_eina_hash_strshare_out_own @beta {
911 return: bool; 911 return: bool;
912 } 912 }
913 913
914 eina_hash_strshare_return { 914 eina_hash_strshare_return @beta {
915 return: hash<stringshare, stringshare>; 915 return: hash<stringshare, stringshare>;
916 } 916 }
917 check_eina_hash_strshare_return { 917 check_eina_hash_strshare_return @beta {
918 return: bool; 918 return: bool;
919 } 919 }
920 920
921 eina_hash_strshare_return_own { 921 eina_hash_strshare_return_own @beta {
922 return: hash<stringshare, stringshare @move> @move; 922 return: hash<stringshare, stringshare @move> @move;
923 } 923 }
924 check_eina_hash_strshare_return_own { 924 check_eina_hash_strshare_return_own @beta {
925 return: bool; 925 return: bool;
926 } 926 }
927 927
928 // Object // 928 // Object //
929 eina_hash_obj_in { 929 eina_hash_obj_in @beta {
930 params { 930 params {
931 @in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; 931 @in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>;
932 @in nwk1: Dummy.Numberwrapper; 932 @in nwk1: Dummy.Numberwrapper;
@@ -937,7 +937,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
937 return: bool; 937 return: bool;
938 } 938 }
939 939
940 eina_hash_obj_in_own { 940 eina_hash_obj_in_own @beta {
941 params { 941 params {
942 @in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; 942 @in hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move;
943 @in nwk1: Dummy.Numberwrapper; 943 @in nwk1: Dummy.Numberwrapper;
@@ -947,7 +947,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
947 } 947 }
948 return: bool; 948 return: bool;
949 } 949 }
950 check_eina_hash_obj_in_own { 950 check_eina_hash_obj_in_own @beta {
951 params { 951 params {
952 @in nwk1: Dummy.Numberwrapper; 952 @in nwk1: Dummy.Numberwrapper;
953 @in nwv1: Dummy.Numberwrapper; 953 @in nwv1: Dummy.Numberwrapper;
@@ -957,7 +957,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
957 return: bool; 957 return: bool;
958 } 958 }
959 959
960 eina_hash_obj_out { 960 eina_hash_obj_out @beta {
961 params { 961 params {
962 @out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; 962 @out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>;
963 @out nwk: Dummy.Numberwrapper; 963 @out nwk: Dummy.Numberwrapper;
@@ -965,7 +965,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
965 } 965 }
966 return: bool; 966 return: bool;
967 } 967 }
968 check_eina_hash_obj_out { 968 check_eina_hash_obj_out @beta {
969 params { 969 params {
970 @in nwk1: Dummy.Numberwrapper; 970 @in nwk1: Dummy.Numberwrapper;
971 @in nwv1: Dummy.Numberwrapper; 971 @in nwv1: Dummy.Numberwrapper;
@@ -975,7 +975,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
975 return: bool; 975 return: bool;
976 } 976 }
977 977
978 eina_hash_obj_out_own { 978 eina_hash_obj_out_own @beta {
979 params { 979 params {
980 @out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; 980 @out hsh: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move;
981 @out nwk: Dummy.Numberwrapper; 981 @out nwk: Dummy.Numberwrapper;
@@ -983,18 +983,18 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
983 } 983 }
984 return: bool; 984 return: bool;
985 } 985 }
986 check_eina_hash_obj_out_own { 986 check_eina_hash_obj_out_own @beta {
987 return: bool; 987 return: bool;
988 } 988 }
989 989
990 eina_hash_obj_return { 990 eina_hash_obj_return @beta {
991 params { 991 params {
992 @out nwk: Dummy.Numberwrapper; 992 @out nwk: Dummy.Numberwrapper;
993 @out nwv: Dummy.Numberwrapper; 993 @out nwv: Dummy.Numberwrapper;
994 } 994 }
995 return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>; 995 return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper>;
996 } 996 }
997 check_eina_hash_obj_return { 997 check_eina_hash_obj_return @beta {
998 params { 998 params {
999 @in nwk1: Dummy.Numberwrapper; 999 @in nwk1: Dummy.Numberwrapper;
1000 @in nwv1: Dummy.Numberwrapper; 1000 @in nwv1: Dummy.Numberwrapper;
@@ -1004,14 +1004,14 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1004 return: bool; 1004 return: bool;
1005 } 1005 }
1006 1006
1007 eina_hash_obj_return_own { 1007 eina_hash_obj_return_own @beta {
1008 params { 1008 params {
1009 @out nwk: Dummy.Numberwrapper; 1009 @out nwk: Dummy.Numberwrapper;
1010 @out nwv: Dummy.Numberwrapper; 1010 @out nwv: Dummy.Numberwrapper;
1011 } 1011 }
1012 return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move; 1012 return: hash<Dummy.Numberwrapper, Dummy.Numberwrapper @move> @move;
1013 } 1013 }
1014 check_eina_hash_obj_return_own { 1014 check_eina_hash_obj_return_own @beta {
1015 return: bool; 1015 return: bool;
1016 } 1016 }
1017 1017
@@ -1419,7 +1419,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1419 } 1419 }
1420 */ 1420 */
1421 1421
1422 struct_complex_in { 1422 struct_complex_in @beta {
1423 params { 1423 params {
1424 @in complex: Dummy.StructComplex; 1424 @in complex: Dummy.StructComplex;
1425 } 1425 }
@@ -1427,14 +1427,14 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1427 } 1427 }
1428 1428
1429 /* 1429 /*
1430 struct_complex_ptr_in { 1430 struct_complex_ptr_in @beta {
1431 params { 1431 params {
1432 @in complex: ptr(Dummy.StructComplex); 1432 @in complex: ptr(Dummy.StructComplex);
1433 } 1433 }
1434 return: bool; 1434 return: bool;
1435 } 1435 }
1436 1436
1437 struct_complex_ptr_in_own { 1437 struct_complex_ptr_in_own @beta {
1438 params { 1438 params {
1439 @in complex: ptr(Dummy.StructComplex) @move; 1439 @in complex: ptr(Dummy.StructComplex) @move;
1440 } 1440 }
@@ -1442,7 +1442,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1442 } 1442 }
1443 */ 1443 */
1444 1444
1445 struct_complex_out { 1445 struct_complex_out @beta {
1446 params { 1446 params {
1447 @out complex: Dummy.StructComplex; 1447 @out complex: Dummy.StructComplex;
1448 } 1448 }
@@ -1463,7 +1463,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1463 // return: bool; 1463 // return: bool;
1464 // } 1464 // }
1465 1465
1466 struct_complex_return { 1466 struct_complex_return @beta {
1467 return: Dummy.StructComplex; 1467 return: Dummy.StructComplex;
1468 } 1468 }
1469 1469
@@ -1523,7 +1523,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1523 } 1523 }
1524 } 1524 }
1525 1525
1526 emit_event_with_struct_complex { 1526 emit_event_with_struct_complex @beta {
1527 params { 1527 params {
1528 @in data: Dummy.StructComplex; 1528 @in data: Dummy.StructComplex;
1529 } 1529 }
@@ -1669,7 +1669,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1669 evt,with,obj @hot: Dummy.Test_Object; 1669 evt,with,obj @hot: Dummy.Test_Object;
1670 evt,with,error @hot: Eina.Error; 1670 evt,with,error @hot: Eina.Error;
1671 evt,with,struct @hot: Dummy.StructSimple; 1671 evt,with,struct @hot: Dummy.StructSimple;
1672 evt,with,struct,complex @hot: Dummy.StructComplex; 1672 evt,with,struct,complex @beta @hot: Dummy.StructComplex;
1673 evt,with,array @hot: const(array<string>); 1673 evt,with,array @hot: const(array<string>);
1674 evt_with,under @hot: void; 1674 evt_with,under @hot: void;
1675 1675