[Checkins] SVN: grok/branches/gotcha-configuration-actions/src/grok/ Move a test that depends on grok's component setup (the site handler) from tests

[Philipp von Weitershausen]

Log message for revision 81134:
  Move a test that depends on grok's component setup (the site handler) from tests
  to ftests (where it belongs).
  
  This branch should be done now. Let's test it and get ready to merge it.
  

Changed:
  A   grok/branches/gotcha-configuration-actions/src/grok/ftests/site/
  D   grok/branches/gotcha-configuration-actions/src/grok/ftests/site/site.py
  A   grok/branches/gotcha-configuration-actions/src/grok/ftests/site/site.py
  U   grok/branches/gotcha-configuration-actions/src/grok/ftests/test_grok_functional.py
  D   grok/branches/gotcha-configuration-actions/src/grok/tests/site/
  U   grok/branches/gotcha-configuration-actions/src/grok/tests/test_grok.py

-=-
Copied: grok/branches/gotcha-configuration-actions/src/grok/ftests/site (from rev 80784, grok/branches/gotcha-configuration-actions/src/grok/tests/site)

Deleted: grok/branches/gotcha-configuration-actions/src/grok/ftests/site/site.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/site/site.py	2007-10-10 12:04:07 UTC (rev 80784)
+++ grok/branches/gotcha-configuration-actions/src/grok/ftests/site/site.py	2007-10-27 16:06:53 UTC (rev 81134)
@@ -1,51 +0,0 @@
-"""
-A site can be created by mixing in grok.Site into a grok.Model or
-grok.Container.
-
-  >>> grok.tests.grok(__name__)
-
-  >>> from zope import interface
-  >>> from zope.app.component.interfaces import IPossibleSite, ISite
-  >>> manfred = Mammoth()
-  >>> IPossibleSite.providedBy(manfred)
-  True
-  >>> herd = Herd()
-  >>> IPossibleSite.providedBy(herd)
-  True
-  >>> nonsite = NonSite()
-  >>> IPossibleSite.providedBy(nonsite)
-  False
-  >>> nonsitecontainer = NonSiteContainer()
-  >>> IPossibleSite.providedBy(nonsitecontainer)
-  False
-
-While manfred and herd are possible sites, they are not yet sites;
-
-  >>> ISite.providedBy(manfred)
-  False
-  >>> ISite.providedBy(herd)
-  False
-  
-When a site is added to a container it will be initialized as a site (
-when the ObjectAddedEvent is fired):
-
-  >>> nonsitecontainer['manfred'] = manfred
-  >>> ISite.providedBy(manfred)
-  True
-  >>> nonsitecontainer['herd'] = herd
-  >>> ISite.providedBy(herd)
-  True
-"""
-import grok
-
-class Mammoth(grok.Model, grok.Site):
-    pass
-
-class Herd(grok.Container, grok.Site):
-    pass
-
-class NonSite(grok.Model):
-    pass
-
-class NonSiteContainer(grok.Container):
-    pass

Copied: grok/branches/gotcha-configuration-actions/src/grok/ftests/site/site.py (from rev 81133, grok/branches/gotcha-configuration-actions/src/grok/tests/site/site.py)
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/ftests/site/site.py	                        (rev 0)
+++ grok/branches/gotcha-configuration-actions/src/grok/ftests/site/site.py	2007-10-27 16:06:53 UTC (rev 81134)
@@ -0,0 +1,49 @@
+"""
+A site can be created by mixing in grok.Site into a grok.Model or
+grok.Container.
+
+  >>> from zope import interface
+  >>> from zope.app.component.interfaces import IPossibleSite, ISite
+  >>> manfred = Mammoth()
+  >>> IPossibleSite.providedBy(manfred)
+  True
+  >>> herd = Herd()
+  >>> IPossibleSite.providedBy(herd)
+  True
+  >>> nonsite = NonSite()
+  >>> IPossibleSite.providedBy(nonsite)
+  False
+  >>> nonsitecontainer = NonSiteContainer()
+  >>> IPossibleSite.providedBy(nonsitecontainer)
+  False
+
+While manfred and herd are possible sites, they are not yet sites;
+
+  >>> ISite.providedBy(manfred)
+  False
+  >>> ISite.providedBy(herd)
+  False
+  
+When a site is added to a container it will be initialized as a site
+(when the ObjectAddedEvent is fired):
+
+  >>> nonsitecontainer['manfred'] = manfred
+  >>> ISite.providedBy(manfred)
+  True
+  >>> nonsitecontainer['herd'] = herd
+  >>> ISite.providedBy(herd)
+  True
+"""
+import grok
+
+class Mammoth(grok.Model, grok.Site):
+    pass
+
+class Herd(grok.Container, grok.Site):
+    pass
+
+class NonSite(grok.Model):
+    pass
+
+class NonSiteContainer(grok.Container):
+    pass

Modified: grok/branches/gotcha-configuration-actions/src/grok/ftests/test_grok_functional.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/ftests/test_grok_functional.py	2007-10-27 16:05:04 UTC (rev 81133)
+++ grok/branches/gotcha-configuration-actions/src/grok/ftests/test_grok_functional.py	2007-10-27 16:06:53 UTC (rev 81134)
@@ -50,7 +50,7 @@
 def test_suite():
     suite = unittest.TestSuite()
     for name in ['view', 'staticdir', 'xmlrpc', 'traversal', 'form', 'url',
-                 'security', 'utility', 'catalog', 'admin']:
+                 'security', 'utility', 'catalog', 'admin', 'site']:
         suite.addTest(suiteFromPackage(name))
     return suite
 

Modified: grok/branches/gotcha-configuration-actions/src/grok/tests/test_grok.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/tests/test_grok.py	2007-10-27 16:05:04 UTC (rev 81133)
+++ grok/branches/gotcha-configuration-actions/src/grok/tests/test_grok.py	2007-10-27 16:06:53 UTC (rev 81134)
@@ -44,7 +44,7 @@
     suite = unittest.TestSuite()
     for name in ['adapter', 'error', 'view', 'event', 'security', 'catalog',
                  'zcml', 'static', 'utility', 'xmlrpc', 'json', 'container',
-                 'traversal', 'form', 'site', 'grokker', 'directive', 'util',
+                 'traversal', 'form', 'grokker', 'directive', 'util',
                  'baseclass', 'annotation', 'application']:
         suite.addTest(suiteFromPackage(name))
     return suite