Skip to content

Clean-up Tests #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vmuriart wants to merge 14 commits into from
Closed

Clean-up Tests #329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0ea7455
Clean-up tests & remove warnfilter
vmuriart Jan 22, 2017
0e26b1a
Sanitize how to run tests
vmuriart Jan 22, 2017
8f29544
Remove dependency on six
vmuriart Jan 22, 2017
30470bb
Clean-up imports
vmuriart Jan 22, 2017
d79db2d
Fix nameclash object
vmuriart Jan 22, 2017
072219c
Refactor utility functions
vmuriart Jan 22, 2017
5206a46
Rename tests
vmuriart Jan 22, 2017
2ef3041
Refactor assertRaises
vmuriart Jan 22, 2017
8c3fe2b
Format for pep8 and linters
vmuriart Jan 22, 2017
c583053
Fix tests comparison to None, True, False, isinstance
vmuriart Jan 22, 2017
4350ac3
Rename test fixtures
vmuriart Jan 22, 2017
2ae78cc
Remove unused `using` from testing and format
vmuriart Jan 22, 2017
b4e8d97
Use unittest.skip(...)
vmuriart Jan 22, 2017
5f163ef
Merge branch 'master' into unittests
filmor Jan 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename test fixtures 
Can mess with test discovery
  • Loading branch information
@vmuriart
vmuriart committed Jan 31, 2017
commit 4350ac32aad9f552b9f60351e2e649f0e992604d
38 changes: 19 additions & 19 deletions src/testing/eventtest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ namespace Python.Test
// Supports CLR event unit tests.
//========================================================================

public delegate void TestEventHandler(object sender, TestEventArgs e);
public delegate void EventHandlerTest(object sender, EventArgsTest e);


public class EventTest
{
public static event TestEventHandler PublicStaticEvent;
public static event EventHandlerTest PublicStaticEvent;

protected static event TestEventHandler ProtectedStaticEvent;
protected static event EventHandlerTest ProtectedStaticEvent;

internal static event TestEventHandler InternalStaticEvent;
internal static event EventHandlerTest InternalStaticEvent;

private static event TestEventHandler PrivateStaticEvent;
private static event EventHandlerTest PrivateStaticEvent;

public event TestEventHandler PublicEvent;
public event EventHandlerTest PublicEvent;

protected event TestEventHandler ProtectedEvent;
protected event EventHandlerTest ProtectedEvent;

internal event TestEventHandler InternalEvent;
internal event EventHandlerTest InternalEvent;

private event TestEventHandler PrivateEvent;
private event EventHandlerTest PrivateEvent;


public static int s_value;
Expand All @@ -42,7 +42,7 @@ static EventTest()
}


public void OnPublicEvent(TestEventArgs e)
public void OnPublicEvent(EventArgsTest e)
{
if (PublicEvent != null)
{
Expand All @@ -51,7 +51,7 @@ public void OnPublicEvent(TestEventArgs e)
}


public void OnProtectedEvent(TestEventArgs e)
public void OnProtectedEvent(EventArgsTest e)
{
if (ProtectedEvent != null)
{
Expand All @@ -60,7 +60,7 @@ public void OnProtectedEvent(TestEventArgs e)
}


public static void OnPublicStaticEvent(TestEventArgs e)
public static void OnPublicStaticEvent(EventArgsTest e)
{
if (PublicStaticEvent != null)
{
Expand All @@ -69,7 +69,7 @@ public static void OnPublicStaticEvent(TestEventArgs e)
}


protected static void OnProtectedStaticEvent(TestEventArgs e)
protected static void OnProtectedStaticEvent(EventArgsTest e)
{
if (ProtectedStaticEvent != null)
{
Expand All @@ -78,12 +78,12 @@ protected static void OnProtectedStaticEvent(TestEventArgs e)
}


public void GenericHandler(object sender, TestEventArgs e)
public void GenericHandler(object sender, EventArgsTest e)
{
this.value = e.value;
}

public static void StaticHandler(object sender, TestEventArgs e)
public static void StaticHandler(object sender, EventArgsTest e)
{
s_value = e.value;
}
Expand All @@ -92,7 +92,7 @@ public static void ShutUpCompiler()
{
// Quiet compiler warnings.
EventTest e = new EventTest();
TestEventHandler f = new TestEventHandler(e.GenericHandler);
EventHandlerTest f = new EventHandlerTest(e.GenericHandler);
ProtectedStaticEvent += f;
InternalStaticEvent += f;
PrivateStaticEvent += f;
Expand All @@ -103,13 +103,13 @@ public static void ShutUpCompiler()
}


public class TestEventArgs : EventArgs
public class EventArgsTest : EventArgs
{
public int value;

public TestEventArgs(int v)
public EventArgsTest(int v)
{
this.value = v;
}
}
}
}
8 changes: 4 additions & 4 deletions src/testing/subclasstest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ public interface IInterfaceTest
string bar(string s, int i);

// test events on interfaces
event TestEventHandler TestEvent;
event EventHandlerTest TestEvent;

void OnTestEvent(int value);
}

public class SubClassTest : IInterfaceTest
{
public event TestEventHandler TestEvent;
public event EventHandlerTest TestEvent;

public SubClassTest()
{
Expand Down Expand Up @@ -60,7 +60,7 @@ public static IList<string> test_list(SubClassTest x)
public virtual void OnTestEvent(int value)
{
if (null != TestEvent)
TestEvent(this, new TestEventArgs(value));
TestEvent(this, new EventArgsTest(value));
}
}

Expand All @@ -75,7 +75,7 @@ public void SomeMethod()
}
}

public class TestFunctions
public class FunctionsTest
{
public static string test_foo(IInterfaceTest x)
{
Expand Down
20 changes: 10 additions & 10 deletions src/tests/leaktest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def test_enumerations(self):
self.end_test()

def test_events(self):
from Python.Test import EventTest, TestEventArgs
from Python.Test import EventTest, EventArgsTest

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

Expand All @@ -151,55 +151,55 @@ def test_events(self):
# Instance method event handler
handler = GenericHandler()
testob.PublicEvent += handler.handler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= handler.handler
del handler

# Vararg method event handler
handler = VariableArgsHandler()
testob.PublicEvent += handler.handler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= handler.handler
del handler

# Callable object event handler
handler = CallableHandler()
testob.PublicEvent += handler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= handler
del handler

# Callable vararg event handler
handler = VarCallableHandler()
testob.PublicEvent += handler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= handler
del handler

# Static method event handler
handler = StaticMethodHandler()
StaticMethodHandler.value = None
testob.PublicEvent += handler.handler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= handler.handler
del handler

# Class method event handler
handler = ClassMethodHandler()
ClassMethodHandler.value = None
testob.PublicEvent += handler.handler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= handler.handler
del handler

# Managed instance event handler
testob.PublicEvent += testob.GenericHandler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= testob.GenericHandler

# Static managed event handler
testob.PublicEvent += EventTest.StaticHandler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= EventTest.StaticHandler

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

testob.PublicEvent += handler
testob.PublicEvent(testob, TestEventArgs(10))
testob.PublicEvent(testob, EventArgsTest(10))
testob.PublicEvent -= handler
del handler

Expand Down
Loading