[pypy-svn] r5510 - in pypy/trunk/src/pypy/tool: . test
lac at codespeak.net
lac at codespeak.net
Sat Jul 10 22:09:06 CEST 2004
Author: lac
Date: Sat Jul 10 22:09:05 2004
New Revision: 5510
Modified:
pypy/trunk/src/pypy/tool/test/test_utestconvert.py
pypy/trunk/src/pypy/tool/test/test_utestconvert2.py
pypy/trunk/src/pypy/tool/utestconvert.py
Log:
now they all pass. Note, before you start using them, utestconvert as
it stands will change assertRaises. comment out the 2 dictionary
entries if you do not want this. But to pass its own unittests, it
needs to have them uncommented ...
Modified: pypy/trunk/src/pypy/tool/test/test_utestconvert.py
==============================================================================
--- pypy/trunk/src/pypy/tool/test/test_utestconvert.py (original)
+++ pypy/trunk/src/pypy/tool/test/test_utestconvert.py Sat Jul 10 22:09:05 2004
@@ -4,21 +4,24 @@
class Testit(unittest.TestCase):
def test(self):
-
assert rewrite_utest("badger badger badger") == (
- "badger badger badger")
+ "badger badger badger")
assert rewrite_utest(
- "self.assertRaises(excClass, callableObj, *args, **kwargs)") == (
- "raises(excClass, callableObj, *args, **kwargs)")
+ "self.assertRaises(excClass, callableObj, *args, **kwargs)"
+ ) == (
+ "raises(excClass, callableObj, *args, **kwargs)"
+ )
- assert rewrite_utest("""
+ assert rewrite_utest(
+ """
self.failUnlessRaises(TypeError, func, 42, **{'arg1': 23})
- """) == ("""
+ """
+ ) == (
+ """
raises(TypeError, func, 42, **{'arg1': 23})
"""
)
-
assert rewrite_utest(
"""
self.assertRaises(TypeError,
@@ -32,17 +35,13 @@
mushroom)
"""
)
-
assert rewrite_utest("self.fail()") == "raise AssertionError"
-
assert rewrite_utest("self.fail('mushroom, mushroom')") == (
"raise AssertionError, 'mushroom, mushroom'")
-
assert rewrite_utest("self.assert_(x)") == "assert x"
-
assert rewrite_utest("self.failUnless(func(x)) # XXX") == (
"assert func(x) # XXX")
-
+
assert rewrite_utest(
"""
self.assert_(1 + f(y)
@@ -68,11 +67,11 @@
"""
) == (
r"""
- assert 0,(
+ assert 0, (
'Meet the badger.\n')
"""
)
-
+
assert rewrite_utest(
r"""
self.failIf(0 + 0
@@ -95,7 +94,7 @@
assert rewrite_utest("self.assertEquals(0, 0)") == (
"assert 0 == 0")
-
+
assert rewrite_utest(
r"""
self.assertEquals(0,
@@ -121,7 +120,7 @@
+ snake) == 0
"""
)
-
+
assert rewrite_utest(
"""
self.assertNotEquals(badger + 0
@@ -155,7 +154,6 @@
- badger())
"""
)
-
assert rewrite_utest("self.failIfEqual(0, 0)") == (
"assert not 0 == 0")
@@ -182,6 +180,7 @@
"""
)
+
assert rewrite_utest(
"""
self.assertEquals('''snake snake snake
@@ -193,7 +192,7 @@
snake snake snake''' == mushroom
"""
)
-
+
assert rewrite_utest(
"""
self.assertEquals(badger(),
@@ -233,10 +232,10 @@
) == (
"""
assert badger() == (
- snake()), '''BAD BADGER
+ snake()), ( '''BAD BADGER
BAD BADGER
BAD BADGER'''
-
+ )
"""
)
@@ -277,14 +276,13 @@
GOOD MUSHROOM''' == (
'''GOOD MUSHROOM
GOOD MUSHROOM
- GOOD MUSHROOM'''),(
+ GOOD MUSHROOM'''), (
''' FAILURE
FAILURE
FAILURE''')
"""
)
-
assert rewrite_utest(
"""
self.assertAlmostEquals(first, second, 5, 'A Snake!')
@@ -349,11 +347,11 @@
"""
)
- assert rewrite_utest(
+ self.assertEquals(rewrite_utest(
"""
self.failIfAlmostEqual(first, second, 5, 6, 7, 'Too Many Args')
"""
- ) == (
+ ),
"""
self.failIfAlmostEqual(first, second, 5, 6, 7, 'Too Many Args')
"""
@@ -384,7 +382,7 @@
expression ... will this blow up?
"""
)
-
+
assert rewrite_utest(
"""
self.failUnless('__builtin__' in modules, "An entry for __builtin__ "
@@ -392,11 +390,13 @@
"""
) == (
"""
- assert '__builtin__' in modules, ("An entry for __builtin__ "
+ assert '__builtin__' in modules, ( "An entry for __builtin__ "
"is not in sys.modules.")
"""
)
-
+
if __name__ == '__main__':
unittest.main()
+
+
Modified: pypy/trunk/src/pypy/tool/test/test_utestconvert2.py
==============================================================================
--- pypy/trunk/src/pypy/tool/test/test_utestconvert2.py (original)
+++ pypy/trunk/src/pypy/tool/test/test_utestconvert2.py Sat Jul 10 22:09:05 2004
@@ -67,7 +67,7 @@
"""
),
r"""
- assert 0,(
+ assert 0, (
'Meet the badger.\n')
"""
)
@@ -232,10 +232,10 @@
),
"""
assert badger() == (
- snake()), '''BAD BADGER
+ snake()), ( '''BAD BADGER
BAD BADGER
BAD BADGER'''
-
+ )
"""
)
@@ -276,7 +276,7 @@
GOOD MUSHROOM''' == (
'''GOOD MUSHROOM
GOOD MUSHROOM
- GOOD MUSHROOM'''),(
+ GOOD MUSHROOM'''), (
''' FAILURE
FAILURE
FAILURE''')
@@ -390,7 +390,7 @@
"""
),
"""
- assert '__builtin__' in modules, ("An entry for __builtin__ "
+ assert '__builtin__' in modules, ( "An entry for __builtin__ "
"is not in sys.modules.")
"""
)
Modified: pypy/trunk/src/pypy/tool/utestconvert.py
==============================================================================
--- pypy/trunk/src/pypy/tool/utestconvert.py (original)
+++ pypy/trunk/src/pypy/tool/utestconvert.py Sat Jul 10 22:09:05 2004
@@ -11,7 +11,7 @@
# function.
# Old Unittest Name new name operator # of args
-#d['assertRaises'] = ('raises', '', ['Any'])
+d['assertRaises'] = ('raises', '', ['Any'])
d['fail'] = ('raise AssertionError', '', [0,1])
d['assert_'] = ('assert', '', [1,2])
d['failIf'] = ('assert not', '', [1,2])
@@ -25,7 +25,7 @@
d['failUnlessAlmostEquals'] = ('assert not round', ' !=', [2,3,4])
# the list of synonyms
-#d['failUnlessRaises'] = d['assertRaises']
+d['failUnlessRaises'] = d['assertRaises']
d['failUnless'] = d['assert_']
d['assertEquals'] = d['assertEqual']
d['assertNotEquals'] = d['assertNotEqual']
@@ -211,10 +211,14 @@
optparser.add_option("-c", "--copy", action="callback",
callback=select_output,
callback_kwargs={'output':'copy'},
- help="copy files ... fn.py --> fn.new.py")
+ help="copy files ... fn.py --> fn.cp.py")
options, args = optparser.parse_args()
+
+
+
+
output = getattr(optparser, 'output', 'stdout')
if output in ['inplace', 'copy'] and not args:
More information about the Pypy-commit
mailing list