Skip to content

Commit daaa131

Browse files
fdannyfdanny
committed
accidently overwrote original test script changes for python 3 testing
1 parent 8b179ff commit daaa131

File tree

1 file changed

+38
-28
lines changed

1 file changed

+38
-28
lines changed

‎src/tests/test_method.py

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313

1414
from Python.Test import MethodTest, MethodTestSub
1515
import System
16+
import six
17+
18+
if six.PY3:
19+
long = int
20+
unichr = chr
21+
1622

1723
class MethodTests(unittest.TestCase):
1824
"""Test CLR method support."""
@@ -235,11 +241,11 @@ def testMethodCallStructConversion(self):
235241

236242
def testSubclassInstanceConversion(self):
237243
"""Test subclass instance conversion in method call."""
238-
class sub(System.Exception):
244+
class TestSubException(System.Exception):
239245
pass
240246

241247
object = MethodTest()
242-
instance = sub()
248+
instance = TestSubException()
243249
result = object.TestSubclassConversion(instance)
244250
self.assertTrue(isinstance(result, System.Exception))
245251

@@ -522,8 +528,8 @@ def testExplicitOverloadSelection(self):
522528
value = MethodTest.Overloaded.__overloads__[System.SByte](127)
523529
self.assertTrue(value == 127)
524530

525-
value = MethodTest.Overloaded.__overloads__[System.Char](u'A')
526-
self.assertTrue(value == u'A')
531+
value = MethodTest.Overloaded.__overloads__[System.Char](six.u('A'))
532+
self.assertTrue(value == six.u('A'))
527533

528534
value = MethodTest.Overloaded.__overloads__[System.Char](65535)
529535
self.assertTrue(value == unichr(65535))
@@ -538,25 +544,27 @@ def testExplicitOverloadSelection(self):
538544
self.assertTrue(value == 2147483647)
539545

540546
value = MethodTest.Overloaded.__overloads__[System.Int64](
541-
9223372036854775807L
547+
long(9223372036854775807)
542548
)
543-
self.assertTrue(value == 9223372036854775807L)
549+
self.assertTrue(value == long(9223372036854775807))
544550

545-
value = MethodTest.Overloaded.__overloads__[long](
546-
9223372036854775807L
547-
)
548-
self.assertTrue(value == 9223372036854775807L)
551+
# Python 3 has no explicit long type, use System.Int64 instead
552+
if not six.PY3:
553+
value = MethodTest.Overloaded.__overloads__[long](
554+
long(9223372036854775807)
555+
)
556+
self.assertTrue(value == long(9223372036854775807))
549557

550558
value = MethodTest.Overloaded.__overloads__[System.UInt16](65000)
551559
self.assertTrue(value == 65000)
552560

553-
value = MethodTest.Overloaded.__overloads__[System.UInt32](4294967295L)
554-
self.assertTrue(value == 4294967295L)
561+
value = MethodTest.Overloaded.__overloads__[System.UInt32](long(4294967295))
562+
self.assertTrue(value == long(4294967295))
555563

556564
value = MethodTest.Overloaded.__overloads__[System.UInt64](
557-
18446744073709551615L
565+
long(18446744073709551615)
558566
)
559-
self.assertTrue(value == 18446744073709551615L)
567+
self.assertTrue(value == long(18446744073709551615))
560568

561569
value = MethodTest.Overloaded.__overloads__[System.Single](3.402823e38)
562570
self.assertTrue(value == 3.402823e38)
@@ -638,10 +646,10 @@ def testOverloadSelectionWithArrayTypes(self):
638646
self.assertTrue(value[1] == 127)
639647

640648
vtype = Array[System.Char]
641-
input = vtype([u'A', u'Z'])
649+
input = vtype([six.u('A'), six.u('Z')])
642650
value = MethodTest.Overloaded.__overloads__[vtype](input)
643-
self.assertTrue(value[0] == u'A')
644-
self.assertTrue(value[1] == u'Z')
651+
self.assertTrue(value[0] == six.u('A'))
652+
self.assertTrue(value[1] == six.u('Z'))
645653

646654
vtype = Array[System.Char]
647655
input = vtype([0, 65535])
@@ -668,16 +676,18 @@ def testOverloadSelectionWithArrayTypes(self):
668676
self.assertTrue(value[1] == 2147483647)
669677

670678
vtype = Array[System.Int64]
671-
input = vtype([0, 9223372036854775807L])
679+
input = vtype([0, long(9223372036854775807)])
672680
value = MethodTest.Overloaded.__overloads__[vtype](input)
673681
self.assertTrue(value[0] == 0)
674-
self.assertTrue(value[1] == 9223372036854775807L)
682+
self.assertTrue(value[1] == long(9223372036854775807))
675683

676-
vtype = Array[long]
677-
input = vtype([0, 9223372036854775807L])
678-
value = MethodTest.Overloaded.__overloads__[vtype](input)
679-
self.assertTrue(value[0] == 0)
680-
self.assertTrue(value[1] == 9223372036854775807L)
684+
# Python 3 has no explicit long type, use System.Int64 instead
685+
if not six.PY3:
686+
vtype = Array[long]
687+
input = vtype([0, long(9223372036854775807)])
688+
value = MethodTest.Overloaded.__overloads__[vtype](input)
689+
self.assertTrue(value[0] == 0)
690+
self.assertTrue(value[1] == long(9223372036854775807))
681691

682692
vtype = Array[System.UInt16]
683693
input = vtype([0, 65000])
@@ -686,16 +696,16 @@ def testOverloadSelectionWithArrayTypes(self):
686696
self.assertTrue(value[1] == 65000)
687697

688698
vtype = Array[System.UInt32]
689-
input = vtype([0, 4294967295L])
699+
input = vtype([0, long(4294967295)])
690700
value = MethodTest.Overloaded.__overloads__[vtype](input)
691701
self.assertTrue(value[0] == 0)
692-
self.assertTrue(value[1] == 4294967295L)
702+
self.assertTrue(value[1] == long(4294967295))
693703

694704
vtype = Array[System.UInt64]
695-
input = vtype([0, 18446744073709551615L])
705+
input = vtype([0, long(18446744073709551615)])
696706
value = MethodTest.Overloaded.__overloads__[vtype](input)
697707
self.assertTrue(value[0] == 0)
698-
self.assertTrue(value[1] == 18446744073709551615L)
708+
self.assertTrue(value[1] == long(18446744073709551615))
699709

700710
vtype = Array[System.Single]
701711
input = vtype([0.0, 3.402823e38])

0 commit comments

Comments
 (0)