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

diff --git a/src/tests/efl_mono/Events.cs b/src/tests/efl_mono/Events.cs
index 529b6de..32c87b2 100644 (file)
--- a/src/tests/efl_mono/Events.cs
+++ b/src/tests/efl_mono/Events.cs
@@ -165,21 +165,21 @@ class TestEoEvents
         Test.AssertEquals(sent_struct.Fobj, received_struct.Fobj);
     }
 
-    public static void event_with_list_payload()
+    public static void event_with_array_payload()
     {
         var obj = new Dummy.TestObject();
-        Eina.List<string> received = null;
-        Eina.List<string> sent = new Eina.List<string>();
+        Eina.Array<string> received = null;
+        Eina.Array<string> sent = new Eina.Array<string>();
 
         sent.Append("Abc");
         sent.Append("Def");
         sent.Append("Ghi");
 
-        obj.EvtWithListEvt += (object sender, Dummy.TestObjectEvtWithListEvt_Args e) => {
+        obj.EvtWithArrayEvt += (object sender, Dummy.TestObjectEvtWithArrayEvt_Args e) => {
             received = e.arg;
         };
 
-        obj.EmitEventWithList(sent);
+        obj.EmitEventWithArray(sent);
 
         Test.AssertEquals(sent.Length, received.Length);
         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 d44190e..ed63eae 100644 (file)
--- 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 {
          }
       }
 
-      emit_event_with_list {
+      emit_event_with_array {
          params {
-            @in data: list<string>;
+            @in data: array<string>;
          }
       }
 
@@ -1398,7 +1398,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
       Dummy.Test_Iface.iface_prop { get; set; }
    }
    events {
-      evt,with,string @hot: string;
+      evt,with,string @hot: const(string);
       evt,with,bool: bool;
       evt,with,int @hot: int;
       evt,with,uint @hot: uint;
@@ -1406,7 +1406,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
       evt,with,error @hot: Eina.Error;
       evt,with,struct @hot: Dummy.StructSimple;
       evt,with,struct,complex @hot: Dummy.StructComplex;
-      evt,with,list @hot: list<string>;
+      evt,with,array @hot: const(array<string>);
       evt_with,under @hot: void;
    }
 }

diff --git a/src/tests/efl_mono/libefl_mono_native_test.c b/src/tests/efl_mono/libefl_mono_native_test.c
index 629f289..7e3bffe 100644 (file)
--- 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
   return obj;
 }
 
-Efl_Object *_dummy_test_object_return_null_object(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd)
+Efl_Object *_dummy_test_object_return_null_object(Eo *obj EINA_UNUSED, EINA_UNUSED Dummy_Test_Object_Data *pd)
 {
   return NULL;
 }
@@ -3790,9 +3790,9 @@ void _dummy_test_object_emit_event_with_struct_complex(Eo *obj, EINA_UNUSED Dumm
     efl_event_callback_legacy_call(obj, DUMMY_TEST_OBJECT_EVENT_EVT_WITH_STRUCT_COMPLEX, &data);
 }
 
-void _dummy_test_object_emit_event_with_list(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd, Eina_List *data)
+void _dummy_test_object_emit_event_with_array(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd, Eina_Array *data)
 {
-    efl_event_callback_legacy_call(obj, DUMMY_TEST_OBJECT_EVENT_EVT_WITH_LIST, data);
+    efl_event_callback_legacy_call(obj, DUMMY_TEST_OBJECT_EVENT_EVT_WITH_ARRAY, data);
 }
 
 void _dummy_test_object_emit_event_with_under(Eo *obj, EINA_UNUSED Dummy_Test_Object_Data *pd)