Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

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.

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

Already on GitHub?Sign in to your account

Closed
vmuriart wants to merge14 commits intopythonnet:masterfromvmuriart:unittests
Closed
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
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
PrevPrevious commit
NextNext commit
Rename test fixtures
Can mess with test discovery
  • Loading branch information
@vmuriart
vmuriart committedJan 31, 2017
commit4350ac32aad9f552b9f60351e2e649f0e992604d
38 changes: 19 additions & 19 deletionssrc/testing/eventtest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,26 +6,26 @@ namespace Python.Test
// Supports CLR event unit tests.
//========================================================================

public delegate voidTestEventHandler(object sender,TestEventArgs e);
public delegate voidEventHandlerTest(object sender,EventArgsTest e);


public class EventTest
{
public static eventTestEventHandler PublicStaticEvent;
public static eventEventHandlerTest PublicStaticEvent;

protected static eventTestEventHandler ProtectedStaticEvent;
protected static eventEventHandlerTest ProtectedStaticEvent;

internal static eventTestEventHandler InternalStaticEvent;
internal static eventEventHandlerTest InternalStaticEvent;

private static eventTestEventHandler PrivateStaticEvent;
private static eventEventHandlerTest PrivateStaticEvent;

public eventTestEventHandler PublicEvent;
public eventEventHandlerTest PublicEvent;

protected eventTestEventHandler ProtectedEvent;
protected eventEventHandlerTest ProtectedEvent;

internal eventTestEventHandler InternalEvent;
internal eventEventHandlerTest InternalEvent;

private eventTestEventHandler PrivateEvent;
private eventEventHandlerTest 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 = newTestEventHandler(e.GenericHandler);
EventHandlerTest f = newEventHandlerTest(e.GenericHandler);
ProtectedStaticEvent += f;
InternalStaticEvent += f;
PrivateStaticEvent += f;
Expand All@@ -103,13 +103,13 @@ public static void ShutUpCompiler()
}


public classTestEventArgs : EventArgs
public classEventArgsTest : EventArgs
{
public int value;

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

// test events on interfaces
eventTestEventHandler TestEvent;
eventEventHandlerTest TestEvent;

void OnTestEvent(int value);
}

public class SubClassTest : IInterfaceTest
{
public eventTestEventHandler TestEvent;
public eventEventHandlerTest TestEvent;

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

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

public classTestFunctions
public classFunctionsTest
{
public static string test_foo(IInterfaceTest x)
{
Expand Down
20 changes: 10 additions & 10 deletionssrc/tests/leaktest.py
View file
Open in desktop
Original file line numberDiff line numberDiff 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
[8]ページ先頭
©2009-2025 Movatter.jp