diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am index 91bb1cd504..28a3f34990 100644 --- a/src/Makefile_Efl_Mono.am +++ b/src/Makefile_Efl_Mono.am @@ -65,7 +65,6 @@ lib_efl_mono_libefl_mono_dll_sources = \ efl_mono_test_files = \ tests/efl_mono/dummy_test_object.eo \ tests/efl_mono/dummy_test_iface.eo \ - tests/efl_mono/dummy_another_iface.eo \ tests/efl_mono/dummy_child.eo \ tests/efl_mono/dummy_part_holder.eo \ tests/efl_mono/dummy_numberwrapper.eo \ @@ -407,8 +406,6 @@ tests/efl_mono/libefl_mono_native_test.c: \ tests/efl_mono/dummy_test_object.eo.c \ tests/efl_mono/dummy_test_iface.eo.h \ tests/efl_mono/dummy_test_iface.eo.c \ - tests/efl_mono/dummy_another_iface.eo.h \ - tests/efl_mono/dummy_another_iface.eo.c \ tests/efl_mono/dummy_child.eo.h \ tests/efl_mono/dummy_child.eo.c \ tests/efl_mono/dummy_part_holder.eo.h \ @@ -423,7 +420,6 @@ tests/efl_mono/libefl_mono_native_test.c: \ # Intermediate C Sharp test DLL efl_mono_test_eolian_mono_files = tests/efl_mono/dummy_test_object.eo.cs \ tests/efl_mono/dummy_test_iface.eo.cs \ -tests/efl_mono/dummy_another_iface.eo.cs \ tests/efl_mono/dummy_child.eo.cs \ tests/efl_mono/dummy_part_holder.eo.cs \ tests/efl_mono/dummy_numberwrapper.eo.cs \ diff --git a/src/tests/efl_mono/Events.cs b/src/tests/efl_mono/Events.cs index 2d6dedb8e9..529b6de25e 100644 --- a/src/tests/efl_mono/Events.cs +++ b/src/tests/efl_mono/Events.cs @@ -225,33 +225,6 @@ class TestInterfaceEvents obj.EmitNonconflicted(); Test.Assert(called); } - - public static void test_conflicting_events() - { - var obj = new Dummy.TestObject(); - var test_called = false; - var another_called = false; - - EventHandler cb = (object sender, EventArgs e) => { - test_called = true; - }; - - EventHandler another_cb = (object sender, EventArgs e) => { - another_called = true; - }; - - ((Dummy.TestIface)obj).ConflictedEvt += cb; - ((Dummy.AnotherIface)obj).ConflictedEvt += another_cb; - - obj.EmitTestConflicted(); - Test.Assert(test_called); - Test.Assert(!another_called); - test_called = false; - - obj.EmitAnotherConflicted(); - Test.Assert(!test_called); - Test.Assert(another_called); - } } class TestEventNaming diff --git a/src/tests/efl_mono/dummy_another_iface.eo b/src/tests/efl_mono/dummy_another_iface.eo deleted file mode 100644 index 84c9187f05..0000000000 --- a/src/tests/efl_mono/dummy_another_iface.eo +++ /dev/null @@ -1,10 +0,0 @@ -interface Dummy.Another_Iface -{ - methods { - emit_another_conflicted { - } - } - events { - conflicted: void; - } -} diff --git a/src/tests/efl_mono/dummy_test_iface.eo b/src/tests/efl_mono/dummy_test_iface.eo index d9d29ac749..3ab37f5407 100644 --- a/src/tests/efl_mono/dummy_test_iface.eo +++ b/src/tests/efl_mono/dummy_test_iface.eo @@ -1,8 +1,6 @@ interface Dummy.Test_Iface { methods { - emit_test_conflicted { - } emit_nonconflicted { } @property iface_prop { @@ -14,7 +12,6 @@ interface Dummy.Test_Iface } } events { - conflicted: void; nonconflicted: void; } } diff --git a/src/tests/efl_mono/dummy_test_object.eo b/src/tests/efl_mono/dummy_test_object.eo index 0d6ced8e62..d44190e90b 100644 --- a/src/tests/efl_mono/dummy_test_object.eo +++ b/src/tests/efl_mono/dummy_test_object.eo @@ -101,7 +101,7 @@ function Dummy.FormatCb { } }; -class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface, Dummy.Another_Iface { +class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface { methods { return_object { return: Dummy.Test_Object; @@ -1394,10 +1394,8 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface, Dummy.An class.destructor; Efl.Object.constructor; Efl.Object.provider_find; - Dummy.Test_Iface.emit_test_conflicted; Dummy.Test_Iface.emit_nonconflicted; Dummy.Test_Iface.iface_prop { get; set; } - Dummy.Another_Iface.emit_another_conflicted; } events { evt,with,string @hot: string; diff --git a/src/tests/efl_mono/libefl_mono_native_test.c b/src/tests/efl_mono/libefl_mono_native_test.c index b02abdefd4..629f289c7e 100644 --- a/src/tests/efl_mono/libefl_mono_native_test.c +++ b/src/tests/efl_mono/libefl_mono_native_test.c @@ -49,7 +49,6 @@ #include "dummy_test_object.eo.h" #include "dummy_child.eo.h" #include "dummy_test_iface.eo.h" -#include "dummy_another_iface.eo.h" #include "dummy_inherit_iface.eo.h" #include "dummy_inherit_helper.eo.h" #include "dummy_part_holder.eo.h" @@ -3895,21 +3894,11 @@ Eina_Accessor *_dummy_test_object_clone_accessor(Eo *obj EINA_UNUSED, Dummy_Test return eina_list_accessor_new(pd->list_for_accessor); } -void _dummy_test_object_dummy_test_iface_emit_test_conflicted(Eo *obj, Dummy_Test_Object_Data *pd EINA_UNUSED) -{ - efl_event_callback_legacy_call(obj, DUMMY_TEST_IFACE_EVENT_CONFLICTED, NULL); -} - void _dummy_test_object_dummy_test_iface_emit_nonconflicted(Eo *obj, Dummy_Test_Object_Data *pd EINA_UNUSED) { efl_event_callback_legacy_call(obj, DUMMY_TEST_IFACE_EVENT_NONCONFLICTED, NULL); } -void _dummy_test_object_dummy_another_iface_emit_another_conflicted(Eo *obj, Dummy_Test_Object_Data *pd EINA_UNUSED) -{ - efl_event_callback_legacy_call(obj, DUMMY_ANOTHER_IFACE_EVENT_CONFLICTED, NULL); -} - void _dummy_test_object_setter_only_set(EINA_UNUSED Eo *obj, Dummy_Test_Object_Data *pd, int value) { pd->setter_only = value; @@ -4057,7 +4046,6 @@ Efl_Object *_dummy_part_holder_efl_part_part_get(EINA_UNUSED const Eo *obj, Dumm #include "dummy_numberwrapper.eo.c" #include "dummy_child.eo.c" #include "dummy_test_iface.eo.c" -#include "dummy_another_iface.eo.c" #include "dummy_inherit_helper.eo.c" #include "dummy_inherit_iface.eo.c" #include "dummy_part_holder.eo.c" diff --git a/src/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build index f9fcbcf88c..f13b9a3b48 100644 --- a/src/tests/efl_mono/meson.build +++ b/src/tests/efl_mono/meson.build @@ -1,4 +1,4 @@ -eo_files = ['dummy_child.eo', 'dummy_numberwrapper.eo', 'dummy_test_object.eo', 'dummy_test_iface.eo', 'dummy_another_iface.eo', 'dummy_inherit_helper.eo', 'dummy_inherit_iface.eo', 'dummy_part_holder.eo'] +eo_files = ['dummy_child.eo', 'dummy_numberwrapper.eo', 'dummy_test_object.eo', 'dummy_test_iface.eo', 'dummy_inherit_helper.eo', 'dummy_inherit_iface.eo', 'dummy_part_holder.eo'] eo_file_targets = []