[Zope3-checkins] CVS: Zope3/src/zope/app/tests - test_clipboard.py:1.4 test_size.py:1.4 test_tzinfo.py:1.2
Albertas Agejevas
alga@codeworks.lt
Thu, 13 Mar 2003 13:49:41 -0500
Update of /cvs-repository/Zope3/src/zope/app/tests
In directory cvs.zope.org:/tmp/cvs-serv1411/src/zope/app/tests
Modified Files:
test_clipboard.py test_size.py test_tzinfo.py
Log Message:
An unexpected raid by the Whitespace Police.
Other than fixes of nonconforming whitespace, just a couple of $Id$
docstrings has been added.
=== Zope3/src/zope/app/tests/test_clipboard.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/tests/test_clipboard.py:1.3 Mon Feb 17 10:10:41 2003
+++ Zope3/src/zope/app/tests/test_clipboard.py Thu Mar 13 13:49:11 2003
@@ -29,9 +29,9 @@
from zope.app.services.tests.placefulsetup \
import PlacefulSetup
from zope.app.interfaces.annotation import IAnnotations
-
+
class PrincipalClipboardTest(AuthSetup, PlacefulSetup, TestCase):
-
+
def setUp(self):
AuthSetup.setUp(self)
PlacefulSetup.setUp(self)
@@ -41,7 +41,7 @@
root_sm = getServiceManager(None)
svc = PrincipalAnnotationService()
root_sm.defineService("PrincipalAnnotation", \
- IPrincipalAnnotationService)
+ IPrincipalAnnotationService)
root_sm.provideService("PrincipalAnnotation", svc)
sm = getServiceManager(self.rootFolder)
sm.PrincipalAnnotation = svc
@@ -55,13 +55,13 @@
annotations = annotationsvc.getAnnotation(user)
clipboard = getAdapter(annotations, IPrincipalClipboard)
clipboard.addItems('move', ['bla', 'bla/foo', 'bla/bar'])
- expected = ({'action':'move', 'target':'bla'},
+ expected = ({'action':'move', 'target':'bla'},
{'action':'move', 'target':'bla/foo'},
{'action':'move', 'target':'bla/bar'})
-
+
self.failUnless(clipboard.getContents() == expected)
clipboard.addItems('copy', ['bla'])
- expected = expected + ({'action':'copy', 'target':'bla'},)
+ expected = expected + ({'action':'copy', 'target':'bla'},)
self.failUnless(clipboard.getContents() == expected)
def testSetContents(self):
@@ -72,13 +72,13 @@
annotations = annotationsvc.getAnnotation(user)
clipboard = getAdapter(annotations, IPrincipalClipboard)
- expected = ({'action':'move', 'target':'bla'},
+ expected = ({'action':'move', 'target':'bla'},
{'action':'move', 'target':'bla/foo'},
{'action':'move', 'target':'bla/bar'})
clipboard.setContents(expected)
self.failUnless(clipboard.getContents() == expected)
clipboard.addItems('copy', ['bla'])
- expected = expected + ({'action':'copy', 'target':'bla'},)
+ expected = expected + ({'action':'copy', 'target':'bla'},)
self.failUnless(clipboard.getContents() == expected)
def testClearContents(self):
=== Zope3/src/zope/app/tests/test_size.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/tests/test_size.py:1.3 Fri Dec 27 14:19:10 2002
+++ Zope3/src/zope/app/tests/test_size.py Thu Mar 13 13:49:11 2003
@@ -29,7 +29,7 @@
from zope.app.size import DefaultSized
sized = DefaultSized(object())
self.assert_(ISized.isImplementedBy(sized))
-
+
def testSizeWithBytes(self):
from zope.app.size import DefaultSized
obj = DummyObject(1023)
@@ -49,22 +49,22 @@
sized = DefaultSized(object())
self.assertEqual(sized.sizeForSorting(), (None, None))
self.assertEqual(sized.sizeForDisplay(), u'n/a')
-
+
def testVariousSizes(self):
from zope.app.size import DefaultSized
-
+
sized = DefaultSized(DummyObject(0))
self.assertEqual(sized.sizeForSorting(), ('byte', 0))
self.assertEqual(sized.sizeForDisplay(), u'0 KB')
-
+
sized = DefaultSized(DummyObject(1))
self.assertEqual(sized.sizeForSorting(), ('byte', 1))
self.assertEqual(sized.sizeForDisplay(), u'1 KB')
-
+
sized = DefaultSized(DummyObject(2048))
self.assertEqual(sized.sizeForSorting(), ('byte', 2048))
self.assertEqual(sized.sizeForDisplay(), u'2 KB')
-
+
sized = DefaultSized(DummyObject(2000000))
self.assertEqual(sized.sizeForSorting(), ('byte', 2000000))
self.assertEqual(sized.sizeForDisplay(), u'1.91 MB')
=== Zope3/src/zope/app/tests/test_tzinfo.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/tests/test_tzinfo.py:1.1 Thu Jan 9 13:29:49 2003
+++ Zope3/src/zope/app/tests/test_tzinfo.py Thu Mar 13 13:49:11 2003
@@ -30,12 +30,12 @@
for minutes in 1439, 600, 1, 0, -1, -600, -1439:
info1 = tzinfo(minutes)
info2 = tzinfo(minutes)
-
+
self.assertEqual(info1, info2)
self.assert_(info1 is info2)
self.assert_(pickle.loads(pickle.dumps(info1)) is info1)
-
+
self.assertEqual(info1.utcoffset(None),
datetime.timedelta(minutes=minutes))
@@ -44,7 +44,7 @@
for minutes in 900000, 1440*60, -1440*60, -900000:
self.assertRaises(ValueError, tzinfo, minutes)
-
+
def test_suite():