[Checkins]
SVN: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/
Move more ftests that aren't really ftests (because they just
test for
Philipp von Weitershausen
philikon at philikon.de
Fri Aug 24 08:02:43 EDT 2007
Log message for revision 79227:
Move more ftests that aren't really ftests (because they just test for
GrokErrors) to regular tests.
Changed:
D grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_class.py
D grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_directive.py
D grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/publicnoncontainer.py
A grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/multiple_class.py
A grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/multiple_directive.py
A grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/publicnoncontainer.py
-=-
Deleted: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_class.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_class.py 2007-08-24 11:56:14 UTC (rev 79226)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_class.py 2007-08-24 12:02:43 UTC (rev 79227)
@@ -1,31 +0,0 @@
-"""
-When you try to register multiple classes with the same (interface, name)
-combination multiple times using grok.local_utility, we expect an error:
-
- >>> from zope import component
- >>> from grok.ftests.utility.multiple_class import *
-
- Traceback (most recent call last):
- ...
- GrokError: Conflicting local utility registration
- <class 'grok.ftests.utility.multiple_class.Fireplace2'> in site
- <class 'grok.ftests.utility.multiple_class.Cave'>.
- Local utilities are registered multiple times for interface
- <InterfaceClass grok.ftests.utility.multiple_class.IFireplace> and
- name 'Foo'.
-"""
-import grok
-from zope import interface
-
-class IFireplace(interface.Interface):
- pass
-
-class Fireplace(grok.LocalUtility):
- grok.implements(IFireplace)
-
-class Fireplace2(grok.LocalUtility):
- grok.implements(IFireplace)
-
-class Cave(grok.Model, grok.Site):
- grok.local_utility(Fireplace, name='Foo')
- grok.local_utility(Fireplace2, name='Foo')
Deleted: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_directive.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_directive.py 2007-08-24 11:56:14 UTC (rev 79226)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_directive.py 2007-08-24 12:02:43 UTC (rev 79227)
@@ -1,31 +0,0 @@
-"""
-When you call the grok.local_utility directive multiple times specifying
-the same (interface, name) combination, we expect an error:
-
- >>> from zope import component
- >>> from grok.ftests.utility.multiple_directive import *
-
- Traceback (most recent call last):
- ...
- GrokError: Conflicting local utility registration
- <class 'grok.ftests.utility.multiple_directive.Fireplace2'> in site
- <class 'grok.ftests.utility.multiple_directive.Cave'>.
- Local utilities are registered multiple times for interface
- <InterfaceClass grok.ftests.utility.multiple_directive.IFireplace> and
- name u''.
-"""
-import grok
-from zope import interface
-
-class IFireplace(interface.Interface):
- pass
-
-class Fireplace(grok.LocalUtility):
- grok.implements(IFireplace)
-
-class Fireplace2(grok.LocalUtility):
- grok.implements(IFireplace)
-
-class Cave(grok.Model, grok.Site):
- grok.local_utility(Fireplace, provides=IFireplace)
- grok.local_utility(Fireplace2, provides=IFireplace)
Deleted: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/publicnoncontainer.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/publicnoncontainer.py 2007-08-24 11:56:14 UTC (rev 79226)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/publicnoncontainer.py 2007-08-24 12:02:43 UTC (rev 79227)
@@ -1,24 +0,0 @@
-"""
-You cannot use local_utility with 'public' set to True if the site class
-isn't a container:
-
- >>> from zope import component
- >>> from grok.ftests.utility.publicnoncontainer import *
- Traceback (most recent call last):
- ...
- GrokError: Cannot set public to True with grok.local_utility as the site
- (<class 'grok.ftests.utility.publicnoncontainer.Cave'>) is not a container.
-
-"""
-
-import grok
-from zope import interface
-
-class IFireplace(interface.Interface):
- pass
-
-class Fireplace(grok.LocalUtility):
- grok.implements(IFireplace)
-
-class Cave(grok.Model, grok.Site):
- grok.local_utility(Fireplace, public=True, name_in_container='fireplace')
Copied: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/multiple_class.py (from rev 79223, grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_class.py)
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/multiple_class.py (rev 0)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/multiple_class.py 2007-08-24 12:02:43 UTC (rev 79227)
@@ -0,0 +1,29 @@
+"""
+When you try to register multiple classes with the same (interface, name)
+combination multiple times using grok.local_utility, we expect an error:
+
+ >>> grok.grok(__name__)
+ Traceback (most recent call last):
+ ...
+ GrokError: Conflicting local utility registration
+ <class 'grok.tests.utility.multiple_class.Fireplace2'> in site
+ <class 'grok.tests.utility.multiple_class.Cave'>.
+ Local utilities are registered multiple times for interface
+ <InterfaceClass grok.tests.utility.multiple_class.IFireplace> and
+ name 'Foo'.
+"""
+import grok
+from zope import interface
+
+class IFireplace(interface.Interface):
+ pass
+
+class Fireplace(grok.LocalUtility):
+ grok.implements(IFireplace)
+
+class Fireplace2(grok.LocalUtility):
+ grok.implements(IFireplace)
+
+class Cave(grok.Model, grok.Site):
+ grok.local_utility(Fireplace, name='Foo')
+ grok.local_utility(Fireplace2, name='Foo')
Copied: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/multiple_directive.py (from rev 79223, grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/multiple_directive.py)
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/multiple_directive.py (rev 0)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/multiple_directive.py 2007-08-24 12:02:43 UTC (rev 79227)
@@ -0,0 +1,29 @@
+"""
+When you call the grok.local_utility directive multiple times specifying
+the same (interface, name) combination, we expect an error:
+
+ >>> grok.grok(__name__)
+ Traceback (most recent call last):
+ ...
+ GrokError: Conflicting local utility registration
+ <class 'grok.tests.utility.multiple_directive.Fireplace2'> in site
+ <class 'grok.tests.utility.multiple_directive.Cave'>.
+ Local utilities are registered multiple times for interface
+ <InterfaceClass grok.tests.utility.multiple_directive.IFireplace> and
+ name u''.
+"""
+import grok
+from zope import interface
+
+class IFireplace(interface.Interface):
+ pass
+
+class Fireplace(grok.LocalUtility):
+ grok.implements(IFireplace)
+
+class Fireplace2(grok.LocalUtility):
+ grok.implements(IFireplace)
+
+class Cave(grok.Model, grok.Site):
+ grok.local_utility(Fireplace, provides=IFireplace)
+ grok.local_utility(Fireplace2, provides=IFireplace)
Copied: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/publicnoncontainer.py (from rev 79223, grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/publicnoncontainer.py)
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/publicnoncontainer.py (rev 0)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/tests/utility/publicnoncontainer.py 2007-08-24 12:02:43 UTC (rev 79227)
@@ -0,0 +1,23 @@
+"""
+You cannot use local_utility with 'public' set to True if the site class
+isn't a container:
+
+ >>> grok.grok(__name__)
+ Traceback (most recent call last):
+ ...
+ GrokError: Cannot set public to True with grok.local_utility as the site
+ (<class 'grok.tests.utility.publicnoncontainer.Cave'>) is not a container.
+
+"""
+
+import grok
+from zope import interface
+
+class IFireplace(interface.Interface):
+ pass
+
+class Fireplace(grok.LocalUtility):
+ grok.implements(IFireplace)
+
+class Cave(grok.Model, grok.Site):
+ grok.local_utility(Fireplace, public=True, name_in_container='fireplace')
More information about the Checkins
mailing list