lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bd446fdcf92d961766ac67b98f45022637dc4dde
commit bd446fdcf92d961766ac67b98f45022637dc4dde Author: Bruno da Silva Belo <[email protected]> Date: Wed Nov 6 23:34:18 2019 -0300 csharp:comma have whitespace after and none before Reviewers: felipealmeida, lauromoura, YOhoho Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10575 --- .../eolian/mono/async_function_definition.hh | 6 +- .../eolian_mono/eolian/mono/function_definition.hh | 6 +- .../eolian_mono/eolian/mono/function_pointer.hh | 2 +- src/bin/eolian_mono/eolian/mono/klass.hh | 14 ++-- src/bin/eolian_mono/eolian/mono/parameter.hh | 2 +- src/bin/eolian_mono/eolian/mono/part_definition.hh | 2 +- src/tests/efl_mono/Eina.cs | 88 ++++++++++++---------- src/tests/efl_mono/EinaTestData.cs | 49 ++++++------ src/tests/efl_mono/Promises.cs | 5 +- 9 files changed, 91 insertions(+), 83 deletions(-) diff --git a/src/bin/eolian_mono/eolian/mono/async_function_definition.hh b/src/bin/eolian_mono/eolian/mono/async_function_definition.hh index 089b115dc6..bf00ddadba 100644 --- a/src/bin/eolian_mono/eolian/mono/async_function_definition.hh +++ b/src/bin/eolian_mono/eolian/mono/async_function_definition.hh @@ -95,7 +95,7 @@ struct async_function_declaration_generator if (!as_generator( scope_tab << "/// <param name=\"token\">Token to notify the async operation of external request to cancel.</param>\n" << scope_tab << "/// <returns>An async task wrapping the result of the operation.</returns>\n" - << scope_tab << "System.Threading.Tasks.Task<Eina.Value> " << name_helpers::managed_async_method_name(f) << "(" << *(parameter << ",") << + << scope_tab << "System.Threading.Tasks.Task<Eina.Value> " << name_helpers::managed_async_method_name(f) << "(" << *(parameter << ", ") << " System.Threading.CancellationToken token = default(System.Threading.CancellationToken));\n\n" ).generate(sink, f.parameters, context)) return false; @@ -153,9 +153,9 @@ struct async_function_definition_generator if(!as_generator( scope_tab << "/// <param name=\"token\">Token to notify the async operation of external request to cancel.</param>\n" << scope_tab << "/// <returns>An async task wrapping the result of the operation.</returns>\n" - << scope_tab << "public System.Threading.Tasks.Task<Eina.Value> " << name_helpers::managed_async_method_name(f) << "(" << *(parameter << ",") << " System.Threading.CancellationToken token = default(System.Threading.CancellationToken))\n" + << scope_tab << "public System.Threading.Tasks.Task<Eina.Value> " << name_helpers::managed_async_method_name(f) << "(" << *(parameter << ", ") << " System.Threading.CancellationToken token = default(System.Threading.CancellationToken))\n" << scope_tab << "{\n" - << scope_tab << scope_tab << "Eina.Future future = " << name_helpers::managed_method_name(f) << "(" << (string % ",") << ");\n" + << scope_tab << scope_tab << "Eina.Future future = " << name_helpers::managed_method_name(f) << "(" << (string % ", ") << ");\n" << scope_tab << scope_tab << "return Efl.Eo.Globals.WrapAsync(future, token);\n" << scope_tab << "}\n\n" ).generate(sink, std::make_tuple(f.parameters, param_forwarding), context)) diff --git a/src/bin/eolian_mono/eolian/mono/function_definition.hh b/src/bin/eolian_mono/eolian/mono/function_definition.hh index 44dd9167ac..51bb17c3a1 100644 --- a/src/bin/eolian_mono/eolian/mono/function_definition.hh +++ b/src/bin/eolian_mono/eolian/mono/function_definition.hh @@ -223,7 +223,7 @@ struct function_definition_generator << scope_tab(2) << eolian_mono::function_definition_preamble() << klass_full_native_inherit_name(f.klass) << "." << string << "_ptr.Value.Delegate(" << self - << ((!f.is_static && (f.parameters.size() > 0)) ? "," : "") + << ((!f.is_static && (f.parameters.size() > 0)) ? ", " : "") << (argument_invocation % ", ") << ");\n" << scope_tab(2) << eolian_mono::function_definition_epilogue() << scope_tab(1) << "}\n\n") @@ -497,8 +497,8 @@ struct property_wrapper_definition_generator << argument(false) << " = default(" << type(true) << ");\n" ) << scope_tab(3) << name_helpers::managed_method_name(*property.getter) - << "(" << (("out _out_" << argument(false)) % ",") << ");\n" - << scope_tab(3) << "return (" << (("_out_"<< argument(false)) % ",") << ");\n" + << "(" << (("out _out_" << argument(false)) % ", ") << ");\n" + << scope_tab(3) << "return (" << (("_out_"<< argument(false)) % ", ") << ");\n" << scope_tab(2) << "}" << "\n" ).generate(sink, std::make_tuple(parameters, parameters, parameters), context)) return false; diff --git a/src/bin/eolian_mono/eolian/mono/function_pointer.hh b/src/bin/eolian_mono/eolian/mono/function_pointer.hh index 0e80659b48..aee11ea5a0 100644 --- a/src/bin/eolian_mono/eolian/mono/function_pointer.hh +++ b/src/bin/eolian_mono/eolian/mono/function_pointer.hh @@ -114,7 +114,7 @@ struct function_pointer { << scope_tab << scope_tab << "GC.SuppressFinalize(this);\n" << scope_tab << "}\n\n" - << scope_tab << "internal " << type << " ManagedCb(" << (parameter % ",") << ")\n" + << scope_tab << "internal " << type << " ManagedCb(" << (parameter % ", ") << ")\n" << scope_tab << "{\n" << function_definition_preamble << "_cb(_cb_data, " << (argument_invocation % ", ") << ");\n" << function_definition_epilogue diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh b/src/bin/eolian_mono/eolian/mono/klass.hh index f2c2c5ab7d..81d5956535 100644 --- a/src/bin/eolian_mono/eolian/mono/klass.hh +++ b/src/bin/eolian_mono/eolian/mono/klass.hh @@ -132,7 +132,7 @@ struct klass continue; if(first->type != attributes::class_type::regular && first->type != attributes::class_type::abstract_) - if(!as_generator("\n" << scope_tab << string << " ,").generate(sink, name_helpers::klass_full_interface_name(*first), iface_cxt)) + if(!as_generator("\n" << scope_tab << string << ",").generate(sink, name_helpers::klass_full_interface_name(*first), iface_cxt)) return false; } @@ -202,9 +202,9 @@ struct klass ( documentation << "public sealed " << (is_partial ? "partial ":"") << "class " << concrete_name << " :\n" - << scope_tab << (root ? "Efl.Eo.EoWrapper" : "") << (klass_full_concrete_or_interface_name % "") << "\n" - << scope_tab << ", " << interface_name << "\n" - << scope_tab << *(", " << name_helpers::klass_full_concrete_or_interface_name) << "\n" + << scope_tab << (root ? "Efl.Eo.EoWrapper" : "") << (klass_full_concrete_or_interface_name % "") + << ",\n" << scope_tab << interface_name + << *(",\n" << scope_tab << name_helpers::klass_full_concrete_or_interface_name) << "\n" << "{\n" ).generate(sink, std::make_tuple(cls, inherit_classes, inherit_interfaces), concrete_cxt)) return false; @@ -564,9 +564,9 @@ struct klass << scope_tab << "/// <param name=\"parent\">Parent instance.</param>\n" << *(documentation) // For constructors with arguments, the parent is also required, as optional parameters can't come before non-optional paramenters. - << scope_tab << "public " << inherit_name << "(Efl.Object parent" << ((constructors.size() > 0) ? "" : "= null") << "\n" - << scope_tab << scope_tab << scope_tab << *(", " << constructor_param ) << ") : " - << "base(" << name_helpers::klass_get_name(cls) << "(), parent)\n" + << scope_tab << "public " << inherit_name << "(Efl.Object parent" << ((constructors.size() > 0) ? "" : "= null") + << *(", " << constructor_param ) << ") : " + << "base(" << name_helpers::klass_get_name(cls) << "(), parent)\n" << scope_tab << "{\n" << (*(scope_tab << scope_tab << constructor_invocation << "\n")) << scope_tab << scope_tab << "FinishInstantiation();\n" diff --git a/src/bin/eolian_mono/eolian/mono/parameter.hh b/src/bin/eolian_mono/eolian/mono/parameter.hh index 55e12544ad..7c7b8f275d 100644 --- a/src/bin/eolian_mono/eolian/mono/parameter.hh +++ b/src/bin/eolian_mono/eolian/mono/parameter.hh @@ -1536,7 +1536,7 @@ struct constructor_param_generator if (!as_generator( efl::eolian::grammar::attribute_reorder<1, -1> - (type(false, ctor.is_optional) << " " << constructor_parameter_name(ctor) << (ctor.is_optional ? " = null" : "")) % "," + (type(false, ctor.is_optional) << " " << constructor_parameter_name(ctor) << (ctor.is_optional ? " = null" : "")) % ", " ).generate(sink, params, context)) return false; // } diff --git a/src/bin/eolian_mono/eolian/mono/part_definition.hh b/src/bin/eolian_mono/eolian/mono/part_definition.hh index 31169f11f5..0b8dece50c 100644 --- a/src/bin/eolian_mono/eolian/mono/part_definition.hh +++ b/src/bin/eolian_mono/eolian/mono/part_definition.hh @@ -74,7 +74,7 @@ struct part_extension_method_definition_generator << name_helpers::klass_full_concrete_or_interface_name(cls) << ", T> x=null) where T : " << name_helpers::klass_full_concrete_or_interface_name(cls) << "\n" << scope_tab << "{\n" - << scope_tab << scope_tab << "return new " << bindableClass << "<" << part_klass_name << ">(\"" << part.name << "\" ,fac);\n" + << scope_tab << scope_tab << "return new " << bindableClass << "<" << part_klass_name << ">(\"" << part.name << "\", fac);\n" << scope_tab << "}\n\n" ).generate(sink, attributes::unused, context)) return false; diff --git a/src/tests/efl_mono/Eina.cs b/src/tests/efl_mono/Eina.cs index 4dad199d9a..1dd57dcf16 100644 --- a/src/tests/efl_mono/Eina.cs +++ b/src/tests/efl_mono/Eina.cs @@ -174,7 +174,8 @@ class TestEinaBinbuf var binbuf = new Eina.Binbuf(base_seq, (uint)base_seq.Length); Test.Assert(t.EinaBinbufIn(binbuf)); Test.Assert(binbuf.Own); - Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[]{43,42,0x0,0x2A,0x42,33})); + Test.Assert(binbuf.GetBytes().SequenceEqual( + new byte[]{43, 42, 0x0, 0x2A, 0x42, 33})); binbuf.Dispose(); Test.Assert(binbuf.Handle == IntPtr.Zero); } @@ -185,7 +186,8 @@ class TestEinaBinbuf var binbuf = new Eina.Binbuf(base_seq, (uint)base_seq.Length); Test.Assert(t.EinaBinbufInOwn(binbuf)); Test.Assert(!binbuf.Own); - Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[]{43,42,0x0,0x2A,0x42,33})); + Test.Assert(binbuf.GetBytes().SequenceEqual( + new byte[]{43, 42, 0x0, 0x2A, 0x42, 33})); binbuf.Dispose(); Test.Assert(binbuf.Handle == IntPtr.Zero); Test.Assert(t.CheckBinbufInOwn()); @@ -253,7 +255,8 @@ class TestEinaBinbuf Test.Assert(t.CallEinaBinbufIn(binbuf)); Test.Assert(t.binbuf_in_flag); Test.Assert(binbuf.Own); - Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[]{43,42,0x0,0x2A,0x42,33})); + Test.Assert(binbuf.GetBytes().SequenceEqual( + new byte[]{43, 42, 0x0, 0x2A, 0x42, 33})); binbuf.Dispose(); Test.Assert(binbuf.Handle == IntPtr.Zero); } @@ -265,7 +268,8 @@ class TestEinaBinbuf binbuf.Own = false; Test.Assert(t.CallEinaBinbufInOwn(binbuf)); Test.Assert(t.binbuf_in_own_flag); - Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[]{43,42,0x0,0x2A,0x42,33})); + Test.Assert(binbuf.GetBytes().SequenceEqual( + new byte[]{43, 42, 0x0, 0x2A, 0x42, 33})); binbuf.Dispose(); Test.Assert(binbuf.Handle == IntPtr.Zero); Test.Assert(t.binbuf_in_own_still_usable()); @@ -378,7 +382,7 @@ class TestEinaSlice var t = new Dummy.TestObject(); Test.Assert(t.EinaRwSliceIn(slc)); - Test.Assert(slc.GetBytes().SequenceEqual(new byte[3]{0x1,0x2B,0x43})); + Test.Assert(slc.GetBytes().SequenceEqual(new byte[3]{0x1, 0x2B, 0x43})); pinnedRWData.Free(); } @@ -818,7 +822,7 @@ class TestEinaArray a.SetNumber(88); b.SetNumber(44); c.SetNumber(22); - var cmp = new Dummy.Numberwrapper[]{a,b,c}; + var cmp = new Dummy.Numberwrapper[]{a, b, c}; var arr = new Eina.Array<Dummy.Numberwrapper>(); Test.Assert(arr.Handle != IntPtr.Zero); @@ -1435,7 +1439,7 @@ class TestEinaInarray a.SetNumber(88); b.SetNumber(44); c.SetNumber(22); - var cmp = new Dummy.Numberwrapper[]{a,b,c}; + var cmp = new Dummy.Numberwrapper[]{a, b, c}; var arr = new Eina.Inarray<Dummy.Numberwrapper>(); Test.Assert(arr.Handle != IntPtr.Zero); @@ -1723,10 +1727,9 @@ class TestEinaList lst.SortedInsert(88); Test.Assert(lst.ToArray().SequenceEqual(new int[]{88})); lst.SortedInsert(22); - Test.Assert(lst.ToArray().SequenceEqual(new int[]{22,88})); + Test.Assert(lst.ToArray().SequenceEqual(new int[]{22, 88})); lst.SortedInsert(44); - Test.Assert(lst.ToArray().SequenceEqual(new int[]{22,44,88})); - + Test.Assert(lst.ToArray().SequenceEqual(new int[]{22, 44, 88})); } public static void sorted_insert_string() @@ -1735,10 +1738,9 @@ class TestEinaList lst.SortedInsert("c"); Test.Assert(lst.ToArray().SequenceEqual(new string[]{"c"})); lst.SortedInsert("a"); - Test.Assert(lst.ToArray().SequenceEqual(new string[]{"a","c"})); + Test.Assert(lst.ToArray().SequenceEqual(new string[]{"a", "c"})); lst.SortedInsert("b"); - Test.Assert(lst.ToArray().SequenceEqual(new string[]{"a","b","c"})); - + Test.Assert(lst.ToArray().SequenceEqual(new string[]{"a", "b", "c"})); } public static void sorted_insert_stringshare() @@ -1747,10 +1749,11 @@ class TestEinaList lst.SortedInsert("c"); Test.Assert(lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"c"})); lst.SortedInsert("a"); - Test.Assert(lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"a","c"})); + Test.Assert( + lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"a", "c"})); lst.SortedInsert("b"); - Test.Assert(lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"a","b","c"})); - + Test.Assert( + lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"a", "b", "c"})); } public static void sorted_insert_custom_comparer_natural() @@ -1790,11 +1793,12 @@ class TestEinaList lst.SortedInsert(comparator, "The"); Test.Assert(lst.ToArray().SequenceEqual(new string[]{"The"})); lst.SortedInsert(comparator, "Quick"); - Test.Assert(lst.ToArray().SequenceEqual(new string[]{"Quick","The"})); + Test.Assert(lst.ToArray().SequenceEqual(new string[]{"Quick", "The"})); lst.SortedInsert(comparator, "Brown"); Test.Assert(lst.ToArray().SequenceEqual(new string[]{"Brown", "Quick", "The"})); lst.SortedInsert(comparator, "Jumped"); - Test.Assert(lst.ToArray().SequenceEqual(new string[]{"Jumped","Brown", "Quick", "The"})); + Test.Assert(lst.ToArray().SequenceEqual( + new string[]{"Jumped", "Brown", "Quick", "The"})); } public static void sort_int() @@ -1804,10 +1808,9 @@ class TestEinaList lst.Append(22); lst.Append(11); lst.Append(44); - Test.Assert(lst.ToArray().SequenceEqual(new int[]{88,22,11,44})); + Test.Assert(lst.ToArray().SequenceEqual(new int[]{88, 22, 11, 44})); lst.Sort(); - Test.Assert(lst.ToArray().SequenceEqual(new int[]{11,22,44,88})); - + Test.Assert(lst.ToArray().SequenceEqual(new int[]{11, 22, 44, 88})); } public static void sort_string() @@ -1817,9 +1820,11 @@ class TestEinaList lst.Append("b"); lst.Append("a"); lst.Append("c"); - Test.Assert(lst.ToArray().SequenceEqual(new string[]{"d","b","a","c"})); + Test.Assert( + lst.ToArray().SequenceEqual(new string[]{"d", "b", "a", "c"})); lst.Sort(); - Test.Assert(lst.ToArray().SequenceEqual(new string[]{"a","b","c","d"})); + Test.Assert( + lst.ToArray().SequenceEqual(new string[]{"a", "b", "c", "d"})); } public static void sort_stringshare() @@ -1829,9 +1834,11 @@ class TestEinaList lst.Append("b"); lst.Append("a"); lst.Append("c"); - Test.Assert(lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"d","b","a","c"})); + Test.Assert(lst.ToArray().SequenceEqual( + new Eina.Stringshare[]{"d", "b", "a", "c"})); lst.Sort(); - Test.Assert(lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"a","b","c","d"})); + Test.Assert(lst.ToArray().SequenceEqual( + new Eina.Stringshare[]{"a", "b", "c", "d"})); } public static void reverse_int() @@ -1840,10 +1847,9 @@ class TestEinaList lst.Append(22); lst.Append(44); lst.Append(88); - Test.Assert(lst.ToArray().SequenceEqual(new int[]{22,44,88})); + Test.Assert(lst.ToArray().SequenceEqual(new int[]{22, 44, 88})); lst.Reverse(); - Test.Assert(lst.ToArray().SequenceEqual(new int[]{88,44,22})); - + Test.Assert(lst.ToArray().SequenceEqual(new int[]{88, 44, 22})); } public static void reverse_string() @@ -1852,9 +1858,9 @@ class TestEinaList lst.Append("a"); lst.Append("b"); lst.Append("c"); - Test.Assert(lst.ToArray().SequenceEqual(new string[]{"a","b","c"})); + Test.Assert(lst.ToArray().SequenceEqual(new string[]{"a", "b", "c"})); lst.Reverse(); - Test.Assert(lst.ToArray().SequenceEqual(new string[]{"c","b","a"})); + Test.Assert(lst.ToArray().SequenceEqual(new string[]{"c", "b", "a"})); } public static void reverse_stringshare() @@ -1863,9 +1869,11 @@ class TestEinaList lst.Append("a"); lst.Append("b"); lst.Append("c"); - Test.Assert(lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"a","b","c"})); + Test.Assert( + lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"a", "b", "c"})); lst.Reverse(); - Test.Assert(lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"c","b","a"})); + Test.Assert( + lst.ToArray().SequenceEqual(new Eina.Stringshare[]{"c", "b", "a"})); } public static void eina_list_as_ienumerable_int() @@ -1921,7 +1929,7 @@ class TestEinaList a.SetNumber(88); b.SetNumber(44); c.SetNumber(22); - var cmp = new Dummy.Numberwrapper[]{a,b,c}; + var cmp = new Dummy.Numberwrapper[]{a, b, c}; var lst = new Eina.List<Dummy.Numberwrapper>(); lst.Append(a); @@ -2483,7 +2491,7 @@ class TestEinaInlist a.SetNumber(88); b.SetNumber(44); c.SetNumber(22); - var cmp = new Dummy.Numberwrapper[]{a,b,c}; + var cmp = new Dummy.Numberwrapper[]{a, b, c}; var lst = new Eina.Inlist<Dummy.Numberwrapper>(); lst.Append(a); @@ -2725,7 +2733,7 @@ class TestEinaHash public static void test_eina_hash_int_in() { var t = new Dummy.TestObject(); - var hsh = new Eina.Hash<int,int>(); + var hsh = new Eina.Hash<int, int>(); hsh[22] = 222; Test.Assert(t.EinaHashIntIn(hsh)); Test.Assert(hsh.Own); @@ -2755,7 +2763,7 @@ class TestEinaHash public static void test_eina_hash_int_out() { var t = new Dummy.TestObject(); - Eina.Hash<int,int> hsh; + Eina.Hash<int, int>hsh; Test.Assert(t.EinaHashIntOut(out hsh)); Test.Assert(!hsh.Own); Test.Assert(hsh[22] == 222); @@ -2815,7 +2823,7 @@ class TestEinaHash public static void test_eina_hash_str_in() { var t = new Dummy.TestObject(); - var hsh = new Eina.Hash<string,string>(); + var hsh = new Eina.Hash<string, string>(); hsh["aa"] = "aaa"; Test.Assert(t.EinaHashStrIn(hsh)); Test.Assert(hsh.Own); @@ -2828,7 +2836,7 @@ class TestEinaHash public static void test_eina_hash_str_in_own() { var t = new Dummy.TestObject(); - var hsh = new Eina.Hash<string,string>(); + var hsh = new Eina.Hash<string, string>(); hsh["aa"] = "aaa"; Test.Assert(t.EinaHashStrInOwn(hsh)); Test.Assert(!hsh.Own); @@ -2843,7 +2851,7 @@ class TestEinaHash public static void test_eina_hash_str_out() { var t = new Dummy.TestObject(); - Eina.Hash<string,string> hsh; + Eina.Hash<string, string>hsh; Test.Assert(t.EinaHashStrOut(out hsh)); Test.Assert(!hsh.Own); Test.Assert(hsh["aa"] == "aaa"); @@ -2857,7 +2865,7 @@ class TestEinaHash public static void test_eina_hash_str_out_own() { var t = new Dummy.TestObject(); - Eina.Hash<string,string> hsh; + Eina.Hash<string, string>hsh; Test.Assert(t.EinaHashStrOutOwn(out hsh)); Test.Assert(hsh.Own); Test.Assert(hsh["aa"] == "aaa"); diff --git a/src/tests/efl_mono/EinaTestData.cs b/src/tests/efl_mono/EinaTestData.cs index f2a9d43d19..5b8c84db81 100644 --- a/src/tests/efl_mono/EinaTestData.cs +++ b/src/tests/efl_mono/EinaTestData.cs @@ -23,25 +23,26 @@ namespace EinaTestData class BaseSequence { - public static byte[] Values() - { - return new byte[3]{0x0,0x2A,0x42}; - } + public static byte[] Values() => new byte[3]{0x0, 0x2A, 0x42}; } public static class BaseData { - public static readonly int[] base_seq_int = {0x0,0x2A,0x42}; - public static readonly int[] append_seq_int = {42,43,33}; - public static readonly int[] modified_seq_int = {0x0,0x2A,0x42,42,43,33}; - - public static readonly string[] base_seq_str = {"0x0","0x2A","0x42"}; - public static readonly string[] append_seq_str = {"42","43","33"}; - public static readonly string[] modified_seq_str = {"0x0","0x2A","0x42","42","43","33"}; - - public static readonly Eina.Stringshare[] base_seq_strshare = {"0x0","0x2A","0x42"}; - public static readonly Eina.Stringshare[] append_seq_strshare = {"42","43","33"}; - public static readonly Eina.Stringshare[] modified_seq_strshare = {"0x0","0x2A","0x42","42","43","33"}; + public static readonly int[] base_seq_int = {0x0, 0x2A, 0x42}; + public static readonly int[] append_seq_int = {42, 43, 33}; + public static readonly int[] modified_seq_int = {0x0, 0x2A, 0x42, 42, 43, 33}; + + public static readonly string[] base_seq_str = {"0x0", "0x2A", "0x42"}; + public static readonly string[] append_seq_str = {"42", "43", "33"}; + public static readonly string[] modified_seq_str = {"0x0", "0x2A", "0x42", + "42", "43", "33"}; + + public static readonly Eina.Stringshare[] base_seq_strshare = {"0x0", "0x2A", + "0x42"}; + public static readonly Eina.Stringshare[] append_seq_strshare = {"42", "43", + "33"}; + public static readonly Eina.Stringshare[] modified_seq_strshare = { + "0x0", "0x2A", "0x42", "42", "43", "33"}; public static Dummy.Numberwrapper NW(int n) { @@ -58,7 +59,7 @@ public static class BaseData a.SetNumber(0x0); b.SetNumber(0x2A); c.SetNumber(0x42); - return new Dummy.Numberwrapper[]{a,b,c}; + return new Dummy.Numberwrapper[]{a, b, c}; } public static Dummy.Numberwrapper[] AppendSeqObj() @@ -69,7 +70,7 @@ public static class BaseData a.SetNumber(42); b.SetNumber(43); c.SetNumber(33); - return new Dummy.Numberwrapper[]{a,b,c}; + return new Dummy.Numberwrapper[]{a, b, c}; } public static Dummy.Numberwrapper[] ModifiedSeqObj() @@ -86,16 +87,14 @@ public static class BaseData d.SetNumber(42); e.SetNumber(43); f.SetNumber(33); - return new Dummy.Numberwrapper[]{a,b,c,d,e,f}; + return new Dummy.Numberwrapper[]{a, b, c, d, e, f}; } public static void NumberwrapperSequenceAssertEqual( - Dummy.Numberwrapper[] a - , Dummy.Numberwrapper[] b - , [CallerLineNumber] int line = 0 - , [CallerFilePath] string file = null - , [CallerMemberName] string member = null) - { + Dummy.Numberwrapper[] a, Dummy.Numberwrapper[] b, + [ CallerLineNumber ] int line = 0, + [ CallerFilePath ] string file = null, + [ CallerMemberName ] string member = null) { Test.Assert(a.Length == b.Length, "Different lenght", line, file, member); for (int i = 0; i < a.Length; ++i) { @@ -201,7 +200,7 @@ class NativeInheritImpl : Dummy.TestObject } public bool binbuf_in_own_still_usable() { - bool r = binbuf_in_own_binbuf.GetBytes().SequenceEqual(new byte[]{43,42,0x0,0x2A,0x42,33}); + bool r = binbuf_in_own_binbuf.GetBytes().SequenceEqual(new byte[]{43, 42, 0x0, 0x2A, 0x42, 33}); r = r && binbuf_in_own_binbuf.Own; binbuf_in_own_binbuf.Dispose(); diff --git a/src/tests/efl_mono/Promises.cs b/src/tests/efl_mono/Promises.cs index f5d51e0ef5..8b50e329da 100644 --- a/src/tests/efl_mono/Promises.cs +++ b/src/tests/efl_mono/Promises.cs @@ -254,11 +254,12 @@ class TestPromises Efl.Loop loop = Efl.App.AppMain; Eina.Promise promise = new Eina.Promise(); #pragma warning disable 0219 - Eina.Future future = new Eina.Future(promise,(Eina.Value value) => { + Eina.Future future = new Eina.Future(promise, (Eina.Value value) => + { callbackCalled = true; received_value = value; return value; - } ); + }); #pragma warning restore 0219 Eina.Value reference_value = new Eina.Value(Eina.ValueType.Int32); --
