summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-03-21 17:20:13 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2019-03-21 17:20:13 +0100
commitcbbc5e5eb63c5100d655c8b3120cca2ddf2b7a82 (patch)
tree706542600564d6da9b084cb0aace8855ecfef530
parent5c1ea543bb9d4e3b36721994563bff0152429d97 (diff)
mono-tests: Fix after latest changes to eolian
Summary: Event payload checking is more strict now. Test Plan: Check that master can be built Reviewers: lauromoura, q66 Reviewed By: q66 Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8437
-rw-r--r--src/tests/efl_mono/Events.cs10
-rw-r--r--src/tests/efl_mono/dummy_test_object.eo8
-rw-r--r--src/tests/efl_mono/libefl_mono_native_test.c6
3 files changed, 12 insertions, 12 deletions
diff --git a/src/tests/efl_mono/Events.cs b/src/tests/efl_mono/Events.cs
index 529b6de25e..32c87b2a75 100644
--- a/src/tests/efl_mono/Events.cs
+++ b/src/tests/efl_mono/Events.cs
@@ -165,21 +165,21 @@ class TestEoEvents
165 Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj); 165 Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj);
166 } 166 }
167 167
168 public static void event_with_list_payload() 168 public static void event_with_array_payload()
169 { 169 {
170 var obj = new Dummy.TestObject(); 170 var obj = new Dummy.TestObject();
171 Eina.List<string> received = null; 171 Eina.Array<string> received = null;
172 Eina.List<string> sent = new Eina.List<string>(); 172 Eina.Array<string> sent = new Eina.Array<string>();
173 173
174 sent.Append("Abc"); 174 sent.Append("Abc");
175 sent.Append("Def"); 175 sent.Append("Def");
176 sent.Append("Ghi"); 176 sent.Append("Ghi");
177 177
178 obj.EvtWithListEvt += (object sender, Dummy.TestObjectEvtWithListEvt_Args e) => { 178 obj.EvtWithArrayEvt += (object sender, Dummy.TestObjectEvtWithArrayEvt_Args e) => {
179 received = e.arg; 179 received = e.arg;
180 }; 180 };
181 181
182 obj.EmitEventWithList(sent); 182 obj.EmitEventWithArray(sent);
183 183
184 Test.AssertEquals(sent.Length, received.Length); 184 Test.AssertEquals(sent.Length, received.Length);
185 var pairs = sent.Zip(received, (string sentItem, string receivedItem) => new { Sent = sentItem, Received = receivedItem } ); 185 var pairs = sent.Zip(received, (string sentItem, string receivedItem) => new { Sent = sentItem, Received = receivedItem } );
diff --git a/src/tests/efl_mono/dummy_test_object.eo b/src/tests/efl_mono/dummy_test_object.eo
index d44190e90b..ed63eaee64 100644
--- a/src/tests/efl_mono/dummy_test_object.eo
+++ b/src/tests/efl_mono/dummy_test_object.eo
@@ -1304,9 +1304,9 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1304 } 1304 }
1305 } 1305 }
1306 1306
1307 emit_event_with_list { 1307 emit_event_with_array {
1308 params { 1308 params {
1309 @in data: list<string>; 1309 @in data: array<string>;
1310 } 1310 }
1311 } 1311 }
1312 1312
@@ -1398,7 +1398,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1398 Dummy.Test_Iface.iface_prop { get; set; } 1398 Dummy.Test_Iface.iface_prop { get; set; }
1399 } 1399 }
1400 events { 1400 events {
1401 evt,with,string @hot: string; 1401 evt,with,string @hot: const(string);
1402 evt,with,bool: bool; 1402 evt,with,bool: bool;
1403 evt,with,int @hot: int; 1403 evt,with,int @hot: int;
1404 evt,with,uint @hot: uint; 1404 evt,with,uint @hot: uint;
@@ -1406,7 +1406,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1406 evt,with,error @hot: Eina.Error; 1406 evt,with,error @hot: Eina.Error;
1407 evt,with,struct @hot: Dummy.StructSimple; 1407 evt,with,struct @hot: Dummy.StructSimple;
1408 evt,with,struct,complex @hot: Dummy.StructComplex; 1408 evt,with,struct,complex @hot: Dummy.StructComplex;
1409 evt,with,list @hot: list<string>; 1409 evt,with,array @hot: const(array<string>);
1410 evt_with,under @hot: void; 1410 evt_with,under @hot: void;
1411 } 1411 }
1412} 1412}
diff --git a/src/tests/efl_mono/libefl_mono_native_test.c b/src/tests/efl_mono/libefl_mono_native_test.c
index 629f289c7e..7e3bffe111 100644
--- a/src/tests/efl_mono/libefl_mono_native_test.c
+++ b/src/tests/efl_mono/libefl_mono_native_test.c
@@ -167,7 +167,7 @@ Efl_Object *_dummy_test_object_return_object(Eo *obj, EINA_UNUSED Dummy_Test_Obj
167 return obj; 167 return obj;
168} 168}
169 169
170Efl_Object *_dummy_test_object_return_null_object(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd) 170Efl_Object *_dummy_test_object_return_null_object(Eo *obj EINA_UNUSED, EINA_UNUSED Dummy_Test_Object_Data *pd)
171{ 171{
172 return NULL; 172 return NULL;
173} 173}
@@ -3790,9 +3790,9 @@ void _dummy_test_object_emit_event_with_struct_complex(Eo *obj, EINA_UNUSED Dumm
3790 efl_event_callback_legacy_call(obj, DUMMY_TEST_OBJECT_EVENT_EVT_WITH_STRUCT_COMPLEX, &data); 3790 efl_event_callback_legacy_call(obj, DUMMY_TEST_OBJECT_EVENT_EVT_WITH_STRUCT_COMPLEX, &data);
3791} 3791}
3792 3792
3793void _dummy_test_object_emit_event_with_list(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd, Eina_List *data) 3793void _dummy_test_object_emit_event_with_array(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd, Eina_Array *data)
3794{ 3794{
3795 efl_event_callback_legacy_call(obj, DUMMY_TEST_OBJECT_EVENT_EVT_WITH_LIST, data); 3795 efl_event_callback_legacy_call(obj, DUMMY_TEST_OBJECT_EVENT_EVT_WITH_ARRAY, data);
3796} 3796}
3797 3797
3798void _dummy_test_object_emit_event_with_under(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd) 3798void _dummy_test_object_emit_event_with_under(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd)