[Python-checkins] python/dist/src/Lib/test test_scope.py, 1.26.2.1, 1.26.2.2

Thu Apr 8 13:52:31 EDT 2004

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2939/Lib/test

Modified Files:
      Tag: ast-branch
	test_scope.py 
Log Message:
Use vereq() instead of verify(==)

Index: test_scope.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_scope.py,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -C2 -d -r1.26.2.1 -r1.26.2.2
*** test_scope.py	28 Apr 2003 17:28:09 -0000	1.26.2.1
--- test_scope.py	8 Apr 2004 17:52:27 -0000	1.26.2.2
***************
*** 1,3 ****
! from test.test_support import verify, TestFailed, check_syntax

  import warnings
--- 1,3 ----
! from test.test_support import verify, TestFailed, check_syntax, vereq

  import warnings
***************
*** 14,19 ****
  plus10 = make_adder(10)

! verify(inc(1) == 2)
! verify(plus10(-2) == 8)

  print "2. extra nesting"
--- 14,19 ----
  plus10 = make_adder(10)

! vereq(inc(1), 2)
! vereq(plus10(-2), 8)

  print "2. extra nesting"
***************
*** 29,34 ****
  plus10 = make_adder2(10)

! verify(inc(1) == 2)
! verify(plus10(-2) == 8)

  print "3. simple nesting + rebinding"
--- 29,34 ----
  plus10 = make_adder2(10)

! vereq(inc(1), 2)
! vereq(plus10(-2), 8)

  print "3. simple nesting + rebinding"
***************
*** 43,48 ****
  plus10 = make_adder3(9)

! verify(inc(1) == 2)
! verify(plus10(-2) == 8)

  print "4. nesting with global but no free"
--- 43,48 ----
  plus10 = make_adder3(9)

! vereq(inc(1), 2)
! vereq(plus10(-2), 8)

  print "4. nesting with global but no free"
***************
*** 59,66 ****
  global_x = 1
  adder = make_adder4()
! verify(adder(1) == 2)

  global_x = 10
! verify(adder(-2) == 8)

  print "5. nesting through class"
--- 59,66 ----
  global_x = 1
  adder = make_adder4()
! vereq(adder(1), 2)

  global_x = 10
! vereq(adder(-2), 8)

  print "5. nesting through class"
***************
*** 75,80 ****
  plus10 = make_adder5(10)

! verify(inc(1) == 2)
! verify(plus10(-2) == 8)

  print "6. nesting plus free ref to global"
--- 75,80 ----
  plus10 = make_adder5(10)

! vereq(inc(1), 2)
! vereq(plus10(-2), 8)

  print "6. nesting plus free ref to global"
***************
*** 90,95 ****
  plus10 = make_adder6(10)

! verify(inc(1) == 11) # there's only one global
! verify(plus10(-2) == 8)

  print "7. nearest enclosing scope"
--- 90,95 ----
  plus10 = make_adder6(10)

! vereq(inc(1), 11) # there's only one global
! vereq(plus10(-2), 8)

  print "7. nearest enclosing scope"
***************
*** 104,108 ****

  test_func = f(10)
! verify(test_func(5) == 47)

  print "8. mixed freevars and cellvars"
--- 104,108 ----

  test_func = f(10)
! vereq(test_func(5), 47)

  print "8. mixed freevars and cellvars"
***************
*** 124,128 ****
  g = f(1, 2, 3)
  h = g(2, 4, 6)
! verify(h() == 39)

  print "9. free variable in method"
--- 124,128 ----
  g = f(1, 2, 3)
  h = g(2, 4, 6)
! vereq(h(), 39)

  print "9. free variable in method"
***************
*** 142,148 ****

  t = test()
! verify(t.test() == "var")
! verify(t.method_and_var() == "method")
! verify(t.actual_global() == "global")

  method_and_var = "var"
--- 142,148 ----

  t = test()
! vereq(t.test(), "var")
! vereq(t.method_and_var(), "method")
! vereq(t.actual_global(), "global")

  method_and_var = "var"
***************
*** 159,165 ****

  t = Test()
! verify(t.test() == "var")
! verify(t.method_and_var() == "method")
! verify(t.actual_global() == "global")

  print "10. recursion"
--- 159,165 ----

  t = Test()
! vereq(t.test(), "var")
! vereq(t.method_and_var(), "method")
! vereq(t.actual_global(), "global")

  print "10. recursion"
***************
*** 176,180 ****
          raise ValueError, "x must be >= 0"

! verify(f(6) == 720)

--- 176,180 ----
          raise ValueError, "x must be >= 0"

! vereq(f(6), 720)

***************
*** 253,274 ****
  inc = f1(1)
  plus10 = f1(10)
! verify(inc(1) == 2)
! verify(plus10(5) == 15)

  f2 = lambda x: (lambda : lambda y: x + y)()
  inc = f2(1)
  plus10 = f2(10)
! verify(inc(1) == 2)
! verify(plus10(5) == 15)

  f3 = lambda x: lambda y: global_x + y
  global_x = 1
  inc = f3(None)
! verify(inc(2) == 3)

  f8 = lambda x, y, z: lambda a, b, c: lambda : z * (b + y)
  g = f8(1, 2, 3)
  h = g(2, 4, 6)
! verify(h() == 18)

  print "13. UnboundLocal"
--- 253,274 ----
  inc = f1(1)
  plus10 = f1(10)
! vereq(inc(1), 2)
! vereq(plus10(5), 15)

  f2 = lambda x: (lambda : lambda y: x + y)()
  inc = f2(1)
  plus10 = f2(10)
! vereq(inc(1), 2)
! vereq(plus10(5), 15)

  f3 = lambda x: lambda y: global_x + y
  global_x = 1
  inc = f3(None)
! vereq(inc(2), 3)

  f8 = lambda x, y, z: lambda a, b, c: lambda : z * (b + y)
  g = f8(1, 2, 3)
  h = g(2, 4, 6)
! vereq(h(), 18)

  print "13. UnboundLocal"
***************
*** 307,311 ****
      return returner

! verify(makeReturner(1,2,3)() == (1,2,3))

  def makeReturner2(**kwargs):
--- 307,311 ----
      return returner

! vereq(makeReturner(1,2,3)(), (1,2,3))

  def makeReturner2(**kwargs):
***************
*** 314,318 ****
      return returner

! verify(makeReturner2(a=11)()['a'] == 11)

  def makeAddPair((a, b)):
--- 314,318 ----
      return returner

! vereq(makeReturner2(a=11)()['a'], 11)

  def makeAddPair((a, b)):
***************
*** 321,325 ****
      return addPair

! verify(makeAddPair((1, 2))((100, 200)) == (101,202))

  print "15. scope of global statements"
--- 321,325 ----
      return addPair

! vereq(makeAddPair((1, 2))((100, 200)), (101,202))

  print "15. scope of global statements"
***************
*** 338,343 ****
          return i()
      return g()
! verify(f() == 7)
! verify(x == 7)

  # II
--- 338,343 ----
          return i()
      return g()
! vereq(f(), 7)
! vereq(x, 7)

  # II
***************
*** 353,358 ****
          return i()
      return g()
! verify(f() == 2)
! verify(x == 7)

  # III
--- 353,358 ----
          return i()
      return g()
! vereq(f(), 2)
! vereq(x, 7)

  # III
***************
*** 369,374 ****
          return i()
      return g()
! verify(f() == 2)
! verify(x == 2)

  # IV
--- 369,374 ----
          return i()
      return g()
! vereq(f(), 2)
! vereq(x, 2)

  # IV
***************
*** 385,390 ****
          return i()
      return g()
! verify(f() == 2)
! verify(x == 2)

  print "16. check leaks"
--- 385,407 ----
          return i()
      return g()
! vereq(f(), 2)
! vereq(x, 2)
! 
! # XXX what about global statements in class blocks?
! # do they affect methods?
! 
! x = 12
! class Global:
!     global x
!     x = 13
!     def set(self, val):
!         x = val
!     def get(self):
!         return x
! 
! g = Global()
! vereq(g.get(), 13)
! g.set(15)
! vereq(g.get(), 13)

  print "16. check leaks"
***************
*** 408,412 ****
      f1()

! verify(Foo.count == 0)

  print "17. class and global"
--- 425,429 ----
      f1()

! vereq(Foo.count, 0)

  print "17. class and global"
***************
*** 420,426 ****

  x = 0
! verify(test(6)(2) == 8)
  x = -1
! verify(test(3)(2) == 5)

  print "18. verify that locals() works"
--- 437,443 ----

  x = 0
! vereq(test(6)(2), 8)
  x = -1
! vereq(test(3)(2), 5)

  print "18. verify that locals() works"
***************
*** 438,442 ****
  verify(d.has_key('h'))
  del d['h']
! verify(d == {'x': 2, 'y': 7, 'w': 6})

  print "19. var is bound and free in class"
--- 455,459 ----
  verify(d.has_key('h'))
  del d['h']
! vereq(d, {'x': 2, 'y': 7, 'w': 6})

  print "19. var is bound and free in class"
***************
*** 450,454 ****

  inst = f(3)()
! verify(inst.a == inst.m())

  print "20. interaction with trace function"
--- 467,471 ----

  inst = f(3)()
! vereq(inst.a, inst.m())

  print "20. interaction with trace function"