[Python-checkins] python/dist/src/Lib/test test_hexoct.py,1.2,1.3
nnorwitz@users.sourceforge.net
nnorwitz@users.sourceforge.net
Tue, 18 Feb 2003 07:45:47 -0800
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv16399/Lib/test
Modified Files:
test_hexoct.py
Log Message:
Fix SF bug #688424, 64-bit test problems
Index: test_hexoct.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_hexoct.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_hexoct.py 12 Feb 2003 23:49:57 -0000 1.2
--- test_hexoct.py 18 Feb 2003 15:45:44 -0000 1.3
***************
*** 6,9 ****
--- 6,12 ----
"""
+ import sys
+ platform_long_is_32_bits = sys.maxint == 2147483647
+
import unittest
from test import test_support
***************
*** 19,45 ****
self.assertEqual(0x0, 0)
self.assertEqual(0x10, 16)
! self.assertEqual(0x7fffffff, 2147483647)
# Ditto with a minus sign and parentheses
self.assertEqual(-(0x0), 0)
self.assertEqual(-(0x10), -16)
! self.assertEqual(-(0x7fffffff), -2147483647)
# Ditto with a minus sign and NO parentheses
self.assertEqual(-0x0, 0)
self.assertEqual(-0x10, -16)
! self.assertEqual(-0x7fffffff, -2147483647)
def test_hex_unsigned(self):
# This test is in a <string> so we can ignore the warnings
exec """if 1:
! # Positive-looking constants with negavive values
! self.assertEqual(0x80000000, -2147483648L)
! self.assertEqual(0xffffffff, -1)
! # Ditto with a minus sign and parentheses
! self.assertEqual(-(0x80000000), 2147483648L)
! self.assertEqual(-(0xffffffff), 1)
! # Ditto with a minus sign and NO parentheses
! # This failed in Python 2.2 through 2.2.2 and in 2.3a1
! self.assertEqual(-0x80000000, 2147483648L)
! self.assertEqual(-0xffffffff, 1)
\n"""
--- 22,69 ----
self.assertEqual(0x0, 0)
self.assertEqual(0x10, 16)
! if platform_long_is_32_bits:
! self.assertEqual(0x7fffffff, 2147483647)
! else:
! self.assertEqual(0x7fffffffffffffff, 9223372036854775807)
# Ditto with a minus sign and parentheses
self.assertEqual(-(0x0), 0)
self.assertEqual(-(0x10), -16)
! if platform_long_is_32_bits:
! self.assertEqual(-(0x7fffffff), -2147483647)
! else:
! self.assertEqual(-(0x7fffffffffffffff), -9223372036854775807)
# Ditto with a minus sign and NO parentheses
self.assertEqual(-0x0, 0)
self.assertEqual(-0x10, -16)
! if platform_long_is_32_bits:
! self.assertEqual(-0x7fffffff, -2147483647)
! else:
! self.assertEqual(-0x7fffffffffffffff, -9223372036854775807)
def test_hex_unsigned(self):
# This test is in a <string> so we can ignore the warnings
exec """if 1:
! if platform_long_is_32_bits:
! # Positive-looking constants with negavive values
! self.assertEqual(0x80000000, -2147483648L)
! self.assertEqual(0xffffffff, -1)
! # Ditto with a minus sign and parentheses
! self.assertEqual(-(0x80000000), 2147483648L)
! self.assertEqual(-(0xffffffff), 1)
! # Ditto with a minus sign and NO parentheses
! # This failed in Python 2.2 through 2.2.2 and in 2.3a1
! self.assertEqual(-0x80000000, 2147483648L)
! self.assertEqual(-0xffffffff, 1)
! else:
! # Positive-looking constants with negavive values
! self.assertEqual(0x8000000000000000, -9223372036854775808L)
! self.assertEqual(0xffffffffffffffff, -1)
! # Ditto with a minus sign and parentheses
! self.assertEqual(-(0x8000000000000000), 9223372036854775808L)
! self.assertEqual(-(0xffffffffffffffff), 1)
! # Ditto with a minus sign and NO parentheses
! # This failed in Python 2.2 through 2.2.2 and in 2.3a1
! self.assertEqual(-0x8000000000000000, 9223372036854775808L)
! self.assertEqual(-0xffffffffffffffff, 1)
\n"""
***************
*** 48,74 ****
self.assertEqual(00, 0)
self.assertEqual(020, 16)
! self.assertEqual(017777777777, 2147483647)
# Ditto with a minus sign and parentheses
self.assertEqual(-(00), 0)
self.assertEqual(-(020), -16)
! self.assertEqual(-(017777777777), -2147483647)
# Ditto with a minus sign and NO parentheses
self.assertEqual(-00, 0)
self.assertEqual(-020, -16)
! self.assertEqual(-017777777777, -2147483647)
def test_oct_unsigned(self):
# This test is in a <string> so we can ignore the warnings
exec """if 1:
! # Positive-looking constants with negavive values
! self.assertEqual(020000000000, -2147483648L)
! self.assertEqual(037777777777, -1)
! # Ditto with a minus sign and parentheses
! self.assertEqual(-(020000000000), 2147483648L)
! self.assertEqual(-(037777777777), 1)
! # Ditto with a minus sign and NO parentheses
! # This failed in Python 2.2 through 2.2.2 and in 2.3a1
! self.assertEqual(-020000000000, 2147483648L)
! self.assertEqual(-037777777777, 1)
\n"""
--- 72,119 ----
self.assertEqual(00, 0)
self.assertEqual(020, 16)
! if platform_long_is_32_bits:
! self.assertEqual(017777777777, 2147483647)
! else:
! self.assertEqual(0777777777777777777777, 9223372036854775807)
# Ditto with a minus sign and parentheses
self.assertEqual(-(00), 0)
self.assertEqual(-(020), -16)
! if platform_long_is_32_bits:
! self.assertEqual(-(017777777777), -2147483647)
! else:
! self.assertEqual(-(0777777777777777777777), -9223372036854775807)
# Ditto with a minus sign and NO parentheses
self.assertEqual(-00, 0)
self.assertEqual(-020, -16)
! if platform_long_is_32_bits:
! self.assertEqual(-017777777777, -2147483647)
! else:
! self.assertEqual(-0777777777777777777777, -9223372036854775807)
def test_oct_unsigned(self):
# This test is in a <string> so we can ignore the warnings
exec """if 1:
! if platform_long_is_32_bits:
! # Positive-looking constants with negavive values
! self.assertEqual(020000000000, -2147483648L)
! self.assertEqual(037777777777, -1)
! # Ditto with a minus sign and parentheses
! self.assertEqual(-(020000000000), 2147483648L)
! self.assertEqual(-(037777777777), 1)
! # Ditto with a minus sign and NO parentheses
! # This failed in Python 2.2 through 2.2.2 and in 2.3a1
! self.assertEqual(-020000000000, 2147483648L)
! self.assertEqual(-037777777777, 1)
! else:
! # Positive-looking constants with negavive values
! self.assertEqual(01000000000000000000000, -9223372036854775808L)
! self.assertEqual(01777777777777777777777, -1)
! # Ditto with a minus sign and parentheses
! self.assertEqual(-(01000000000000000000000), 9223372036854775808L)
! self.assertEqual(-(01777777777777777777777), 1)
! # Ditto with a minus sign and NO parentheses
! # This failed in Python 2.2 through 2.2.2 and in 2.3a1
! self.assertEqual(-01000000000000000000000, 9223372036854775808L)
! self.assertEqual(-01777777777777777777777, 1)
\n"""