Skip to content

Commit a4e15ca

Browse files
vmuriartvmuriart
committed
Rename test fixtures
Can mess with test discovery
1 parent a44d1ab commit a4e15ca

5 files changed

Lines changed: 104 additions & 104 deletions

File tree

‎src/testing/eventtest.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ namespace Python.Test
66
// Supports CLR event unit tests.
77
//========================================================================
88

9-
public delegate void TestEventHandler(object sender, TestEventArgs e);
9+
public delegate void EventHandlerTest(object sender, EventArgsTest e);
1010

1111

1212
public class EventTest
1313
{
14-
public static event TestEventHandler PublicStaticEvent;
14+
public static event EventHandlerTest PublicStaticEvent;
1515

16-
protected static event TestEventHandler ProtectedStaticEvent;
16+
protected static event EventHandlerTest ProtectedStaticEvent;
1717

18-
internal static event TestEventHandler InternalStaticEvent;
18+
internal static event EventHandlerTest InternalStaticEvent;
1919

20-
private static event TestEventHandler PrivateStaticEvent;
20+
private static event EventHandlerTest PrivateStaticEvent;
2121

22-
public event TestEventHandler PublicEvent;
22+
public event EventHandlerTest PublicEvent;
2323

24-
protected event TestEventHandler ProtectedEvent;
24+
protected event EventHandlerTest ProtectedEvent;
2525

26-
internal event TestEventHandler InternalEvent;
26+
internal event EventHandlerTest InternalEvent;
2727

28-
private event TestEventHandler PrivateEvent;
28+
private event EventHandlerTest PrivateEvent;
2929

3030

3131
public static int s_value;
@@ -42,7 +42,7 @@ static EventTest()
4242
}
4343

4444

45-
public void OnPublicEvent(TestEventArgs e)
45+
public void OnPublicEvent(EventArgsTest e)
4646
{
4747
if (PublicEvent != null)
4848
{
@@ -51,7 +51,7 @@ public void OnPublicEvent(TestEventArgs e)
5151
}
5252

5353

54-
public void OnProtectedEvent(TestEventArgs e)
54+
public void OnProtectedEvent(EventArgsTest e)
5555
{
5656
if (ProtectedEvent != null)
5757
{
@@ -60,7 +60,7 @@ public void OnProtectedEvent(TestEventArgs e)
6060
}
6161

6262

63-
public static void OnPublicStaticEvent(TestEventArgs e)
63+
public static void OnPublicStaticEvent(EventArgsTest e)
6464
{
6565
if (PublicStaticEvent != null)
6666
{
@@ -69,7 +69,7 @@ public static void OnPublicStaticEvent(TestEventArgs e)
6969
}
7070

7171

72-
protected static void OnProtectedStaticEvent(TestEventArgs e)
72+
protected static void OnProtectedStaticEvent(EventArgsTest e)
7373
{
7474
if (ProtectedStaticEvent != null)
7575
{
@@ -78,12 +78,12 @@ protected static void OnProtectedStaticEvent(TestEventArgs e)
7878
}
7979

8080

81-
public void GenericHandler(object sender, TestEventArgs e)
81+
public void GenericHandler(object sender, EventArgsTest e)
8282
{
8383
this.value = e.value;
8484
}
8585

86-
public static void StaticHandler(object sender, TestEventArgs e)
86+
public static void StaticHandler(object sender, EventArgsTest e)
8787
{
8888
s_value = e.value;
8989
}
@@ -92,7 +92,7 @@ public static void ShutUpCompiler()
9292
{
9393
// Quiet compiler warnings.
9494
EventTest e = new EventTest();
95-
TestEventHandler f = new TestEventHandler(e.GenericHandler);
95+
EventHandlerTest f = new EventHandlerTest(e.GenericHandler);
9696
ProtectedStaticEvent += f;
9797
InternalStaticEvent += f;
9898
PrivateStaticEvent += f;
@@ -103,13 +103,13 @@ public static void ShutUpCompiler()
103103
}
104104

105105

106-
public class TestEventArgs : EventArgs
106+
public class EventArgsTest : EventArgs
107107
{
108108
public int value;
109109

110-
public TestEventArgs(int v)
110+
public EventArgsTest(int v)
111111
{
112112
this.value = v;
113113
}
114114
}
115-
}
115+
}

‎src/testing/subclasstest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ public interface IInterfaceTest
1414
string bar(string s, int i);
1515

1616
// test events on interfaces
17-
event TestEventHandler TestEvent;
17+
event EventHandlerTest TestEvent;
1818

1919
void OnTestEvent(int value);
2020
}
2121

2222
public class SubClassTest : IInterfaceTest
2323
{
24-
public event TestEventHandler TestEvent;
24+
public event EventHandlerTest TestEvent;
2525

2626
public SubClassTest()
2727
{
@@ -60,7 +60,7 @@ public static IList<string> test_list(SubClassTest x)
6060
public virtual void OnTestEvent(int value)
6161
{
6262
if (null != TestEvent)
63-
TestEvent(this, new TestEventArgs(value));
63+
TestEvent(this, new EventArgsTest(value));
6464
}
6565
}
6666

@@ -75,7 +75,7 @@ public void SomeMethod()
7575
}
7676
}
7777

78-
public class TestFunctions
78+
public class FunctionsTest
7979
{
8080
public static string test_foo(IInterfaceTest x)
8181
{

‎src/tests/leaktest.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def test_enumerations(self):
138138
self.end_test()
139139

140140
def test_events(self):
141-
from Python.Test import EventTest, TestEventArgs
141+
from Python.Test import EventTest, EventArgsTest
142142

143143
self.notify("Running event leak check...")
144144

@@ -151,55 +151,55 @@ def test_events(self):
151151
# Instance method event handler
152152
handler = GenericHandler()
153153
testob.PublicEvent += handler.handler
154-
testob.PublicEvent(testob, TestEventArgs(10))
154+
testob.PublicEvent(testob, EventArgsTest(10))
155155
testob.PublicEvent -= handler.handler
156156
del handler
157157

158158
# Vararg method event handler
159159
handler = VariableArgsHandler()
160160
testob.PublicEvent += handler.handler
161-
testob.PublicEvent(testob, TestEventArgs(10))
161+
testob.PublicEvent(testob, EventArgsTest(10))
162162
testob.PublicEvent -= handler.handler
163163
del handler
164164

165165
# Callable object event handler
166166
handler = CallableHandler()
167167
testob.PublicEvent += handler
168-
testob.PublicEvent(testob, TestEventArgs(10))
168+
testob.PublicEvent(testob, EventArgsTest(10))
169169
testob.PublicEvent -= handler
170170
del handler
171171

172172
# Callable vararg event handler
173173
handler = VarCallableHandler()
174174
testob.PublicEvent += handler
175-
testob.PublicEvent(testob, TestEventArgs(10))
175+
testob.PublicEvent(testob, EventArgsTest(10))
176176
testob.PublicEvent -= handler
177177
del handler
178178

179179
# Static method event handler
180180
handler = StaticMethodHandler()
181181
StaticMethodHandler.value = None
182182
testob.PublicEvent += handler.handler
183-
testob.PublicEvent(testob, TestEventArgs(10))
183+
testob.PublicEvent(testob, EventArgsTest(10))
184184
testob.PublicEvent -= handler.handler
185185
del handler
186186

187187
# Class method event handler
188188
handler = ClassMethodHandler()
189189
ClassMethodHandler.value = None
190190
testob.PublicEvent += handler.handler
191-
testob.PublicEvent(testob, TestEventArgs(10))
191+
testob.PublicEvent(testob, EventArgsTest(10))
192192
testob.PublicEvent -= handler.handler
193193
del handler
194194

195195
# Managed instance event handler
196196
testob.PublicEvent += testob.GenericHandler
197-
testob.PublicEvent(testob, TestEventArgs(10))
197+
testob.PublicEvent(testob, EventArgsTest(10))
198198
testob.PublicEvent -= testob.GenericHandler
199199

200200
# Static managed event handler
201201
testob.PublicEvent += EventTest.StaticHandler
202-
testob.PublicEvent(testob, TestEventArgs(10))
202+
testob.PublicEvent(testob, EventArgsTest(10))
203203
testob.PublicEvent -= EventTest.StaticHandler
204204

205205
# Function event handler
@@ -209,7 +209,7 @@ def handler(sender, args, dict_=dict_):
209209
dict_['value'] = args.value
210210

211211
testob.PublicEvent += handler
212-
testob.PublicEvent(testob, TestEventArgs(10))
212+
testob.PublicEvent(testob, EventArgsTest(10))
213213
testob.PublicEvent -= handler
214214
del handler
215215

0 commit comments

Comments
 (0)