[Python-checkins] python/nondist/sandbox/sets test_set.py,1.3,1.4
gvanrossum@users.sourceforge.net
gvanrossum@users.sourceforge.net
Thu, 15 Aug 2002 13:43:09 -0700
Update of /cvsroot/python/python/nondist/sandbox/sets
In directory usw-pr-cvs1:/tmp/cvs-serv2516
Modified Files:
test_set.py
Log Message:
Changes by Alex Martelli. Fixed to reflect name change of
is_subset_of() to issubset().
Index: test_set.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/sets/test_set.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_set.py 28 Aug 2001 16:19:35 -0000 1.3
--- test_set.py 15 Aug 2002 20:43:07 -0000 1.4
***************
*** 1,5 ****
#!/usr/bin/env python
! from set import Set
import unittest, operator, copy
--- 1,5 ----
#!/usr/bin/env python
! from set import Set, ImmutableSet
import unittest, operator, copy
***************
*** 318,331 ****
self.values = [0, 1]
self.set = Set(self.values)
hash(self.set)
- def test_freeze_after_hash(self):
- assert self.set.is_frozen(), "Set not frozen after hashing"
-
def test_clear_after_freeze(self):
try:
self.set.clear()
assert 0, "Empty disregards freezing"
! except ValueError:
pass
--- 318,329 ----
self.values = [0, 1]
self.set = Set(self.values)
+ self.set = ImmutableSet(self.set)
hash(self.set)
def test_clear_after_freeze(self):
try:
self.set.clear()
assert 0, "Empty disregards freezing"
! except (TypeError, AttributeError):
pass
***************
*** 334,338 ****
self.set |= Set([2])
assert 0, "Union update disregards freezing"
! except ValueError:
pass
--- 332,336 ----
self.set |= Set([2])
assert 0, "Union update disregards freezing"
! except (TypeError, AttributeError):
pass
***************
*** 341,345 ****
self.set &= Set([2])
assert 0, "Intersection update disregards freezing"
! except ValueError:
pass
--- 339,343 ----
self.set &= Set([2])
assert 0, "Intersection update disregards freezing"
! except (TypeError, AttributeError):
pass
***************
*** 348,352 ****
self.set ^= Set([2])
assert 0, "Symmetric difference update disregards freezing"
! except ValueError:
pass
--- 346,350 ----
self.set ^= Set([2])
assert 0, "Symmetric difference update disregards freezing"
! except (TypeError, AttributeError):
pass
***************
*** 355,359 ****
self.set -= Set([2])
assert 0, "Difference update disregards freezing"
! except ValueError:
pass
--- 353,357 ----
self.set -= Set([2])
assert 0, "Difference update disregards freezing"
! except (TypeError, AttributeError):
pass
***************
*** 362,366 ****
self.set.add(4)
assert 0, "Add disregards freezing"
! except ValueError:
pass
--- 360,364 ----
self.set.add(4)
assert 0, "Add disregards freezing"
! except (TypeError, AttributeError):
pass
***************
*** 369,373 ****
self.set.update([4, 5])
assert 0, "Update disregards freezing"
! except ValueError:
pass
--- 367,371 ----
self.set.update([4, 5])
assert 0, "Update disregards freezing"
! except (TypeError, AttributeError):
pass
***************
*** 376,381 ****
class TestSubsets(unittest.TestCase):
! def test_is_subset_of(self):
! result = self.left.is_subset_of(self.right)
if "<" in self.cases:
assert result, "subset: " + self.name
--- 374,379 ----
class TestSubsets(unittest.TestCase):
! def test_issubset(self):
! result = self.left.issubset(self.right)
if "<" in self.cases:
assert result, "subset: " + self.name
***************
*** 436,445 ****
self.other < self.set
assert 0, "Comparison with non-set on left"
! except ValueError:
pass
try:
self.set >= self.other
assert 0, "Comparison with non-set on right"
! except ValueError:
pass
--- 434,443 ----
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
***************
*** 448,452 ****
self.set |= self.other
assert 0, "Union update with non-set"
! except ValueError:
pass
--- 446,450 ----
self.set |= self.other
assert 0, "Union update with non-set"
! except TypeError:
pass
***************
*** 455,464 ****
self.other | self.set
assert 0, "Union with non-set on left"
! except ValueError:
pass
try:
self.set | self.other
assert 0, "Union with non-set on right"
! except ValueError:
pass
--- 453,462 ----
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
***************
*** 467,471 ****
self.set &= self.other
assert 0, "Intersection update with non-set"
! except ValueError:
pass
--- 465,469 ----
self.set &= self.other
assert 0, "Intersection update with non-set"
! except TypeError:
pass
***************
*** 474,483 ****
self.other & self.set
assert 0, "Intersection with non-set on left"
! except ValueError:
pass
try:
self.set & self.other
assert 0, "Intersection with non-set on right"
! except ValueError:
pass
--- 472,481 ----
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
***************
*** 486,490 ****
self.set ^= self.other
assert 0, "Symmetric difference update with non-set"
! except ValueError:
pass
--- 484,488 ----
self.set ^= self.other
assert 0, "Symmetric difference update with non-set"
! except TypeError:
pass
***************
*** 493,502 ****
self.other ^ self.set
assert 0, "Symmetric difference with non-set on left"
! except ValueError:
pass
try:
self.set ^ self.other
assert 0, "Symmetric difference with non-set on right"
! except ValueError:
pass
--- 491,500 ----
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
***************
*** 505,509 ****
self.set -= self.other
assert 0, "Symmetric difference update with non-set"
! except ValueError:
pass
--- 503,507 ----
self.set -= self.other
assert 0, "Symmetric difference update with non-set"
! except TypeError:
pass
***************
*** 512,521 ****
self.other - self.set
assert 0, "Symmetric difference with non-set on left"
! except ValueError:
pass
try:
self.set - self.other
assert 0, "Symmetric difference with non-set on right"
! except ValueError:
pass
--- 510,519 ----
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
***************
*** 555,558 ****
--- 553,557 ----
def test_deep_copy(self):
dup = copy.deepcopy(self.set)
+ ##print type(dup), `dup`
dup_list = list(dup); dup_list.sort()
set_list = list(self.set); set_list.sort()