builtin,vm: fix builtin-hex test

sbinet · ncw · commit f44679132338 · 2019-11-12T13:14:40.000Z
diff --git a/builtin/tests/builtin.py b/builtin/tests/builtin.py
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
+from libtest import assertRaises
+
 doc="abs"
 assert abs(0) == 0
 assert abs(10) == 10
@@ -151,6 +153,20 @@ def func(p):
 ok = True
 assert ok, "ValueError not raised"
 
+doc="hex"
+assert hex( 0)=="0x0", "hex(0)"
+assert hex( 1)=="0x1", "hex(1)"
+assert hex(42)=="0x2a", "hex(42)"
+assert hex( -0)=="0x0", "hex(-0)"
+assert hex( -1)=="-0x1", "hex(-1)"
+assert hex(-42)=="-0x2a", "hex(-42)"
+assert hex( 1<<64) == "0x10000000000000000", "hex(1<<64)"
+assert hex(-1<<64) == "-0x10000000000000000", "hex(-1<<64)"
+assert hex( 1<<128) == "0x100000000000000000000000000000000", "hex(1<<128)"
+assert hex(-1<<128) == "-0x100000000000000000000000000000000", "hex(-1<<128)"
+assertRaises(TypeError, hex, 10.0) ## TypeError: 'float' object cannot be interpreted as an integer
+assertRaises(TypeError, hex, float(0)) ## TypeError: 'float' object cannot be interpreted as an integer
+
 doc="iter"
 cnt = 0
 def f():
diff --git a/builtin/tests/libtest.py b/builtin/tests/libtest.py
diff --git a/vm/tests/builtin.py b/vm/tests/builtin.py
@@ -66,20 +66,6 @@
 else:
 assert False, "SyntaxError not raised"
 
-doc="hex"
-assert True, hex( 0)=="0x0"
-assert True, hex( 1)=="0x1"
-assert True, hex(42)=="0x2a"
-assert True, hex( -0)=="0x0"
-assert True, hex( -1)=="-0x1"
-assert True, hex(-42)=="-0x2a"
-assert True, hex( 1<<64) == "0x10000000000000000"
-assert True, hex(-1<<64) == "-0x10000000000000000"
-assert True, hex( 1<<128) == "0x100000000000000000000000000000000"
-assert True, hex(-1<<128) == "-0x100000000000000000000000000000000"
-assertRaises(TypeError, hex, 10.0) ## TypeError: 'float' object cannot be interpreted as an integer
-assertRaises(TypeError, hex, float(0)) ## TypeError: 'float' object cannot be interpreted as an integer
-
 doc="isinstance"
 class A:
 pass

-Original file line number
+Diff line change
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 +fromlibtestimportassertRaises
++
 doc="abs"
 assertabs(0) ==0
 assertabs(10) ==10
 ok=True
 assertok, "ValueError not raised"
 +doc="hex"
 +asserthex( 0)=="0x0", "hex(0)"
 +asserthex( 1)=="0x1", "hex(1)"
 +asserthex(42)=="0x2a", "hex(42)"
 +asserthex( -0)=="0x0", "hex(-0)"
 +asserthex( -1)=="-0x1", "hex(-1)"
 +asserthex(-42)=="-0x2a", "hex(-42)"
 +asserthex( 1<<64) =="0x10000000000000000", "hex(1<<64)"
 +asserthex(-1<<64) =="-0x10000000000000000", "hex(-1<<64)"
 +asserthex( 1<<128) =="0x100000000000000000000000000000000", "hex(1<<128)"
 +asserthex(-1<<128) =="-0x100000000000000000000000000000000", "hex(-1<<128)"
 +assertRaises(TypeError, hex, 10.0) ## TypeError: 'float' object cannot be interpreted as an integer
 +assertRaises(TypeError, hex, float(0)) ## TypeError: 'float' object cannot be interpreted as an integer
++
 doc="iter"
 cnt=0
 deff():
-Original file line number
+Diff line change
 else:
 assertFalse, "SyntaxError not raised"
 -doc="hex"
 -assertTrue, hex( 0)=="0x0"
 -assertTrue, hex( 1)=="0x1"
 -assertTrue, hex(42)=="0x2a"
 -assertTrue, hex( -0)=="0x0"
 -assertTrue, hex( -1)=="-0x1"
 -assertTrue, hex(-42)=="-0x2a"
 -assertTrue, hex( 1<<64) =="0x10000000000000000"
 -assertTrue, hex(-1<<64) =="-0x10000000000000000"
 -assertTrue, hex( 1<<128) =="0x100000000000000000000000000000000"
 -assertTrue, hex(-1<<128) =="-0x100000000000000000000000000000000"
 -assertRaises(TypeError, hex, 10.0) ## TypeError: 'float' object cannot be interpreted as an integer
 -assertRaises(TypeError, hex, float(0)) ## TypeError: 'float' object cannot be interpreted as an integer
+-
 doc="isinstance"
 classA:
 pass