[Checkins] SVN: grok/trunk/src/grok/ Remove tests which are already in grokcore.site.

Sylvain Viollon sylvain at infrae.com
Fri Sep 18 08:05:44 EDT 2009


Log message for revision 104314:
  Remove tests which are already in grokcore.site.
  
  

Changed:
  U   grok/trunk/src/grok/ftests/test_grok_functional.py
  D   grok/trunk/src/grok/ftests/utility/
  D   grok/trunk/src/grok/tests/utility/local_implementsmany.py
  D   grok/trunk/src/grok/tests/utility/local_implementsmany_fixture.py
  D   grok/trunk/src/grok/tests/utility/local_implementsnone.py
  D   grok/trunk/src/grok/tests/utility/local_implementsnone2.py
  D   grok/trunk/src/grok/tests/utility/local_implementsnone2_fixture.py
  D   grok/trunk/src/grok/tests/utility/local_implementsnone_fixture.py
  D   grok/trunk/src/grok/tests/utility/multiple_class.py
  D   grok/trunk/src/grok/tests/utility/multiple_class_fixture.py
  D   grok/trunk/src/grok/tests/utility/multiple_directive.py
  D   grok/trunk/src/grok/tests/utility/multiple_directive_fixture.py
  D   grok/trunk/src/grok/tests/utility/publicnoncontainer.py

-=-
Modified: grok/trunk/src/grok/ftests/test_grok_functional.py
===================================================================
--- grok/trunk/src/grok/ftests/test_grok_functional.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/ftests/test_grok_functional.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -71,7 +71,7 @@
 def test_suite():
     suite = unittest.TestSuite()
     for name in ['xmlrpc', 'traversal', 'form', 'url', 'security', 'publish',
-                 'utility', 'catalog', 'site', 'rest', 'viewlet','json']:
+                 'catalog', 'site', 'rest', 'viewlet','json']:
         suite.addTest(suiteFromPackage(name))
     return suite
 

Deleted: grok/trunk/src/grok/tests/utility/local_implementsmany.py
===================================================================
--- grok/trunk/src/grok/tests/utility/local_implementsmany.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/local_implementsmany.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,15 +0,0 @@
-"""
-Anything can be registered as a local utility. If it implements a single
-interface, there is no need to specify which interface it provides.
-
-In this test, the utility implements more than one interface, so it cannot be
-registered as a local utility.
-
-  >>> import grok.tests.utility.local_implementsmany_fixture
-  Traceback (most recent call last):
-    ...
-  GrokError: <class 'grok.tests.utility.local_implementsmany_fixture.Fireplace'>
-  is implementing more than one interface (use grok.provides to specify
-  which one to use).
-
-"""

Deleted: grok/trunk/src/grok/tests/utility/local_implementsmany_fixture.py
===================================================================
--- grok/trunk/src/grok/tests/utility/local_implementsmany_fixture.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/local_implementsmany_fixture.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,14 +0,0 @@
-import grok
-from zope import interface
-
-class IHome(interface.Interface):
-    pass
-
-class IFireplace(interface.Interface):
-    pass
-
-class Fireplace(object):
-    interface.implements(IHome, IFireplace)
-
-class Cave(grok.Model, grok.Site):
-    grok.local_utility(Fireplace)

Deleted: grok/trunk/src/grok/tests/utility/local_implementsnone.py
===================================================================
--- grok/trunk/src/grok/tests/utility/local_implementsnone.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/local_implementsnone.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,14 +0,0 @@
-"""
-Anything can be registered as a local utility. If it implements a single
-interface, there is no need to specify which interface it provides.
-
-In this test, the utility does not implement any interface, so it cannot be
-registered as a local utility.
-
-  >>> import grok.tests.utility.local_implementsnone_fixture
-  Traceback (most recent call last):
-    ...
-  GrokError: <class 'grok.tests.utility.local_implementsnone_fixture.Fireplace'>
-  must implement at least one interface (use grok.implements to specify).
-
-"""

Deleted: grok/trunk/src/grok/tests/utility/local_implementsnone2.py
===================================================================
--- grok/trunk/src/grok/tests/utility/local_implementsnone2.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/local_implementsnone2.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,14 +0,0 @@
-"""
-  >>> import grok.tests.utility.local_implementsnone2_fixture
-  Traceback (most recent call last):
-    ...
-  GrokImportError: ("Cannot determine which interface to use for utility
-  registration of
-  <class 'grok.tests.utility.local_implementsnone2_fixture.Fireplace'>.
-  It implements an interface that is a specialization of an interface
-  implemented by grok.LocalUtility. Specify the interface by either
-  using grok.provides on the utility or passing 'provides' to
-  grok.local_utility.",
-  <class 'grok.tests.utility.local_implementsnone2_fixture.Fireplace'>)
-
-"""

Deleted: grok/trunk/src/grok/tests/utility/local_implementsnone2_fixture.py
===================================================================
--- grok/trunk/src/grok/tests/utility/local_implementsnone2_fixture.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/local_implementsnone2_fixture.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,12 +0,0 @@
-import grok
-from zope import interface
-import persistent
-
-class ISpecialPersistent(persistent.interfaces.IPersistent):
-    pass
-
-class Fireplace(grok.LocalUtility):
-    grok.implements(ISpecialPersistent)
-
-class Cave(grok.Model, grok.Site):
-    grok.local_utility(Fireplace)

Deleted: grok/trunk/src/grok/tests/utility/local_implementsnone_fixture.py
===================================================================
--- grok/trunk/src/grok/tests/utility/local_implementsnone_fixture.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/local_implementsnone_fixture.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,8 +0,0 @@
-import grok
-from zope import interface
-
-class Fireplace(object):
-    pass
-
-class Cave(grok.Model, grok.Site):
-    grok.local_utility(Fireplace)

Deleted: grok/trunk/src/grok/tests/utility/multiple_class.py
===================================================================
--- grok/trunk/src/grok/tests/utility/multiple_class.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/multiple_class.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,14 +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:
-
-  >>> import grok.tests.utility.multiple_class_fixture
-  Traceback (most recent call last):
-    ...
-  GrokImportError: ("Conflicting local utility registration
-  <class 'grok.tests.utility.multiple_class_fixture.Fireplace2'>.
-  Local utilities are registered multiple times for interface
-  <InterfaceClass grok.tests.utility.multiple_class_fixture.IFireplace>
-  and name 'Foo'.",
-  <class 'grok.tests.utility.multiple_class_fixture.Fireplace2'>)
-"""

Deleted: grok/trunk/src/grok/tests/utility/multiple_class_fixture.py
===================================================================
--- grok/trunk/src/grok/tests/utility/multiple_class_fixture.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/multiple_class_fixture.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,15 +0,0 @@
-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/trunk/src/grok/tests/utility/multiple_directive.py
===================================================================
--- grok/trunk/src/grok/tests/utility/multiple_directive.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/multiple_directive.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,14 +0,0 @@
-"""
-When you call the grok.local_utility directive multiple times specifying
-the same (interface, name) combination, we expect an error:
-
-  >>> import grok.tests.utility.multiple_directive_fixture
-  Traceback (most recent call last):
-    ...
-  GrokImportError: ("Conflicting local utility registration
-  <class 'grok.tests.utility.multiple_directive_fixture.Fireplace2'>.
-  Local utilities are registered multiple times for interface
-  <InterfaceClass grok.tests.utility.multiple_directive_fixture.IFireplace>
-  and name u''.",
-  <class 'grok.tests.utility.multiple_directive_fixture.Fireplace2'>)
-"""

Deleted: grok/trunk/src/grok/tests/utility/multiple_directive_fixture.py
===================================================================
--- grok/trunk/src/grok/tests/utility/multiple_directive_fixture.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/multiple_directive_fixture.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,15 +0,0 @@
-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/trunk/src/grok/tests/utility/publicnoncontainer.py
===================================================================
--- grok/trunk/src/grok/tests/utility/publicnoncontainer.py	2009-09-18 12:05:29 UTC (rev 104313)
+++ grok/trunk/src/grok/tests/utility/publicnoncontainer.py	2009-09-18 12:05:44 UTC (rev 104314)
@@ -1,23 +0,0 @@
-"""
-You cannot use local_utility with 'public' set to True if the site class
-isn't a container:
-
-  >>> grok.testing.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