[Python-checkins] python/dist/src/Lib/test test_sets.py,1.10,1.11
tim_one@users.sourceforge.net
tim_one@users.sourceforge.net
2002年8月25日 11:02:32 -0700
Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv17582/python/lib/test
Modified Files:
test_sets.py
Log Message:
Rewrote all remaining assert stmts.
Index: test_sets.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sets.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test_sets.py 25 Aug 2002 17:49:04 -0000 1.10
--- test_sets.py 25 Aug 2002 18:02:29 -0000 1.11
***************
*** 73,77 ****
def test_iteration(self):
for v in self.set:
! assert v in self.values, "Missing item in iteration for " + self.case
#------------------------------------------------------------------------------
--- 73,77 ----
def test_iteration(self):
for v in self.set:
! self.assert_(v in self.values)
#------------------------------------------------------------------------------
***************
*** 98,105 ****
def test_in(self):
! assert 3 in self.set, "Valueship for unit set"
def test_not_in(self):
! assert 2 not in self.set, "Non-valueship for unit set"
#------------------------------------------------------------------------------
--- 98,105 ----
def test_in(self):
! self.failUnless(3 in self.set)
def test_not_in(self):
! self.failUnless(2 not in self.set)
#------------------------------------------------------------------------------
***************
*** 115,122 ****
def test_in(self):
! assert (0, "zero") in self.set, "Valueship for tuple set"
def test_not_in(self):
! assert 9 not in self.set, "Non-valueship for tuple set"
#------------------------------------------------------------------------------
--- 115,122 ----
def test_in(self):
! self.failUnless((0, "zero") in self.set)
def test_not_in(self):
! self.failUnless(9 not in self.set)
#------------------------------------------------------------------------------
***************
*** 138,145 ****
outer = Set([inner])
element = outer.pop()
! assert type(element) == ImmutableSet, "Construct set of sets"
outer.add(inner) # Rebuild set of sets with .add method
outer.remove(inner)
! assert outer == Set() # Verify that remove worked
outer.discard(inner) # Absence of KeyError indicates working fine
--- 138,145 ----
outer = Set([inner])
element = outer.pop()
! self.assertEqual(type(element), ImmutableSet)
outer.add(inner) # Rebuild set of sets with .add method
outer.remove(inner)
! self.assertEqual(outer, Set()) # Verify that remove worked
outer.discard(inner) # Absence of KeyError indicates working fine
***************
*** 315,319 ****
try:
self.set.remove("d")
! assert 0, "Removing missing element"
except LookupError:
pass
--- 315,319 ----
try:
self.set.remove("d")
! self.fail("Removing missing element should have raised LookupError")
except LookupError:
pass
***************
*** 324,328 ****
self.set.remove(v)
expected_len -= 1
! assert len(self.set) == expected_len, "Removing values one by one"
def test_discard_present(self):
--- 324,328 ----
self.set.remove(v)
expected_len -= 1
! self.assertEqual(len(self.set), expected_len)
def test_discard_present(self):
***************
*** 344,348 ****
self.assertEqual(len(popped), len(self.values))
for v in self.values:
! assert v in popped, "Popping items"
def test_update_empty_tuple(self):
--- 344,348 ----
self.assertEqual(len(popped), len(self.values))
for v in self.values:
! self.failUnless(v in popped)
def test_update_empty_tuple(self):
***************
*** 365,371 ****
result = self.left.issubset(self.right)
if "<" in self.cases:
! assert result, "subset: " + self.name
else:
! assert not result, "non-subset: " + self.name
#------------------------------------------------------------------------------
--- 365,371 ----
result = self.left.issubset(self.right)
if "<" in self.cases:
! self.failUnless(result)
else:
! self.failUnless(not result)
#------------------------------------------------------------------------------
***************
*** 416,425 ****
try:
self.other == self.set
! assert 0, "Comparison with non-set on left"
except TypeError:
pass
try:
self.set != self.other
! assert 0, "Comparison with non-set on right"
except TypeError:
pass
--- 416,425 ----
try:
self.other == self.set
! self.fail("expected TypeError")
except TypeError:
pass
try:
self.set != self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 428,432 ****
try:
self.set |= self.other
! assert 0, "Union update with non-set"
except TypeError:
pass
--- 428,432 ----
try:
self.set |= self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 435,444 ****
try:
self.other | self.set
! assert 0, "Union with non-set on left"
except TypeError:
pass
try:
self.set | self.other
! assert 0, "Union with non-set on right"
except TypeError:
pass
--- 435,444 ----
try:
self.other | self.set
! self.fail("expected TypeError")
except TypeError:
pass
try:
self.set | self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 447,451 ****
try:
self.set &= self.other
! assert 0, "Intersection update with non-set"
except TypeError:
pass
--- 447,451 ----
try:
self.set &= self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 454,463 ****
try:
self.other & self.set
! assert 0, "Intersection with non-set on left"
except TypeError:
pass
try:
self.set & self.other
! assert 0, "Intersection with non-set on right"
except TypeError:
pass
--- 454,463 ----
try:
self.other & self.set
! self.fail("expected TypeError")
except TypeError:
pass
try:
self.set & self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 466,470 ****
try:
self.set ^= self.other
! assert 0, "Symmetric difference update with non-set"
except TypeError:
pass
--- 466,470 ----
try:
self.set ^= self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 473,482 ****
try:
self.other ^ self.set
! assert 0, "Symmetric difference with non-set on left"
except TypeError:
pass
try:
self.set ^ self.other
! assert 0, "Symmetric difference with non-set on right"
except TypeError:
pass
--- 473,482 ----
try:
self.other ^ self.set
! self.fail("expected TypeError")
except TypeError:
pass
try:
self.set ^ self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 485,489 ****
try:
self.set -= self.other
! assert 0, "Symmetric difference update with non-set"
except TypeError:
pass
--- 485,489 ----
try:
self.set -= self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 492,501 ****
try:
self.other - self.set
! assert 0, "Symmetric difference with non-set on left"
except TypeError:
pass
try:
self.set - self.other
! assert 0, "Symmetric difference with non-set on right"
except TypeError:
pass
--- 492,501 ----
try:
self.other - self.set
! self.fail("expected TypeError")
except TypeError:
pass
try:
self.set - self.other
! self.fail("expected TypeError")
except TypeError:
pass
***************
*** 530,536 ****
dup_list = list(dup); dup_list.sort()
set_list = list(self.set); set_list.sort()
! assert len(dup_list) == len(set_list), "Unequal lengths after copy"
for i in range(len(dup_list)):
! assert dup_list[i] is set_list[i], "Non-identical items after copy"
def test_deep_copy(self):
--- 530,536 ----
dup_list = list(dup); dup_list.sort()
set_list = list(self.set); set_list.sort()
! self.assertEqual(len(dup_list), len(set_list))
for i in range(len(dup_list)):
! self.failUnless(dup_list[i] is set_list[i])
def test_deep_copy(self):
***************
*** 539,545 ****
dup_list = list(dup); dup_list.sort()
set_list = list(self.set); set_list.sort()
! assert len(dup_list) == len(set_list), "Unequal lengths after deep copy"
for i in range(len(dup_list)):
! assert dup_list[i] == set_list[i], "Unequal items after deep copy"
#------------------------------------------------------------------------------
--- 539,545 ----
dup_list = list(dup); dup_list.sort()
set_list = list(self.set); set_list.sort()
! self.assertEqual(len(dup_list), len(set_list))
for i in range(len(dup_list)):
! self.assertEqual(dup_list[i], set_list[i])
#------------------------------------------------------------------------------