Skip to content

Enable some tests #893

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

Merged
slozier merged 4 commits into from
Jun 27, 2020
Merged

Enable some tests #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f499b6
Enable test_methodbinder1
slozier Jun 17, 2020
73f14c5
Enable test_methodbinder2
slozier Jun 17, 2020
9a784a2
Enable test_methoddispatch
slozier Jun 17, 2020
0d74c9a
Resolve failures
slozier Jun 17, 2020
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
9 changes: 0 additions & 9 deletions Src/IronPythonTest/Cases/IronPythonCasesManifest.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,6 @@ Ignore=true
Ignore=true
Reason=Fails intermittently - https://github.com/IronLanguages/ironpython3/issues/508

[IronPython.test_methodbinder1]
Ignore=true

[IronPython.test_methodbinder2]
Ignore=true

[IronPython.test_methoddispatch]
Ignore=true

[IronPython.test_namebinding]
RunCondition=NOT $(IS_POSIX)
Reason=See https://bugzilla.xamarin.com/show_bug.cgi?id=45677 and https://github.com/IronLanguages/main/issues/1473
Expand Down
41 changes: 24 additions & 17 deletions Tests/test_methodbinder1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def test_this_matrix(self):
( "UInt64Max", OverF, OverF, True, True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, True, TypeE, True, True, ),
( "DecimalMax", OverF, OverF, True, True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, OverF, TypeE, True, True, ),
( "SingleMax", OverF, OverF, True, True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, OverF, TypeE, OverF, True, ),
( "floatMax", OverF, OverF, True, True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, OverF, TypeE, OverF, True, ),
( "floatMax", TypeE, TypeE, True, True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, OverF, TypeE, OverF, True, ),
#### M201 M680 M202 M203 M204 M205 M301 M302 M303 M304 M310 M311 M312 M313 M320 M321 M400
#### int int? double bigint bool str sbyte i16 i64 single byte ui16 ui32 ui64 char decm obj
( "SByteMin", True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ),
Expand All @@ -123,7 +123,7 @@ def test_this_matrix(self):
( "UInt64Min", True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ),
( "DecimalMin", OverF, OverF, True , True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, OverF, TypeE, True , True, ),
( "SingleMin", OverF, OverF, True, True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, OverF, TypeE, OverF, True, ),
( "floatMin", OverF, OverF, True, True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, OverF, TypeE, OverF, True, ),
( "floatMin", TypeE, TypeE, True, True, True, TypeE, OverF, OverF, OverF, True, OverF, OverF, OverF, OverF, TypeE, OverF, True, ),
#### M201 M680 M202 M203 M204 M205 M301 M302 M303 M304 M310 M311 M312 M313 M320 M321 M400
#### int int? double bigint bool str sbyte i16 i64 single byte ui16 ui32 ui64 char decm obj
( "SBytePlusOne", True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ),
Expand All @@ -137,7 +137,7 @@ def test_this_matrix(self):
( "UInt64PlusOne", True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ),
( "DecimalPlusOne", True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ),
( "SinglePlusOne", True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ),
( "floatPlusOne", True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ),
( "floatPlusOne", TypeE, TypeE, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ),
( myfloat1, True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ),
#### M201 M680 M202 M203 M204 M205 M301 M302 M303 M304 M310 M311 M312 M313 M320 M321 M400
#### int int? double bigint bool str sbyte i16 i64 single byte ui16 ui32 ui64 char decm obj
Expand All @@ -148,7 +148,7 @@ def test_this_matrix(self):
( "Int64MinusOne", True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ),
( "DecimalMinusOne", True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ),
( "SingleMinusOne", True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ),
( "floatMinusOne", True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ),
( "floatMinusOne", TypeE, TypeE, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ),
( myfloat2, True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ),
################################################## pass in bool #########################################################
#### M201 M680 M202 M203 M204 M205 M301 M302 M303 M304 M310 M311 M312 M313 M320 M321 M400
Expand Down Expand Up @@ -182,10 +182,10 @@ def test_this_matrix(self):
################################################## pass in float #########################################################
#### single/double becomes Int32, but this does not apply to other primitive types
#### int int? double bigint bool str sbyte i16 i64 single byte ui16 ui32 ui64 char decm obj
matrix.append((System.Single.Parse("8.01", InvariantCulture), True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ))
matrix.append((System.Double.Parse("10.2", InvariantCulture), True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ))
matrix.append((System.Single.Parse("-8.1", InvariantCulture), True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ))
matrix.append((System.Double.Parse("-1.8", InvariantCulture), True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ))
matrix.append((System.Single.Parse("8.01", InvariantCulture), True, True, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ))
matrix.append((System.Double.Parse("10.2", InvariantCulture), TypeE, TypeE, True, True, True, TypeE, True, True, True, True, True, True, True, True, TypeE, True, True, ))
matrix.append((System.Single.Parse("-8.1", InvariantCulture), True, True, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ))
matrix.append((System.Double.Parse("-1.8", InvariantCulture), TypeE, TypeE, True, True, True, TypeE, True, True, True, True, OverF, OverF, OverF, OverF, TypeE, True, True, ))
matrix = tuple(matrix)

for scenario in matrix:
Expand Down Expand Up @@ -322,7 +322,7 @@ class CP2(C6): pass
self._helper(self.target.M411, [C6(), cp2, cp4, ], 411, [C3(), object(), C1(), cp1, cp3,], TypeError)

def test_nullable_int(self):
self._helper(self.target.M680, [None, 100, 100, System.Byte.MaxValue, System.UInt32.MinValue, myint1, mylong2, 3.6, ], 680, [(), 3+1j], TypeError)
self._helper(self.target.M680, [None, 100, 100, System.Byte.MaxValue, System.UInt32.MinValue, myint1, mylong2, ], 680, [(), 3+1j], TypeError)

def test_out_int(self):
self._helper(self.target.M701, [], 701, [1, 10, None, System.Byte.Parse('3')], TypeError) # not allow to pass in anything
Expand Down Expand Up @@ -470,8 +470,9 @@ def test_other_concern(self):
# generic method
self.target.M200[int](100)
self.assertEqual(Flag.Value, 200); Flag.Value = 99
self.target.M200[int](100.1234)
self.assertEqual(Flag.Value, 200); Flag.Value = 99
with self.assertRaises(TypeError):
self.target.M200[int](100.1234)
self.assertEqual(Flag.Value, 99)
self.target.M200[int](100)
self.assertEqual(Flag.Value, 200); Flag.Value = 99
self.assertRaises(OverflowError, self.target.M200[System.Byte], 300)
Expand Down Expand Up @@ -596,7 +597,7 @@ def f4(): return clr.Reference[C1](C2()) # C2 inherits C1

# GOtherConcern<T>
self.target = GOtherConcern[int]()
for x in [100, 200, 4.56, myint1]:
for x in [100, 200, myint1]:
self.target.M100(x)
self.assertEqual(Flag.Value, 100); Flag.Value = 99

Expand Down Expand Up @@ -642,13 +643,19 @@ def __len__(self): return 10
self.assertEqual(Flag.Value, len(x))

# IEnumerable<char> / IEnumerator<char>
self.target.M630(x)
self.assertEqual(Flag.Value, len(x)); Flag.Value = 0
if not isinstance(x, C):
self.target.M630(x)
self.assertEqual(Flag.Value, len(x)); Flag.Value = 0
else:
self.assertRaises(TypeError, self.target.M630, x)
self.assertRaises(TypeError, self.target.M631, x)

# IEnumerable<int> / IEnumerator<int>
self.target.M640(x)
self.assertEqual(Flag.Value, len(x)); Flag.Value = 0
if not isinstance(x, C):
self.target.M640(x)
self.assertEqual(Flag.Value, len(x)); Flag.Value = 0
else:
self.assertRaises(TypeError, self.target.M640, x)
self.assertRaises(TypeError, self.target.M641, x)

# IList / IList<char> / IList<int>
Expand All @@ -668,7 +675,7 @@ def __len__(self): return 10
self.assertRaises(TypeError, self.target.M642, x)

def test_explicit_inheritance(self):
from IronPythonTest.BinderTest import *
from IronPythonTest.BinderTest import CInheritMany1, CInheritMany2, CInheritMany3, CInheritMany4, CInheritMany5, CInheritMany6, CInheritMany7, CInheritMany8, Flag, I1, I2, I3, I4
self.target = CInheritMany1()
self.assertTrue(hasattr(self.target, "M"))
self.target.M()
Expand Down
Loading