Add test_clrmethod.py and update AUTHORS and CHANGELOG

pythonnet · filmor · Jun 16, 2017 · Jun 15, 2017 · Jun 15, 2017 · Jun 15, 2017
commit d620babe3354d33b8b29ddf505e7ffe8b7087cf8
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -31,6 +31,7 @@
 -   Matthias Dittrich ([@matthid](https://github.com/matthid))
 -   Patrick Stewart ([@patstew](https://github.com/patstew))
 -   Raphael Nestler ([@rnestler](https://github.com/rnestler))
+-   Rickard Holmberg ([@rickardraysearch](https://github.com/rickardraysearch))
 -   Sam Winstanley ([@swinstanley](https://github.com/swinstanley))
 -   Sean Freitag ([@cowboygneox](https://github.com/cowboygneox))
 -   Serge Weinstock ([@sweinst](https://github.com/sweinst))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
     derived from a .NET class has a `__namespace__` or `__assembly__`
     attribute (#481)
 -   Fixed conversion of 'float' and 'double' values (#486)
+-   Fixed 'clrmethod' for python 2 (#492)
 
 
 ## [2.3.0][] - 2017-03-11

diff --git a/src/tests/test_clrmethod.py b/src/tests/test_clrmethod.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+"""Test clrmethod and clrproperty support for calling methods and getting/setting python properties from CLR."""
+
+import Python.Test as Test
+import System
+import pytest
+import clr
+
+class ExampleClrClass(System.Object):
+    __namespace__ = "PyTest"
+    def __init__(self):
+        self._x = 3
+    @clr.clrmethod(int, [int])
+    def test(self, x):
+        return x*2
+
+    def get_X(self):
+        return self._x
+    def set_X(self, value):
+        self._x = value
+    X = clr.clrproperty(int, get_X, set_X)
+
+    @clr.clrproperty(int)
+    def Y(self):
+        return self._x * 2
+
+def test_set_and_get_property_from_py():
+    """Test usage of CLR defined reference types."""
+    t = ExampleClrClass()
+    assert t.X == 3
+    assert t.Y == 3 * 2
+    t.X = 4
+    assert t.X == 4
+    assert t.Y == 4 * 2
+
+def test_set_and_get_property_from_clr():
+    """Test usage of CLR defined reference types."""
+    t = ExampleClrClass()
+    assert t.GetType().GetProperty("X").GetValue(t) == 3
+    assert t.GetType().GetProperty("Y").GetValue(t) == 3 * 2
+    t.GetType().GetProperty("X").SetValue(t, 4)
+    assert t.GetType().GetProperty("X").GetValue(t) == 4
+    assert t.GetType().GetProperty("Y").GetValue(t) == 4 * 2
+
+
+def test_set_and_get_property_from_clr_and_py():
+    """Test usage of CLR defined reference types."""
+    t = ExampleClrClass()
+    assert t.GetType().GetProperty("X").GetValue(t) == 3
+    assert t.GetType().GetProperty("Y").GetValue(t) == 3 * 2
+    assert t.X == 3
+    assert t.Y == 3 * 2
+    t.GetType().GetProperty("X").SetValue(t, 4)
+    assert t.GetType().GetProperty("X").GetValue(t) == 4
+    assert t.GetType().GetProperty("Y").GetValue(t) == 4 * 2
+    assert t.X == 4
+    assert t.Y == 4 * 2
+    t.X = 5
+    assert t.GetType().GetProperty("X").GetValue(t) == 5
+    assert t.GetType().GetProperty("Y").GetValue(t) == 5 * 2
+    assert t.X == 5
+    assert t.Y == 5 * 2
+
+def test_method_invocation_from_py():
+    t = ExampleClrClass()
+    assert t.test(41) == 41*2
+
+def test_method_invocation_from_clr():
+    t = ExampleClrClass()
+    assert t.GetType().GetMethod("test").Invoke(t, [37]) == 37*2