[Python-checkins] python/dist/src/Lib/test test_sets.py,1.7,1.8
tim_one@users.sourceforge.net
tim_one@users.sourceforge.net
Sun, 25 Aug 2002 10:38:51 -0700
Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv11998/python/lib/test
Modified Files:
test_sets.py
Log Message:
Ack! Virtually every test here relied on an assert stmt. assert stmts
should never be used in tests. Repaired dozens, but more is needed.
Index: test_sets.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sets.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_sets.py 25 Aug 2002 17:22:23 -0000 1.7
--- test_sets.py 25 Aug 2002 17:38:49 -0000 1.8
***************
*** 13,73 ****
def test_repr(self):
if self.repr is not None:
! assert `self.set` == self.repr, "Wrong representation for " + self.case
def test_length(self):
! assert len(self.set) == self.length, "Wrong length for " + self.case
def test_self_equality(self):
! assert self.set == self.set, "Self-equality failed for " + self.case
def test_equivalent_equality(self):
! assert self.set == self.dup, "Equivalent equality failed for " + self.case
def test_copy(self):
! assert self.set.copy() == self.dup, "Copy and comparison failed for " + self.case
def test_self_union(self):
result = self.set | self.set
! assert result == self.dup, "Self-union failed for " + self.case
def test_empty_union(self):
result = self.set | empty_set
! assert result == self.dup, "Union with empty failed for " + self.case
def test_union_empty(self):
result = empty_set | self.set
! assert result == self.dup, "Union with empty failed for " + self.case
def test_self_intersection(self):
result = self.set & self.set
! assert result == self.dup, "Self-intersection failed for " + self.case
def test_empty_intersection(self):
result = self.set & empty_set
! assert result == empty_set, "Intersection with empty failed for " + self.case
def test_intersection_empty(self):
result = empty_set & self.set
! assert result == empty_set, "Intersection with empty failed for " + self.case
def test_self_symmetric_difference(self):
result = self.set ^ self.set
! assert result == empty_set, "Self-symdiff failed for " + self.case
def checkempty_symmetric_difference(self):
result = self.set ^ empty_set
! assert result == self.set, "Symdiff with empty failed for " + self.case
def test_self_difference(self):
result = self.set - self.set
! assert result == empty_set, "Self-difference failed for " + self.case
def test_empty_difference(self):
result = self.set - empty_set
! assert result == self.dup, "Difference with empty failed for " + self.case
def test_empty_difference_rev(self):
result = empty_set - self.set
! assert result == empty_set, "Difference from empty failed for " + self.case
def test_iteration(self):
--- 13,73 ----
def test_repr(self):
if self.repr is not None:
! self.assertEqual(`self.set`, self.repr)
def test_length(self):
! self.assertEqual(len(self.set), self.length)
def test_self_equality(self):
! self.assertEqual(self.set, self.set)
def test_equivalent_equality(self):
! self.assertEqual(self.set, self.dup)
def test_copy(self):
! self.assertEqual(self.set.copy(), self.dup)
def test_self_union(self):
result = self.set | self.set
! self.assertEqual(result, self.dup)
def test_empty_union(self):
result = self.set | empty_set
! self.assertEqual(result, self.dup)
def test_union_empty(self):
result = empty_set | self.set
! self.assertEqual(result, self.dup)
def test_self_intersection(self):
result = self.set & self.set
! self.assertEqual(result, self.dup)
def test_empty_intersection(self):
result = self.set & empty_set
! self.assertEqual(result, empty_set)
def test_intersection_empty(self):
result = empty_set & self.set
! self.assertEqual(result, empty_set)
def test_self_symmetric_difference(self):
result = self.set ^ self.set
! self.assertEqual(result, empty_set)
def checkempty_symmetric_difference(self):
result = self.set ^ empty_set
! self.assertEqual(result, self.set)
def test_self_difference(self):
result = self.set - self.set
! self.assertEqual(result, empty_set)
def test_empty_difference(self):
result = self.set - empty_set
! self.assertEqual(result, self.dup)
def test_empty_difference_rev(self):
result = empty_set - self.set
! self.assertEqual(result, empty_set)
def test_iteration(self):
***************
*** 152,200 ****
def test_union_subset(self):
result = self.set | Set([2])
! assert result == Set((2, 4, 6)), "Subset union"
def test_union_superset(self):
result = self.set | Set([2, 4, 6, 8])
! assert result == Set([2, 4, 6, 8]), "Superset union"
def test_union_overlap(self):
result = self.set | Set([3, 4, 5])
! assert result == Set([2, 3, 4, 5, 6]), "Overlapping union"
def test_union_non_overlap(self):
result = self.set | Set([8])
! assert result == Set([2, 4, 6, 8]), "Non-overlapping union"
def test_intersection_subset(self):
result = self.set & Set((2, 4))
! assert result == Set((2, 4)), "Subset intersection"
def test_intersection_superset(self):
result = self.set & Set([2, 4, 6, 8])
! assert result == Set([2, 4, 6]), "Superset intersection"
def test_intersection_overlap(self):
result = self.set & Set([3, 4, 5])
! assert result == Set([4]), "Overlapping intersection"
def test_intersection_non_overlap(self):
result = self.set & Set([8])
! assert result == empty_set, "Non-overlapping intersection"
def test_sym_difference_subset(self):
result = self.set ^ Set((2, 4))
! assert result == Set([6]), "Subset symmetric difference"
def test_sym_difference_superset(self):
result = self.set ^ Set((2, 4, 6, 8))
! assert result == Set([8]), "Superset symmetric difference"
def test_sym_difference_overlap(self):
result = self.set ^ Set((3, 4, 5))
! assert result == Set([2, 3, 5, 6]), "Overlapping symmetric difference"
def test_sym_difference_non_overlap(self):
result = self.set ^ Set([8])
! assert result == Set([2, 4, 6, 8]), "Non-overlapping symmetric difference"
#==============================================================================
--- 152,200 ----
def test_union_subset(self):
result = self.set | Set([2])
! self.assertEqual(result, Set((2, 4, 6)))
def test_union_superset(self):
result = self.set | Set([2, 4, 6, 8])
! self.assertEqual(result, Set([2, 4, 6, 8]))
def test_union_overlap(self):
result = self.set | Set([3, 4, 5])
! self.assertEqual(result, Set([2, 3, 4, 5, 6]))
def test_union_non_overlap(self):
result = self.set | Set([8])
! self.assertEqual(result, Set([2, 4, 6, 8]))
def test_intersection_subset(self):
result = self.set & Set((2, 4))
! self.assertEqual(result, Set((2, 4)))
def test_intersection_superset(self):
result = self.set & Set([2, 4, 6, 8])
! self.assertEqual(result, Set([2, 4, 6]))
def test_intersection_overlap(self):
result = self.set & Set([3, 4, 5])
! self.assertEqual(result, Set([4]))
def test_intersection_non_overlap(self):
result = self.set & Set([8])
! self.assertEqual(result, empty_set)
def test_sym_difference_subset(self):
result = self.set ^ Set((2, 4))
! self.assertEqual(result, Set([6]))
def test_sym_difference_superset(self):
result = self.set ^ Set((2, 4, 6, 8))
! self.assertEqual(result, Set([8]))
def test_sym_difference_overlap(self):
result = self.set ^ Set((3, 4, 5))
! self.assertEqual(result, Set([2, 3, 5, 6]))
def test_sym_difference_non_overlap(self):
result = self.set ^ Set([8])
! self.assertEqual(result, Set([2, 4, 6, 8]))
#==============================================================================
***************
*** 206,286 ****
def test_union_subset(self):
self.set |= Set([2])
! assert self.set == Set((2, 4, 6)), "Subset union"
def test_union_superset(self):
self.set |= Set([2, 4, 6, 8])
! assert self.set == Set([2, 4, 6, 8]), "Superset union"
def test_union_overlap(self):
self.set |= Set([3, 4, 5])
! assert self.set == Set([2, 3, 4, 5, 6]), "Overlapping union"
def test_union_non_overlap(self):
self.set |= Set([8])
! assert self.set == Set([2, 4, 6, 8]), "Non-overlapping union"
def test_union_method_call(self):
self.set.union_update(Set([3, 4, 5]))
! assert self.set == Set([2, 3, 4, 5, 6]), "Union method call"
def test_intersection_subset(self):
self.set &= Set((2, 4))
! assert self.set == Set((2, 4)), "Subset intersection"
def test_intersection_superset(self):
self.set &= Set([2, 4, 6, 8])
! assert self.set == Set([2, 4, 6]), "Superset intersection"
def test_intersection_overlap(self):
self.set &= Set([3, 4, 5])
! assert self.set == Set([4]), "Overlapping intersection"
def test_intersection_non_overlap(self):
self.set &= Set([8])
! assert self.set == empty_set, "Non-overlapping intersection"
def test_intersection_method_call(self):
self.set.intersection_update(Set([3, 4, 5]))
! assert self.set == Set([4]), "Intersection method call"
def test_sym_difference_subset(self):
self.set ^= Set((2, 4))
! assert self.set == Set([6]), "Subset symmetric difference"
def test_sym_difference_superset(self):
self.set ^= Set((2, 4, 6, 8))
! assert self.set == Set([8]), "Superset symmetric difference"
def test_sym_difference_overlap(self):
self.set ^= Set((3, 4, 5))
! assert self.set == Set([2, 3, 5, 6]), "Overlapping symmetric difference"
def test_sym_difference_non_overlap(self):
self.set ^= Set([8])
! assert self.set == Set([2, 4, 6, 8]), "Non-overlapping symmetric difference"
def test_sym_difference_method_call(self):
self.set.symmetric_difference_update(Set([3, 4, 5]))
! assert self.set == Set([2, 3, 5, 6]), "Symmetric difference method call"
def test_difference_subset(self):
self.set -= Set((2, 4))
! assert self.set == Set([6]), "Subset difference"
def test_difference_superset(self):
self.set -= Set((2, 4, 6, 8))
! assert self.set == Set([]), "Superset difference"
def test_difference_overlap(self):
self.set -= Set((3, 4, 5))
! assert self.set == Set([2, 6]), "Overlapping difference"
def test_difference_non_overlap(self):
self.set -= Set([8])
! assert self.set == Set([2, 4, 6]), "Non-overlapping difference"
def test_difference_method_call(self):
self.set.difference_update(Set([3, 4, 5]))
! assert self.set == Set([2, 6]), "Difference method call"
#==============================================================================
--- 206,286 ----
def test_union_subset(self):
self.set |= Set([2])
! self.assertEqual(self.set, Set((2, 4, 6)))
def test_union_superset(self):
self.set |= Set([2, 4, 6, 8])
! self.assertEqual(self.set, Set([2, 4, 6, 8]))
def test_union_overlap(self):
self.set |= Set([3, 4, 5])
! self.assertEqual(self.set, Set([2, 3, 4, 5, 6]))
def test_union_non_overlap(self):
self.set |= Set([8])
! self.assertEqual(self.set, Set([2, 4, 6, 8]))
def test_union_method_call(self):
self.set.union_update(Set([3, 4, 5]))
! self.assertEqual(self.set, Set([2, 3, 4, 5, 6]))
def test_intersection_subset(self):
self.set &= Set((2, 4))
! self.assertEqual(self.set, Set((2, 4)))
def test_intersection_superset(self):
self.set &= Set([2, 4, 6, 8])
! self.assertEqual(self.set, Set([2, 4, 6]))
def test_intersection_overlap(self):
self.set &= Set([3, 4, 5])
! self.assertEqual(self.set, Set([4]))
def test_intersection_non_overlap(self):
self.set &= Set([8])
! self.assertEqual(self.set, empty_set)
def test_intersection_method_call(self):
self.set.intersection_update(Set([3, 4, 5]))
! self.assertEqual(self.set, Set([4]))
def test_sym_difference_subset(self):
self.set ^= Set((2, 4))
! self.assertEqual(self.set, Set([6]))
def test_sym_difference_superset(self):
self.set ^= Set((2, 4, 6, 8))
! self.assertEqual(self.set, Set([8]))
def test_sym_difference_overlap(self):
self.set ^= Set((3, 4, 5))
! self.assertEqual(self.set, Set([2, 3, 5, 6]))
def test_sym_difference_non_overlap(self):
self.set ^= Set([8])
! self.assertEqual(self.set, Set([2, 4, 6, 8]))
def test_sym_difference_method_call(self):
self.set.symmetric_difference_update(Set([3, 4, 5]))
! self.assertEqual(self.set, Set([2, 3, 5, 6]))
def test_difference_subset(self):
self.set -= Set((2, 4))
! self.assertEqual(self.set, Set([6]))
def test_difference_superset(self):
self.set -= Set((2, 4, 6, 8))
! self.assertEqual(self.set, Set([]))
def test_difference_overlap(self):
self.set -= Set((3, 4, 5))
! self.assertEqual(self.set, Set([2, 6]))
def test_difference_non_overlap(self):
self.set -= Set([8])
! self.assertEqual(self.set, Set([2, 4, 6]))
def test_difference_method_call(self):
self.set.difference_update(Set([3, 4, 5]))
! self.assertEqual(self.set, Set([2, 6]))
#==============================================================================
***************
*** 293,301 ****
def test_add_present(self):
self.set.add("c")
! assert self.set == Set(("a", "b", "c")), "Adding present element"
def test_add_absent(self):
self.set.add("d")
! assert self.set == Set(("a", "b", "c", "d")), "Adding missing element"
def test_add_until_full(self):
--- 293,301 ----
def test_add_present(self):
self.set.add("c")
! self.assertEqual(self.set, Set(("a", "b", "c")))
def test_add_absent(self):
self.set.add("d")
! self.assertEqual(self.set, Set(("a", "b", "c", "d")))
def test_add_until_full(self):
***************
*** 305,314 ****
tmp.add(v)
expected_len += 1
! assert len(tmp) == expected_len, "Adding values one by one to temporary"
! assert tmp == self.set, "Adding values one by one"
def test_remove_present(self):
self.set.remove("b")
! assert self.set == Set(("a", "c")), "Removing present element"
def test_remove_absent(self):
--- 305,314 ----
tmp.add(v)
expected_len += 1
! self.assertEqual(len(tmp), expected_len)
! self.assertEqual(tmp, self.set)
def test_remove_present(self):
self.set.remove("b")
! self.assertEqual(self.set, Set(("a", "c")))
def test_remove_absent(self):
***************
*** 328,340 ****
def test_discard_present(self):
self.set.discard("c")
! assert self.set == Set(("a", "b")), "Discarding present element"
def test_discard_absent(self):
self.set.discard("d")
! assert self.set == Set(("a", "b", "c")), "Discarding missing element"
def test_clear(self):
self.set.clear()
! assert len(self.set) == 0, "Clearing set"
def test_pop(self):
--- 328,340 ----
def test_discard_present(self):
self.set.discard("c")
! self.assertEqual(self.set, Set(("a", "b")))
def test_discard_absent(self):
self.set.discard("d")
! self.assertEqual(self.set, Set(("a", "b", "c")))
def test_clear(self):
self.set.clear()
! self.assertEqual(len(self.set), 0)
def test_pop(self):
***************
*** 342,346 ****
while self.set:
popped[self.set.pop()] = None
! assert len(popped) == len(self.values), "Popping items"
for v in self.values:
assert v in popped, "Popping items"
--- 342,346 ----
while self.set:
popped[self.set.pop()] = None
! self.assertEqual(len(popped), len(self.values))
for v in self.values:
assert v in popped, "Popping items"
***************
*** 348,360 ****
def test_update_empty_tuple(self):
self.set.update(())
! assert self.set == Set(self.values), "Updating with empty tuple"
def test_update_unit_tuple_overlap(self):
self.set.update(("a",))
! assert self.set == Set(self.values), "Updating with overlapping unit tuple"
def test_update_unit_tuple_non_overlap(self):
self.set.update(("a", "z"))
! assert self.set == Set(self.values + ["z"]), "Updating with non-overlapping unit tuple"
#==============================================================================
--- 348,360 ----
def test_update_empty_tuple(self):
self.set.update(())
! self.assertEqual(self.set, Set(self.values))
def test_update_unit_tuple_overlap(self):
self.set.update(("a",))
! self.assertEqual(self.set, Set(self.values))
def test_update_unit_tuple_non_overlap(self):
self.set.update(("a", "z"))
! self.assertEqual(self.set, Set(self.values + ["z"]))
#==============================================================================