- Notifications
You must be signed in to change notification settings - Fork752
Method overload object type#377
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
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletionsrc/runtime/methodbinder.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletionssrc/testing/methodtest.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -116,6 +116,71 @@ public static int[] TestOverloadedParams(int v, int[] args) | ||
| return args; | ||
| } | ||
| public static string TestOverloadedNoObject(int i) | ||
| { | ||
| return "Got int"; | ||
| } | ||
| public static string TestOverloadedObject(int i) | ||
| { | ||
| return "Got int"; | ||
| } | ||
| public static string TestOverloadedObject(object o) | ||
| { | ||
| return "Got object"; | ||
| } | ||
| public static string TestOverloadedObjectTwo(int a, int b) | ||
| { | ||
| return "Got int-int"; | ||
| } | ||
| public static string TestOverloadedObjectTwo(string a, string b) | ||
| { | ||
| return "Got string-string"; | ||
| } | ||
| public static string TestOverloadedObjectTwo(string a, int b) | ||
| { | ||
| return "Got string-int"; | ||
| } | ||
| public static string TestOverloadedObjectTwo(string a, object b) | ||
| { | ||
| return "Got string-object"; | ||
| } | ||
| public static string TestOverloadedObjectTwo(int a, object b) | ||
| { | ||
| return "Got int-object"; | ||
| } | ||
| public static string TestOverloadedObjectTwo(object a, int b) | ||
| { | ||
| return "Got object-int"; | ||
| } | ||
| public static string TestOverloadedObjectTwo(object a, object b) | ||
Contributor
| ||
| { | ||
| return "Got object-object"; | ||
| } | ||
| public static string TestOverloadedObjectTwo(int a, string b) | ||
| { | ||
| return "Got int-string"; | ||
| } | ||
| public static string TestOverloadedObjectThree(object a, int b) | ||
| { | ||
| return "Got object-int"; | ||
| } | ||
| public static string TestOverloadedObjectThree(int a, object b) | ||
| { | ||
| return "Got int-object"; | ||
| } | ||
| public static bool TestStringOutParams(string s, out string s1) | ||
| { | ||
| s1 = "output string"; | ||
50 changes: 50 additions & 0 deletionssrc/tests/test_method.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -769,3 +769,53 @@ def test_wrong_overload(): | ||
| res = System.Math.Max(System.Double(50.5), 50.1) | ||
| assert res == 50.5 | ||
| assert type(res) == float | ||
| def test_no_object_in_param(): | ||
| """Test that fix for #203 doesn't break behavior w/ no object overload""" | ||
| res = MethodTest.TestOverloadedNoObject(5) | ||
| assert res == "Got int" | ||
| with pytest.raises(TypeError): | ||
| MethodTest.TestOverloadedNoObject("test") | ||
| def test_object_in_param(): | ||
| """Test regression introduced by #151 in which Object method overloads | ||
| aren't being used. See #203 for issue.""" | ||
| res = MethodTest.TestOverloadedObject(5) | ||
| assert res == "Got int" | ||
| res = MethodTest.TestOverloadedObject("test") | ||
| assert res == "Got object" | ||
| def test_object_in_multiparam(): | ||
| """Test method with object multiparams behaves""" | ||
| res = MethodTest.TestOverloadedObjectTwo(5, 5) | ||
| assert res == "Got int-int" | ||
| res = MethodTest.TestOverloadedObjectTwo(5, "foo") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. will this break if you add: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Now its there. | ||
| assert res == "Got int-string" | ||
| res = MethodTest.TestOverloadedObjectTwo("foo", 7.24) | ||
| assert res == "Got string-object" | ||
| res = MethodTest.TestOverloadedObjectTwo("foo", "bar") | ||
| assert res == "Got string-string" | ||
| res = MethodTest.TestOverloadedObjectTwo("foo", 5) | ||
| assert res == "Got string-int" | ||
| res = MethodTest.TestOverloadedObjectTwo(7.24, 7.24) | ||
| assert res == "Got object-object" | ||
| def test_object_in_multiparam_exception(): | ||
| """Test method with object multiparams behaves""" | ||
| with pytest.raises(TypeError): | ||
| MethodTest.TestOverloadedObjectThree("foo", "bar") | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.