Add test for int ctor (#1155)

Author: slozier

Src/IronPython/Lib/iptest/__init__.py

@@ -6,5 +6,3 @@
 from .test_env import *
 from .type_util import *
 from .misc_util import ip_supported_encodings
-
-long = type(1 << 63) # https://github.com/IronLanguages/ironpython3/issues/52

Src/IronPython/Lib/iptest/type_util.py

@@ -4,8 +4,10 @@
 
 # types derived from built-in types
 
+long = type(1 << 63) # https://github.com/IronLanguages/ironpython3/issues/52
+
 class myint(int): pass
-class mylong(int): pass
+class mylong(long): pass
 class myfloat(float): pass
 class mycomplex(complex): pass
 

Src/IronPython/Runtime/Operations/IntOps.cs

@@ -32,19 +32,19 @@ private static object FastNew(CodeContext/*!*/ context, object o, int @base = 10
                 case Extensible<int> ei:
                     return TryInvokeInt(context, o, out var value) ? value : ei.Value;
                 case BigInteger val:
-                    return val.IsInt32() ? (int)val : o;
-                case Extensible<BigInteger> el:
-                    return TryInvokeInt(context, o, out result) ? result : el.Value.IsInt32() ? (int)el.Value : el.Value;
+                    return val.IsInt32() ? (object)(int)val : o;
+                case Extensible<BigInteger> ebi:
+                    return TryInvokeInt(context, o, out result) ? result : ebi.Value.IsInt32() ? (object)(int)ebi.Value : ebi.Value;
                 case float f:
                     return DoubleOps.__int__(f);
                 case long val:
-                    return int.MinValue <= val && val <= int.MaxValue ? (int)val : (BigInteger)val;
+                    return int.MinValue <= val && val <= int.MaxValue ? (object)(int)val : (BigInteger)val;
                 case uint val:
-                    return val <= int.MaxValue ? (int)val : (BigInteger)val;
+                    return val <= int.MaxValue ? (object)(int)val : (BigInteger)val;
                 case ulong val:
-                    return val <= int.MaxValue ? (int)val : (BigInteger)val;
+                    return val <= int.MaxValue ? (object)(int)val : (BigInteger)val;
                 case decimal val:
-                    return int.MinValue <= val && val <= int.MaxValue ? (int)val : (BigInteger)val;
+                    return int.MinValue <= val && val <= int.MaxValue ? (object)(int)val : (BigInteger)val;
                 case Enum e:
                     return ((IConvertible)e).ToInt32(null);
                 case string s:
@@ -62,13 +62,13 @@ private static object FastNew(CodeContext/*!*/ context, object o, int @base = 10
                     case int _:
                         return result;
                     case BigInteger bi:
-                        return bi.IsInt32() ? (int)bi : result;
+                        return bi.IsInt32() ? (object)(int)bi : result;
                     case bool b:
                         return BoolOps.__int__(b); // Python 3.6: return the int value
                     case Extensible<int> ei:
                         return ei.Value; // Python 3.6: return the int value
                     case Extensible<BigInteger> ebi:
-                        return ebi.Value.IsInt32() ? (int)ebi.Value : ebi.Value; // Python 3.6: return the int value
+                        return ebi.Value.IsInt32() ? (object)(int)ebi.Value : ebi.Value; // Python 3.6: return the int value
                     default: {
                             if (TryInvokeInt(context, result, out var intResult)) {
                                 return intResult;
@@ -98,7 +98,7 @@ static bool TryInvokeInt(CodeContext context, object o, out object result) {
                             return true;
                         case Extensible<BigInteger> ebi:
                             Warn(context, result);
-                            result = ebi.Value.IsInt32() ? (int)ebi.Value : ebi.Value; // Python 3.6: return the int value
+                            result = ebi.Value.IsInt32() ? (object)(int)ebi.Value : ebi.Value; // Python 3.6: return the int value
                             return true;
                         default:
                             throw PythonOps.TypeError("__int__ returned non-int (type {0})", PythonTypeOps.GetName(result));

Tests/test_int.py

@@ -2,14 +2,66 @@
 # The .NET Foundation licenses this file to you under the Apache 2.0 License.
 # See the LICENSE file in the project root for more information.
 
+import sys
 import unittest
 
+from iptest import is_cli
+
 class IntSubclass(int): pass
 
 class IntTest(unittest.TestCase):
     def test_from_bytes(self):
         self.assertEqual(type(int.from_bytes(b"abc", "big")), int)
         self.assertEqual(type(IntSubclass.from_bytes(b"abc", "big")), IntSubclass) # https://github.com/IronLanguages/ironpython3/pull/973
 
+    def test_int(self):
+        from iptest import long, myint, mylong
+
+        class MyTrunc:
+            def __init__(self, x):
+                self.x = x
+            def __trunc__(self):
+                return self.x
+
+        class MyInt:
+            def __init__(self, x):
+                self.x = x
+            def __int__(self):
+                return self.x
+
+        for value in ("0", b"0"):
+            # int(str/bytes)
+            v = int(value)
+            self.assertEqual(v, 0)
+            self.assertIs(type(v), int)
+
+        for t in (bool, int, long, myint, mylong):
+            # int()
+            v = int(t(0))
+            self.assertEqual(v, 0)
+            self.assertIs(type(v), int)
+
+            # __trunc__
+            v = int(MyTrunc(t(0)))
+            self.assertEqual(v, 0)
+            self.assertIs(type(v), int if is_cli or sys.version_info >= (3,6) else t)
+
+            # __int__
+            if t in (bool, myint, mylong):
+                with self.assertWarns(DeprecationWarning):
+                    v = int(MyInt(t(0)))
+            else:
+                v = int(MyInt(t(0)))
+            self.assertEqual(v, 0)
+            self.assertIs(type(v), int if is_cli or sys.version_info >= (3,6) else t)
+
+        if is_cli:
+            from iptest import clr_all_types
+            for t in clr_all_types:
+                # int(System.*)
+                v = int(t(0))
+                self.assertEqual(v, 0)
+                self.assertIs(type(v), int)
+
 if __name__ == "__main__":
     unittest.main()