@@ -90,9 +90,17 @@ public static IInterfaceTest pass_through(IInterfaceTest s)
             return s;
         }
 
-        public static void test_event(IInterfaceTest x, int value)
+        public static int test_event(IInterfaceTest x, int value)
         {
+            // reuse the event handler from eventtest.cs
+            EventTest et = new EventTest();
+            x.TestEvent += et.GenericHandler;
+
+            // raise the event (should trigger both python and managed handlers)
             x.OnTestEvent(value);
+
+            x.TestEvent -= et.GenericHandler;
+            return et.value;
         }
     }
 }
@@ -11,7 +11,7 @@
 clr.AddReference('System')
 
 import sys, os, string, unittest, types
-from Python.Test import TestFunctions, SubClassTest, IInterfaceTest
+from Python.Test import TestFunctions, SubClassTest, IInterfaceTest, TestEventArgs
 from System.Collections.Generic import List
 from System import NotImplementedException
 
@@ -48,6 +48,26 @@ def return_list(self):
         l.Add("C")
         return l
 
+# class that implements IInterfaceTest.TestEvent
+class DerivedEventTest(IInterfaceTest):
+    __namespace__ = "Python.Test"
+
+    def __init__(self):
+        self.event_handlers = []
+
+    # event handling
+    def add_TestEvent(self, handler):
+        self.event_handlers.append(handler)
+
+    def remove_TestEvent(self, handler):
+        self.event_handlers.remove(handler)
+
+    def OnTestEvent(self, value):
+        args = TestEventArgs(value)
+        for handler in self.event_handlers:
+            handler(self, args)
+
+
 class SubClassTests(unittest.TestCase):
     """Test subclassing managed types"""
 
@@ -120,12 +140,18 @@ def handler(self, x, args):
 
         x = SubClassTest()
         x.TestEvent += event_handler.handler
-        TestFunctions.test_event(x, 1)
+        self.assertEqual(TestFunctions.test_event(x, 1), 1)
         self.assertEqual(event_handler.value, 1)
 
         i = InterfaceTestClass()
         self.assertRaises(NotImplementedException, TestFunctions.test_event, i, 2)
 
+        d = DerivedEventTest()
+        d.add_TestEvent(event_handler.handler)
+        self.assertEqual(TestFunctions.test_event(d, 3), 3)
+        self.assertEqual(event_handler.value, 3)
+        self.assertEqual(len(d.event_handlers), 1)
+
 
 def test_suite():
     return unittest.makeSuite(SubClassTests)
Original file line number	Diff line number	Diff line change
@@ -90,9 +90,17 @@ public static IInterfaceTest pass_through(IInterfaceTest s)
90	90	return s;
91	91	}
92	92
93		- public static void test_event(IInterfaceTest x, int value)
	93	+ public static int test_event(IInterfaceTest x, int value)
94	94	{
	95	+ // reuse the event handler from eventtest.cs
	96	+ EventTest et = new EventTest();
	97	+ x.TestEvent += et.GenericHandler;
	98	+
	99	+ // raise the event (should trigger both python and managed handlers)
95	100	x.OnTestEvent(value);
	101	+
	102	+ x.TestEvent -= et.GenericHandler;
	103	+ return et.value;
96	104	}
97	105	}
98	106	}