[Checkins] SVN: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_ Coverage for z.s._f.{Tuple, List, Set, Frozenset}.
Tres Seaver
cvs-admin at zope.org
Wed Apr 25 18:20:07 UTC 2012
Log message for revision 125285:
Coverage for z.s._f.{Tuple,List,Set,Frozenset}.
Collapse out-of-module tests.
Changed:
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test__field.py
D zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_listfield.py
D zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_setfield.py
D zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_tuplefield.py
-=-
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test__field.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test__field.py 2012-04-25 18:19:58 UTC (rev 125284)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test__field.py 2012-04-25 18:20:04 UTC (rev 125285)
@@ -35,12 +35,16 @@
def test_validate_wrong_types(self):
from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
self.assertRaises(WrongType, field.validate, 1)
self.assertRaises(WrongType, field.validate, 1.0)
self.assertRaises(WrongType, field.validate, ())
self.assertRaises(WrongType, field.validate, [])
self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
self.assertRaises(WrongType, field.validate, object())
def test_fromUnicode_miss(self):
@@ -77,12 +81,16 @@
def test_validate_wrong_types(self):
from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
self.assertRaises(WrongType, field.validate, 1)
self.assertRaises(WrongType, field.validate, 1.0)
self.assertRaises(WrongType, field.validate, ())
self.assertRaises(WrongType, field.validate, [])
self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
self.assertRaises(WrongType, field.validate, object())
def test__validate_empty(self):
@@ -135,12 +143,16 @@
def test_validate_wrong_types(self):
from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
self.assertRaises(WrongType, field.validate, 1)
self.assertRaises(WrongType, field.validate, 1.0)
self.assertRaises(WrongType, field.validate, ())
self.assertRaises(WrongType, field.validate, [])
self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
self.assertRaises(WrongType, field.validate, object())
def test_validate_not_required(self):
@@ -191,14 +203,17 @@
def test_validate_wrong_types(self):
from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
self.assertRaises(WrongType, field.validate, 1)
self.assertRaises(WrongType, field.validate, 1.0)
self.assertRaises(WrongType, field.validate, ())
self.assertRaises(WrongType, field.validate, [])
self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
self.assertRaises(WrongType, field.validate, object())
- self.assertRaises(WrongType, field.validate, object())
def test_validate_not_required(self):
from zope.schema.interfaces import InvalidValue
@@ -413,12 +428,18 @@
def test_validate_wrong_types(self):
from datetime import date
from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
+ from zope.schema._compat import b
field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
+ self.assertRaises(WrongType, field.validate, b(''))
self.assertRaises(WrongType, field.validate, 1)
self.assertRaises(WrongType, field.validate, 1.0)
self.assertRaises(WrongType, field.validate, ())
self.assertRaises(WrongType, field.validate, [])
self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
self.assertRaises(WrongType, field.validate, object())
self.assertRaises(WrongType, field.validate, date.today())
@@ -493,12 +514,18 @@
def test_validate_wrong_types(self):
from datetime import datetime
from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
+ from zope.schema._compat import b
field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
+ self.assertRaises(WrongType, field.validate, b(''))
self.assertRaises(WrongType, field.validate, 1)
self.assertRaises(WrongType, field.validate, 1.0)
self.assertRaises(WrongType, field.validate, ())
self.assertRaises(WrongType, field.validate, [])
self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
self.assertRaises(WrongType, field.validate, object())
self.assertRaises(WrongType, field.validate, datetime.now())
@@ -938,12 +965,18 @@
def test_validate_wrong_types(self):
from datetime import date
from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
+ from zope.schema._compat import b
field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
+ self.assertRaises(WrongType, field.validate, b(''))
self.assertRaises(WrongType, field.validate, 1)
self.assertRaises(WrongType, field.validate, 1.0)
self.assertRaises(WrongType, field.validate, ())
self.assertRaises(WrongType, field.validate, [])
self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
self.assertRaises(WrongType, field.validate, object())
self.assertRaises(WrongType, field.validate, date.today())
@@ -1026,6 +1059,322 @@
self.assertRaises(NotUnique, absc.validate, [u('a'), u('a')])
+class TupleTests(unittest.TestCase):
+
+ def _getTargetClass(self):
+ from zope.schema._field import Tuple
+ return Tuple
+
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
+ def test_class_conforms_to_ITuple(self):
+ from zope.interface.verify import verifyClass
+ from zope.schema.interfaces import ITuple
+ verifyClass(ITuple, self._getTargetClass())
+
+ def test_instance_conforms_to_ITuple(self):
+ from zope.interface.verify import verifyObject
+ from zope.schema.interfaces import ITuple
+ verifyObject(ITuple, self._makeOne())
+
+ def test_validate_wrong_types(self):
+ from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
+ from zope.schema._compat import b
+ field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
+ self.assertRaises(WrongType, field.validate, b(''))
+ self.assertRaises(WrongType, field.validate, 1)
+ self.assertRaises(WrongType, field.validate, 1.0)
+ self.assertRaises(WrongType, field.validate, [])
+ self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
+ self.assertRaises(WrongType, field.validate, object())
+
+ def test_validate_not_required(self):
+ field = self._makeOne(required=False)
+ field.validate(())
+ field.validate((1, 2))
+ field.validate((3,))
+ field.validate(None)
+
+ def test_validate_required(self):
+ from zope.schema.interfaces import RequiredMissing
+ field = self._makeOne()
+ field.validate(())
+ field.validate((1, 2))
+ field.validate((3,))
+ self.assertRaises(RequiredMissing, field.validate, None)
+
+ def test_validate_min_length(self):
+ from zope.schema.interfaces import TooShort
+ field = self._makeOne(min_length=2)
+ field.validate((1, 2))
+ field.validate((1, 2, 3))
+ self.assertRaises(TooShort, field.validate, ())
+ self.assertRaises(TooShort, field.validate, (1,))
+
+ def test_validate_max_length(self):
+ from zope.schema.interfaces import TooLong
+ field = self._makeOne(max_length=2)
+ field.validate(())
+ field.validate((1, 2))
+ self.assertRaises(TooLong, field.validate, (1, 2, 3, 4))
+ self.assertRaises(TooLong, field.validate, (1, 2, 3))
+
+ def test_validate_min_length_and_max_length(self):
+ from zope.schema.interfaces import TooLong
+ from zope.schema.interfaces import TooShort
+ field = self._makeOne(min_length=1, max_length=2)
+ field.validate((1, ))
+ field.validate((1, 2))
+ self.assertRaises(TooShort, field.validate, ())
+ self.assertRaises(TooLong, field.validate, (1, 2, 3))
+
+
+class ListTests(unittest.TestCase):
+
+ def _getTargetClass(self):
+ from zope.schema._field import List
+ return List
+
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
+ def test_class_conforms_to_IList(self):
+ from zope.interface.verify import verifyClass
+ from zope.schema.interfaces import IList
+ verifyClass(IList, self._getTargetClass())
+
+ def test_instance_conforms_to_IList(self):
+ from zope.interface.verify import verifyObject
+ from zope.schema.interfaces import IList
+ verifyObject(IList, self._makeOne())
+
+ def test_validate_wrong_types(self):
+ from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
+ from zope.schema._compat import b
+ field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
+ self.assertRaises(WrongType, field.validate, b(''))
+ self.assertRaises(WrongType, field.validate, 1)
+ self.assertRaises(WrongType, field.validate, 1.0)
+ self.assertRaises(WrongType, field.validate, ())
+ self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, frozenset())
+ self.assertRaises(WrongType, field.validate, object())
+
+ def test_validate_not_required(self):
+ field = self._makeOne(required=False)
+ field.validate([])
+ field.validate([1, 2])
+ field.validate([3])
+ field.validate(None)
+
+ def test_validate_required(self):
+ from zope.schema.interfaces import RequiredMissing
+ field = self._makeOne()
+ field.validate([])
+ field.validate([1, 2])
+ field.validate([3])
+ self.assertRaises(RequiredMissing, field.validate, None)
+
+ def test_validate_min_length(self):
+ from zope.schema.interfaces import TooShort
+ field = self._makeOne(min_length=2)
+ field.validate([1, 2])
+ field.validate([1, 2, 3])
+ self.assertRaises(TooShort, field.validate, [])
+ self.assertRaises(TooShort, field.validate, [1,])
+
+ def test_validate_max_length(self):
+ from zope.schema.interfaces import TooLong
+ field = self._makeOne(max_length=2)
+ field.validate([])
+ field.validate([1])
+ field.validate([1, 2])
+ self.assertRaises(TooLong, field.validate, [1, 2, 3, 4])
+ self.assertRaises(TooLong, field.validate, [1, 2, 3])
+
+ def test_validate_min_length_and_max_length(self):
+ from zope.schema.interfaces import TooLong
+ from zope.schema.interfaces import TooShort
+ field = self._makeOne(min_length=1, max_length=2)
+ field.validate([1])
+ field.validate([1, 2])
+ self.assertRaises(TooShort, field.validate, [])
+ self.assertRaises(TooLong, field.validate, [1, 2, 3])
+
+
+class SetTests(unittest.TestCase):
+
+ def _getTargetClass(self):
+ from zope.schema._field import Set
+ return Set
+
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
+ def test_class_conforms_to_ISet(self):
+ from zope.interface.verify import verifyClass
+ from zope.schema.interfaces import ISet
+ verifyClass(ISet, self._getTargetClass())
+
+ def test_instance_conforms_to_ISet(self):
+ from zope.interface.verify import verifyObject
+ from zope.schema.interfaces import ISet
+ verifyObject(ISet, self._makeOne())
+
+ def test_ctor_disallows_unique(self):
+ self.assertRaises(TypeError, self._makeOne, unique=False)
+ self.assertRaises(TypeError, self._makeOne, unique=True)
+ self.assertTrue(self._makeOne().unique)
+
+ def test_validate_wrong_types(self):
+ from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
+ from zope.schema._compat import b
+ field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
+ self.assertRaises(WrongType, field.validate, b(''))
+ self.assertRaises(WrongType, field.validate, 1)
+ self.assertRaises(WrongType, field.validate, 1.0)
+ self.assertRaises(WrongType, field.validate, ())
+ self.assertRaises(WrongType, field.validate, [])
+ self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, frozenset())
+ self.assertRaises(WrongType, field.validate, object())
+
+ def test_validate_not_required(self):
+ field = self._makeOne(required=False)
+ field.validate(set())
+ field.validate(set((1, 2)))
+ field.validate(set((3,)))
+ field.validate(None)
+
+ def test_validate_required(self):
+ from zope.schema.interfaces import RequiredMissing
+ field = self._makeOne()
+ field.validate(set())
+ field.validate(set((1, 2)))
+ field.validate(set((3,)))
+ field.validate(set())
+ field.validate(set((1, 2)))
+ field.validate(set((3,)))
+ self.assertRaises(RequiredMissing, field.validate, None)
+
+ def test_validate_min_length(self):
+ from zope.schema.interfaces import TooShort
+ field = self._makeOne(min_length=2)
+ field.validate(set((1, 2)))
+ field.validate(set((1, 2, 3)))
+ self.assertRaises(TooShort, field.validate, set())
+ self.assertRaises(TooShort, field.validate, set((1,)))
+
+ def test_validate_max_length(self):
+ from zope.schema.interfaces import TooLong
+ field = self._makeOne(max_length=2)
+ field.validate(set())
+ field.validate(set((1,)))
+ field.validate(set((1, 2)))
+ self.assertRaises(TooLong, field.validate, set((1, 2, 3, 4)))
+ self.assertRaises(TooLong, field.validate, set((1, 2, 3)))
+
+ def test_validate_min_length_and_max_length(self):
+ from zope.schema.interfaces import TooLong
+ from zope.schema.interfaces import TooShort
+ field = self._makeOne(min_length=1, max_length=2)
+ field.validate(set((1,)))
+ field.validate(set((1, 2)))
+ self.assertRaises(TooShort, field.validate, set())
+ self.assertRaises(TooLong, field.validate, set((1, 2, 3)))
+
+
+class FrozenSetTests(unittest.TestCase):
+
+ def _getTargetClass(self):
+ from zope.schema._field import FrozenSet
+ return FrozenSet
+
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
+ def test_class_conforms_to_IFrozenSet(self):
+ from zope.interface.verify import verifyClass
+ from zope.schema.interfaces import IFrozenSet
+ verifyClass(IFrozenSet, self._getTargetClass())
+
+ def test_instance_conforms_to_IFrozenSet(self):
+ from zope.interface.verify import verifyObject
+ from zope.schema.interfaces import IFrozenSet
+ verifyObject(IFrozenSet, self._makeOne())
+
+ def test_ctor_disallows_unique(self):
+ self.assertRaises(TypeError, self._makeOne, unique=False)
+ self.assertRaises(TypeError, self._makeOne, unique=True)
+ self.assertTrue(self._makeOne().unique)
+
+ def test_validate_wrong_types(self):
+ from zope.schema.interfaces import WrongType
+ from zope.schema._compat import u
+ from zope.schema._compat import b
+ field = self._makeOne()
+ self.assertRaises(WrongType, field.validate, u(''))
+ self.assertRaises(WrongType, field.validate, b(''))
+ self.assertRaises(WrongType, field.validate, 1)
+ self.assertRaises(WrongType, field.validate, 1.0)
+ self.assertRaises(WrongType, field.validate, ())
+ self.assertRaises(WrongType, field.validate, [])
+ self.assertRaises(WrongType, field.validate, {})
+ self.assertRaises(WrongType, field.validate, set())
+ self.assertRaises(WrongType, field.validate, object())
+
+ def test_validate_not_required(self):
+ field = self._makeOne(required=False)
+ field.validate(frozenset())
+ field.validate(frozenset((1, 2)))
+ field.validate(frozenset((3,)))
+ field.validate(None)
+
+ def test_validate_required(self):
+ from zope.schema.interfaces import RequiredMissing
+ field = self._makeOne()
+ field.validate(frozenset())
+ field.validate(frozenset((1, 2)))
+ field.validate(frozenset((3,)))
+ self.assertRaises(RequiredMissing, field.validate, None)
+
+ def test_validate_min_length(self):
+ from zope.schema.interfaces import TooShort
+ field = self._makeOne(min_length=2)
+ field.validate(frozenset((1, 2)))
+ field.validate(frozenset((1, 2, 3)))
+ self.assertRaises(TooShort, field.validate, frozenset())
+ self.assertRaises(TooShort, field.validate, frozenset((1,)))
+
+ def test_validate_max_length(self):
+ from zope.schema.interfaces import TooLong
+ field = self._makeOne(max_length=2)
+ field.validate(frozenset())
+ field.validate(frozenset((1,)))
+ field.validate(frozenset((1, 2)))
+ self.assertRaises(TooLong, field.validate, frozenset((1, 2, 3, 4)))
+ self.assertRaises(TooLong, field.validate, frozenset((1, 2, 3)))
+
+ def test_validate_min_length_and_max_length(self):
+ from zope.schema.interfaces import TooLong
+ from zope.schema.interfaces import TooShort
+ field = self._makeOne(min_length=1, max_length=2)
+ field.validate(frozenset((1,)))
+ field.validate(frozenset((1, 2)))
+ self.assertRaises(TooShort, field.validate, frozenset())
+ self.assertRaises(TooLong, field.validate, frozenset((1, 2, 3)))
+
+
class DummyInstance(object):
pass
@@ -1084,5 +1433,9 @@
unittest.makeSuite(ChoiceTests),
unittest.makeSuite(InterfaceFieldTests),
unittest.makeSuite(AbstractCollectionTests),
+ unittest.makeSuite(TupleTests),
+ unittest.makeSuite(ListTests),
+ unittest.makeSuite(SetTests),
+ unittest.makeSuite(FrozenSetTests),
))
Deleted: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_listfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_listfield.py 2012-04-25 18:19:58 UTC (rev 125284)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_listfield.py 2012-04-25 18:20:04 UTC (rev 125285)
@@ -1,139 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""List field tests
-"""
-import unittest
-
-from zope.schema.tests.test_field import CollectionFieldTestBase
-
-
-class ListTest(unittest.TestCase, CollectionFieldTestBase):
- """Test the List Field."""
-
- def _getTargetClass(self):
- from zope.schema import List
- return List
-
- def testValidate(self):
- from zope.schema._compat import u
- field = self._makeOne(title=u('List field'), description=u(''),
- readonly=False, required=False)
- field.validate(None)
- field.validate([])
- field.validate([1, 2])
- field.validate([3,])
-
- def testValidateRequired(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import RequiredMissing
- field = self._makeOne(title=u('List field'), description=u(''),
- readonly=False, required=True)
- field.validate([])
- field.validate([1, 2])
- field.validate([3,])
-
- self.assertRaises(RequiredMissing, field.validate, None)
-
- def testValidateMinValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooShort
- field = self._makeOne(title=u('List field'), description=u(''),
- readonly=False, required=False, min_length=2)
- field.validate(None)
- field.validate([1, 2])
- field.validate([1, 2, 3])
-
- self.assertRaises(TooShort, field.validate, [])
- self.assertRaises(TooShort, field.validate, [1,])
-
- def testValidateMaxValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooLong
- field = self._makeOne(title=u('List field'), description=u(''),
- readonly=False, required=False, max_length=2)
- field.validate(None)
- field.validate([])
- field.validate([1, 2])
-
- self.assertRaises(TooLong, field.validate, [1, 2, 3, 4])
- self.assertRaises(TooLong, field.validate, [1, 2, 3])
-
- def testValidateMinValuesAndMaxValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooLong
- from zope.schema.interfaces import TooShort
- field = self._makeOne(title=u('List field'), description=u(''),
- readonly=False, required=False,
- min_length=1, max_length=2)
- field.validate(None)
- field.validate([1, ])
- field.validate([1, 2])
-
- self.assertRaises(TooShort, field.validate, [])
- self.assertRaises(TooLong, field.validate, [1, 2, 3])
-
- def testValidateValueTypes(self):
- from zope.schema._compat import u
- from zope.schema import Int
- from zope.schema.interfaces import WrongContainedType
- field = self._makeOne(title=u('List field'), description=u(''),
- readonly=False, required=False,
- value_type=Int())
- field.validate(None)
- field.validate([5,])
- field.validate([2, 3])
-
- self.assertRaises(WrongContainedType, field.validate, ['',] )
- self.assertRaises(WrongContainedType, field.validate, [3.14159,] )
-
- def testCorrectValueType(self):
- # TODO: We should not allow for a None valeu type.
- from zope.interface import implementer
- from zope.schema import Field
- from zope.schema.interfaces import IField
- self._makeOne(value_type=None)
-
- # do not allow arbitrary value types
- self.assertRaises(ValueError, self._makeOne, value_type=object())
- self.assertRaises(ValueError, self._makeOne, value_type=Field)
-
- # however, allow anything that implements IField
- self._makeOne(value_type=Field())
- @implementer(IField)
- class FakeField(object):
- pass
- self._makeOne(value_type=FakeField())
-
- def testUnique(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import NotUnique
- field = self._makeOne(title=u('test field'), description=u(''),
- readonly=False, required=True, unique=True)
- field.validate([1, 2])
- self.assertRaises(NotUnique, field.validate, [1, 2, 1])
-
- def testImplements(self):
- from zope.schema.interfaces import ICollection
- from zope.schema.interfaces import IList
- from zope.schema.interfaces import ISequence
- field = self._makeOne()
- self.assertTrue(IList.providedBy(field))
- self.assertTrue(ISequence.providedBy(field))
- self.assertTrue(ICollection.providedBy(field))
-
-
-def test_suite():
- return unittest.TestSuite((
- unittest.makeSuite(ListTest),
- ))
Deleted: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_setfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_setfield.py 2012-04-25 18:19:58 UTC (rev 125284)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_setfield.py 2012-04-25 18:20:04 UTC (rev 125285)
@@ -1,331 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Set field tests.
-"""
-import unittest
-
-from zope.schema.tests.test_field import CollectionFieldTestBase
-
-
-class SetTest(unittest.TestCase, CollectionFieldTestBase):
- """Test the Tuple Field."""
-
- def _getTargetClass(self):
- from zope.schema import Set
- return Set
-
- def testValidate(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import WrongType
- field = self._makeOne(title=u('Set field'), description=u(''),
- readonly=False, required=False)
- field.validate(None)
- field.validate(set())
- field.validate(set((1, 2)))
- field.validate(set((3,)))
- field.validate(set())
- field.validate(set((1, 2)))
- field.validate(set((3,)))
-
- self.assertRaises(WrongType, field.validate, [1, 2, 3])
- self.assertRaises(WrongType, field.validate, 'abc')
- self.assertRaises(WrongType, field.validate, 1)
- self.assertRaises(WrongType, field.validate, {})
- self.assertRaises(WrongType, field.validate, (1, 2, 3))
- self.assertRaises(WrongType, field.validate, frozenset((1, 2, 3)))
-
- def testValidateRequired(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import RequiredMissing
- field = self._makeOne(title=u('Set field'), description=u(''),
- readonly=False, required=True)
- field.validate(set())
- field.validate(set((1, 2)))
- field.validate(set((3,)))
- field.validate(set())
- field.validate(set((1, 2)))
- field.validate(set((3,)))
-
- self.assertRaises(RequiredMissing, field.validate, None)
-
- def testValidateRequiredAltMissingValue(self):
- from zope.schema.interfaces import RequiredMissing
- missing = object()
- field = self._makeOne(required=True, missing_value=missing)
- field.validate(set())
- field.validate(set())
-
- self.assertRaises(RequiredMissing, field.validate, missing)
-
- def testValidateDefault(self):
- field = self._makeOne(required=True)
- field.default = None
-
- def testValidateDefaultAltMissingValue(self):
- missing = object()
- field = self._makeOne(required=True, missing_value=missing)
- field.default = missing
-
- def testValidateMinValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooShort
- field = self._makeOne(title=u('Set field'), description=u(''),
- readonly=False, required=False, min_length=2)
- field.validate(None)
- field.validate(set((1, 2)))
- field.validate(set((1, 2, 3)))
- field.validate(set((1, 2)))
- field.validate(set((1, 2, 3)))
-
- self.assertRaises(TooShort, field.validate, set(()))
- self.assertRaises(TooShort, field.validate, set((3,)))
- self.assertRaises(TooShort, field.validate, set(()))
- self.assertRaises(TooShort, field.validate, set((3,)))
-
- def testValidateMaxValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooLong
- field = self._makeOne(title=u('Set field'), description=u(''),
- readonly=False, required=False, max_length=2)
- field.validate(None)
- field.validate(set())
- field.validate(set((1, 2)))
- field.validate(set())
- field.validate(set((1, 2)))
-
- self.assertRaises(TooLong, field.validate, set((1, 2, 3, 4)))
- self.assertRaises(TooLong, field.validate, set((1, 2, 3)))
- self.assertRaises(TooLong, field.validate, set((1, 2, 3, 4)))
- self.assertRaises(TooLong, field.validate, set((1, 2, 3)))
-
- def testValidateMinValuesAndMaxValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooLong
- from zope.schema.interfaces import TooShort
- field = self._makeOne(title=u('Set field'), description=u(''),
- readonly=False, required=False,
- min_length=1, max_length=2)
- field.validate(None)
- field.validate(set((3,)))
- field.validate(set((1, 2)))
- field.validate(set((3,)))
- field.validate(set((1, 2)))
-
- self.assertRaises(TooShort, field.validate, set())
- self.assertRaises(TooLong, field.validate, set((1, 2, 3)))
- self.assertRaises(TooShort, field.validate, set())
- self.assertRaises(TooLong, field.validate, set((1, 2, 3)))
-
- def testValidateValueTypes(self):
- from zope.schema._compat import u
- from zope.schema import Int
- from zope.schema.interfaces import WrongContainedType
- field = self._makeOne(title=u('Set field'), description=u(''),
- readonly=False, required=False,
- value_type=Int())
- field.validate(None)
- field.validate(set((5,)))
- field.validate(set((2, 3)))
- field.validate(set((5,)))
- field.validate(set((2, 3)))
-
- self.assertRaises(WrongContainedType, field.validate,
- set(('',)))
- self.assertRaises(WrongContainedType,
- field.validate, set((3.14159,)))
- self.assertRaises(WrongContainedType, field.validate, set(('',)))
- self.assertRaises(WrongContainedType,
- field.validate, set((3.14159,)))
-
- def testCorrectValueType(self):
- from zope.interface import implementer
- from zope.schema import Field
- from zope.schema.interfaces import IField
- # TODO: We should not allow for a None value type.
- self._makeOne(value_type=None)
-
- # do not allow arbitrary value types
- self.assertRaises(ValueError, self._makeOne, value_type=object())
- self.assertRaises(ValueError, self._makeOne, value_type=Field)
-
- # however, allow anything that implements IField
- self._makeOne(value_type=Field())
- @implementer(IField)
- class FakeField(object):
- pass
- self._makeOne(value_type=FakeField())
-
- def testNoUniqueArgument(self):
- self.assertRaises(TypeError, self._makeOne, unique=False)
- self.assertRaises(TypeError, self._makeOne, unique=True)
- self.assertTrue(self._makeOne().unique)
-
- def testImplements(self):
- from zope.schema.interfaces import IAbstractSet
- from zope.schema.interfaces import ICollection
- from zope.schema.interfaces import ISet
- from zope.schema.interfaces import IUnorderedCollection
- field = self._makeOne()
- self.assertTrue(ISet.providedBy(field))
- self.assertTrue(IUnorderedCollection.providedBy(field))
- self.assertTrue(IAbstractSet.providedBy(field))
- self.assertTrue(ICollection.providedBy(field))
-
-
-class FrozenSetTest(unittest.TestCase, CollectionFieldTestBase):
- """Test the Tuple Field."""
-
- def _getTargetClass(self):
- from zope.schema import FrozenSet
- return FrozenSet
-
- def testValidate(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import WrongType
- field = self._makeOne(title=u('Set field'), description=u(''),
- readonly=False, required=False)
- field.validate(None)
- field.validate(frozenset())
- field.validate(frozenset((1, 2)))
- field.validate(frozenset((3,)))
-
- self.assertRaises(WrongType, field.validate, [1, 2, 3])
- self.assertRaises(WrongType, field.validate, 'abc')
- self.assertRaises(WrongType, field.validate, 1)
- self.assertRaises(WrongType, field.validate, {})
- self.assertRaises(WrongType, field.validate, (1, 2, 3))
- self.assertRaises(WrongType, field.validate, set((1, 2, 3)))
- self.assertRaises(WrongType, field.validate, set((1, 2, 3)))
-
- def testValidateRequired(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import RequiredMissing
- field = self._makeOne(title=u('Set field'), description=u(''),
- readonly=False, required=True)
- field.validate(frozenset())
- field.validate(frozenset((1, 2)))
- field.validate(frozenset((3,)))
-
- self.assertRaises(RequiredMissing, field.validate, None)
-
- def testValidateRequiredAltMissingValue(self):
- from zope.schema.interfaces import RequiredMissing
- missing = object()
- field = self._makeOne(required=True, missing_value=missing)
- field.validate(frozenset())
-
- self.assertRaises(RequiredMissing, field.validate, missing)
-
- def testValidateDefault(self):
- field = self._makeOne(required=True)
- field.default = None
-
- def testValidateDefaultAltMissingValue(self):
- missing = object()
- field = self._makeOne(required=True, missing_value=missing)
- field.default = missing
-
- def testValidateMinValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooShort
- field = self._makeOne(title=u('FrozenSet field'), description=u(''),
- readonly=False, required=False, min_length=2)
- field.validate(None)
- field.validate(frozenset((1, 2)))
- field.validate(frozenset((1, 2, 3)))
-
- self.assertRaises(TooShort, field.validate, frozenset(()))
- self.assertRaises(TooShort, field.validate, frozenset((3,)))
-
- def testValidateMaxValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooLong
- field = self._makeOne(title=u('FrozenSet field'), description=u(''),
- readonly=False, required=False, max_length=2)
- field.validate(None)
- field.validate(frozenset())
- field.validate(frozenset((1, 2)))
-
- self.assertRaises(TooLong, field.validate, frozenset((1, 2, 3, 4)))
- self.assertRaises(TooLong, field.validate, frozenset((1, 2, 3)))
-
- def testValidateMinValuesAndMaxValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooLong
- from zope.schema.interfaces import TooShort
- field = self._makeOne(title=u('FrozenSet field'), description=u(''),
- readonly=False, required=False,
- min_length=1, max_length=2)
- field.validate(None)
- field.validate(frozenset((3,)))
- field.validate(frozenset((1, 2)))
-
- self.assertRaises(TooShort, field.validate, frozenset())
- self.assertRaises(TooLong, field.validate, frozenset((1, 2, 3)))
-
- def testValidateValueTypes(self):
- from zope.schema._compat import u
- from zope.schema import Int
- from zope.schema.interfaces import WrongContainedType
- field = self._makeOne(title=u('FrozenSet field'), description=u(''),
- readonly=False, required=False,
- value_type=Int())
- field.validate(None)
- field.validate(frozenset((5,)))
- field.validate(frozenset((2, 3)))
-
- self.assertRaises(WrongContainedType, field.validate, frozenset(('',)))
- self.assertRaises(WrongContainedType,
- field.validate, frozenset((3.14159,)))
-
- def testCorrectValueType(self):
- from zope.interface import implementer
- from zope.schema import Field
- from zope.schema.interfaces import IField
- # TODO: We should not allow for a None value type.
- self._makeOne(value_type=None)
-
- # do not allow arbitrary value types
- self.assertRaises(ValueError, self._makeOne, value_type=object())
- self.assertRaises(ValueError, self._makeOne, value_type=Field)
-
- # however, allow anything that implements IField
- self._makeOne(value_type=Field())
- @implementer(IField)
- class FakeField(object):
- pass
- self._makeOne(value_type=FakeField())
-
- def testNoUniqueArgument(self):
- self.assertRaises(TypeError, self._makeOne, unique=False)
- self.assertRaises(TypeError, self._makeOne, unique=True)
- self.assertTrue(self._makeOne().unique)
-
- def testImplements(self):
- from zope.schema.interfaces import IAbstractSet
- from zope.schema.interfaces import ICollection
- from zope.schema.interfaces import IFrozenSet
- from zope.schema.interfaces import IUnorderedCollection
- field = self._makeOne()
- self.assertTrue(IFrozenSet.providedBy(field))
- self.assertTrue(IAbstractSet.providedBy(field))
- self.assertTrue(IUnorderedCollection.providedBy(field))
- self.assertTrue(ICollection.providedBy(field))
-
-
-def test_suite():
- return unittest.TestSuite((
- unittest.makeSuite(SetTest),
- unittest.makeSuite(FrozenSetTest),
- ))
Deleted: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_tuplefield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_tuplefield.py 2012-04-25 18:19:58 UTC (rev 125284)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_tuplefield.py 2012-04-25 18:20:04 UTC (rev 125285)
@@ -1,145 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Tuple field tests.
-"""
-import unittest
-
-from zope.schema.tests.test_field import CollectionFieldTestBase
-
-
-class TupleTest(unittest.TestCase, CollectionFieldTestBase):
- """Test the Tuple Field."""
-
- def _getTargetClass(self):
- from zope.schema import Tuple
- return Tuple
-
- def testValidate(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import WrongType
- field = self._makeOne(title=u('Tuple field'), description=u(''),
- readonly=False, required=False)
- field.validate(None)
- field.validate(())
- field.validate((1, 2))
- field.validate((3,))
-
- self.assertRaises(WrongType, field.validate, [1, 2, 3])
- self.assertRaises(WrongType, field.validate, 'abc')
- self.assertRaises(WrongType, field.validate, 1)
- self.assertRaises(WrongType, field.validate, {})
-
- def testValidateRequired(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import RequiredMissing
- field = self._makeOne(title=u('Tuple field'), description=u(''),
- readonly=False, required=True)
- field.validate(())
- field.validate((1, 2))
- field.validate((3,))
-
- self.assertRaises(RequiredMissing, field.validate, None)
-
- def testValidateMinValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooShort
- field = self._makeOne(title=u('Tuple field'), description=u(''),
- readonly=False, required=False, min_length=2)
- field.validate(None)
- field.validate((1, 2))
- field.validate((1, 2, 3))
-
- self.assertRaises(TooShort, field.validate, ())
- self.assertRaises(TooShort, field.validate, (1,))
-
- def testValidateMaxValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooLong
- field = self._makeOne(title=u('Tuple field'), description=u(''),
- readonly=False, required=False, max_length=2)
- field.validate(None)
- field.validate(())
- field.validate((1, 2))
-
- self.assertRaises(TooLong, field.validate, (1, 2, 3, 4))
- self.assertRaises(TooLong, field.validate, (1, 2, 3))
-
- def testValidateMinValuesAndMaxValues(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import TooLong
- from zope.schema.interfaces import TooShort
- field = self._makeOne(title=u('Tuple field'), description=u(''),
- readonly=False, required=False,
- min_length=1, max_length=2)
- field.validate(None)
- field.validate((1, ))
- field.validate((1, 2))
-
- self.assertRaises(TooShort, field.validate, ())
- self.assertRaises(TooLong, field.validate, (1, 2, 3))
-
- def testValidateValueTypes(self):
- from zope.schema._compat import u
- from zope.schema import Int
- from zope.schema.interfaces import WrongContainedType
- field = self._makeOne(title=u('Tuple field'), description=u(''),
- readonly=False, required=False,
- value_type=Int())
- field.validate(None)
- field.validate((5,))
- field.validate((2, 3))
-
- self.assertRaises(WrongContainedType, field.validate, ('',) )
- self.assertRaises(WrongContainedType, field.validate, (3.14159,) )
-
- def testCorrectValueType(self):
- from zope.interface import implementer
- from zope.schema import Field
- from zope.schema.interfaces import IField
- # allow value_type of None (??? is this OK?)
- self._makeOne(value_type=None)
-
- # do not allow arbitrary value types
- self.assertRaises(ValueError, self._makeOne, value_type=object())
- self.assertRaises(ValueError, self._makeOne, value_type=Field)
-
- # however, allow anything that implements IField
- self._makeOne(value_type=Field())
- @implementer(IField)
- class FakeField(object):
- pass
- self._makeOne(value_type=FakeField())
-
- def testUnique(self):
- from zope.schema._compat import u
- from zope.schema.interfaces import NotUnique
- field = self._makeOne(title=u('test field'), description=u(''),
- readonly=False, required=True, unique=True)
- field.validate((1, 2))
- self.assertRaises(NotUnique, field.validate, (1, 2, 1))
-
- def testImplements(self):
- from zope.schema.interfaces import ICollection
- from zope.schema.interfaces import ISequence
- from zope.schema.interfaces import ITuple
- field = self._makeOne()
- self.assertTrue(ITuple.providedBy(field))
- self.assertTrue(ISequence.providedBy(field))
- self.assertTrue(ICollection.providedBy(field))
-
-
-def test_suite():
- return unittest.TestSuite((
- unittest.makeSuite(TupleTest),
- ))
More information about the checkins
mailing list