summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-03-20 17:29:25 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-03-20 18:44:02 +0100
commit43a1d79ba8b67c56a84c7e3a970311e88bfaade4 (patch)
tree2e9d69a1d5e0bd0b1dbf56637f05eb90ec345858 /src/tests
parent2d7678074eb050246e0da23df05abd091466e9cc (diff)
csharp: Remove test about conflicting events.
Conflictings events won't be allowed anymore on eolian-based classes. For manually subclassed C# classes that eventually have conflicts, this should be dealt with in T7744. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D8426
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/efl_mono/Events.cs27
-rw-r--r--src/tests/efl_mono/dummy_another_iface.eo10
-rw-r--r--src/tests/efl_mono/dummy_test_iface.eo3
-rw-r--r--src/tests/efl_mono/dummy_test_object.eo4
-rw-r--r--src/tests/efl_mono/libefl_mono_native_test.c12
-rw-r--r--src/tests/efl_mono/meson.build2
6 files changed, 2 insertions, 56 deletions
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
225 obj.EmitNonconflicted(); 225 obj.EmitNonconflicted();
226 Test.Assert(called); 226 Test.Assert(called);
227 } 227 }
228
229 public static void test_conflicting_events()
230 {
231 var obj = new Dummy.TestObject();
232 var test_called = false;
233 var another_called = false;
234
235 EventHandler cb = (object sender, EventArgs e) => {
236 test_called = true;
237 };
238
239 EventHandler another_cb = (object sender, EventArgs e) => {
240 another_called = true;
241 };
242
243 ((Dummy.TestIface)obj).ConflictedEvt += cb;
244 ((Dummy.AnotherIface)obj).ConflictedEvt += another_cb;
245
246 obj.EmitTestConflicted();
247 Test.Assert(test_called);
248 Test.Assert(!another_called);
249 test_called = false;
250
251 obj.EmitAnotherConflicted();
252 Test.Assert(!test_called);
253 Test.Assert(another_called);
254 }
255} 228}
256 229
257class TestEventNaming 230class 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 @@
1interface Dummy.Another_Iface
2{
3 methods {
4 emit_another_conflicted {
5 }
6 }
7 events {
8 conflicted: void;
9 }
10}
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 @@
1interface Dummy.Test_Iface 1interface Dummy.Test_Iface
2{ 2{
3 methods { 3 methods {
4 emit_test_conflicted {
5 }
6 emit_nonconflicted { 4 emit_nonconflicted {
7 } 5 }
8 @property iface_prop { 6 @property iface_prop {
@@ -14,7 +12,6 @@ interface Dummy.Test_Iface
14 } 12 }
15 } 13 }
16 events { 14 events {
17 conflicted: void;
18 nonconflicted: void; 15 nonconflicted: void;
19 } 16 }
20} 17}
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 {
101 } 101 }
102}; 102};
103 103
104class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface, Dummy.Another_Iface { 104class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
105 methods { 105 methods {
106 return_object { 106 return_object {
107 return: Dummy.Test_Object; 107 return: Dummy.Test_Object;
@@ -1394,10 +1394,8 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface, Dummy.An
1394 class.destructor; 1394 class.destructor;
1395 Efl.Object.constructor; 1395 Efl.Object.constructor;
1396 Efl.Object.provider_find; 1396 Efl.Object.provider_find;
1397 Dummy.Test_Iface.emit_test_conflicted;
1398 Dummy.Test_Iface.emit_nonconflicted; 1397 Dummy.Test_Iface.emit_nonconflicted;
1399 Dummy.Test_Iface.iface_prop { get; set; } 1398 Dummy.Test_Iface.iface_prop { get; set; }
1400 Dummy.Another_Iface.emit_another_conflicted;
1401 } 1399 }
1402 events { 1400 events {
1403 evt,with,string @hot: string; 1401 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 @@
49#include "dummy_test_object.eo.h" 49#include "dummy_test_object.eo.h"
50#include "dummy_child.eo.h" 50#include "dummy_child.eo.h"
51#include "dummy_test_iface.eo.h" 51#include "dummy_test_iface.eo.h"
52#include "dummy_another_iface.eo.h"
53#include "dummy_inherit_iface.eo.h" 52#include "dummy_inherit_iface.eo.h"
54#include "dummy_inherit_helper.eo.h" 53#include "dummy_inherit_helper.eo.h"
55#include "dummy_part_holder.eo.h" 54#include "dummy_part_holder.eo.h"
@@ -3895,21 +3894,11 @@ Eina_Accessor *_dummy_test_object_clone_accessor(Eo *obj EINA_UNUSED, Dummy_Test
3895 return eina_list_accessor_new(pd->list_for_accessor); 3894 return eina_list_accessor_new(pd->list_for_accessor);
3896} 3895}
3897 3896
3898void _dummy_test_object_dummy_test_iface_emit_test_conflicted(Eo *obj, Dummy_Test_Object_Data *pd EINA_UNUSED)
3899{
3900 efl_event_callback_legacy_call(obj, DUMMY_TEST_IFACE_EVENT_CONFLICTED, NULL);
3901}
3902
3903void _dummy_test_object_dummy_test_iface_emit_nonconflicted(Eo *obj, Dummy_Test_Object_Data *pd EINA_UNUSED) 3897void _dummy_test_object_dummy_test_iface_emit_nonconflicted(Eo *obj, Dummy_Test_Object_Data *pd EINA_UNUSED)
3904{ 3898{
3905 efl_event_callback_legacy_call(obj, DUMMY_TEST_IFACE_EVENT_NONCONFLICTED, NULL); 3899 efl_event_callback_legacy_call(obj, DUMMY_TEST_IFACE_EVENT_NONCONFLICTED, NULL);
3906} 3900}
3907 3901
3908void _dummy_test_object_dummy_another_iface_emit_another_conflicted(Eo *obj, Dummy_Test_Object_Data *pd EINA_UNUSED)
3909{
3910 efl_event_callback_legacy_call(obj, DUMMY_ANOTHER_IFACE_EVENT_CONFLICTED, NULL);
3911}
3912
3913void _dummy_test_object_setter_only_set(EINA_UNUSED Eo *obj, Dummy_Test_Object_Data *pd, int value) 3902void _dummy_test_object_setter_only_set(EINA_UNUSED Eo *obj, Dummy_Test_Object_Data *pd, int value)
3914{ 3903{
3915 pd->setter_only = value; 3904 pd->setter_only = value;
@@ -4057,7 +4046,6 @@ Efl_Object *_dummy_part_holder_efl_part_part_get(EINA_UNUSED const Eo *obj, Dumm
4057#include "dummy_numberwrapper.eo.c" 4046#include "dummy_numberwrapper.eo.c"
4058#include "dummy_child.eo.c" 4047#include "dummy_child.eo.c"
4059#include "dummy_test_iface.eo.c" 4048#include "dummy_test_iface.eo.c"
4060#include "dummy_another_iface.eo.c"
4061#include "dummy_inherit_helper.eo.c" 4049#include "dummy_inherit_helper.eo.c"
4062#include "dummy_inherit_iface.eo.c" 4050#include "dummy_inherit_iface.eo.c"
4063#include "dummy_part_holder.eo.c" 4051#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 @@
1eo_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'] 1eo_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']
2 2
3eo_file_targets = [] 3eo_file_targets = []
4 4